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

[tor/master] Merge remote-tracking branch 'teor/bug16343-master-key-assert'
by nickm＠torproject.org 10 Jun '15

10 Jun '15

commit a60d9023c34a2c77b2211bb213b165a0e5bd4439 Merge: 95bcd2d e870f62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 10 12:40:32 2015 -0400 Merge remote-tracking branch 'teor/bug16343-master-key-assert' src/common/tortls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix clang address of struct member always non-NULL in SSL master key
by nickm＠torproject.org 10 Jun '15

10 Jun '15

commit e870f6285d8c490536f62c6923ad0aca9844079d Author: teor <teor2345(a)gmail.com> Date: Thu Jun 11 01:06:15 2015 +1000 Fix clang address of struct member always non-NULL in SSL master key clang complains that the address of struct member in an assert in SSL_SESSION_get_master_key is always non-NULL. Instead, check each pointer argument is non-NULL before using it. Fix on f90a704f1258 from 27 May 2015, not in any released version of tor. --- src/common/tortls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 4cfe94e..98840c1 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2631,10 +2631,11 @@ SSL_get_server_random(SSL *s, uint8_t *out, size_t len) static size_t SSL_SESSION_get_master_key(SSL_SESSION *s, uint8_t *out, size_t len) { + tor_assert(s); if (len == 0) return s->master_key_length; tor_assert(len == (size_t)s->master_key_length); - tor_assert(s->master_key); + tor_assert(out); memcpy(out, s->master_key, len); return len; }

1 0

[tor/master] Update and clarify release checklist
by andrea＠torproject.org 10 Jun '15

10 Jun '15

commit 95bcd2dc151ba59fe3b9a4ae4725874cf67dc698 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 10 15:05:52 2015 +0000 Update and clarify release checklist --- doc/HACKING | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 511e3fb..d94e0a9 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -568,8 +568,9 @@ a stable release, add it to the ReleaseNotes file too. If we're adding to a release-0.2.x branch, manually commit the changelogs to the later git branches too. -4) Bump the version number in configure.ac and rebuild. Then run - "make update-versions". +4) In maint-0.2.x, bump the version number in configure.ac and run + scripts/maint/updateVersions.pl to update version numbers in other + places, and commit. Then merge maint-0.2.x into release-0.2.x. 5) Make dist, put the tarball up somewhere, and tell #tor about it. Wait a while to see if anybody has problems building it. Try to get Sebastian

1 0

[tor/release-0.2.6] Bump version to 0.2.6.9
by andrea＠torproject.org 10 Jun '15

10 Jun '15

commit 1eb2c0cbd3a9be2650419bd07474770629261f56 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 10 14:58:33 2015 +0000 Bump version to 0.2.6.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 156bb3f..1496b05 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.6.8]) +AC_INIT([tor],[0.2.6.9]) 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 1764614..5c5c1bb 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.6.8" +!define VERSION "0.2.6.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 c0ab2de..9b2e84d 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.6.8" +#define VERSION "0.2.6.9"

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by andrea＠torproject.org 10 Jun '15

10 Jun '15

commit 0e939c1e0021b40491789a082eec8ddb422ecc2d Merge: 2f17b91 1eb2c0c Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 10 15:03:22 2015 +0000 Merge branch 'maint-0.2.6' into release-0.2.6

1 0

[tor/maint-0.2.6] Bump version to 0.2.6.9
by andrea＠torproject.org 10 Jun '15

10 Jun '15

commit 1eb2c0cbd3a9be2650419bd07474770629261f56 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 10 14:58:33 2015 +0000 Bump version to 0.2.6.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 156bb3f..1496b05 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.6.8]) +AC_INIT([tor],[0.2.6.9]) 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 1764614..5c5c1bb 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.6.8" +!define VERSION "0.2.6.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 c0ab2de..9b2e84d 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.6.8" +#define VERSION "0.2.6.9"

