tor-commits June 2017

tor-commits@lists.torproject.org

13 participants
1918 discussions

[tor/release-0.3.0] 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

[tor/release-0.3.0] 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.3.0] 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] 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.3.0] Fold TROVE-2017-00[45] into changelog
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 2664156a341495f63a1c1902e015f0c70cfffefa Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:33:01 2017 -0400 Fold TROVE-2017-00[45] into changelog --- ChangeLog | 10 ++++++++++ changes/trove-2017-004 | 6 ------ changes/trove-2017-005 | 7 ------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56a7ce0..460beee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,16 @@ Changes in version 0.3.0.8 - 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 when a hidden service + handles a malformed BEGIN cell. Fixes bug 22493, tracked as + TROVE-2017-004 and as CVE-2017-0375; bugfix on 0.3.0.1-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-004 b/changes/trove-2017-004 deleted file mode 100644 index af1567f..0000000 --- a/changes/trove-2017-004 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (hidden service, relay, security): - - 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 0.3.0.1-alpha. - Found by armadev. 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] Bump to 0.2.7.8
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 2efe0275bcdbbdf37d1d8ef59a8ec4df9f5fca59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:27:34 2017 -0400 Bump to 0.2.7.8 --- 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 80c4d3c..f754942 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.7.7]) +AC_INIT([tor],[0.2.7.8]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index f20c1a6..32c9731 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.7.7" +!define VERSION "0.2.7.8" !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 57385c9..46714ef 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.7.7" +#define VERSION "0.2.7.8"

1 0

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

08 Jun '17

commit d389480da54dfff4900b5ddf8c0795a02672bafe Merge: a0664fd 8239af0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:29:23 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.0] 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/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit d15d09a96839e0c13a9b9845a51a402d7a931949 Merge: d850d27 c1646d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/trove-2017-005 | 7 +++++++ src/or/relay.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

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

08 Jun '17

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2017