Merge branch 'extract_relay_dns'

diff --cc src/feature/relay/include.am
index 5cb0731fb4f277d42d5d98a95612519f6887c732,ad81e60d75f3647df8d1a6230fe4840363d0384a..aa7c1b35b3e7932e3afbeb1c8e59453cc0048b50
--- 1/src/feature/relay/include.am
--- 2/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                      \