February 2017 - tor-commits - lists.torproject.org

[tor/master] Fix a wide line
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit 65b012c90bd410e5b4908f97ab2bfe1a2b3ec52c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 10:58:26 2017 -0500 Fix a wide line --- src/or/directory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index c460f12..fae3131 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2164,8 +2164,9 @@ connection_dir_client_reached_eof(dir_connection_t *conn) tor_free(body); tor_free(headers); tor_free(reason); return -1; } - log_info(LD_DIR,"Received authority certificates (body size %d) from server " - "'%s:%d'", (int)body_len, conn->base_.address, conn->base_.port); + log_info(LD_DIR,"Received authority certificates (body size %d) from " + "server '%s:%d'", + (int)body_len, conn->base_.address, conn->base_.port); /* * Tell trusted_dirs_load_certs_from_string() whether it was by fp

1 0

[tor/master] Fix a "directive within macro arguments" warning
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit 135a0c20545aeff32407d2100a04b5b284b837de Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 10:58:19 2017 -0500 Fix a "directive within macro arguments" warning --- src/or/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 5cd2397..c460f12 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1980,7 +1980,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } if (!reason) reason = tor_strdup("[no reason given]"); - log_debug(LD_DIR, + tor_log(LOG_DEBUG, LD_DIR, "Received response from directory server '%s:%d': %d %s " "(purpose: %d, response size: " U64_FORMAT #ifdef MEASUREMENTS_21206

1 0

[chutney/master] Make the formatting of warnings slightly more consistent
by teor＠torproject.org 27 Feb '17

27 Feb '17

commit 2ee92311eb62c2c24777b92e1924e0ffeebeae87 Author: teor <teor2345(a)gmail.com> Date: Tue Feb 28 02:24:24 2017 +1100 Make the formatting of warnings slightly more consistent Part of tor's 21570. --- tools/warnings.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/warnings.sh b/tools/warnings.sh index 4a9b54c..da17eda 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -57,14 +57,14 @@ function show_warnings() { fi # Give context to the warnings we're about to display if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then - $ECHO_Q "${GREEN}Summary `basename $1`:${NC}" + $ECHO_Q "${GREEN}Summary: `basename $1`${NC}" else - $ECHO_Q "${GREEN}Node `basename $1`:${NC}" + $ECHO_Q "${GREEN}Node: `basename $1`${NC}" fi if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true -a \ -e "$IGNORE_FILE" ]; then PERMANENT_DIR=`readlink -n "$1"` - $ECHO_A "${GREEN}(Detail: chutney/tools/warnings.sh $PERMANENT_DIR)${NC}" + $ECHO_A "${GREEN}Detail: chutney/tools/warnings.sh $PERMANENT_DIR${NC}" fi # Display the warnings, after filtering and counting occurrences # must be kept in sync with the filter commands above

1 0

[chutney/master] Add a warning-only mode to test-network.sh
by teor＠torproject.org 27 Feb '17

27 Feb '17

commit f741edfdbce2eb76e67c128fd12ef19d3bde402b Author: teor <teor2345(a)gmail.com> Date: Tue Feb 28 01:42:50 2017 +1100 Add a warning-only mode to test-network.sh And provide a canonical path to the nodes directory in warnings.sh. This is part of tor feature 21570. Closes 21572. --- README | 1 + tools/test-network.sh | 20 ++++++++++++++------ tools/warnings.sh | 5 +++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/README b/README index 346a032..d184947 100644 --- a/README +++ b/README @@ -54,6 +54,7 @@ Warning Options: --all-warnings CHUTNEY_WARNINGS_IGNORE_EXPECTED=false CHUTNEY_WARNINGS_SUMMARY=false --no-warnings CHUTNEY_WARNINGS_SKIP=true + --only-warnings CHUTNEY_WARNINGS_ONLY=true Expert Options: --coverage USE_COVERAGE_BINARY=true diff --git a/tools/test-network.sh b/tools/test-network.sh index 3ed709e..2f54ed0 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -98,6 +98,10 @@ do export CHUTNEY_WARNINGS_IGNORE_EXPECTED=false export CHUTNEY_WARNINGS_SUMMARY=false ;; + # this doesn't run chutney, and only logs warnings + --only-warnings) + export CHUTNEY_WARNINGS_ONLY=true + ;; # this skips warnings entirely --no-warnings) export CHUTNEY_WARNINGS_SKIP=true @@ -231,8 +235,17 @@ fi export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR" +if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then + WARNINGS=true +else + WARNINGS="$CHUTNEY_PATH/tools/warnings.sh" +fi + # And finish up if we're doing a dry run -if [ "$NETWORK_DRY_RUN" = true ]; then +if [ "$NETWORK_DRY_RUN" = true -o "$CHUTNEY_WARNINGS_ONLY" = true ]; then + if [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then + "$WARNINGS" + fi # we can't exit here, it breaks argument processing # this only works in bash: return semantics are shell-specific return 2>/dev/null || exit @@ -249,11 +262,6 @@ export CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60} export CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0} CHUTNEY="$CHUTNEY_PATH/chutney" -if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then - WARNINGS=true -else - WARNINGS="$CHUTNEY_PATH/tools/warnings.sh" -fi if [ "$CHUTNEY_START_TIME" -ge 0 ]; then $ECHO "Waiting ${CHUTNEY_START_TIME} seconds for a consensus containing relays to be generated..." diff --git a/tools/warnings.sh b/tools/warnings.sh index 5808c79..09bf8ea 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -53,13 +53,14 @@ function show_warnings() { fi # Give context to the warnings we're about to display if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then - $ECHO "${GREEN}All `basename $1`:${NC}" + $ECHO "${GREEN}Summary `basename $1`:${NC}" else $ECHO "${GREEN}Node `basename $1`:${NC}" fi if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true -a \ -e "$IGNORE_FILE" ]; then - $ECHO " ${GREEN}(Ignoring expected warnings, run chutney/tools/warnings.sh to see all warnings)${NC}" + PERMANENT_DIR=`readlink -n "$1"` + $ECHO "${GREEN}(Detail: chutney/tools/warnings.sh $PERMANENT_DIR)${NC}" fi # Display the warnings, after filtering and counting occurrences # must be kept in sync with the filter commands above

1 0

[chutney/master] Add a quiet mode to test-network.sh and warnings.sh
by teor＠torproject.org 27 Feb '17

27 Feb '17

commit 52f5355ca985330048fbae9182b209ea49cdcc19 Author: teor <teor2345(a)gmail.com> Date: Tue Feb 28 01:37:48 2017 +1100 Add a quiet mode to test-network.sh and warnings.sh This prepares for the tor changes in 21570. Closes 21571. --- README | 1 + tools/test-network.sh | 46 +++++++++++++++++++++++++--------------------- tools/warnings.sh | 4 ++-- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/README b/README index b2ce936..346a032 100644 --- a/README +++ b/README @@ -59,6 +59,7 @@ Expert Options: --coverage USE_COVERAGE_BINARY=true --net-dir CHUTNEY_DATA_DIR --dry-run NETWORK_DRY_RUN=true + --quiet ECHO=true (These are advanced options: in the past, they have had long-standing bugs.) Standard Actions: diff --git a/tools/test-network.sh b/tools/test-network.sh index 0e6ffb3..3ed709e 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -ECHO_N="/bin/echo -n" +export ECHO=${ECHO:-"echo"} # Output is prefixed with the name of the script myname=$(basename "$0") @@ -117,10 +117,14 @@ do export CHUTNEY_DATA_DIR="$2" shift ;; + # Try not to say anything (applies only to this script) + --quiet) + export ECHO=true + ;; # Oops *) - echo "$myname: Sorry, I don't know what to do with '$1'." - echo "$UPDATE_YOUR_CHUTNEY" + $ECHO "$myname: Sorry, I don't know what to do with '$1'." + $ECHO "$UPDATE_YOUR_CHUTNEY" # continue processing arguments during a dry run if [ "$NETWORK_DRY_RUN" != true ]; then exit 2 @@ -140,21 +144,21 @@ if [ ! -d "$TOR_DIR" ]; then if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then # Choose the build directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$BUILDDIR" + $ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR" export TOR_DIR="$BUILDDIR" elif [ -d "$PWD/src/or" -a -d "$PWD/src/tools" ]; then # Guess the tor directory is the current directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$PWD" + $ECHO "$myname: \$TOR_DIR not set, trying \$PWD" export TOR_DIR="$PWD" elif [ -d "$PWD/../tor" -a -d "$PWD/../tor/src/or" -a \ -d "$PWD/../tor/src/tools" ]; then # Guess the tor directory is next to the current directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$PWD/../tor" + $ECHO "$myname: \$TOR_DIR not set, trying \$PWD/../tor" export TOR_DIR="$PWD/../tor" else - echo "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" + $ECHO "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" unset TOR_DIR fi fi @@ -173,25 +177,25 @@ fi if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" -o \ ! -f "$CHUTNEY_PATH/chutney" ]; then if [ -x "$PWD/chutney" -a -f "$PWD/chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" + $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" export CHUTNEY_PATH="$PWD" elif [ -d "`dirname \"$0\"`/.." -a \ -x "`dirname \"$0\"`/../chutney" -a \ -f "`dirname \"$0\"`/../chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, using this script's location" + $ECHO "$myname: \$CHUTNEY_PATH not valid, using this script's location" export CHUTNEY_PATH="`dirname \"$0\"`/.." elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ -x "$TOR_DIR/../chutney/chutney" -a \ -f "$TOR_DIR/../chutney/chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" + $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" export CHUTNEY_PATH="$TOR_DIR/../chutney" else # TODO: work out how to package and install chutney, # so users can find it in $PATH - echo "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" - echo "$myname: Get chutney: git clone https://git.torproject.org/\ + $ECHO "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" + $ECHO "$myname: Get chutney: git clone https://git.torproject.org/\ chutney.git" - echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ + $ECHO "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ CHUTNEY_PATH=\`pwd\`/chutney" unset CHUTNEY_PATH exit 1 @@ -252,11 +256,11 @@ else fi if [ "$CHUTNEY_START_TIME" -ge 0 ]; then - echo "Waiting ${CHUTNEY_START_TIME} seconds for a consensus containing relays to be generated..." + $ECHO "Waiting ${CHUTNEY_START_TIME} seconds for a consensus containing relays to be generated..." sleep "$CHUTNEY_START_TIME" else - echo "Chutney network launched and running. To stop the network, use:" - echo "$CHUTNEY stop $CHUTNEY_NETWORK" + $ECHO "Chutney network launched and running. To stop the network, use:" + $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" "$WARNINGS" exit 0 fi @@ -266,15 +270,15 @@ if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then "$CHUTNEY" verify "$CHUTNEY_NETWORK" VERIFY_EXIT_STATUS="$?" else - echo "Chutney network ready and running. To stop the network, use:" - echo "$CHUTNEY" stop "$CHUTNEY_NETWORK" + $ECHO "Chutney network ready and running. To stop the network, use:" + $ECHO "$CHUTNEY" stop "$CHUTNEY_NETWORK" "$WARNINGS" exit 0 fi if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then if [ "$CHUTNEY_STOP_TIME" -gt 0 ]; then - echo "Waiting ${CHUTNEY_STOP_TIME} seconds before stopping the network..." + $ECHO "Waiting ${CHUTNEY_STOP_TIME} seconds before stopping the network..." fi sleep "$CHUTNEY_STOP_TIME" # work around a bug/feature in make -j2 (or more) @@ -283,8 +287,8 @@ if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then "$WARNINGS" exit "$VERIFY_EXIT_STATUS" else - echo "Chutney network verified and running. To stop the network, use:" - echo "$CHUTNEY stop $CHUTNEY_NETWORK" + $ECHO "Chutney network verified and running. To stop the network, use:" + $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" "$WARNINGS" exit 0 fi diff --git a/tools/warnings.sh b/tools/warnings.sh index 02912cb..5808c79 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -50,8 +50,6 @@ function show_warnings() { if [ `$CAT $IGNORE_FILE $FILE | $SED_E "$FILTER" | wc -c` -eq 0 -a \ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then ECHO=true - else - ECHO=echo fi # Give context to the warnings we're about to display if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then @@ -96,6 +94,8 @@ CHUTNEY_WARNINGS_SUMMARY=${CHUTNEY_WARNINGS_SUMMARY:-0} SED_E='sed -n -E' # Label errs as "Warning:", they're infrequent enough it doesn't matter FILTER='s/^.*\[(warn|err)\]//p' +# use the --quiet setting from test-network.sh, if available +ECHO=${ECHO:-"echo"} [ -d "$DEST" ] || { echo "$NAME: no logs available"; exit 1; } if [ $# -eq 0 ];

1 0

[chutney/master] If there are warnings, always echo the canonical nodes path
by teor＠torproject.org 27 Feb '17

27 Feb '17

commit 7cb6efd023216e6632d0f549355af4905f4dd3dd Author: teor <teor2345(a)gmail.com> Date: Tue Feb 28 01:54:51 2017 +1100 If there are warnings, always echo the canonical nodes path Revision of 21571 to better suit tor's needs in 21570. --- tools/warnings.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/warnings.sh b/tools/warnings.sh index 09bf8ea..4a9b54c 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -49,25 +49,29 @@ function show_warnings() { # must be kept in sync with the filter commands below if [ `$CAT $IGNORE_FILE $FILE | $SED_E "$FILTER" | wc -c` -eq 0 -a \ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then - ECHO=true + ECHO_Q=true + ECHO_A=true + else + # if there is output, always echo the detail message + ECHO_A=echo fi # Give context to the warnings we're about to display if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then - $ECHO "${GREEN}Summary `basename $1`:${NC}" + $ECHO_Q "${GREEN}Summary `basename $1`:${NC}" else - $ECHO "${GREEN}Node `basename $1`:${NC}" + $ECHO_Q "${GREEN}Node `basename $1`:${NC}" fi if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true -a \ -e "$IGNORE_FILE" ]; then PERMANENT_DIR=`readlink -n "$1"` - $ECHO "${GREEN}(Detail: chutney/tools/warnings.sh $PERMANENT_DIR)${NC}" + $ECHO_A "${GREEN}(Detail: chutney/tools/warnings.sh $PERMANENT_DIR)${NC}" fi # Display the warnings, after filtering and counting occurrences # must be kept in sync with the filter commands above $CAT $IGNORE_FILE $FILE | $SED_E "$FILTER" | sort | uniq -c | \ sed -e 's/^\s*//' -e "s/ *$[0-9][0-9]*$ *$.*$/${YELLOW}Warning:${NC} \2${YELLOW} Number: \1${NC}/" if [ "$CHUTNEY_WARNINGS_SUMMARY" != true ]; then - $ECHO "" + $ECHO_Q "" fi } @@ -96,7 +100,7 @@ SED_E='sed -n -E' # Label errs as "Warning:", they're infrequent enough it doesn't matter FILTER='s/^.*\[(warn|err)\]//p' # use the --quiet setting from test-network.sh, if available -ECHO=${ECHO:-"echo"} +ECHO_Q=${ECHO:-"echo"} [ -d "$DEST" ] || { echo "$NAME: no logs available"; exit 1; } if [ $# -eq 0 ];

