commit f16e39673a973d2792bec1f91cc3aacb09aefc6c Author: teor teor@torproject.org Date: Mon Aug 27 22:59:06 2018 +1000

Use bridges+hs-v2 as the default in test-network.sh

Using the onion service version in the network name helps diagnose errors.

Partial fix for 27345. --- tools/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/test-network.sh b/tools/test-network.sh index 16d8f78..31bf927 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -306,7 +306,7 @@ fi $ECHO "$myname: Using $CHUTNEY_TOR: '$CHUTNEY_TOR' and $CHUTNEY_TOR_GENCERT: '$CHUTNEY_TOR_GENCERT'"

# Set the variables for the chutney network flavour -export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} +export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs-v2"} export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR"

if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then