sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2017-11-02 10:26:30 -04:00
parent aed642a4b2 27ea6fcd31
commit 33652fce62
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket24109 Normal file
View File

@ -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.

6
src/test/include.am
View File

@ -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