diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-12-23 01:18:14 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-12-23 01:18:14 +0000 |
| commit | 61bd5583d9221c387b693a266a80561d76be0484 (patch) | |
| tree | d9d99f0c117e237d980b3493a261a3b229dab0bc | |
| parent | 3a85c9fa65a2d6fd7d0b65726a3bbc471d39a5af (diff) | |
| download | tor-61bd5583d9221c387b693a266a80561d76be0484.tar.gz tor-61bd5583d9221c387b693a266a80561d76be0484.zip | |
If we receive a general-purpose descriptor and then receive an
identical bridge-purpose descriptor soon after, don't discard
the next one as a duplicate.
svn:r12933
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/or/routerlist.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -28,6 +28,9 @@ Changes in version 0.2.0.14-alpha - 2007-12-?? - Fix test for rlim_t on OSX 10.3: sys/resource.h doesn't want to be included unless sys/time.h is already included. Fixes bug 553. Bugfix on 0.2.0.x. + - If we receive a general-purpose descriptor and then receive an + identical bridge-purpose descriptor soon after, don't discard + the next one as a duplicate. o Minor features: - If BridgeRelay is set to 1, then the default for diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 0c56d440e3..6edf123bd4 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4121,6 +4121,7 @@ router_differences_are_cosmetic(routerinfo_t *r1, routerinfo_t *r2) strcasecmp(r1->nickname, r2->nickname) || r1->or_port != r2->or_port || r1->dir_port != r2->dir_port || + r1->purpose != r2->purpose || crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) || crypto_pk_cmp_keys(r1->identity_pkey, r2->identity_pkey) || strcasecmp(r1->platform, r2->platform) || |