summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-29 11:01:19 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-29 11:01:19 -0400
commitff2c31093a0bb7516397e09c37d8dd6e834e5ca9 (patch)
tree0daa5d4c06650cde8c4d225589576b90c0653bdf
parent51d14b3d478a94c410a695f736445f42ccc23fb9 (diff)
parent5e08cf350bfa0157b1be62753bdf4dc6b8dd2988 (diff)
downloadtor-ff2c31093a0bb7516397e09c37d8dd6e834e5ca9.tar.gz
tor-ff2c31093a0bb7516397e09c37d8dd6e834e5ca9.zip
Merge branch 'maint-0.3.1' into release-0.3.1
-rw-r--r--src/test/include.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am
index 29ba1ce7c9..d5ae0bec1c 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -275,6 +275,7 @@ noinst_HEADERS+= \
src/test/failing_routerdescs.inc \
src/test/ed25519_vectors.inc \
src/test/test_descriptors.inc \
+ src/test/test_hs_descriptor.inc \
src/test/vote_descriptors.inc
noinst_PROGRAMS+= src/test/test-ntor-cl