commit 65d268c77bedef363b786924a0ec7e254af9945f Merge: 9e6a276c26 3c0d398847 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 27 09:36:39 2021 -0500

Merge branch 'maint-0.4.5' into release-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(-)