commit a5b4ee2a01128a97e5b9ec8f50b975a5aaf40551 Merge: 16bd8c7247 9eba65bd8b Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:44:19 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket2667 | 4 ++ src/core/or/address_set.c | 74 +++++++++++++++++++++++++++++++++++ src/core/or/address_set.h | 20 +++++++++- src/core/or/connection_edge.c | 25 ++++++++++++ src/feature/nodelist/dirlist.c | 36 +++++++++++++++++ src/feature/nodelist/dirlist.h | 2 + src/feature/nodelist/nodelist.c | 87 +++++++++++++++++++++++++++++++++++------ src/feature/nodelist/nodelist.h | 4 ++ src/test/test_address_set.c | 87 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 325 insertions(+), 14 deletions(-)