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 | 103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542 (patch) | |
tree | 7135b364b9da3bfd2ec5940ae300e72f59f4a533 /src/test/include.am | |
parent | 2e54c80aec5ed4684950f5ef1ba208fcc0b8339c (diff) | |
parent | 0483f7f64c80fe18c922415ae6062149a2ebb9f7 (diff) | |
download | tor-103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542.tar.gz tor-103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542.zip |
Merge branch '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 81b089b8f7..9367b0cb82 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. |