commit f865993653604d7e3e8256d052398591627f8989 parent a46dcc0709d29393a2cd1a0a547bf641f4a79aa6 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 2 Nov 2017 10:26:30 -0400 Merge branch 'maint-0.3.2' Diffstat:
| A | changes/ticket24109 | | | 4 | ++++ |
| M | src/test/include.am | | | 6 | +++--- |
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes/ticket24109 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 @@ -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