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

[tor/release-0.2.6] Bump 025 version to 0.2.5.11
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit a00d07ac1bddd84dd6109cae7afda970d5722d24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:52:09 2015 -0400 Bump 025 version to 0.2.5.11 --- 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 8fab975..5372943 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.10-dev]) +AC_INIT([tor],[0.2.5.11]) 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 fc4b81b..a5b7557 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.10-dev" +!define VERSION "0.2.5.11" !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 b2490c3..34e1471 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.10-dev" +#define VERSION "0.2.5.11"

1 0

[tor/release-0.2.6] Bump 0.2.4 version.
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 5f46a59ba394a1b45ecc1ee52514998e774d3dca Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:50:15 2015 -0400 Bump 0.2.4 version. --- 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 9cf172a..5cc9ab8 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.25-dev]) +AC_INIT([tor],[0.2.4.26]) 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 1e578cd..f16e637 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.25-dev" +!define VERSION "0.2.4.26" !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 d3f3eb1..a028e9e 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.25-dev" +#define VERSION "0.2.4.26"

1 0

[tor/release-0.2.6] Merge branch 'bug15245_026' into maint-0.2.6
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 1a1d431cff40dd92e43df892b0369cd12c3596fb Merge: 354897a d4c1716 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 11:37:02 2015 -0400 Merge branch 'bug15245_026' into maint-0.2.6 changes/bug15245 | 5 +++++ src/or/cpuworker.c | 8 ++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 7eb84e10e32f787ebddca6692431bf9c70a96073 Merge: 0f0b838 1a1d431 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:11:03 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bug15245 | 5 +++++ changes/bug9495_redux | 4 ++++ src/common/compat_pthreads.c | 6 +++++- src/common/container.h | 1 - src/or/cpuworker.c | 8 ++++++++ src/test/test_status.c | 6 ++++-- 6 files changed, 26 insertions(+), 4 deletions(-)

1 0

[tor/release-0.2.6] Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 66c81802076811cf2e329525a0fc9cb38a1e3608 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 11:13:57 2015 -0400 Fix crash bug when calling cpuworkers_rotate_keyinfo on a client. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting! --- changes/bug15245 | 5 +++++ src/or/cpuworker.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/bug15245 b/changes/bug15245 new file mode 100644 index 0000000..520a370 --- /dev/null +++ b/changes/bug15245 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Avoid crashing when making certain configuration option changes + on clients. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Reported + by "anonym". + diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 09ffdb8..588eae9 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -178,6 +178,8 @@ update_state_threadfn(void *state_, void *work_) void cpuworkers_rotate_keyinfo(void) { + if (!threadpool) + return; if (threadpool_queue_update(threadpool, worker_state_new, update_state_threadfn,

1 0

[tor/release-0.2.6] add an explanatory comment
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit d4c17162632b662c333fb09b930838c3884a6fc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 11:28:18 2015 -0400 add an explanatory comment --- src/or/cpuworker.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index e3781ad..d511ecf 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -178,8 +178,12 @@ update_state_threadfn(void *state_, void *work_) void cpuworkers_rotate_keyinfo(void) { - if (!threadpool) + if (!threadpool) { + /* If we're a client, then we won't have cpuworkers, and we won't need + * to tell them to rotate their state. + */ return; + } if (threadpool_queue_update(threadpool, worker_state_new, update_state_threadfn,

1 0

[tor/master] Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 66c81802076811cf2e329525a0fc9cb38a1e3608 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 11:13:57 2015 -0400 Fix crash bug when calling cpuworkers_rotate_keyinfo on a client. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting! --- changes/bug15245 | 5 +++++ src/or/cpuworker.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/bug15245 b/changes/bug15245 new file mode 100644 index 0000000..520a370 --- /dev/null +++ b/changes/bug15245 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Avoid crashing when making certain configuration option changes + on clients. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Reported + by "anonym". + diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 09ffdb8..588eae9 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -178,6 +178,8 @@ update_state_threadfn(void *state_, void *work_) void cpuworkers_rotate_keyinfo(void) { + if (!threadpool) + return; if (threadpool_queue_update(threadpool, worker_state_new, update_state_threadfn,

1 0

[tor/master] Also, add an assertion to assign_onionskin_to_cpuworker
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 648af0438d4a293f12b649afc47dd947a7666a05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 11:15:50 2015 -0400 Also, add an assertion to assign_onionskin_to_cpuworker --- src/or/cpuworker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 588eae9..e3781ad 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -488,6 +488,8 @@ assign_onionskin_to_cpuworker(or_circuit_t *circ, cpuworker_request_t req; int should_time; + tor_assert(threadpool); + if (!circ->p_chan) { log_info(LD_OR,"circ->p_chan gone. Failing circ."); tor_free(onionskin);

1 0

[tor/master] add an explanatory comment
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit d4c17162632b662c333fb09b930838c3884a6fc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 11:28:18 2015 -0400 add an explanatory comment --- src/or/cpuworker.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index e3781ad..d511ecf 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -178,8 +178,12 @@ update_state_threadfn(void *state_, void *work_) void cpuworkers_rotate_keyinfo(void) { - if (!threadpool) + if (!threadpool) { + /* If we're a client, then we won't have cpuworkers, and we won't need + * to tell them to rotate their state. + */ return; + } if (threadpool_queue_update(threadpool, worker_state_new, update_state_threadfn,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit b683b9af00b9ddf20f68169f47f8da0b49d6fbc8 Merge: a46f498 1a1d431 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 11:37:56 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug15245 | 5 +++++ src/or/cpuworker.c | 8 ++++++++ 2 files changed, 13 insertions(+)

1 0