commit 21c201202effaa18ba591ca96043ec9489566e0c Merge: 7bd2247 4ff08bb Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 2 15:04:28 2015 +0200

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

src/or/config.c | 4 +- src/or/config.h | 4 +- src/or/directory.c | 6 +- src/or/directory.h | 4 + src/or/dirvote.c | 8 +- src/or/dirvote.h | 6 +- src/or/geoip.c | 9 +- src/or/geoip.h | 1 + src/or/router.c | 4 +- src/or/router.h | 2 +- src/or/routerlist.c | 4 +- src/or/routerlist.h | 2 +- src/test/include.am | 4 +- src/test/rend_test_helpers.c | 66 ++ src/test/rend_test_helpers.h | 15 + src/test/test.c | 2 + src/test/test_dir_handle_get.c | 2528 ++++++++++++++++++++++++++++++++++++++++ src/test/vote_descriptors.inc | 94 ++ 18 files changed, 2738 insertions(+), 25 deletions(-)

diff --cc src/test/include.am index 5a5f63a,1a55394..fad8037 --- a/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