commit 973a5db80851838e4516de40afe028bc10c425f0 Merge: 9c6283732 c659603ac Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 20 07:53:57 2018 -0500

Merge remote-tracking branch 'tor-github/pr/445'

changes/ticket27325 | 4 + src/core/or/channeltls.c | 98 ++++-- src/core/or/connection_or.c | 82 +++-- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_netinfo.c | 48 +++ src/trunnel/include.am | 6 +- src/trunnel/netinfo.c | 723 ++++++++++++++++++++++++++++++++++++++++++++ src/trunnel/netinfo.h | 226 ++++++++++++++ src/trunnel/netinfo.trunnel | 24 ++ 11 files changed, 1164 insertions(+), 50 deletions(-)