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

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit fb33bcbcf0fff2f5d6fa29d1097a943b1a764572 Merge: 71b9f4f a535735 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:36:58 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump.

1 0

[tor/release-0.3.1] Bump 0.3.1 to 0.3.1.4-alpha
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit a53573559fc97b0931ec67a0ad27b796c305ff06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:36:50 2017 -0400 Bump 0.3.1 to 0.3.1.4-alpha --- 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 0c673d0..bbc60c3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.3-alpha-dev]) +AC_INIT([tor],[0.3.1.4-alpha]) 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 d3df391..e1b8bc5 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.3.1.3-alpha-dev" +!define VERSION "0.3.1.4-alpha" !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 696f6fe..668f0b6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.1.3-alpha-dev" +#define VERSION "0.3.1.4-alpha"

1 0

[tor/master] Bump 0.3.1 to 0.3.1.4-alpha
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit a53573559fc97b0931ec67a0ad27b796c305ff06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:36:50 2017 -0400 Bump 0.3.1 to 0.3.1.4-alpha --- 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 0c673d0..bbc60c3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.3-alpha-dev]) +AC_INIT([tor],[0.3.1.4-alpha]) 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 d3df391..e1b8bc5 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.3.1.3-alpha-dev" +!define VERSION "0.3.1.4-alpha" !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 696f6fe..668f0b6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.1.3-alpha-dev" +#define VERSION "0.3.1.4-alpha"

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit c552ce0e17f26ae00d781d7e7f88bf2cb530573b Merge: 7444f2d 98ffb2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:35:46 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Update maint-0.3.0 to 0.3.0.9
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 98ffb2e722316568b2bbec7969c12db3663081d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:35:40 2017 -0400 Update maint-0.3.0 to 0.3.0.9 --- 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 218de29..6c6eb6c 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.3.0.8-dev]) +AC_INIT([tor],[0.3.0.9]) 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 010d390..57821bc 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.3.0.8-dev" +!define VERSION "0.3.0.9" !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 231da06..96d16bd 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.8-dev" +#define VERSION "0.3.0.9"

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 07862d84359360e6ea3d7fa2dfae47ad8f8fb264 Merge: d9c230e a535735 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:37:21 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.0] Update maint-0.3.0 to 0.3.0.9
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 98ffb2e722316568b2bbec7969c12db3663081d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:35:40 2017 -0400 Update maint-0.3.0 to 0.3.0.9 --- 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 218de29..6c6eb6c 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.3.0.8-dev]) +AC_INIT([tor],[0.3.0.9]) 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 010d390..57821bc 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.3.0.8-dev" +!define VERSION "0.3.0.9" !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 231da06..96d16bd 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.8-dev" +#define VERSION "0.3.0.9"

1 0

[tor/release-0.3.1] "Relay" in changelog, not "node"
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit d9c230e71222d0a531ea6f56082019daf2c34fc6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:34:27 2017 -0400 "Relay" in changelog, not "node" --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab2202e..c60633d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 Tor 0.3.1.4-alpha fixes a path selection bug that would allow a client to use a guard that was in the same network family as a chosen exit - node. This is a security regression; all clients running earlier + relay. This is a security regression; all clients running earlier versions of 0.3.0.x or 0.3.1.x should upgrade to 0.3.0.9 or 0.3.1.4-alpha.

1 0

