[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

[dgoulet@xxxxxxxxxxxxxx]

commit 6bde42b4de3fd1a3d7c8385a66f8e40b954e60f8
Merge: 385fda038f ed373eaa8d
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Mon Feb 1 14:10:06 2021 -0500

    Merge branch 'maint-0.4.5'

 src/core/or/address_set.c       | 75 -----------------------------------------
 src/core/or/address_set.h       | 15 ---------
 src/core/or/connection_edge.c   |  4 +--
 src/feature/nodelist/nodelist.c | 63 ++++++++++++++++++++++++++--------
 src/feature/nodelist/nodelist.h |  3 +-
 src/test/test_address_set.c     | 12 +++----
 6 files changed, 58 insertions(+), 114 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits