commit 86da0cfd36f82d1d8a0948a3587aef0f518c7a66 Merge: 4af6e3b4d 29a35d262 Author: David Goulet dgoulet@torproject.org Date: Wed Jun 24 13:51:51 2020 -0400
Merge branch 'tor-github/pr/1945'
changes/ticket33233 | 4 + scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 4 +- src/app/config/or_options_st.h | 5 +- src/app/config/resolve_addr.c | 786 +++++++++++++++++++++---------- src/app/config/resolve_addr.h | 12 +- src/app/main/main.c | 3 +- src/core/mainloop/connection.c | 2 +- src/core/or/channeltls.c | 6 +- src/feature/dirauth/dirauth_config.c | 4 +- src/feature/dirauth/dirvote.c | 8 +- src/feature/dircache/dircache.c | 2 +- src/feature/nodelist/dirlist.c | 10 +- src/feature/relay/relay_config.c | 2 +- src/feature/relay/relay_find_addr.c | 37 +- src/feature/relay/router.c | 5 +- src/test/test_channeltls.c | 32 +- src/test/test_config.c | 285 ++++++----- 18 files changed, 760 insertions(+), 449 deletions(-)