mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Nick Mathewson 2021-01-19 13:20:31 -05:00
commit 27ee12836d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/ticket40243 Normal file
View file

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

3
src/feature/dirauth/dirvote.c
View file

@ -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,