aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-17 15:59:40 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-17 15:59:40 -0400
commita9d56289ee53da6aa98a0c8b89796b7872ff6e1a (patch)
treeed82821095fc5b7ff3b693a0b75f636d2996e75f /src/or/routerlist.c
parent851197f11d8d602de5c6487d79a21339a587ebb6 (diff)
parent9ed87b37d04705983b11cd995140e8864454bf5e (diff)
downloadtor-a9d56289ee53da6aa98a0c8b89796b7872ff6e1a.tar.gz
tor-a9d56289ee53da6aa98a0c8b89796b7872ff6e1a.zip
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index ee99e2c7ae..cee149a16d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5160,6 +5160,8 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
if (strcasecmp(r1->address, r2->address) ||
strcasecmp(r1->nickname, r2->nickname) ||
r1->or_port != r2->or_port ||
+ !tor_addr_eq(&r1->ipv6_addr, &r2->ipv6_addr) ||
+ r1->ipv6_orport != r2->ipv6_orport ||
r1->dir_port != r2->dir_port ||
r1->purpose != r2->purpose ||
crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) ||