commit ebaac297961e88390aaf0e5612d87df3fdec8639 Merge: 6a44c9f 79105ff Author: teor teor@torproject.org Date: Tue Jun 11 14:40:40 2019 +1000

Merge remote-tracking branch 'tor-github/pr/32'

lib/chutney/Host.py | 20 ++++ lib/chutney/TorNet.py | 202 ++++++++++++++++++++++++++--------- lib/chutney/Util.py | 13 +++ networks/bridges+ipv6 | 1 + networks/bridges+ipv6+hs | 1 + networks/bridges+ipv6+hs-v2 | 1 + networks/bridges+ipv6+hs-v23 | 1 + networks/bridges+ipv6-min | 1 + networks/client-ipv6-only | 1 + networks/client-ipv6-only-md | 1 + networks/hs-client-ipv6 | 1 + networks/hs-client-ipv6-md | 1 + networks/hs-ipv6 | 1 + networks/hs-ipv6-md | 1 + networks/hs-v23-ipv6 | 1 + networks/hs-v23-ipv6-md | 1 + networks/hs-v3-ipv6 | 1 + networks/hs-v3-ipv6-md | 1 + networks/ipv6-exit-min | 1 + networks/single-onion-client-ipv6 | 1 + networks/single-onion-client-ipv6-md | 1 + networks/single-onion-ipv6 | 1 + networks/single-onion-ipv6-md | 1 + networks/single-onion-v23-ipv6 | 1 + networks/single-onion-v23-ipv6-md | 1 + networks/single-onion-v3-ipv6 | 1 + networks/single-onion-v3-ipv6-md | 1 + tools/bootstrap-network.sh | 5 + tools/test-network-impl.sh | 4 + tools/test-network.sh | 3 + 30 files changed, 221 insertions(+), 50 deletions(-)