commit ec9575944ac780d67bd36c0e6e64ddcebcdadeb3 Merge: e50469299b 46efbcb116 Author: David Goulet dgoulet@torproject.org Date: Fri Jan 29 14:40:56 2021 -0500

Merge branch 'maint-0.4.5'

changes/ticket2667 | 4 +++ src/core/or/address_set.c | 74 ++++++++++++++++++++++++++++++++++++++ src/core/or/address_set.h | 18 +++++++++- src/core/or/connection_edge.c | 24 +++++++++++++ src/feature/nodelist/dirlist.c | 9 +++-- src/feature/nodelist/nodelist.c | 64 +++++++++++++++++++++++++++------ src/feature/nodelist/nodelist.h | 5 ++- src/test/test_address_set.c | 80 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 262 insertions(+), 16 deletions(-)