[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/41'

[nickm at torproject.org]

commit 0c2bb9eac576d899b2ff8a8fa1be91762b4ee1be
Merge: 063cdb314 46b86b22e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 10 13:19:28 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/41'

 src/feature/relay/relay_find_addr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)