tor

commit 103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542
parent 2e54c80aec5ed4684950f5ef1ba208fcc0b8339c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 27 Aug 2018 09:39:08 -0400

Merge branch 'maint-0.3.4'

Diffstat:
A
changes/bug27345
 | 
5
+++++
M
src/test/include.am
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug27345 b/changes/bug27345
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+    - When running make test-network-all, use the mixed+hs-v2 network.
+      (A previous fix to chutney removed v3 onion services from the
+      mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
+      confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/include.am b/src/test/include.am
@@ -51,7 +51,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \
 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
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.