commit d9e648f0d961699c1eb89fd49dfdcfce80e598a9 Merge: 62cecfdc5f e50648582b Author: David Goulet <dgoulet@torproject.org> Date: Wed Feb 3 08:54:40 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 src/core/or/connection_edge.c | 2 +- src/feature/nodelist/nodelist.c | 63 ++++++++++++++++++++++++++++++++--------- src/feature/nodelist/nodelist.h | 3 +- src/test/test_address_set.c | 12 ++++---- 4 files changed, 57 insertions(+), 23 deletions(-)