[tor/release-0.3.1] Edit and reflow the changelog.
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 173dc174bf7f315956dfcf4a232d3660847758fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:31:40 2017 -0400 Edit and reflow the changelog. --- ChangeLog | 79 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bf8e6f..ab2202e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,41 +2,36 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 Tor 0.3.1.4-alpha fixes a path selection bug that would allow a client to use a guard that was in the same network family as a chosen exit node. This is a security regression; all clients running earlier - versions of 0.3.0.x or 0.3.1.x should upgrade to 0.3.0.9 or - 0.3.1.4-alpha. + versions of 0.3.0.x or 0.3.1.x should upgrade to 0.3.0.9 + or 0.3.1.4-alpha. This release also fixes several other bugs related to new features in 0.3.0.x and 0.3.1.x, including others that can effect bandwidth usage and correctness. - o Major bugfixes (path selection, security): - - When choosing which guard to use for a circuit, avoid the - exit's family along with the exit itself. Previously, the new - guard selection logic avoided the exit, but did not consider - its family. Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked - as TROVE-2016-006 and CVE-2017-0377. - o New dependencies: - - To build with zstd and lzma support, Tor now requires the pkg- - config tool at build time. (This requirement was new in + - To build with zstd and lzma support, Tor now requires the + pkg-config tool at build time. (This requirement was new in 0.3.1.1-alpha, but was not noted at the time. Noting it here to close ticket 22623.) - o Major bugfixes (compression): - - Fix crash in LZMA module, when the Sandbox is enabled, where - liblzma would allocate more than 16 MB of memory. We solve this by - bumping the mprotect() limit in the Sandbox module from 16 MB to - 20 MB. Fixes bug 22751; bugfix on 0.3.1.1-alpha. + o Major bugfixes (path selection, security): + - When choosing which guard to use for a circuit, avoid the exit's + family along with the exit itself. Previously, the new guard + selection logic avoided the exit, but did not consider its family. + Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016- + 006 and CVE-2017-0377. o Major bugfixes (compression, zstd): - Correctly detect a full buffer when decompessing a large zstd- - compressed input. Fixes bug 22628; bugfix on 0.3.1.1-alpha. + compressed input. (Previously, we would sometimes treat a full + buffer as an error.) Fixes bug 22628; bugfix on 0.3.1.1-alpha. o Major bugfixes (directory protocol): - - Ensure that we sent "304 Not modified" as HTTP status code when a - client is attempting to fetch a consensus or consensus diff that - matches the latest consensus we have available. Fixes bug 22702; - bugfix on 0.3.1.1-alpha. + - Ensure that we send "304 Not modified" as HTTP status code when a + client is attempting to fetch a consensus or consensus diff, and + the best one we can send them is one we already have. Fixes bug + 22702; bugfix on 0.3.1.1-alpha. o Major bugfixes (entry guards): - When starting with an old consensus, do not add new entry guards @@ -48,11 +43,6 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 unable to remove a file from the consensus cache on Windows. Attempts to mitigate and diagnose bug 22752. - o Minor features (compression, defensive programming): - - Detect and break out of infinite loops in our compression code. We - don't think that any such loops exist now, but it's best to be - safe. Closes ticket 22672. - o Minor features (geoip): - Update geoip and geoip6 to the June 8 2017 Maxmind GeoLite2 Country database. @@ -64,10 +54,10 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 - When decompressing a buffer, check for extra data after the end of the compressed data. Fixes bug 22629; bugfix on 0.3.1.1-alpha. - When decompressing an object received over an anonymous directory - connection, if we have already successfully decompressed it using - an acceptable compression method, do not reject it for looking - like an unacceptable compression method. Fixes part of bug 22670; - bugfix on 0.3.1.1-alpha. + connection, if we have already decompressed it using an acceptable + compression method, do not reject it for looking like an + unacceptable compression method. Fixes part of bug 22670; bugfix + on 0.3.1.1-alpha. - When serving directory votes compressed with zlib, do not claim to have compressed them with zstd. Fixes bug 22669; bugfix on 0.3.1.1-alpha. @@ -77,7 +67,10 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 compression requests with nothing to do, which interferes with our 22672 checks. Fixes bug 22719; bugfix on 0.2.0.16-alpha. - o Minor bugfixes (defensive programming, undefined behavior): + o Minor bugfixes (defensive programming): + - Detect and break out of infinite loops in our compression code. We + don't think that any such loops exist now, but it's best to be + safe. Closes ticket 22672. - Fix a memset() off the end of an array when packing cells. This bug should be harmless in practice, since the corrupted bytes are still in the same structure, and are always padding bytes, @@ -92,6 +85,10 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 starting with the seccomp2 sandbox and an unexpected set of permissions on the data directory or its contents. Fixes bug 22516; bugfix on 0.2.5.4-alpha. + - Fix a crash in LZMA module, when the sandbox was enabled, and + liblzma would allocate more than 16 MB of memory. We solve this by + bumping the mprotect() limit in the sandbox module from 16 MB to + 20 MB. Fixes bug 22751; bugfix on 0.3.1.1-alpha. o Minor bugfixes (logging): - When decompressing, do not warn if we fail to decompress using a @@ -100,23 +97,23 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 - When decompressing, treat mismatch between content-encoding and actual compression type as a protocol warning. Fixes part of bug 22670; bugfix on 0.1.1.9-alpha. - - Downgrade "assigned_to_cpuworker failed" message to INFO-level + - Downgrade "assigned_to_cpuworker failed" message to info-level severity. In every case that can reach it, either a better warning has already been logged, or no warning is warranted. Fixes bug 22356; bugfix on 0.2.6.3-alpha. - - Demote a warn that was caused by libevent delays to info if the - padding is less than 4.5 seconds late, or notice if it is more - (4.5 seconds is the amount of time that a netflow record might be - emitted after, if we chose the maximum timeout). Fixes bug 22212; - bugfix on 0.3.1.1-alpha. + - Demote a warn that was caused by libevent delays to info if + netflow padding padding is less than 4.5 seconds late, or to + notice if it is more (4.5 seconds is the amount of time that a + netflow record might be emitted after, if we chose the maximum + timeout). Fixes bug 22212; bugfix on 0.3.1.1-alpha. o Minor bugfixes (process behavior): - When exiting because of an error, always exit with a nonzero exit status. Previously, we would fail to report an error in our exit - status in cases related to lockfile contention, - __OwningControllerProcess failure, and Ed25519 key initialization. - Fixes bug 22720; bugfix on versions 0.2.1.6-alpha, 0.2.2.28-beta, - and 0.2.7.2-alpha respectively. Reported by "f55jwk4f"; patch + status in cases related to __OwningControllerProcess failure, + lockfile contention, and Ed25519 key initialization. Fixes bug + 22720; bugfix on versions 0.2.1.6-alpha, 0.2.2.28-beta, and + 0.2.7.2-alpha respectively. Reported by "f55jwk4f"; patch from "huyvq". o Documentation:

