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

diff --git a/ChangeLog b/ChangeLog
index ee94c7d733928ae2dd796410a7118a2176fb197c..78392d074f45a920d93926505b417f2312801159 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 0c56d440e3e1b836d001c4172c5f78c28982b122..6edf123bd44bbde1abe8b3f278e807576665a085 100644 (file)
--- 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) ||