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

[dgoulet at torproject.org]

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

    Merge branch 'maint-0.3.5' into release-0.3.5

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