commit f79a31f6d50b6b44e0bef091f3e6df0d473141bd Merge: f8cf2546ea f0c29f0883 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 12:02:21 2021 -0500

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

changes/ticket40231 | 4 ++++ src/feature/relay/relay_find_addr.c | 10 +++++++--- src/feature/relay/relay_periodic.c | 2 +- src/feature/relay/router.c | 18 +++++++++--------- src/feature/relay/router.h | 2 +- 5 files changed, 22 insertions(+), 14 deletions(-)