[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet at torproject.org]

commit 056b86a8b5df18de0ae79902922334c35cac1537
Merge: c38d46750e f79a31f6d5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 12:02:28 2021 -0500

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