commit 49800cf5390bc1445a5fab9bbf346ca73c6b3a58 Merge: cbe9e5659 ed4420b4b Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 29 19:16:40 2020 -0400
Merge remote-tracking branch 'tor-github/pr/1864/head'
changes/bug33900 | 3 + changes/bug33917 | 5 + changes/ticket33817 | 12 ++ changes/ticket33901 | 4 + scripts/maint/practracker/exceptions.txt | 2 +- src/core/or/channel.c | 60 ++++-- src/core/or/channel.h | 5 +- src/core/or/channeltls.c | 2 +- src/core/or/circuitbuild.c | 16 +- src/core/or/connection_edge.c | 2 +- src/core/or/onion.c | 43 +++- src/core/or/policies.c | 4 +- src/core/or/relay.c | 8 +- src/core/proto/proto_socks.c | 5 +- src/feature/client/addressmap.c | 2 +- src/feature/relay/circuitbuild_relay.c | 196 +++++++++++++++--- src/feature/relay/circuitbuild_relay.h | 3 + src/feature/relay/router.c | 20 +- src/feature/relay/router.h | 2 + src/lib/log/util_bug.h | 23 ++- src/lib/net/address.c | 62 +++++- src/lib/net/address.h | 15 +- src/test/test_address.c | 4 +- src/test/test_cell_formats.c | 78 ++++++-- src/test/test_channel.c | 37 ++-- src/test/test_circuitbuild.c | 328 +++++++++++++++++++++++++++++-- src/tools/tor-resolve.c | 2 +- 27 files changed, 805 insertions(+), 138 deletions(-)