[tor-commits] [chutney/master] test-network: Make bridges+hs-v23 the default

[teor at torproject.org]

commit f4f92d97fc5ee2402be1834a9caffe0b9c8d0998
Author: teor <teor at torproject.org>
Date:   Thu Feb 13 12:38:37 2020 +1000

    test-network: Make bridges+hs-v23 the default
    
    Now that all Tor versions < 0.3.2 are unsupported, we can use a default
    that includes v3 Onion Services.
    
    Users who want to run tor versions < 0.3.2 should explicitly choose a
    legacy network, like bridges+hs-v2 or basic-min.
    
    Closes 33302.
---
 tools/bootstrap-network.sh | 5 ++---
 tools/test-network.sh      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh
index e17db0e..3c25021 100755
--- a/tools/bootstrap-network.sh
+++ b/tools/bootstrap-network.sh
@@ -10,8 +10,7 @@
 # Usage:
 #    tools/bootstrap-network.sh [network-flavour]
 #    network-flavour: one of the files in the networks directory,
-#                     (default: 'bridges+hs-v2')
-#
+#                     (default: 'bridges+hs-v23')
 
 # Get a working chutney path
 if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then
@@ -53,7 +52,7 @@ myname=$(basename "$0")
     { echo "$myname: missing chutney: $CHUTNEY"; exit 1; }
 
 # Set the variables for the chutney network flavour
-export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs-v2"}
+export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs-v23"}
 [ -n "$1" ] && { NETWORK_FLAVOUR=$1; shift; }
 export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR"
 
diff --git a/tools/test-network.sh b/tools/test-network.sh
index 81b57de..213dab4 100755
--- a/tools/test-network.sh
+++ b/tools/test-network.sh
@@ -329,7 +329,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-v2"}
+export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs-v23"}
 export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR"
 
 export WARNING_COMMAND="$CHUTNEY_PATH/tools/warnings.sh"