commit 65b75ef3d5628fac8e8eeebaf66c437a505653e0 Merge: 7b6e81f8e 9b21a5d25 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 19 13:55:18 2020 -0500

Merge branch 'extract_ext_orport'

changes/ticket33368 | 3 ++ src/app/main/shutdown.c | 3 +- src/core/or/connection_or.c | 69 --------------------------------------- src/core/proto/proto_ext_or.h | 7 ++++ src/feature/client/transports.c | 6 ++-- src/feature/relay/ext_orport.c | 71 +++++++++++++++++++++++++++++++++++++++++ src/feature/relay/ext_orport.h | 50 +++++++++++++++++++++++------ src/feature/relay/include.am | 2 +- 8 files changed, 129 insertions(+), 82 deletions(-)

diff --cc src/feature/relay/include.am index 2f730a685,1cfc0961b..5cb0731fb --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@@ -2,10 -2,10 +2,9 @@@ # Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ src/feature/relay/dns.c \ - src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ src/feature/relay/router.c \ - src/feature/relay/routerkeys.c \ - src/feature/relay/selftest.c + src/feature/relay/routerkeys.c

# The Relay module.