Merge remote-tracking branch 'twstrike/dir-handle-cmd-get'

diff --cc src/or/config.c
Simple merge

diff --cc src/or/router.c
Simple merge

diff --cc src/or/routerlist.c
Simple merge

diff --cc src/test/include.am
index 5a5f63a34192ca24f0e9cde5a62e1ed11a3d5217,1a55394b27f6ed9af631e36f94f37910c4a80c39..fad8037b9ada0485d9e99e934bd4852819b5863e
--- 1/src/test/include.am
--- 2/src/test/include.am
+++ b/src/test/include.am
@@@ -95,11 -96,10 +96,12 @@@ src_test_test_SOURCES = 
        src/test/test_socks.c \
        src/test/test_status.c \
        src/test/test_threads.c \
 +      src/test/test_tortls.c \
        src/test/test_util.c \
 +      src/test/test_util_format.c \
        src/test/test_helpers.c \
-         src/test/test_dns.c \
+       src/test/rend_test_helpers.c \
+       src/test/test_dns.c \
        src/test/testing_common.c \
        src/ext/tinytest.c
  

diff --cc src/test/test.c
Simple merge