From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Oct 2015 13:04:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'twstrike/dir-handle-cmd-get'
X-Git-Tag: tor-0.2.8.1-alpha~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21c201202effaa18ba591ca96043ec9489566e0c;p=thirdparty%2Ftor.git

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

21c201202effaa18ba591ca96043ec9489566e0c
diff --cc src/test/include.am
index 5a5f63a341,1a55394b27..fad8037b9a
--- 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