1 0

[tor/release-0.3.1] Fold in changes entry for 22753, and write a blurb.
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 20a46bdce6b573b9c219bb6f599fb28a22a64833 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:02:47 2017 -0400 Fold in changes entry for 22753, and write a blurb. --- ChangeLog | 25 ++++++++++++++++++------- changes/bug22753 | 7 ------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 097482c..4bf8e6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ -Changes in version 0.3.1.4-alpha - 2017-06-29: - blurb goes here. +Changes in version 0.3.1.4-alpha - 2017-06-29 + Tor 0.3.1.4-alpha fixes a path selection bug that would allow a client + to use a guard that was in the same network family as a chosen exit + node. This is a security regression; all clients running earlier + versions of 0.3.0.x or 0.3.1.x should upgrade to 0.3.0.9 or + 0.3.1.4-alpha. + + This release also fixes several other bugs related to new features in + 0.3.0.x and 0.3.1.x, including others that can effect bandwidth usage + and correctness. + + o Major bugfixes (path selection, security): + - When choosing which guard to use for a circuit, avoid the + exit's family along with the exit itself. Previously, the new + guard selection logic avoided the exit, but did not consider + its family. Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked + as TROVE-2016-006 and CVE-2017-0377. o New dependencies: - To build with zstd and lzma support, Tor now requires the pkg- @@ -78,21 +93,17 @@ Changes in version 0.3.1.4-alpha - 2017-06-29: permissions on the data directory or its contents. Fixes bug 22516; bugfix on 0.2.5.4-alpha. - o Minor bugfixes (logging, compression): + o Minor bugfixes (logging): - When decompressing, do not warn if we fail to decompress using a compression method that we merely guessed. Fixes part of bug 22670; bugfix on 0.1.1.14-alpha. - When decompressing, treat mismatch between content-encoding and actual compression type as a protocol warning. Fixes part of bug 22670; bugfix on 0.1.1.9-alpha. - - o Minor bugfixes (logging, relay): - Downgrade "assigned_to_cpuworker failed" message to INFO-level severity. In every case that can reach it, either a better warning has already been logged, or no warning is warranted. Fixes bug 22356; bugfix on 0.2.6.3-alpha. - - o Minor bugfixes (netflow padding logging): - Demote a warn that was caused by libevent delays to info if the padding is less than 4.5 seconds late, or notice if it is more (4.5 seconds is the amount of time that a netflow record might be diff --git a/changes/bug22753 b/changes/bug22753 deleted file mode 100644 index 32a6dfa..0000000 --- a/changes/bug22753 +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (path selection, security): - - When choosing which guard to use for a circuit, avoid the - exit's family along with the exit itself. Previously, the new - guard selection logic avoided the exit, but did not consider - its family. Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked - as TROVE-2016-006 and CVE-2017-0377. -

1 0