summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-02 10:26:30 -0400
committerNick Mathewson <nickm@torproject.org>2017-11-02 10:26:30 -0400
commitf865993653604d7e3e8256d052398591627f8989 (patch)
treee4d788a820bc9d7dfaec67a42a9de93d6ef1557c
parenta46dcc0709d29393a2cd1a0a547bf641f4a79aa6 (diff)
parent27ea6fcd31ceb7dd9e48e5586aa05f05bfe86e0a (diff)
downloadtor-f865993653604d7e3e8256d052398591627f8989.tar.gz
tor-f865993653604d7e3e8256d052398591627f8989.zip
Merge branch 'maint-0.3.2'
-rw-r--r--changes/ticket241094
-rw-r--r--src/test/include.am6
2 files changed, 7 insertions, 3 deletions
diff --git a/changes/ticket24109 b/changes/ticket24109
new file mode 100644
index 0000000000..f66271817d
--- /dev/null
+++ b/changes/ticket24109
@@ -0,0 +1,4 @@
+ o Minor features (integration tests):
+ - Test that IPv6-only clients can use microdescriptors when running
+ "make test-network-all". Requires chutney master 61c28b9 or later.
+ Closes ticket 24109.
diff --git a/src/test/include.am b/src/test/include.am
index e2d8b3e346..bbf8a370e2 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -43,9 +43,9 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \
single-onion-v23
# only run if we can ping6 ::1 (localhost)
# IPv6-only v3 single onion services don't work yet, so we don't test the
-# single-onion-v23-ipv6 flavor
-TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6 \
- single-onion-ipv6
+# single-onion-v23-ipv6-md flavor
+TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
+ single-onion-ipv6-md
# only run if we can find a stable (or simply another) version of tor
TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23