commit b7a165228f02e693b3e777b4c815214bb6e05691
Merge: 3a785dd5b c81c5a264
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu May 7 08:19:11 2020 -0400
Merge remote-tracking branch 'tor-github/pr/1880/head'
changes/ticket33789 | 4 +
scripts/maint/practracker/exceptions.txt | 2 +-
src/app/config/config.c | 289 -----------------------------
src/app/config/config.h | 6 -
src/app/config/include.am | 2 +
src/app/config/resolve_addr.c | 308 +++++++++++++++++++++++++++++++
src/app/config/resolve_addr.h | 28 +++
src/core/mainloop/connection.c | 1 +
src/core/or/channeltls.c | 1 +
src/core/stA1RajU | 0
src/core/stiysZND | Bin 0 -> 19083264 bytes
src/feature/client/transports.c | 1 +
src/feature/control/control_getinfo.c | 1 +
src/feature/dirauth/dirauth_config.c | 1 +
src/feature/dirauth/dirvote.c | 1 +
src/feature/dircache/dircache.c | 1 +
src/feature/dirclient/dirclient.c | 1 +
src/feature/dirclient/dirclient_modes.c | 1 +
src/feature/nodelist/dirlist.c | 1 +
src/feature/relay/include.am | 2 +
src/feature/relay/relay_find_addr.c | 133 +++++++++++++
src/feature/relay/relay_find_addr.h | 23 +++
src/feature/relay/router.c | 119 +-----------
src/feature/relay/router.h | 8 +-
src/test/test_channeltls.c | 1 +
src/test/test_config.c | 2 +
26 files changed, 520 insertions(+), 417 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
