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

[dgoulet at torproject.org]

commit e50648582b6e0bc7bb37edc08e7a4d67b50f2c53
Merge: 0f8195406e c2cee6c780
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Feb 3 08:54:40 2021 -0500

    Merge branch 'maint-0.3.5' into maint-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(-)