[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

[dgoulet at torproject.org]

commit 903bfc4eca6a02c56db66c708f3f102129a470df
Merge: 36b51a1c71 e50648582b
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Feb 3 08:54:40 2021 -0500

    Merge branch 'maint-0.4.3' into maint-0.4.4

 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(-)