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

[tor/master] Deprecate ReachableDirAddresses and ClientPreferIPv6DirPort
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit de6f121b5984c7c2c647c785f4707cd5392b37e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 16:12:15 2017 -0400 Deprecate ReachableDirAddresses and ClientPreferIPv6DirPort Closes ticket 19704. --- changes/ticket19704 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/ticket19704 b/changes/ticket19704 new file mode 100644 index 000000000..b05f6abcb --- /dev/null +++ b/changes/ticket19704 @@ -0,0 +1,5 @@ + o Deprecated features: + - The ReachableDirAddresses and ClientPreferIPv6DirPort options + are now deprecated; they do not apply to relays, and they + have had no effect on clients since 0.2.8.x. Closes ticket 19704. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d49dd9633..3aabffdc8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -978,7 +978,8 @@ The following options are useful only for clients (that is, if these restrictions when fetching directory information, using standard HTTP GET requests. If not set explicitly then the value of **ReachableAddresses** is used. If **HTTPProxy** is set then these - connections will go through that proxy. + connections will go through that proxy. (DEPRECATED: This option has + had no effect for some time.) [[ReachableORAddresses]] **ReachableORAddresses** __ADDR__[/__MASK__][:__PORT__]...:: Like **ReachableAddresses**, a list of addresses and ports. Tor will obey @@ -1547,7 +1548,8 @@ The following options are useful only for clients (that is, if server has both. (Tor also prefers an IPv6 DirPort if IPv4Client is set to 0.) If this option is set to auto, clients prefer IPv4. Other things may influence the choice. This option breaks a tie to the favor of IPv6. - (Default: auto) + (Default: auto) (DEPRECATED: This option has had no effect for some + time.) [[ClientPreferIPv6ORPort]] **ClientPreferIPv6ORPort** **0**|**1**|**auto**:: If this option is set to 1, Tor prefers an OR port with an IPv6 diff --git a/src/or/config.c b/src/or/config.c index 55c9531f4..bb3bca6c1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -693,6 +693,10 @@ static const config_deprecation_t option_deprecation_notes_[] = { "to your directory server, which your Tor probably wasn't using." }, { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy " "which should be used with HTTPSProxyAuthenticator." }, + { "ReachableDirAddresses", "It has no effect on relays, and has had no " + "effect on clients since 0.2.8." }, + { "ClientPreferIPv6DirPort", "It has no effect on relays, and has had no " + "effect on clients since 0.2.8." }, /* End of options deprecated since 0.3.2.0-alpha. */ { NULL, NULL }

1 0

[tor/master] Add check for double-semi-colons at the end of a line
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit f0e87ff9eb01ead1a959bd45bd8a3588479514c7 Author: Edmund Wong <ewongbb(a)pw-wspx.org> Date: Mon Sep 18 15:33:24 2017 +0800 Add check for double-semi-colons at the end of a line --- scripts/maint/checkSpace.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index 37dcc98af..9929932cc 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -123,6 +123,10 @@ for my $fn (@ARGV) { if (/([^\s'])\{/) { msg " $1\{:$fn:$.\n"; } + ## Warn about double semi-colons at the end of a line. + if (/;;$/) { + msg " double semi-colons at the end of $. in $fn\n" + } ## Warn about multiple internal spaces. #if (/[^\s,:]\s{2,}[^\s\\=]/) { # msg " X X:$fn:$.\n";

1 0

[tor/master] small tweaks to releasingtor.md
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 3c9ff0af96835575af942a367726732366977581 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:49:06 2017 -0400 small tweaks to releasingtor.md --- doc/HACKING/ReleasingTor.md | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index b206b3149..62029b44f 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -8,7 +8,11 @@ new Tor release: === 0. Preliminaries 1. Get at least three of weasel/arma/Sebastian/Sina to put the new - version number in their approved versions list. + version number in their approved versions list. Give them a few + days to do this if you can. + +2. If this is going to be an important security release, give the packagers + some advance warning: See this list of packagers in IV.3 below. === I. Make sure it works @@ -26,19 +30,24 @@ new Tor release: What about Coverity Scan? + What about clan scan-build? + Does 'make distcheck' complain? - How about 'make test-stem' and 'make test-network'? + How about 'make test-stem' and 'make test-network' and + `make test-network-full`? - Are all those tests still happy with --enable-expensive-hardening ? Any memory leaks? -=== II. Write a changelog. +=== II. Write a changelog -1. Gather the `changes/*` files into a changelog entry, rewriting many +1a. (Alpha release variant) + + Gather the `changes/*` files into a changelog entry, rewriting many of them and reordering to focus on what users and funders would find interesting and understandable. @@ -83,6 +92,15 @@ new Tor release: 4. Run `./scripts/maint/format_changelog.py --inplace` to make it prettier +1b. (old-stable release variant) + + For stable releases that backport things from later, we try to compose + their releases, we try to make sure that we keep the changelog entries + identical to their original versions, with a 'backport from 0.x.y.z' + note added to each section. So in this case, once you have the items + from the changes files copied together, don't use them to build a new + changelog: instead, look up the corrected versions that were merged + into ChangeLog in the master branch, and use those. 2. Compose a short release blurb to highlight the user-facing changes. Insert said release blurb into the ChangeLog stanza. If it's @@ -109,7 +127,7 @@ new Tor release: === III. Making the source release. 1. In `maint-0.?.x`, bump the version number in `configure.ac` and run - `scripts/maint/updateVersions.pl` to update version numbers in other + `perl scripts/maint/updateVersions.pl` to update version numbers in other places, and commit. Then merge `maint-0.?.x` into `release-0.?.x`. (NOTE: To bump the version number, edit `configure.ac`, and then run @@ -165,7 +183,7 @@ new Tor release: 5. Mail the release blurb and ChangeLog to tor-talk (development release) or tor-announce (stable). - Post the changelog on the the blog as well. You can generate a + Post the changelog on the blog as well. You can generate a blog-formatted version of the changelog with the -B option to format-changelog.

1 0

[tor/master] Merge remote-tracking branch 'ewongbb/chkdblcolon'
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 2b5bc5613cac86787a42d69b32a2acd3d7b5bae4 Merge: 94a88eaa4 f0e87ff9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 15:04:14 2017 -0400 Merge remote-tracking branch 'ewongbb/chkdblcolon' scripts/maint/checkSpace.pl | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[torspec/master] Merge remote-tracking branch 'dgoulet/ticket22979_01'
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 609abee7106061d6edd859847eb67f1945f1474b Merge: a3d9506 0667997 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:58:41 2017 -0400 Merge remote-tracking branch 'dgoulet/ticket22979_01' proposals/224-rend-spec-ng.txt | 8 ++++++++ 1 file changed, 8 insertions(+)

1 0

[torspec/master] prop224: Add an intro onion key in the descriptor
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 0667997d793a08d607a430a2d44a35d683fa52bd Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 19 09:32:29 2017 -0400 prop224: Add an intro onion key in the descriptor The onion key for the ntor handshake is missing in the descriptor in order for the client to extend to it. Ticket #22979 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 8431d45..1c4762f 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1304,6 +1304,14 @@ Table of contents: The link-specifiers is a base64 encoding of a link specifier block in the format described in BUILDING-BLOCKS. + "onion-key" SP "ntor" SP key NL + + [Exactly once per introduction point] + + The key is a base64 encoded curve25519 public key which is the onion + key of the introduction point Tor node used for the ntor handshake + when a client extends to it. + "auth-key" NL certificate NL [Exactly once per introduction point]

1 0

[torspec/master] prop224: Remove the HSDir3 flag concept
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 2922ca3243b70c5d923e32d9986714b1ea9daec2 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 18 08:34:10 2017 -0400 prop224: Remove the HSDir3 flag concept Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 8431d45..e26fb81 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -635,12 +635,9 @@ Table of contents: 2. Generating and publishing hidden service descriptors [HSDIR] Hidden service descriptors follow the same metaformat as other Tor - directory objects. They are published anonymously to Tor servers with - the HSDir3 flag. - - (Authorities should assign this flag as they currently assign the - HSDir flag, except that they should restrict it to Tor versions - implementing the HSDir parts of this specification.) + directory objects. They are published anonymously to Tor servers with the + HSDir flag, HSDir=2 protocol version and tor version >= 0.3.0.8 (because a + bug was fixed in this version). 2.1. Deriving blinded keys and subcredentials [SUBCRED]

1 0

[torspec/master] Merge remote-tracking branch 'dgoulet/ticket23340_01'
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit a3d9506c673690a1fe931b7cf008d6091eb4a624 Merge: 417aac2 2922ca3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:55:47 2017 -0400 Merge remote-tracking branch 'dgoulet/ticket23340_01' proposals/224-rend-spec-ng.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.2.8] bump to 0.2.8.15-dev
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:39:40 2017 -0400 bump to 0.2.8.15-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4695f111d..55ace93cb 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.15]) +AC_INIT([tor],[0.2.8.15-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 57002a04e..60ee61ff8 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.15" +!define VERSION "0.2.8.15-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index bb09bafe0..1f256c204 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.15" +#define VERSION "0.2.8.15-dev"

1 0

[tor/maint-0.3.0] bump to 0.2.8.15-dev
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:39:40 2017 -0400 bump to 0.2.8.15-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4695f111d..55ace93cb 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.15]) +AC_INIT([tor],[0.2.8.15-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 57002a04e..60ee61ff8 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.15" +!define VERSION "0.2.8.15-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index bb09bafe0..1f256c204 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.15" +#define VERSION "0.2.8.15-dev"

1 0