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

[nickm at torproject.org]

commit b019c8385348e94b2f5d898191af41abc978078b
Merge: 05a7624266 3c0d398847
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 27 09:36:39 2021 -0500

    Merge branch 'maint-0.4.5'

 changes/ticket40254                 |  4 ++++
 src/feature/relay/relay_find_addr.c | 24 +++++++++++++++++++++++
 src/feature/relay/router.c          | 39 ++++++++++++-------------------------
 src/test/test_relay.c               | 33 ++++++++++++++++++++++---------
 4 files changed, 64 insertions(+), 36 deletions(-)