October 2011 - tor-commits - lists.torproject.org

[flashproxy/master] Use a small custom HTTP downloader rather than Wget.
by dcf＠torproject.org 31 Oct '11

31 Oct '11

commit 7740d4fdb9626c8b47e99e30e60839c7f9abb90d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 16:57:01 2011 -0700 Use a small custom HTTP downloader rather than Wget. I had been timing downloads with "time wget" but that counts the time taken to establish (and possibly retry) the connection. In my graphs there was a clear effect where the first 20 connections would take x seconds to download, but the 21st and later would take x + 5 or so. --- experiments/throughput/httpget.py | 35 ++++++++++++++++++++++++++++++++++ experiments/throughput/throughput.sh | 17 +-------------- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/experiments/throughput/httpget.py b/experiments/throughput/httpget.py new file mode 100755 index 0000000..a08412b --- /dev/null +++ b/experiments/throughput/httpget.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python + +# A simple HTTP downloader that discards what it downloads and prints the time +# taken to download. We use this rather than "time wget" because the latter +# includes time taken to establish (and possibly retry) the connection. + +import getopt +import sys +import time +import urllib2 + +BLOCK_SIZE = 65536 + +label = None + +opts, args = getopt.gnu_getopt(sys.argv[1:], "l:") +for o, a in opts: + if o == "-l": + label = a + +try: + stream = urllib2.urlopen(args[0], timeout=10) + start_time = time.time() + while stream.read(BLOCK_SIZE): + pass + end_time = time.time() + if label: + print "%s %.3f" % (label, end_time - start_time) + else: + print "%.3f" % (end_time - start_time) +except: + if label: + print "%s error" % label + else: + print "error" diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index 5e2fd4b..7dcbad2 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -77,26 +77,13 @@ PIDS_TO_KILL+=($!) visible_sleep 1 -# Extract and parse the "real" part of "time" output and return as a count of -# seconds. -extract_real_time() { - perl -n -e '($m, $s) = ($_ =~ m/real\s+(\d+)m([\d\.]+)s/); if (defined($m)) { print $m*60 + $s . "\n"; }' -} - > "$RESULTS_FILE_NAME" declare -a WAIT_PIDS i=0 while [ $i -lt $NUM_CLIENTS ]; do - echo "Start Wget $((i + 1))." - ( - times=$((time wget http://localhost:2000/dump -q --timeout 30 -t 1 -O /dev/null) 2>&1) - if [ $? -eq 0 ]; then - echo "$times" | extract_real_time >> "$RESULTS_FILE_NAME" - else - echo "error" >> "$RESULTS_FILE_NAME" - fi - ) & + echo "Start downloader $((i + 1))." + ./httpget.py http://localhost:2000/dump >> "$RESULTS_FILE_NAME" & WAIT_PIDS+=($!) i=$((i + 1)) done

1 0

[flashproxy/master] Do a long delay only when the browser isn't running yet.
by dcf＠torproject.org 31 Oct '11

31 Oct '11

commit f53313602b7ebc57f00941aa1e064fff6ba3995a Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 17:02:06 2011 -0700 Do a long delay only when the browser isn't running yet. --- experiments/common.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index 485e908..6f2deea 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -18,7 +18,7 @@ visible_sleep() { ensure_browser_started() { local PROFILE="$1" - ("$FIREFOX" -P "$PROFILE" -remote "ping()" || "$FIREFOX" -P "$PROFILE" -no-remote & visible_sleep 5) 2>/dev/null + ("$FIREFOX" -P "$PROFILE" -remote "ping()" || ("$FIREFOX" -P "$PROFILE" -no-remote & visible_sleep 5)) 2>/dev/null } browser_clear() {

1 0

[flashproxy/master] Do a download direct not through the proxy as well, for comparison.
by dcf＠torproject.org 31 Oct '11

31 Oct '11

