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

[flashproxy/master] Allow ratelimit=off.
by dcf＠torproject.org 22 Dec '11

22 Dec '11

commit cc318101d94589b4456bf2722086614579374f48 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 16 05:03:35 2011 -0800 Allow ratelimit=off. --- experiments/switching/local-http-alternating.sh | 2 +- experiments/switching/local-http-constant.sh | 2 +- experiments/switching/remote-tor-alternating.sh | 2 +- experiments/switching/remote-tor-constant.sh | 2 +- experiments/throughput/throughput.sh | 2 +- swfcat.as | 12 ++++++++---- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 8b3bf91..696f1d5 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index bcc65c8..c1a52f8 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index a9c394d..26070d9 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index c1f1a82..939aef9 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index 02939b1..672f2ac 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -19,7 +19,7 @@ while getopts "n:" OPTNAME; do done PROFILE=flashexp1 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&max_clients=$NU…" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&max_clients=$NU…" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" RESULTS_FILE_NAME="results-$NUM_CLIENTS-$(date --iso)" diff --git a/swfcat.as b/swfcat.as index 478b97c..76b35c4 100644 --- a/swfcat.as +++ b/swfcat.as @@ -25,9 +25,10 @@ * How often to poll the facilitator, in seconds. The default is * DEFAULT_FACILITATOR_POLL_INTERVAL. There is a sanity-check minimum of 1.0 s. * - * ratelimit=<FLOAT>(<UNIT>)? - * What rate to limit all proxy traffic combined to. The default is - * DEFAULT_RATE_LIMIT. There is a sanity-check minimum of "10K". + * ratelimit=<FLOAT>(<UNIT>)?|off + * What rate to limit all proxy traffic combined to. The special value "off" + * disables the limit. The default is DEFAULT_RATE_LIMIT. There is a + * sanity-check minimum of "10K". * * client=1 * If set (to any value), run in client RTMFP mode. In this mode, rather than @@ -166,7 +167,10 @@ package } facilitator_poll_interval = Number(tmp); - tmp = get_param_byte_count("ratelimit", DEFAULT_RATE_LIMIT); + if (this.loaderInfo.parameters["ratelimit"] == "off") + tmp = undefined; + else + tmp = get_param_byte_count("ratelimit", DEFAULT_RATE_LIMIT); if (tmp === undefined) { /* No rate limit. */ } else if (tmp == null || tmp < MIN_FACILITATOR_POLL_INTERVAL) {

1 0

[torbrowser/maint-2.3] and a day later, firefox 9.0.1 comes out
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e6f450dfd48979d0d4d05bcc41bb11afe3e6b677 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:33:13 2011 +0100 and a day later, firefox 9.0.1 comes out --- 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 568d719..20cfd71 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.1 -FIREFOX_VER=9.0 +FIREFOX_VER=9.0.1 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.2.4

1 0

[torbrowser/maint-2.2] and a day later, firefox 9.0.1 comes out
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e6f450dfd48979d0d4d05bcc41bb11afe3e6b677 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:33:13 2011 +0100 and a day later, firefox 9.0.1 comes out --- 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 568d719..20cfd71 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.1 -FIREFOX_VER=9.0 +FIREFOX_VER=9.0.1 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.2.4

1 0

[torbrowser/master] and a day later, firefox 9.0.1 comes out
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e6f450dfd48979d0d4d05bcc41bb11afe3e6b677 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:33:13 2011 +0100 and a day later, firefox 9.0.1 comes out --- 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 568d719..20cfd71 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.1 -FIREFOX_VER=9.0 +FIREFOX_VER=9.0.1 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.2.4

1 0

[torbrowser/maint-2.3] Revert "update recommended versions to 2.2.35-2"
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e8cc0bf29c433be2c2ea9615ba039d93fd4e66b5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:31:45 2011 +0100 Revert "update recommended versions to 2.2.35-2" This reverts commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d. --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index fc269f3..ae01274 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-2-Linux-i686", -"2.2.35-2-Linux-x86_64", -"2.2.35-2-MacOS-i386", -"2.2.35-2-MacOS-x86_64", -"2.2.35-2-Windows" +"2.2.35-1-Linux-i686", +"2.2.35-1-Linux-x86_64", +"2.2.35-1-MacOS-i386", +"2.2.35-1-MacOS-x86_64", +"2.2.35-1-Windows" ]

1 0

[torbrowser/master] Revert "update recommended versions to 2.2.35-2"
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e8cc0bf29c433be2c2ea9615ba039d93fd4e66b5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:31:45 2011 +0100 Revert "update recommended versions to 2.2.35-2" This reverts commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d. --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index fc269f3..ae01274 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-2-Linux-i686", -"2.2.35-2-Linux-x86_64", -"2.2.35-2-MacOS-i386", -"2.2.35-2-MacOS-x86_64", -"2.2.35-2-Windows" +"2.2.35-1-Linux-i686", +"2.2.35-1-Linux-x86_64", +"2.2.35-1-MacOS-i386", +"2.2.35-1-MacOS-x86_64", +"2.2.35-1-Windows" ]

1 0

[torbrowser/maint-2.2] Revert "update recommended versions to 2.2.35-2"
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e8cc0bf29c433be2c2ea9615ba039d93fd4e66b5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:31:45 2011 +0100 Revert "update recommended versions to 2.2.35-2" This reverts commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d. --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index fc269f3..ae01274 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-2-Linux-i686", -"2.2.35-2-Linux-x86_64", -"2.2.35-2-MacOS-i386", -"2.2.35-2-MacOS-x86_64", -"2.2.35-2-Windows" +"2.2.35-1-Linux-i686", +"2.2.35-1-Linux-x86_64", +"2.2.35-1-MacOS-i386", +"2.2.35-1-MacOS-x86_64", +"2.2.35-1-Windows" ]

1 0

[torbrowser/maint-2.2] update recommended versions to 2.2.35-2
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:17:15 2011 +0100 update recommended versions to 2.2.35-2 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ae01274..fc269f3 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-1-Linux-i686", -"2.2.35-1-Linux-x86_64", -"2.2.35-1-MacOS-i386", -"2.2.35-1-MacOS-x86_64", -"2.2.35-1-Windows" +"2.2.35-2-Linux-i686", +"2.2.35-2-Linux-x86_64", +"2.2.35-2-MacOS-i386", +"2.2.35-2-MacOS-x86_64", +"2.2.35-2-Windows" ]

1 0

[torbrowser/maint-2.3] update recommended versions to 2.2.35-2
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:17:15 2011 +0100 update recommended versions to 2.2.35-2 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ae01274..fc269f3 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-1-Linux-i686", -"2.2.35-1-Linux-x86_64", -"2.2.35-1-MacOS-i386", -"2.2.35-1-MacOS-x86_64", -"2.2.35-1-Windows" +"2.2.35-2-Linux-i686", +"2.2.35-2-Linux-x86_64", +"2.2.35-2-MacOS-i386", +"2.2.35-2-MacOS-x86_64", +"2.2.35-2-Windows" ]

1 0

[torbrowser/master] update recommended versions to 2.2.35-2
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:17:15 2011 +0100 update recommended versions to 2.2.35-2 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ae01274..fc269f3 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-1-Linux-i686", -"2.2.35-1-Linux-x86_64", -"2.2.35-1-MacOS-i386", -"2.2.35-1-MacOS-x86_64", -"2.2.35-1-Windows" +"2.2.35-2-Linux-i686", +"2.2.35-2-Linux-x86_64", +"2.2.35-2-MacOS-i386", +"2.2.35-2-MacOS-x86_64", +"2.2.35-2-Windows" ]

1 0