1 0

[chutney/master] Reserve an exit status of 2 for "unknown command-line argument"
by teor＠torproject.org 27 Feb '17

27 Feb '17

commit 68ac9d859c0ffb91e02160d87a93e0b328b9f374 Author: teor <teor2345(a)gmail.com> Date: Tue Feb 28 02:01:53 2017 +1100 Reserve an exit status of 2 for "unknown command-line argument" Required for tor's 21570 to work. --- 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 2f54ed0..bf04dd5 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -251,7 +251,7 @@ if [ "$NETWORK_DRY_RUN" = true -o "$CHUTNEY_WARNINGS_ONLY" = true ]; then return 2>/dev/null || exit fi -"$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR" || exit 2 +"$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR" || exit 3 # chutney starts verifying after 20 seconds, keeps on trying for 60 seconds, # and then stops immediately (by default)

1 0

[torspec/master] Teor informs me that the fallback code implements prop#210 in 0.2.8 and later
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit aeab3bf5a7816df8e6ba81685189b5ca4ec5c733 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 10:12:44 2017 -0500 Teor informs me that the fallback code implements prop#210 in 0.2.8 and later --- proposals/000-index.txt | 4 ++-- proposals/210-faster-headless-consensus-bootstrap.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index e08816d..9a57ba0 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -130,7 +130,7 @@ Proposals by number: 207 Directory guards [CLOSED] 208 IPv6 Exits Redux [CLOSED] 209 Tuning the Parameters for the Path Bias Defense [OPEN] -210 Faster Headless Consensus Bootstrapping [OPEN] +210 Faster Headless Consensus Bootstrapping [FINISHED] 211 Internal Mapaddress for Tor Configuration Testing [RESERVE] 212 Increase Acceptable Consensus Age [OPEN] 213 Remove stream-level sendmes from the design [DEAD] @@ -236,7 +236,6 @@ Proposals by status: 201 Make bridges report statistics on daily v3 network status requests [for 0.2.4.x] 202 Two improved relay encryption protocols for Tor cells 209 Tuning the Parameters for the Path Bias Defense [for 0.2.4.x+] - 210 Faster Headless Consensus Bootstrapping [for 0.2.8.x+] 212 Increase Acceptable Consensus Age [for 0.2.4.x+] 219 Support for full DNS and DNSSEC resolution in Tor [for 0.2.5.x] 226 "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS" @@ -276,6 +275,7 @@ Proposals by status: 162 Publish the consensus in multiple flavors [in 0.2.3.1-alpha] 196 Extended ORPort and TransportControlPort [for 0.2.4.x] 204 Subdomain support for Hidden Service addresses + 210 Faster Headless Consensus Bootstrapping [for 0.2.8.x+] 217 Tor Extended ORPort Authentication [for 0.2.5.x] 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] 232 Pluggable Transport through SOCKS proxy [in 0.2.6] diff --git a/proposals/210-faster-headless-consensus-bootstrap.txt b/proposals/210-faster-headless-consensus-bootstrap.txt index d3c56ff..6737bc2 100644 --- a/proposals/210-faster-headless-consensus-bootstrap.txt +++ b/proposals/210-faster-headless-consensus-bootstrap.txt @@ -3,7 +3,7 @@ Title: Faster Headless Consensus Bootstrapping Author: Mike Perry, Tim Wilson-Brown, Peter Palfrader Created: 01-10-2012 Last Modified: 02-10-2015 -Status: Open +Status: Finished Target: 0.2.8.x+

