- tor-commits - lists.torproject.org

[torbrowser/master] Use archive.tpo urls to download our software
by erinn＠torproject.org 11 May '12

11 May '12

commit c2a2a5ce352e688444a19aa0aed8b6a7f9a8a6d6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 10 09:19:06 2012 +0200 Use archive.tpo urls to download our software --- build-scripts/versions.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index eda1b90..6ddffad 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -44,17 +44,17 @@ ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/$(LIBPNG_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) -VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) +VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACK… -TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) +TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win3… PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archiv… -TORBUTTON_URL=https://www.torproject.org/dist/torbutton/$(TORBUTTON_PACKAGE) +TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE) NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSC… HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) -OBFSPROXY_URL=https://www.torproject.org/dist/obfsproxy/$(OBFSPROXY_PACKAGE) +OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PACKAGE) # Provide some mappings between lower and upper case, which means we don't need # to rely on shell shenanigans when we need the upper case version. This is

1 0

[torbrowser/maint-2.3] Use archive.tpo urls to download our software
by erinn＠torproject.org 11 May '12

11 May '12

commit c2a2a5ce352e688444a19aa0aed8b6a7f9a8a6d6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 10 09:19:06 2012 +0200 Use archive.tpo urls to download our software --- build-scripts/versions.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index eda1b90..6ddffad 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -44,17 +44,17 @@ ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/$(LIBPNG_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) -VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) +VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACK… -TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) +TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win3… PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archiv… -TORBUTTON_URL=https://www.torproject.org/dist/torbutton/$(TORBUTTON_PACKAGE) +TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE) NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSC… HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) -OBFSPROXY_URL=https://www.torproject.org/dist/obfsproxy/$(OBFSPROXY_PACKAGE) +OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PACKAGE) # Provide some mappings between lower and upper case, which means we don't need # to rely on shell shenanigans when we need the upper case version. This is

1 0

[torbrowser/maint-2.2] update libevent to 2.0.19-stable
by erinn＠torproject.org 11 May '12

11 May '12

commit 9c8253937b86c58425922fb9a1e4ed32cf366874 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 16:12:05 2012 -0300 update libevent to 2.0.19-stable --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 42a481b..eea574e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,7 +7,7 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 -LIBEVENT_VER=2.0.18-stable +LIBEVENT_VER=2.0.19-stable TOR_VER=0.2.2.35 PIDGIN_VER=2.6.4 FIREFOX_VER=12.0

1 0

[torbrowser/master] Update zlib to 1.2.7
by erinn＠torproject.org 11 May '12

11 May '12

commit 8ce8d7111cf70cb90986cf4ae03e9ef84105e176 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed May 9 17:28:08 2012 +0200 Update zlib to 1.2.7 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 9d865b2..42a481b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,7 +2,7 @@ RELEASE_VER=2.2.35 -ZLIB_VER=1.2.6 +ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.10 QT_VER=4.8.1

1 0

[torbrowser/master] update libevent to 2.0.19-stable
by erinn＠torproject.org 11 May '12

11 May '12

commit 9c8253937b86c58425922fb9a1e4ed32cf366874 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 16:12:05 2012 -0300 update libevent to 2.0.19-stable --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 42a481b..eea574e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,7 +7,7 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 -LIBEVENT_VER=2.0.18-stable +LIBEVENT_VER=2.0.19-stable TOR_VER=0.2.2.35 PIDGIN_VER=2.6.4 FIREFOX_VER=12.0

1 0

[torbrowser/master] Update obfsproxy version to 0.1.4
by erinn＠torproject.org 11 May '12

11 May '12

commit ef95067e02b4f9ded7748fa42e7b9ec4be06e3f7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 10 09:20:26 2012 +0200 Update obfsproxy version to 0.1.4 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 6ddffad..9d865b2 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -17,7 +17,7 @@ TORBUTTON_VER=1.4.5.1 NOSCRIPT_VER=2.3.9 HTTPSEVERYWHERE_VER=2.0.2 OTR_VER=3.2.0 -OBFSPROXY_VER=0.1.1 +OBFSPROXY_VER=0.1.4 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 11 May '12

11 May '12

commit 0caa05d8ae7a4d1943d2bba37d4bc489851c0ecd Merge: daad02b 8ce8d71 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 16:11:31 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 11 May '12

11 May '12

commit fe9c51463e759d8f7b9e05a2dc527db9d3da7984 Merge: 0caa05d 9c82539 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 16:12:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix a couple of wide lines
by nickm＠torproject.org 11 May '12

11 May '12

