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

[tor/release-0.2.9] Bump to 0.2.4.29
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 8e439a66f3846b65a16b62936ad1d35dbf902e9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:25:31 2017 -0400 Bump to 0.2.4.29 --- configure.ac | 2 +- contrib/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 8e70722..6b4d009 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.28]) +AC_INIT([tor],[0.2.4.29]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index da24244..4e00cb7 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.28" +!define VERSION "0.2.4.29" !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 cca8ad0..5468455 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.28" +#define VERSION "0.2.4.29"

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 77c5d8c73856da7f07508fc263685717bd88dbc7 Merge: fa73f59 8e439a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:28:11 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.

1 0

[tor/release-0.2.9] Tweak 0.2.9.11 changelog
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit aa8950022562be763eb283d972d9b5351a354773 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:47:58 2017 -0400 Tweak 0.2.9.11 changelog --- ChangeLog | 5 +++-- ReleaseNotes | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cdc59d7..37e7ded 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ Changes in version 0.2.9.11 - 2017-06-08 - Tor 0.2.9.11 fixes a pair of bugs that would allow an attacker to + Tor 0.2.9.11 backports a fix for a bug that would allow an attacker to remotely crash a hidden service with an assertion failure. Anyone running a hidden service should upgrade to this version, or to some - other version with fixes for TROVE-2017-004 and TROVE-2017-005. + other version with fixes for TROVE-2017-005. (Versions before 0.3.0 + are not affected by TROVE-2017-004.) Tor 0.2.9.11 also backports fixes for several key management bugs that sometimes made relays unreliable, as well as several other diff --git a/ReleaseNotes b/ReleaseNotes index 13455b3..0057fbd 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,10 +3,11 @@ of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. Changes in version 0.2.9.11 - 2017-06-08 - Tor 0.2.9.11 fixes a pair of bugs that would allow an attacker to + Tor 0.2.9.11 backports a fix for a bug that would allow an attacker to remotely crash a hidden service with an assertion failure. Anyone running a hidden service should upgrade to this version, or to some - other version with fixes for TROVE-2017-004 and TROVE-2017-005. + other version with fixes for TROVE-2017-005. (Versions before 0.3.0 + are not affected by TROVE-2017-004.) Tor 0.2.9.11 also backports fixes for several key management bugs that sometimes made relays unreliable, as well as several other

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit b796ad0300d1b023bc38e5a1498b47bc2e680eae Merge: 0de4620 77c5d8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:28:29 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bump.

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit bff08ed8eb4f9c36d32ae5e15bd574052cca8d78 Merge: 792931d 4915d9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:29:05 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.0] Another changes fix.
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit eb5d05f696a2de7572427ae55c35816e01796efc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:20:53 2017 -0400 Another changes fix. --- changes/trove-2017-004 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/trove-2017-004 b/changes/trove-2017-004 index aa90145..eb0789d 100644 --- a/changes/trove-2017-004 +++ b/changes/trove-2017-004 @@ -1,8 +1,8 @@ o Major bugfixes (hidden service, relay, security): - - Fix an assertion failure when an hidden service handles a + - Fix an assertion failure when a hidden service handles a malformed BEGIN cell. This bug resulted in the service crashing triggered by a tor_assert(). Fixes bug 22493, tracked as - TROVE-2017-004 and as CVE-2017-0375; bugfix on tor-0.3.0.1-alpha. + TROVE-2017-004 and as CVE-2017-0375; bugfix on 0.3.0.1-alpha. Found by armadev.

1 0

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

08 Jun '17

commit 6a6173a21443884df37cfd4f6046dbe7ef2f2519 Merge: 2cc6d8d 8239af0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:29:49 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 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.2.9] Fold TROVE-2017-005 into changelog
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit ac9ac3a35ff69457a06a4aa6b27e034b20b66a6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:33:23 2017 -0400 Fold TROVE-2017-005 into changelog --- ChangeLog | 7 +++++++ changes/trove-2017-005 | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d75b31..cdc59d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,13 @@ Changes in version 0.2.9.11 - 2017-06-08 that sometimes made relays unreliable, as well as several other bugfixes described below. + o Major bugfixes (hidden service, relay, security, backport + from 0.3.1.3-alpha): + - Fix a remotely triggerable assertion failure caused by receiving a + BEGIN_DIR cell on a hidden service rendezvous circuit. Fixes bug + 22494, tracked as TROVE-2017-005 and CVE-2017-0376; bugfix + on 0.2.2.1-alpha. + o Major bugfixes (relay, link handshake, backport from 0.3.1.3-alpha): - When performing the v3 link handshake on a TLS connection, report that we have the x509 certificate that we actually used on that diff --git a/changes/trove-2017-005 b/changes/trove-2017-005 deleted file mode 100644 index cebb013..0000000 --- a/changes/trove-2017-005 +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (hidden service, relay, security): - - Fix an assertion failure caused by receiving a BEGIN_DIR cell on - a hidden service rendezvous circuit. Fixes bug 22494, tracked as - TROVE-2017-005 and CVE-2017-0376; bugfix on 0.2.2.1-alpha. Found - by armadev. - -

1 0

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

08 Jun '17

commit 916791f0bef4ce57e01051dffa96e01f3e97e889 Merge: 17c61d9 0c46dc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:17:32 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/trove-2017-004 | 8 ++++++++ src/or/connection_edge.c | 21 ++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 8239af0d9cb3e45e4c5ff04ab057450934e306cf Merge: b533220 bff08ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:29:12 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

1 0