1 0

[torspec/master] mark some proposals superseded or finished.
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit 6e7a3fc4216db2ab13287979fc90449eb8f6ee71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 09:55:06 2017 -0500 mark some proposals superseded or finished. --- proposals/000-index.txt | 24 +++++++++++----------- proposals/173-getinfo-option-expansion.txt | 2 ++ proposals/220-ecc-id-keys.txt | 6 +++--- proposals/236-single-guard-node.txt | 6 +++++- proposals/237-directory-servers-for-all.txt | 2 +- proposals/244-use-rfc5705-for-tls-binding.txt | 7 ++++++- proposals/252-single-onion.txt | 3 ++- .../266-removing-current-obsolete-clients.txt | 4 ++-- 8 files changed, 33 insertions(+), 21 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index d3a4100..9915b0a 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -140,7 +140,7 @@ Proposals by number: 217 Tor Extended ORPort Authentication [FINISHED] 218 Controller events to better understand connection/circuit usage [CLOSED] 219 Support for full DNS and DNSSEC resolution in Tor [OPEN] -220 Migrate server identity keys to Ed25519 [ACCEPTED] +220 Migrate server identity keys to Ed25519 [FINISHED] 221 Stop using CREATE_FAST [CLOSED] 222 Stop sending client timestamps [CLOSED] 223 Ace: Improved circuit-creation key exchange [RESERVE] @@ -156,15 +156,15 @@ Proposals by number: 233 Making Tor2Web mode faster [OPEN] 234 Adding remittance field to directory specification [OPEN] 235 Stop assigning (and eventually supporting) the Named flag [FINISHED] -236 The move to a single guard node [OPEN] -237 All relays are directory servers [OPEN] +236 The move to a single guard node [FINISHED] +237 All relays are directory servers [FINISHED] 238 Better hidden service stats from Tor relays [CLOSED] 239 Consensus Hash Chaining [DRAFT] 240 Early signing key revocation for directory authorities [DRAFT] 241 Resisting guard-turnover attacks [REJECTED] 242 Better performance and usability for the MyFamily option [OPEN] 243 Give out HSDir flag only to relays with Stable flag [CLOSED] -244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [ACCEPTED] +244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [FINISHED] 245 Deprecating and removing the TAP circuit extension protocol [DRAFT] 246 Merging Hidden Service Directories and Introduction Points [NEEDS-RESEARCH] 247 Defending Against Guard Discovery Attacks using Vanguards [DRAFT] @@ -172,7 +172,7 @@ Proposals by number: 249 Allow CREATE cells with >505 bytes of handshake data [DRAFT] 250 Random Number Generation During Tor Voting [CLOSED] 251 Padding for netflow record resolution reduction [DRAFT] -252 Single Onion Services [DRAFT] +252 Single Onion Services [SUPERSEDED] 253 Out of Band Circuit HMACs [DRAFT] 254 Padding Negotiation [DRAFT] 255 Controller features to allow for load-balancing hidden services [DRAFT] @@ -186,7 +186,7 @@ Proposals by number: 263 Request to change key exchange protocol for handshake v1.2 [OBSOLETE] 264 Putting version numbers on the Tor subprotocols [CLOSED] 265 Load Balancing with Overhead Parameters [ACCEPTED] -266 Removing current obsolete clients from the Tor network [DRAFT] +266 Removing current obsolete clients from the Tor network [SUPERSEDED] 267 Tor Consensus Transparency [DRAFT] 268 New Guard Selection Behaviour [OBSOLETE] 269 Transitionally secure hybrid handshakes [DRAFT] @@ -214,11 +214,9 @@ Proposals by status: 248 Remove all RSA identity keys 249 Allow CREATE cells with >505 bytes of handshake data 251 Padding for netflow record resolution reduction - 252 Single Onion Services 253 Out of Band Circuit HMACs 254 Padding Negotiation 255 Controller features to allow for load-balancing hidden services - 266 Removing current obsolete clients from the Tor network 267 Tor Consensus Transparency 269 Transitionally secure hybrid handshakes 270 RebelAlliance: A Post-Quantum Secure Hybrid Handshake Based on NewHope @@ -247,8 +245,6 @@ Proposals by status: 229 Further SOCKS5 extensions 233 Making Tor2Web mode faster 234 Adding remittance field to directory specification - 236 The move to a single guard node - 237 All relays are directory servers [for 0.2.7.x] 242 Better performance and usability for the MyFamily option 256 Key revocation for relays and authorities 261 AEZ for relay cryptography @@ -262,8 +258,6 @@ Proposals by status: 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion 188 Bridge Guards and other anti-enumeration defenses - 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] - 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls 258 Denial-of-service resistance for directory authorities 265 Load Balancing with Overhead Parameters [for 0.2.9.x] META: @@ -283,8 +277,12 @@ Proposals by status: 196 Extended ORPort and TransportControlPort [for 0.2.4.x] 204 Subdomain support for Hidden Service addresses 217 Tor Extended ORPort Authentication [for 0.2.5.x] + 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] 232 Pluggable Transport through SOCKS proxy [in 0.2.6] 235 Stop assigning (and eventually supporting) the Named flag [in 0.2.6, 0.2.7] + 236 The move to a single guard node + 237 All relays are directory servers [for 0.2.7.x] + 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [in 0.3.0.1-alpha] 260 Rendezvous Single Onion Services 272 Listed routers should be Valid, Running, and treated as such [in 0.2.9.3-alpha, 0.2.9.4-alpha] CLOSED: @@ -368,6 +366,8 @@ Proposals by status: 185 Directory caches without DirPort 194 Mnemonic .onion URLs 225 Strawman proposal: commit-and-reveal shared rng + 252 Single Onion Services + 266 Removing current obsolete clients from the Tor network DEAD: 100 Tor Unreliable Datagram Extension Proposal 115 Two Hop Paths diff --git a/proposals/173-getinfo-option-expansion.txt b/proposals/173-getinfo-option-expansion.txt index 54356c9..8e9abb1 100644 --- a/proposals/173-getinfo-option-expansion.txt +++ b/proposals/173-getinfo-option-expansion.txt @@ -54,9 +54,11 @@ Specification: "process/user" -- Username under which the tor process is running, or an empty string if none exists. [what do we mean 'if none exists'?] + [Implemented in 0.2.3.1-alpha.] "process/pid" -- Process id belonging to the main tor process, -1 if none exists for the platform. + [Implemented in 0.2.3.1-alpha.] "process/uptime" -- Total uptime of the tor process (in seconds). diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt index 7dc1cd9..ca862ba 100644 --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@ -3,14 +3,14 @@ Title: Migrate server identity keys to Ed25519 Authors: Nick Mathewson Created: 12 August 2013 Target: 0.2.x.x -Status: Accepted +Status: Finished [Note: This is a draft proposal; I've probably made some important mistakes, and there are parts that need more thinking. I'm publishing it now so that we can do the thinking together.] - (Sections 0-3 are currently implemented, except for section 2.3. Sections - 4-8 are a work in progress.) + (Sections 0-5 are currently implemented, except for section 2.3. Sections + 6-8 are a work in progress, and may require revision.) 0. Introduction diff --git a/proposals/236-single-guard-node.txt b/proposals/236-single-guard-node.txt index 32327db..9b4ae4c 100644 --- a/proposals/236-single-guard-node.txt +++ b/proposals/236-single-guard-node.txt @@ -2,7 +2,11 @@ Filename: 236-single-guard-node.txt Title: The move to a single guard node Author: George Kadianakis, Nicholas Hopper Created: 2014-03-22 -Status: Open +Status: Finished + +-1. Implementation-status + + Partially implemented, and partially superseded by proposal 271. 0. Introduction diff --git a/proposals/237-directory-servers-for-all.txt b/proposals/237-directory-servers-for-all.txt index 04b79fa..58fcdaf 100644 --- a/proposals/237-directory-servers-for-all.txt +++ b/proposals/237-directory-servers-for-all.txt @@ -2,7 +2,7 @@ Filename: 237-directory-servers-for-all.txt Title: All relays are directory servers Author: Matthew Finkel Created: 29-Jul-2014 -Status: Open +Status: Finished Target: 0.2.7.x Supersedes: 185 diff --git a/proposals/244-use-rfc5705-for-tls-binding.txt b/proposals/244-use-rfc5705-for-tls-binding.txt index c4369b3..1c4a08e 100644 --- a/proposals/244-use-rfc5705-for-tls-binding.txt +++ b/proposals/244-use-rfc5705-for-tls-binding.txt @@ -2,7 +2,12 @@ Filename: 244-use-rfc5705-for-tls-binding.txt Title: Use RFC5705 Key Exporting in our AUTHENTICATE calls Author: Nick Mathewson Created: 2015-05-14 -Status: Accepted +Status: Finished +Implemented-In: 0.3.0.1-alpha + +0. IMPLEMENTATION-NOTES + + We decided to implement this proposal for the Ed25519 handshake only. 1. Proposal diff --git a/proposals/252-single-onion.txt b/proposals/252-single-onion.txt index f91acb3..ddd78ea 100644 --- a/proposals/252-single-onion.txt +++ b/proposals/252-single-onion.txt @@ -2,7 +2,8 @@ Filename: 252-single-onion.txt Title: Single Onion Services Author: John Brooks, Paul Syverson, Roger Dingledine Created: 2015-07-13 -Status: Draft +Status: Superseded +Superseded-by: 260 1. Overview diff --git a/proposals/266-removing-current-obsolete-clients.txt b/proposals/266-removing-current-obsolete-clients.txt index d803c41..bc3592b 100644 --- a/proposals/266-removing-current-obsolete-clients.txt +++ b/proposals/266-removing-current-obsolete-clients.txt @@ -2,8 +2,8 @@ Filename: 266-removing-current-obsolete-clients.txt Title: Removing current obsolete clients from the Tor network Author: Nick Mathewson Created: 14 Jan 2016 -Status: Draft - +Status: Superseded +Superseded-by: 264, 272. 1. Introduction

