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 | 0483f7f64c80fe18c922415ae6062149a2ebb9f7 (patch) | |
| tree | 0e3edc118cc374106955e2095a00015a1959a475 /src/test/include.am | |
| parent | 4c1c818ffa2ea3d18c4a45406acd78d40c0b3a91 (diff) | |
| parent | 64c3c6a790278f82b0d3fef7fa1ac675c9733457 (diff) | |
| download | tor-0483f7f64c80fe18c922415ae6062149a2ebb9f7.tar.gz tor-0483f7f64c80fe18c922415ae6062149a2ebb9f7.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am index 2c4da6ac42..70df3aac14 100644 --- 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. |