[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/303' into maint-0.4.5

[dgoulet at torproject.org]

commit 73bedcaf4db3688c5720fb078e584d5b2a73f052
Merge: d24a6b2f75 ae5800cd9f
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Feb 12 12:54:52 2021 -0500

    Merge branch 'tor-gitlab/mr/303' into maint-0.4.5

 changes/ticket40208           |  6 ++++++
 src/app/config/resolve_addr.c | 14 +++++++++++++-
 src/test/test_config.c        | 17 +++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)