1 0

[tor/release-0.2.6] Bump version to 0.2.6.9
by andrea＠torproject.org 10 Jun '15

10 Jun '15

commit b616aea0740e05934fa23d15e127659ca06c2b15 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 10 14:58:33 2015 +0000 Bump version to 0.2.6.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 156bb3f..1496b05 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.6.8]) +AC_INIT([tor],[0.2.6.9]) 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 1764614..5c5c1bb 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.6.8" +!define VERSION "0.2.6.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 466822e..fd59446 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.6.8" +#define VERSION "0.2.6.9" #define HAVE_STRUCT_SOCKADDR_IN6

1 0

[tor/release-0.2.6] Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into release-0.2.6
by andrea＠torproject.org 10 Jun '15

10 Jun '15

commit 2f17b91ae2ca622294bf63dec2a6986756685702 Merge: b616aea 3761711 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 10 14:59:13 2015 +0000 Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into release-0.2.6 ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.6] Yawning found a typo
by nickm＠torproject.org 10 Jun '15

10 Jun '15

commit 376171104c9187a7d5899df2cb58f64222c61145 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 10 10:52:58 2015 -0400 Yawning found a typo --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ad9e76b..e980c9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Changes in version 0.2.6.9 - 2015-06-1? Tor 0.2.6.9 fixes a regression in the circuit isolation code, increases the requirements for receiving an HSDir flag, and addresses some other small - bugs in the systemd and sandboc code. Clients using circuit isolation + bugs in the systemd and sandbox code. Clients using circuit isolation should upgrade; all directory authorities should upgrade. o Major bugfixes (client-side privacy):

1 0

[tor/release-0.2.6] edit 0.2.6 changelog entries
by nickm＠torproject.org 10 Jun '15

10 Jun '15

commit f591ce17e8f456f21d61e2795ca8ed7cd4559100 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 10 10:36:43 2015 -0400 edit 0.2.6 changelog entries --- ChangeLog | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea4c86f..5a17254 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,8 +4,9 @@ Changes in version 0.2.6.9 - 2015-06-?? o Major bugfixes (client-side privacy): - Properly separate out each SOCKSPort when applying stream isolation. The error occured because each port's session group was - being overwritten by a default value. Fixes bug 16247; bugfix on - 0.2.6.3-alpha. Patch by "jojelino". + being overwritten by a default value when the listener connection + was initialized. Fixes bug 16247; bugfix on 0.2.6.3-alpha. Patch + by "jojelino". o Minor feature (directory authorities, security): - The HSDir flag given by authorities now requires the Stable flag. @@ -21,17 +22,16 @@ Changes in version 0.2.6.9 - 2015-06-?? 0.2.6.3-alpha. Patch from Peter Palfrader. o Minor bugfixes (Linux seccomp2 sandbox): - - Fix sandboxing to work when running as a relay again. This - includes correctly allowing renaming secret_id_key and allowing - the eventfd2 and futex syscalls. Fixes bug 16244; bugfix on - 0.2.6.1-alpha. Patch by Peter Palfrader. + - Fix sandboxing to work when running as a relaymby renaming of + secret_id_key, and allowing the eventfd2 and futex syscalls. Fixes + bug 16244; bugfix on 0.2.6.1-alpha. Patch by Peter Palfrader. - Allow systemd connections to work with the Linux seccomp2 sandbox code. Fixes bug 16212; bugfix on 0.2.6.2-alpha. Patch by Peter Palfrader. o Minor bugfixes (tests): - - Fix a crash in the unit tests on MSVC2013. Fixes bug 16030; bugfix - on 0.2.6.2-alpha. Patch from "NewEraCracker". + - Fix a crash in the unit tests when built with MSVC2013. Fixes bug + 16030; bugfix on 0.2.6.2-alpha. Patch from "NewEraCracker". Changes in version 0.2.6.8 - 2015-05-21

1 0