tor

commit 27ee12836d67a0cfa123a2f2fad378c93848519a
parent e3a5482681f9c4625df1e418b42038cded3cb082
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 19 Jan 2021 13:20:31 -0500

Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5

Diffstat:
A
changes/ticket40243
 | 
4
++++
M
src/feature/dirauth/dirvote.c
 | 
3
+--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/ticket40243 b/changes/ticket40243
@@ -0,0 +1,4 @@
+  o Major bugfixes (authority, IPv6):
+    - Do not consider multiple relays in the same IPv6 network to be sybils.
+      Sybils are selected based on the /128 now, not the /64. Fixes bug 40243;
+      bugfix on 0.4.5.1-alpha.
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
@@ -4219,8 +4219,7 @@ compare_routerinfo_addrs_by_family(const routerinfo_t *a,
 {
   const tor_addr_t *addr1 = (family==AF_INET) ? &a->ipv4_addr : &a->ipv6_addr;
   const tor_addr_t *addr2 = (family==AF_INET) ? &b->ipv4_addr : &b->ipv6_addr;
-  const int maskbits = (family==AF_INET) ? 32 : 64;
-  return tor_addr_compare_masked(addr1, addr2, maskbits, CMP_EXACT);
+  return tor_addr_compare(addr1, addr2, CMP_EXACT);
 }
 
 /** Helper for sorting: compares two ipv4 routerinfos first by ipv4 address,