commit 70a07fa90b3aa908e2878356464dd5c889066a4c Author: teor teor@torproject.org Date: Mon Aug 27 23:06:04 2018 +1000

When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

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. --- changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 000000000..d98f4afbc --- /dev/null +++ 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 index 230845a1e..2f6789c58 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,7 +47,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.