diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-27 09:39:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-27 09:39:08 -0400 |
| commit | 64c3c6a790278f82b0d3fef7fa1ac675c9733457 (patch) | |
| tree | 96433e3e1811433c702d3ccaac0c21185d4f8595 | |
| parent | 33e4e30d0a0aa8717ca67cb82581e536b402f30b (diff) | |
| parent | 70a07fa90b3aa908e2878356464dd5c889066a4c (diff) | |
| download | tor-64c3c6a790278f82b0d3fef7fa1ac675c9733457.tar.gz tor-64c3c6a790278f82b0d3fef7fa1ac675c9733457.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -rw-r--r-- | changes/bug27345 | 5 | ||||
| -rw-r--r-- | src/test/include.am | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 0000000000..d98f4afbcc --- /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 cc4f3e5c88..93fc008419 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -48,7 +48,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. |