commit c1b5e7fa1bfb7a64c148f098c86b08f4f3167213 Merge: e6caf7d8c7 bdca475518 Author: David Goulet <dgoulet@torproject.org> Date: Fri Feb 12 12:57:18 2021 -0500 Merge branch 'maint-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(-)