- tor-commits - lists.torproject.org

r25408: {website} new 32-bit obfs tbbs are up too (website/trunk/projects/en)
by Roger Dingledine 13 Feb '12

13 Feb '12

Author: arma Date: 2012-02-13 10:13:24 +0000 (Mon, 13 Feb 2012) New Revision: 25408 Modified: website/trunk/projects/en/obfsproxy.wml Log: new 32-bit obfs tbbs are up too Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-13 09:21:28 UTC (rev 25407) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-13 10:13:24 UTC (rev 25408) @@ -83,9 +83,9 @@ - <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Linux 32-bit Obfsproxy Tor Browser Bundle</a> - (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) - (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or + <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Linux 32-bit Obfsproxy Tor Browser Bundle</a> + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or <a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_32bit_linux.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_32bit_linux.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_32bit_linux.torrent">torrent</a>).

1 0

r25407: {website} sebastian has the linux 64-bit obfsproxy tbb ready (website/trunk/projects/en)
by Roger Dingledine 13 Feb '12

13 Feb '12

Author: arma Date: 2012-02-13 09:21:28 +0000 (Mon, 13 Feb 2012) New Revision: 25407 Modified: website/trunk/projects/en/obfsproxy.wml Log: sebastian has the linux 64-bit obfsproxy tbb ready Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-13 00:51:12 UTC (rev 25406) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-13 09:21:28 UTC (rev 25407) @@ -90,9 +90,9 @@ - <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Linux 64-bit Obfsproxy Tor Browser Bundle</a> - (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) - (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or + <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Linux 64-bit Obfsproxy Tor Browser Bundle</a> + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.torrent">torrent</a>).

1 0

[obfsproxy/master] add a warning for the unwary traveller
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit 9af47b14a470aa56153ea5a42e416b19bcee7eb0 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 04:12:30 2012 -0500 add a warning for the unwary traveller eventually we might want to come up with a smarter approach here. --- src/util.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/util.c b/src/util.c index 5701d2f..608471e 100644 --- a/src/util.c +++ b/src/util.c @@ -495,6 +495,10 @@ log_do_debug(void) Accepts a logging 'severity' and a 'format' string and logs the message in 'format' according to the configured obfsproxy minimum logging severity and logging method. + + Beware! Because die_oom() calls this function, we must avoid mallocing + any memory here, or we could get into an infinite loop. I believe it + is currently the case that we don't malloc anything. -RD */ static void logv(int severity, const char *format, va_list ap)

1 0

[torbrowser/master] update recommended versions to also have 2.2.35-6
by erinn＠torproject.org 13 Feb '12

13 Feb '12

commit 5ab753d417c54206bb405a75706edcaf4bdb8596 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Feb 13 08:50:09 2012 +0100 update recommended versions to also have 2.2.35-6 --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index c713d85..944c2da 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,5 +3,10 @@ "2.2.35-5-Linux-x86_64", "2.2.35-5-MacOS-i386", "2.2.35-5-MacOS-x86_64", -"2.2.35-5-Windows" +"2.2.35-5-Windows", +"2.2.35-6-Linux-i686", +"2.2.35-6-Linux-x86_64", +"2.2.35-6-MacOS-i386", +"2.2.35-6-MacOS-x86_64", +"2.2.35-6-Windows" ]

1 0

[torbrowser/maint-2.2] update recommended versions to also have 2.2.35-6
by erinn＠torproject.org 13 Feb '12

13 Feb '12

commit 5ab753d417c54206bb405a75706edcaf4bdb8596 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Feb 13 08:50:09 2012 +0100 update recommended versions to also have 2.2.35-6 --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index c713d85..944c2da 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,5 +3,10 @@ "2.2.35-5-Linux-x86_64", "2.2.35-5-MacOS-i386", "2.2.35-5-MacOS-x86_64", -"2.2.35-5-Windows" +"2.2.35-5-Windows", +"2.2.35-6-Linux-i686", +"2.2.35-6-Linux-x86_64", +"2.2.35-6-MacOS-i386", +"2.2.35-6-MacOS-x86_64", +"2.2.35-6-Windows" ]

