Merge branch 'extract_ext_orport'

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