commit 3c0d3988473b51b776207fdc8d1b0d332fed2284 Merge: af5250b1df f03047332c Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 27 09:36:29 2021 -0500

Merge branch 'mr_274_squashed' into 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(-)