commit 4961645254a7cb1bc0a64947995a3ec2d77bffb0 Merge: 85c4087de9 f79a31f6d5 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 12:02:28 2021 -0500

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