1 0

[torspec/master] Upgrade prop224 to accepted and 249 to open
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit 4ade9a3dbcdc8cca3d2afc036adbbd412a953a7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 09:57:16 2017 -0500 Upgrade prop224 to accepted and 249 to open --- proposals/000-index.txt | 8 ++++---- proposals/224-rend-spec-ng.txt | 2 +- proposals/249-large-create-cells.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 9915b0a..e08816d 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -144,7 +144,7 @@ Proposals by number: 221 Stop using CREATE_FAST [CLOSED] 222 Stop sending client timestamps [CLOSED] 223 Ace: Improved circuit-creation key exchange [RESERVE] -224 Next-Generation Hidden Services in Tor [OPEN] +224 Next-Generation Hidden Services in Tor [ACCEPTED] 225 Strawman proposal: commit-and-reveal shared rng [SUPERSEDED] 226 "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS" [OPEN] 227 Include package fingerprints in consensus documents [CLOSED] @@ -169,7 +169,7 @@ Proposals by number: 246 Merging Hidden Service Directories and Introduction Points [NEEDS-RESEARCH] 247 Defending Against Guard Discovery Attacks using Vanguards [DRAFT] 248 Remove all RSA identity keys [DRAFT] -249 Allow CREATE cells with >505 bytes of handshake data [DRAFT] +249 Allow CREATE cells with >505 bytes of handshake data [OPEN] 250 Random Number Generation During Tor Voting [CLOSED] 251 Padding for netflow record resolution reduction [DRAFT] 252 Single Onion Services [SUPERSEDED] @@ -212,7 +212,6 @@ Proposals by status: 245 Deprecating and removing the TAP circuit extension protocol 247 Defending Against Guard Discovery Attacks using Vanguards 248 Remove all RSA identity keys - 249 Allow CREATE cells with >505 bytes of handshake data 251 Padding for netflow record resolution reduction 253 Out of Band Circuit HMACs 254 Padding Negotiation @@ -240,12 +239,12 @@ Proposals by status: 210 Faster Headless Consensus Bootstrapping [for 0.2.8.x+] 212 Increase Acceptable Consensus Age [for 0.2.4.x+] 219 Support for full DNS and DNSSEC resolution in Tor [for 0.2.5.x] - 224 Next-Generation Hidden Services in Tor 226 "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS" 229 Further SOCKS5 extensions 233 Making Tor2Web mode faster 234 Adding remittance field to directory specification 242 Better performance and usability for the MyFamily option + 249 Allow CREATE cells with >505 bytes of handshake data 256 Key revocation for relays and authorities 261 AEZ for relay cryptography 262 Re-keying live circuits with new cryptographic material @@ -258,6 +257,7 @@ Proposals by status: 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion 188 Bridge Guards and other anti-enumeration defenses + 224 Next-Generation Hidden Services in Tor 258 Denial-of-service resistance for directory authorities 265 Load Balancing with Overhead Parameters [for 0.2.9.x] META: diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 69cd7c6..50bbdd3 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -2,7 +2,7 @@ Filename: 224-rend-spec-ng.txt Title: Next-Generation Hidden Services in Tor Author: Nick Mathewson Created: 2013-11-29 -Status: Open +Status: Accepted Table of contents: diff --git a/proposals/249-large-create-cells.txt b/proposals/249-large-create-cells.txt index e04b4c0..b7505c6 100644 --- a/proposals/249-large-create-cells.txt +++ b/proposals/249-large-create-cells.txt @@ -2,7 +2,7 @@ Filename: 249-large-create-cells.txt Title: Allow CREATE cells with >505 bytes of handshake data Authors: Nick Mathewson Created: 23 July 15 -Status: Draft +Status: Open 1. Summary

1 0