1 0

[torbrowser/maint-2.3] update recommended versions to also have 2.2.35-6
by erinn＠torproject.org 13 Feb '12

13 Feb '12

commit 5ab753d417c54206bb405a75706edcaf4bdb8596 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Feb 13 08:50:09 2012 +0100 update recommended versions to also have 2.2.35-6 --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index c713d85..944c2da 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,5 +3,10 @@ "2.2.35-5-Linux-x86_64", "2.2.35-5-MacOS-i386", "2.2.35-5-MacOS-x86_64", -"2.2.35-5-Windows" +"2.2.35-5-Windows", +"2.2.35-6-Linux-i686", +"2.2.35-6-Linux-x86_64", +"2.2.35-6-MacOS-i386", +"2.2.35-6-MacOS-x86_64", +"2.2.35-6-Windows" ]

1 0

[tor/master] today is the day for a 0.2.3.12-alpha release
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit 4c81358f3b8ea5b9cde4a96154425c4e5f3b9d3d Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 00:54:57 2012 -0500 today is the day for a 0.2.3.12-alpha release --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e095ae4..8bee030 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.3.12-alpha - 2012-02-?? +Changes in version 0.2.3.12-alpha - 2012-02-13 o Major bugfixes: - Fix building when the path to sed, openssl or sha1sum contains spaces, which is pretty common on Windows. Fixes bug 5065; bugfix

1 0

[tor/master] bump to 0.2.3.12-alpha
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit ff0059b924ec9bf1637eef81135b897da9210cc4 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 00:55:03 2012 -0500 bump to 0.2.3.12-alpha --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index ef571b8..e6d8a8b 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.11-alpha-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.12-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index e548639..e154e30 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.3.11-alpha-dev" +!define VERSION "0.2.3.12-alpha" !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 bf33c81..f4f763d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,7 +233,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.11-alpha-dev" +#define VERSION "0.2.3.12-alpha"

1 0

[obfsproxy/master] Fixed memory leak when incorrect arguments are given. Fixes bug5068.
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit 79c44ced73a77ba045473c0fd2c8015a064e10ae Author: Brendan C <temurion(a)gmail.com> Date: Sun Feb 12 12:26:38 2012 -0600 Fixed memory leak when incorrect arguments are given. Fixes bug5068. --- src/external.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/external.c b/src/external.c index 3a79909..76abf56 100644 --- a/src/external.c +++ b/src/external.c @@ -56,8 +56,10 @@ launch_external_proxy(const char *const *begin) usage(); } else { config_t *cfg = config_create(end - begin, begin); - if (!cfg) + if (!cfg) { + smartlist_free(configs); return -1; /* diagnostic already issued */ + } smartlist_add(configs, cfg); } begin = end;

1 0

[tor/master] revise changelog entry for 5097 too
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit 5b4d72168f39d1fc732760dd2fd851e9df3f7981 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 00:16:05 2012 -0500 revise changelog entry for 5097 too --- ChangeLog | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8839d5..e095ae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,8 +38,9 @@ Changes in version 0.2.3.12-alpha - 2012-02-?? managed pluggable transport server proxy's environment. Previously, we would put it there, even though Tor doesn't implement an 'extended server port' yet, and even though Tor - almost certainly isn't listening to that address. Bugfix on - 0.2.3.6-alpha. + almost certainly isn't listening to that address. For now, we set + it to an empty string, to avoid crashing older obfsproxies. Bugfix + on 0.2.3.6-alpha. - Actually log the heartbeat message every HeartbeatPeriod seconds, not every HeartbeatPeriod + 1 seconds. Fixes bug 4942; bugfix on 0.2.3.1-alpha. Bug reported by Scott Bennett.

1 0