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

[dgoulet at torproject.org]

commit 37af94daf938fc21883d3ab0d49231af4373ba33
Merge: 21ca3c2501 4d7f31b964
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 22 15:34:17 2021 -0500

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

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