diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-15 20:09:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-15 20:09:10 -0400 |
| commit | 4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611 (patch) | |
| tree | d76a05b933fef271e890e27f7933fa4a6668219b /src/common/di_ops.h | |
| parent | d29c2eb9214a82653a18d51e643d637851dcd145 (diff) | |
| parent | 00ff80e0ae3a07ff3e2148d66d59716bc4630096 (diff) | |
| download | tor-4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611.tar tor-4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/networkstatus.c
Diffstat (limited to 'src/common/di_ops.h')
| -rw-r--r-- | src/common/di_ops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/di_ops.h b/src/common/di_ops.h index 4a212b0ca..fa7d86806 100644 --- a/src/common/di_ops.h +++ b/src/common/di_ops.h @@ -28,3 +28,4 @@ int tor_memeq(const void *a, const void *b, size_t sz); #define fast_memneq(a,b,c) (0!=memcmp((a),(b),(c))) #endif + |