[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/316' into maint-0.4.5

[nickm at torproject.org]

commit bc21ed32903459c53599ee03605e8d23bf42ffe9
Merge: 26c2e843f9 4d7f31b964
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 22 15:37:31 2021 -0500

    Merge remote-tracking branch 'tor-gitlab/mr/316' into maint-0.4.5

 changes/ticket40300                 |  5 +++++
 src/feature/relay/relay_find_addr.c | 25 +++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)