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

[dgoulet at torproject.org]

commit 4a7fcc7361aff1ff4cf4d763472742c38edc8124
Merge: 8e493f321a bdca475518
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Feb 12 12:57:18 2021 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40208           |  6 ++++++
 src/app/config/resolve_addr.c | 14 +++++++++++++-
 src/feature/relay/router.c    |  3 +--
 src/test/test_config.c        | 17 +++++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)