commit 0031f2b3c3fe3cb2035759942c10999d0ccb213d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 17:02:21 2011 -0700 Do a download direct not through the proxy as well, for comparison. --- experiments/throughput/throughput.sh | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index 7dcbad2..304e5e5 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -79,14 +79,30 @@ visible_sleep 1 > "$RESULTS_FILE_NAME" +# Proxied downloads. declare -a WAIT_PIDS i=0 while [ $i -lt $NUM_CLIENTS ]; do echo "Start downloader $((i + 1))." - ./httpget.py http://localhost:2000/dump >> "$RESULTS_FILE_NAME" & + ./httpget.py -l proxy http://localhost:2000/dump >> "$RESULTS_FILE_NAME" & WAIT_PIDS+=($!) i=$((i + 1)) done for pid in "${WAIT_PIDS[@]}"; do wait "$pid" done +unset WAIT_PIDS + +# Direct downloads. +declare -a WAIT_PIDS +i=0 +while [ $i -lt $NUM_CLIENTS ]; do + echo "Start downloader $((i + 1))." + ./httpget.py -l direct http://localhost:8000/dump >> "$RESULTS_FILE_NAME" & + WAIT_PIDS+=($!) + i=$((i + 1)) +done +for pid in "${WAIT_PIDS[@]}"; do + wait "$pid" +done +unset WAIT_PIDS

1 0

[tor/master] remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit a6ea34977b0c053cfc330a207961374f58911a7f Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 31 00:52:52 2011 +0000 remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle --- changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/win-bundle-path b/changes/win-bundle-path new file mode 100644 index 0000000..32ff514 --- /dev/null +++ b/changes/win-bundle-path @@ -0,0 +1,4 @@ + o Packaging changes: + - Remove absolute path from makensis.exe command to build Tor expert bundle + in order to make it easier to automate package builds + diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 59811f4..b8a46cd 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -91,5 +91,5 @@ clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample cp contrib/tor-mingw.nsi.in win_tmp/contrib/ cd win_tmp -"C:\Program Files\NSIS\makensis.exe" contrib/tor-mingw.nsi.in +makensis.exe contrib/tor-mingw.nsi.in

1 0

[tor/master] Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit 16dbcafb06205bd193bc2656dfbdaf20865ab203 Merge: c5c5f85 a6ea349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 30 21:28:19 2011 -0400 Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2 changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit c58f4a86521d3d222d60787d63f6040f73a4c054 Merge: c2d03be 16dbcaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 30 21:28:36 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit a6ea34977b0c053cfc330a207961374f58911a7f Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 31 00:52:52 2011 +0000 remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle --- changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/win-bundle-path b/changes/win-bundle-path new file mode 100644 index 0000000..32ff514 --- /dev/null +++ b/changes/win-bundle-path @@ -0,0 +1,4 @@ + o Packaging changes: + - Remove absolute path from makensis.exe command to build Tor expert bundle + in order to make it easier to automate package builds + diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 59811f4..b8a46cd 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -91,5 +91,5 @@ clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample cp contrib/tor-mingw.nsi.in win_tmp/contrib/ cd win_tmp -"C:\Program Files\NSIS\makensis.exe" contrib/tor-mingw.nsi.in +makensis.exe contrib/tor-mingw.nsi.in

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit 16dbcafb06205bd193bc2656dfbdaf20865ab203 Merge: c5c5f85 a6ea349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 30 21:28:19 2011 -0400 Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2 changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

r25191: {website} 0.2.3.7-alpha tarball is up (website/trunk/include)
by Roger Dingledine 30 Oct '11

30 Oct '11

Author: arma Date: 2011-10-30 23:00:18 +0000 (Sun, 30 Oct 2011) New Revision: 25191 Modified: website/trunk/include/versions.wmi Log: 0.2.3.7-alpha tarball is up Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-10-27 23:54:08 UTC (rev 25190) +++ website/trunk/include/versions.wmi 2011-10-30 23:00:18 UTC (rev 25191) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.6-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.7-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.6-alpha</define-tag>

1 0

[tor/master] blurb and version bump for 0.2.3.7-alpha
by arma＠torproject.org 30 Oct '11

30 Oct '11

commit c2d03beb65d0c82035be714666bfd0e9fc7c3060 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 30 18:39:49 2011 -0400 blurb and version bump for 0.2.3.7-alpha --- ChangeLog | 4 ++++ configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5198350..bedd216 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ Changes in version 0.2.3.7-alpha - 2011-10-30 + Tor 0.2.3.7-alpha fixes a crash bug in 0.2.3.6-alpha introduced by + the new v3 handshake. It also resolves yet another bridge address + enumeration issue. + o Major bugfixes: - If we mark an OR connection for close based on a cell we process, don't process any further cells on it. We already avoid further diff --git a/configure.in b/configure.in index df5551c..17f5c8d 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.6-alpha-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.7-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index fceb087..eadae39 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.6-alpha-dev" +!define VERSION "0.2.3.7-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 a0b66f1..7460d4f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,7 +234,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.6-alpha-dev" +#define VERSION "0.2.3.7-alpha"

1 0