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

[tor/maint-0.3.2] version bump to 0.2.8.17
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 6ee44725449794951f93020bb04e5fa3ba784742 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:22:32 2017 -0500 version bump to 0.2.8.17 --- 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 6fb101bf9..94cebf401 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.16-dev]) +AC_INIT([tor],[0.2.8.17]) 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 b9eac37c5..b9076fbc7 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.16-dev" +!define VERSION "0.2.8.17" !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 211243d1d..9db6ef209 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.16-dev" +#define VERSION "0.2.8.17"

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 6b9c2ac23e7dfbaeaefc1fd5923645850668e7af Merge: ee48eb1eb f2ecdeb72 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:25:07 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" to avoid version bump.

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 8f36104574a6dcce6e6dbb9b49e1f3766ab56441 Merge: 5fc0587c0 16c9cfd65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:24:13 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0

[tor/maint-0.3.2] bump to 0.2.5.16
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 6bda6777c1e86a54dedafd1fadd6142b1ff4955a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:19:48 2017 -0500 bump to 0.2.5.16 --- 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 317778275..67fddd7b4 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.5.15-dev]) +AC_INIT([tor],[0.2.5.16]) 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 6dc7cbd76..c88262afa 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.5.15-dev" +!define VERSION "0.2.5.16" !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 5ba3ec194..87ba1f11a 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.5.15-dev" +#define VERSION "0.2.5.16"

1 0

[tor/master] Guard: Don't pick ourselves as a possible Guard
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 91cee3c9e73aba089804cd88305115fc3ab1f76c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 28 19:09:13 2017 -0500 Guard: Don't pick ourselves as a possible Guard TROVE-2017-12. Severity: Medium Thankfully, tor will close any circuits that we try to extend to ourselves so this is not problematic but annoying. Part of #21534. --- changes/trove-2017-012-part2 | 5 +++++ src/or/entrynodes.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/trove-2017-012-part2 b/changes/trove-2017-012-part2 new file mode 100644 index 000000000..ed994c5b0 --- /dev/null +++ b/changes/trove-2017-012-part2 @@ -0,0 +1,5 @@ + o Major bugfixes (security, relay): + - When running as a relay, make sure that we never ever choose ourselves + as a guard. Previously, this was possible. Fixes part of bug 21534; + bugfix on 0.3.0.1-alpha. This issue is also tracked as TROVE-2017-012 + and CVE-2017-8822. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d762afdcf..0109da8e0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -740,7 +740,8 @@ node_is_possible_guard(const node_t *node) node->is_stable && node->is_fast && node->is_valid && - node_is_dir(node)); + node_is_dir(node) && + !router_digest_is_me(node->identity)); } /**

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 9c89e8e4354283e4596e82adb876653d4c95ac6c Merge: fd73a168c 4ebd43654 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:25:53 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bumps

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 1fd6e25522ed064e8043f4548fbd33fca9246295 Merge: 7e2b012b4 6ee447254 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:22:38 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

1 0

[tor/master] Merge branch 'trove-2017-012_025' into maint-0.2.5
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit f49876d66efbc5679ba7d9d9c6538c763b8e06b5 Merge: 08ce39fb0 6ab07419c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:06:21 2017 -0500 Merge branch 'trove-2017-012_025' into maint-0.2.5 changes/trove-2017-012-part1 | 6 ++++++ src/or/routerlist.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e Merge: 3030741b5 f49876d66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/trove-2017-009 | 10 ++++++++++ changes/trove-2017-011 | 8 ++++++++ changes/trove-2017-012-part1 | 6 ++++++ src/common/crypto.c | 16 +++++++++++++--- src/or/rendservice.c | 4 +++- src/or/routerlist.c | 5 ++++- 6 files changed, 44 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge branch 'trove-2017-012_030' into maint-0.3.0
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit d459c08b7d5cb1766bda5443ea2750bca160212d Merge: 766d0a2d9 91cee3c9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:07:43 2017 -0500 Merge branch 'trove-2017-012_030' into maint-0.3.0 changes/trove-2017-012-part2 | 5 +++++ src/or/entrynodes.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0