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

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit b563082ad87448066f950fe581b47f1533b78341 Merge: 306f2f0 5f46a59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:51:08 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/release-0.2.5] 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.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 6bf06c5656ddd2c3649db790b3bdbb14eb50aaee Merge: 78d9af3 a00d07a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:53:21 2015 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h 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/maint-0.2.4] 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.4] fold more entries into 0.2.4 changelog
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 9e44ed47acc9805e77c2d6aa562845a71ea9db5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:47:12 2015 -0400 fold more entries into 0.2.4 changelog --- ChangeLog | 5 +++-- changes/geoip-march2015 | 3 --- changes/geoip6-march2015 | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f3af3d..4a862ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,8 +25,9 @@ Changes in version 0.2.4.26 - 2015-03-?? it is past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. o Minor features (geoip): - - Update geoip and geoip6 files to the January 7 2015 Maxmind - GeoLite2 Country database. + - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the March 3 2015 Maxmind GeoLite2 + Country database. Changes in version 0.2.4.25 - 2014-10-20 diff --git a/changes/geoip-march2015 b/changes/geoip-march2015 deleted file mode 100644 index 5657812..0000000 --- a/changes/geoip-march2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database. - diff --git a/changes/geoip6-march2015 b/changes/geoip6-march2015 deleted file mode 100644 index 9a38c65..0000000 --- a/changes/geoip6-march2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database. -

1 0

[tor/release-0.2.4] 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.4] Merge branch 'maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 22bdc694290c48e959a44e9937d04b0b576e765d Merge: 9e44ed4 5f46a59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:50:28 2015 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.5] fold entries into changelog for 025
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 78d9af302e63f827aa9bb98251bfb6034944dfe3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:46:18 2015 -0400 fold entries into changelog for 025 --- ChangeLog | 5 +++-- changes/geoip-march2015 | 3 --- changes/geoip6-march2015 | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46014ac..caf1f4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,8 +36,9 @@ Changes in version 0.2.5.11 - 2015-03-?? get recent bandwidth history after the fix for ticket 13988. o Minor features (geoip): - - Update geoip and geoip6 files to the January 7 2015 Maxmind - GeoLite2 Country database. + - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the March 3 2015 Maxmind GeoLite2 + Country database. o Minor bugfixes (client, automapping): - Avoid crashing on torrc lines for VirtualAddrNetworkIPv[4|6] when diff --git a/changes/geoip-march2015 b/changes/geoip-march2015 deleted file mode 100644 index 5657812..0000000 --- a/changes/geoip-march2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database. - diff --git a/changes/geoip6-march2015 b/changes/geoip6-march2015 deleted file mode 100644 index 9a38c65..0000000 --- a/changes/geoip6-march2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database. -

1 0

[tor/master] Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 192ed944101174d775d27ac54002ee9bc2708080 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 09:49:45 2015 -0400 Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash When calling pthread_attr_setdetachstate, we were using 1 as the argument. But the pthreads documentation says that you have to say PTHREAD_CREATE_DETACH, which on Solaris is apparently 0x40. Calling pthread_attr_setdetachstate with 1 crashes on Solaris with FLTBOUNDS. (Because we're so late in the release cycle, I made the code define PTHREAD_CREATE_DETACHED if it doesn't exist, so we aren't likely to break any other platforms.) This bug was introduced when we made threading mandatory in 0.2.6.1-alpha; previously, we had force-disabled threading on Solaris. See #9495 discussion. --- changes/bug9495_redux | 4 ++++ src/common/compat_pthreads.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug9495_redux b/changes/bug9495_redux new file mode 100644 index 0000000..74b0cdf --- /dev/null +++ b/changes/bug9495_redux @@ -0,0 +1,4 @@ + o Major bugfixes (portability): + - Do not crash on startup when running on Solaris. Fixes a bug + related to our fix for 9495; bugfix on 0.2.6.1-alpha. Reported + by "ruebezahl". diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index f4a6cad..246076b 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -279,7 +279,11 @@ tor_threads_init(void) pthread_mutexattr_init(&attr_recursive); pthread_mutexattr_settype(&attr_recursive, PTHREAD_MUTEX_RECURSIVE); tor_assert(0==pthread_attr_init(&attr_detached)); - tor_assert(0==pthread_attr_setdetachstate(&attr_detached, 1)); +#ifndef PTHREAD_CREATE_DETACHED +#define PTHREAD_CREATE_DETACHED 1 +#endif + tor_assert(0==pthread_attr_setdetachstate(&attr_detached, + PTHREAD_CREATE_DETACHED)); threads_initialized = 1; set_main_thread(); }

1 0

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

12 Mar '15

commit a95e18b3589a2ebc4b9a5c741c37bdf083d5057d Merge: 985687b 192ed94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:05:06 2015 -0400 Merge branch 'bug9495_redux_v2' into maint-0.2.6 changes/bug9495_redux | 4 ++++ src/common/compat_pthreads.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0