commit 1fb9be53969011a10c453a36099583f631dc8a09 Merge: b335ef178 3e4814ede Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 5 10:08:27 2020 -0400

Merge remote-tracking branch 'tor-github/pr/1902/head'

changes/ticket33788 | 4 ++ src/app/config/resolve_addr.c | 2 +- src/core/or/connection_edge.c | 5 +- src/feature/client/circpathbias.c | 5 ++ src/feature/control/control_getinfo.c | 1 + src/feature/dirauth/dirvote.c | 86 +++++++++++++++++++-------------- src/feature/nodelist/authcert.c | 12 +++-- src/feature/nodelist/dirlist.c | 3 ++ src/feature/nodelist/fmt_routerstatus.c | 6 ++- src/feature/relay/dns.c | 24 ++++++--- src/feature/relay/relay_periodic.c | 43 +++++++++-------- src/feature/relay/router.c | 3 ++ src/feature/relay/selftest.c | 12 +++++ src/feature/rend/rendservice.c | 25 +++++----- src/lib/net/address.c | 27 +++++++++-- 15 files changed, 171 insertions(+), 87 deletions(-)