Merge branch 'maint-0.4.5'

changes/ticket40243

+  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.

src/feature/dirauth/dirvote.c

@@ -4232,8 +4232,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,