From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 19 Feb 2020 18:55:18 +0000 (-0500)
Subject: Merge branch 'extract_ext_orport'
X-Git-Tag: tor-0.4.5.0-alpha-dev~177
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65b75ef3d5628fac8e8eeebaf66c437a505653e0;p=thirdparty%2Ftor.git

Merge branch 'extract_ext_orport'
---

65b75ef3d5628fac8e8eeebaf66c437a505653e0
diff --cc src/feature/relay/include.am
index 2f730a6857,1cfc0961b7..5cb0731fb4
--- 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.