commit b2434d30d2c1071f01d9331752fc7d357169332f Merge: ea38016202 705fd37875 Author: David Goulet dgoulet@torproject.org Date: Fri Jan 29 14:54:21 2021 -0500

Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01

changes/ticket2667 | 4 ++ src/core/or/address_set.c | 74 +++++++++++++++++++++++++++++++++++ src/core/or/address_set.h | 18 ++++++++- src/core/or/connection_edge.c | 25 ++++++++++++ src/feature/nodelist/dirlist.c | 11 ++++-- src/feature/nodelist/nodelist.c | 87 +++++++++++++++++++++++++++++------------ src/feature/nodelist/nodelist.h | 6 ++- src/test/test_address_set.c | 80 +++++++++++++++++++++++++++++++++++++ 8 files changed, 274 insertions(+), 31 deletions(-)