commit 4bac2233116f0d94fd6ad1e77acb0baceeaf2336 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 13:01:07 2012 -0400 Fix a couple of wide lines --- src/or/transports.c | 3 ++- src/test/test_util.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 0082b6a..5f650d1 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -999,7 +999,8 @@ create_managed_proxy_environment(const managed_proxy_t *mp) if (mp->is_server) { { - char *orport_tmp = get_first_listener_addrport_string(CONN_TYPE_OR_LISTENER); + char *orport_tmp = + get_first_listener_addrport_string(CONN_TYPE_OR_LISTENER); smartlist_add_asprintf(envs, "TOR_PT_ORPORT=%s", orport_tmp); tor_free(orport_tmp); } diff --git a/src/test/test_util.c b/src/test/test_util.c index 365b5ac..b5b40bb 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1778,7 +1778,7 @@ test_util_strtok(void) tor_snprintf(buf, sizeof(buf), "%sGraved on the dark in gestures of descent%s", pad1, pad1); tor_snprintf(buf2, sizeof(buf2), - "%sthey.seemed;;their!.own;most.perfect;monument%s",pad2,pad2); + "%sthey.seemed;;their!.own;most.perfect;monument%s",pad2,pad2); /* -- "Year's End", Richard Wilbur */ test_streq("Graved", tor_strtok_r_impl(buf, " ", &cp1));

1 0

[stem/master] Expanding launch_tor to support commandline options
by atagar＠torproject.org 11 May '12

11 May '12

commit f3c5f334ce84621547139ae70eedb2c3fbfa2076 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 11 09:05:18 2012 -0700 Expanding launch_tor to support commandline options When writing small scripts we often want to start a tor instance for a special purpose, for instance to test a new feature. When doing this we want a bare-bones tor instance with just a few specific options. Adding better support for this by making the launch_tor function accept command-line options and the ability to use a blank torrc. --- stem/process.py | 33 +++++++++++++++++++++++++++++---- test/runner.py | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/stem/process.py b/stem/process.py index 2b00117..8d65072 100644 --- a/stem/process.py +++ b/stem/process.py @@ -8,12 +8,18 @@ launch_tor - starts up a tor process import re import os import signal +import tempfile import subprocess # number of seconds before we time out our attempt to start a tor instance DEFAULT_INIT_TIMEOUT = 90 -def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): +# special parameter that can be set for the torrc_path to run with a blank +# configuration + +NO_TORRC = "<no torrc>" + +def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): """ Initializes a tor process. This blocks until initialization completes or we error out. @@ -25,6 +31,7 @@ def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, ini Arguments: tor_cmd (str) - command for starting tor + options (dict) - configuration options, such as ("ControlPort": "9051") torrc_path (str) - location of the torrc for us to use completion_percent (int) - percent of bootstrap completion at which this'll return @@ -42,18 +49,32 @@ def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, ini """ # double check that we have a torrc to work with - if not os.path.exists(torrc_path): + if not torrc_path in (None, NO_TORRC) and not os.path.exists(torrc_path): raise OSError("torrc doesn't exist (%s)" % torrc_path) # starts a tor subprocess, raising an OSError if it fails - runtime_args = [tor_cmd] - if torrc_path: runtime_args += ["-f", torrc_path] + runtime_args, temp_file = [tor_cmd], None + if torrc_path: + if torrc_path == NO_TORRC: + temp_file = tempfile.mkstemp("-empty-torrc", text = True)[1] + runtime_args += ["-f", temp_file] + else: + runtime_args += ["-f", torrc_path] + + if options: + for key, value in options.items(): + value = value.replace('"', '\\"') + runtime_args += ["--%s" % key.lower(), value] tor_process = subprocess.Popen(runtime_args, stdout = subprocess.PIPE, stderr = subprocess.PIPE) if timeout: def timeout_handler(signum, frame): # terminates the uninitialized tor process and raise on timeout + if temp_file: + try: os.remove(temp_file) + except: pass + tor_process.kill() raise OSError("reached a %i second timeout without success" % timeout) @@ -77,5 +98,9 @@ def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, ini bootstrap_match = bootstrap_line.search(init_line) if bootstrap_match and int(bootstrap_match.groups()[0]) >= completion_percent: + if temp_file: + try: os.remove(temp_file) + except: pass + return tor_process diff --git a/test/runner.py b/test/runner.py index 66636f2..6acc68e 100644 --- a/test/runner.py +++ b/test/runner.py @@ -637,7 +637,7 @@ class Runner: print_init_line = lambda line: test.output.print_line(" %s" % line, *SUBSTATUS_ATTR) torrc_dst = os.path.join(self._test_dir, "torrc") - self._tor_process = stem.process.launch_tor(tor_cmd, torrc_dst, complete_percent, print_init_line) + self._tor_process = stem.process.launch_tor(tor_cmd, None, torrc_dst, complete_percent, print_init_line) runtime = time.time() - start_time test.output.print_line(" done (%i seconds)\n" % runtime, *STATUS_ATTR)

1 0