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

Merge branch 'extract_relay_dns'
---

a65efa7e8378fa470b7312509eecf92aa029817f
diff --cc src/feature/relay/include.am
index 5cb0731fb4,ad81e60d75..aa7c1b35b3
--- a/src/feature/relay/include.am
+++ b/src/feature/relay/include.am
@@@ -1,16 -1,17 +1,16 @@@
  
  # 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.
  
  # ADD_C_FILE: INSERT SOURCES HERE.
  MODULE_RELAY_SOURCES = 						\
+ 	src/feature/relay/dns.c					\
 +	src/feature/relay/ext_orport.c		                \
  	src/feature/relay/routermode.c				\
  	src/feature/relay/relay_config.c			\
  	src/feature/relay/relay_periodic.c			\