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

[arm/master] Skipping import of readline when showing cli
by atagar＠torproject.org 23 Dec '11

23 Dec '11

commit b86e5bf8d186124e3e7cc7d76e737b33bf174ab0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 23 08:11:54 2011 -0800 Skipping import of readline when showing cli Commit 3e1a135, which added a startup option for running the control interpretor without the rest of arm, also caused us to inadvertantly import the readline module prior to starting curses. This import ordering royally screws the terminal in some use cases, most noticeably if you... - start arm within a screen session - detatch and resize the terminal - reattach to the screen session I've seen several other terminal glitches that I'm suspecting is related to this too, but until now didn't have a repro case. I'm fixing this by removing the readline import entirely unless we're specifically showing the prompt. Thanks to Stephan Seitz for catching this and suggesting a repo! --- src/util/torInterpretor.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 1ff3b84..4fa0dff 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -6,7 +6,6 @@ directly, history and tab completion. import re import sys -import readline import version @@ -961,6 +960,13 @@ class ControlInterpretor: return (inputLines, outputLines) def showPrompt(): + # When displaying the prompt we want the readline module to be imported so + # we get its neat features like history scrollback. HOWEVER, importing + # readline prior to initializing curses causes terminal bugs, most noticeably + # screen resizing. + + import readline + # For Python 2.6 and earlier cycling history via the readline module with # up/down is buggy with a color prompt. For more information see: # http://bugs.python.org/issue12972

1 0

[torbrowser/maint-2.3] bump recommended-versions to 2.2.35-3
by erinn＠torproject.org 23 Dec '11

23 Dec '11

commit 2e213ee39f15d72367100aea8cf51a61d8e1dcb3 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 23 12:34:33 2011 +0100 bump recommended-versions to 2.2.35-3 --- 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..293d0b4 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-3-Linux-i686", +"2.2.35-3-Linux-x86_64", +"2.2.35-3-MacOS-i386", +"2.2.35-3-MacOS-x86_64", +"2.2.35-3-Windows" ]

1 0

[torbrowser/maint-2.2] bump recommended-versions to 2.2.35-3
by erinn＠torproject.org 23 Dec '11

23 Dec '11

commit 2e213ee39f15d72367100aea8cf51a61d8e1dcb3 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 23 12:34:33 2011 +0100 bump recommended-versions to 2.2.35-3 --- 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..293d0b4 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-3-Linux-i686", +"2.2.35-3-Linux-x86_64", +"2.2.35-3-MacOS-i386", +"2.2.35-3-MacOS-x86_64", +"2.2.35-3-Windows" ]

1 0

[torbrowser/master] bump recommended-versions to 2.2.35-3
by erinn＠torproject.org 23 Dec '11

23 Dec '11

commit 2e213ee39f15d72367100aea8cf51a61d8e1dcb3 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 23 12:34:33 2011 +0100 bump recommended-versions to 2.2.35-3 --- 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..293d0b4 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-3-Linux-i686", +"2.2.35-3-Linux-x86_64", +"2.2.35-3-MacOS-i386", +"2.2.35-3-MacOS-x86_64", +"2.2.35-3-Windows" ]

1 0

r25265: {website} bump all tbbs to 2.2.35-3 for firefox 9.0.1 (website/trunk/include)
by Erinn Clark 23 Dec '11

23 Dec '11

Author: erinn Date: 2011-12-23 11:49:00 +0000 (Fri, 23 Dec 2011) New Revision: 25265 Modified: website/trunk/include/versions.wmi Log: bump all tbbs to 2.2.35-3 for firefox 9.0.1 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-12-18 00:42:03 UTC (rev 25264) +++ website/trunk/include/versions.wmi 2011-12-23 11:49:00 UTC (rev 25265) @@ -27,29 +27,29 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.10-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-1</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-3</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>8.0.1</define-tag> -<define-tag version-torbrowser-torbutton whitespace=delete>1.4.5</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-1</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-3</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-3</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>8.0.1</define-tag> -<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-1</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-1</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-3</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-3</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>8.0.1</define-tag> -<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>9.0.1</define-tag> +<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.15</define-tag>

1 0

[torbrowser/master] bump all tbb versions to 2.2.35-3 for firefox 9.0.1
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit 6e9a7af5c95b66c2b42e5d4e807ba43e56c01249 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 22:07:22 2011 +0100 bump all tbb versions to 2.2.35-3 for firefox 9.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 6 ++++++ changelog.osx-2.2 | 6 ++++++ changelog.windows-2.2 | 6 ++++++ 9 files changed, 25 insertions(+), 7 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 7d2d9f5..87cb931 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) -Firefox (Aurora) 9.0 +Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 8d1e6e9..2ea9db6 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 9.0 +Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 5f7ba97..b005c2a 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) -FirefoxPortable 9.0 - \_ Firefox (Aurora) 9.0 +FirefoxPortable 9.0.1 + \_ Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 58b69c0..963da78 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ea0af58..f53941b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4d6848a..9cf24dc 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index cd66053..9475ded 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=linux + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:39 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=linux * Update Firefox to 9.0 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b50b3c6..4f850d0 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=osx + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:33 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=osx * Update Firefox to 9.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2c4b19d..c53d06d 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=windows + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:45 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=windows * Update Firefox to 9.0

1 0

[torbrowser/maint-2.3] bump all tbb versions to 2.2.35-3 for firefox 9.0.1
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit 6e9a7af5c95b66c2b42e5d4e807ba43e56c01249 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 22:07:22 2011 +0100 bump all tbb versions to 2.2.35-3 for firefox 9.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 6 ++++++ changelog.osx-2.2 | 6 ++++++ changelog.windows-2.2 | 6 ++++++ 9 files changed, 25 insertions(+), 7 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 7d2d9f5..87cb931 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) -Firefox (Aurora) 9.0 +Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 8d1e6e9..2ea9db6 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 9.0 +Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 5f7ba97..b005c2a 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) -FirefoxPortable 9.0 - \_ Firefox (Aurora) 9.0 +FirefoxPortable 9.0.1 + \_ Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 58b69c0..963da78 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ea0af58..f53941b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4d6848a..9cf24dc 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index cd66053..9475ded 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=linux + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:39 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=linux * Update Firefox to 9.0 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b50b3c6..4f850d0 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=osx + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:33 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=osx * Update Firefox to 9.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2c4b19d..c53d06d 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=windows + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:45 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=windows * Update Firefox to 9.0

1 0

[torbrowser/maint-2.2] bump all tbb versions to 2.2.35-3 for firefox 9.0.1
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit 6e9a7af5c95b66c2b42e5d4e807ba43e56c01249 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 22:07:22 2011 +0100 bump all tbb versions to 2.2.35-3 for firefox 9.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 6 ++++++ changelog.osx-2.2 | 6 ++++++ changelog.windows-2.2 | 6 ++++++ 9 files changed, 25 insertions(+), 7 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 7d2d9f5..87cb931 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) -Firefox (Aurora) 9.0 +Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 8d1e6e9..2ea9db6 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 9.0 +Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 5f7ba97..b005c2a 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) -FirefoxPortable 9.0 - \_ Firefox (Aurora) 9.0 +FirefoxPortable 9.0.1 + \_ Firefox (Aurora) 9.0.1 \_ Torbutton 1.4.5.1 |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 58b69c0..963da78 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ea0af58..f53941b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4d6848a..9cf24dc 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index cd66053..9475ded 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=linux + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:39 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=linux * Update Firefox to 9.0 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b50b3c6..4f850d0 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=osx + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:33 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=osx * Update Firefox to 9.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2c4b19d..c53d06d 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-3); suite=windows + + * Update Firefox to 9.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Thu Dec 22 21:42:45 CET 2011 + Tor Browser Bundle (2.2.35-2); suite=windows * Update Firefox to 9.0

1 0

[flashproxy/master] Add a ratelimit parameter.
by dcf＠torproject.org 22 Dec '11

22 Dec '11

commit cbb7fd82306fe7231136a8b5d1cfaf56c7820f9a Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 16 04:40:17 2011 -0800 Add a ratelimit parameter. --- swfcat.as | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 62 insertions(+), 7 deletions(-) diff --git a/swfcat.as b/swfcat.as index b83dc2f..478b97c 100644 --- a/swfcat.as +++ b/swfcat.as @@ -24,6 +24,10 @@ * facilitator_poll_interval=<FLOAT> * 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". * * client=1 * If set (to any value), run in client RTMFP mode. In this mode, rather than @@ -78,7 +82,8 @@ package private const MIN_FACILITATOR_POLL_INTERVAL:Number = 1.0; // Bytes per second. Set to undefined to disable limit. - public static const RATE_LIMIT:Number = undefined; + public static const DEFAULT_RATE_LIMIT:Number = undefined; + public static const MIN_RATE_LIMIT:Number = 10 * 1024; // Seconds. private static const RATE_LIMIT_HISTORY:Number = 5.0; @@ -117,18 +122,13 @@ package proxy_pairs = []; - if (RATE_LIMIT) - rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); - else - rate_limit = new RateUnlimit(); - // Wait until the query string parameters are loaded. this.loaderInfo.addEventListener(Event.COMPLETE, loaderinfo_complete); } private function loaderinfo_complete(e:Event):void { - var tmp:Object; + var tmp:*; debug = this.loaderInfo.parameters["debug"]; @@ -166,6 +166,18 @@ package } facilitator_poll_interval = Number(tmp); + tmp = get_param_byte_count("ratelimit", DEFAULT_RATE_LIMIT); + if (tmp === undefined) { + /* No rate limit. */ + } else if (tmp == null || tmp < MIN_FACILITATOR_POLL_INTERVAL) { + puts("Error: ratelimit must be a nonnegative number at least " + MIN_RATE_LIMIT + "."); + return; + } + if (tmp) + rate_limit = new BucketRateLimit(Number(tmp) * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); + else + rate_limit = new RateUnlimit(); + local_addr = get_param_addr("local", DEFAULT_LOCAL_TOR_CLIENT_ADDR); if (!local_addr) { puts("Error: Local spec must be in the form \"host:port\"."); @@ -219,6 +231,19 @@ package return get_param_number(param, default_val); } + /* Get a count of bytes from a string specification like "100" or + "1.3m". Returns null on error. */ + private function get_param_byte_count(param:String, default_val:Number):Object + { + var spec:String; + + spec = this.loaderInfo.parameters[param]; + if (spec) + return parse_byte_count(spec); + else + return default_val; + } + /* The main logic begins here, after start-up issues are taken care of. */ private function proxy_main():void { @@ -411,6 +436,36 @@ package return addr; } + + /* Parse a count of bytes. A suffix of "k", "m", or "g" (or uppercase) + does what you would think. Returns null on error. */ + private static function parse_byte_count(spec:String):Object + { + const UNITS:Object = { + k: 1024, m: 1024 * 1024, g: 1024 * 1024 * 1024, + K: 1024, M: 1024 * 1024, G: 1024 * 1024 * 1024 + }; + var count:Number, units:Object; + var matches:Array; + + matches = spec.match(/^(\d+(?:\.\d*)?)(\w*)$/); + if (matches == null) + return null; + + count = Number(matches[1]); + if (isNaN(count)) + return null; + + if (matches[2] == "") { + units = 1; + } else { + units = UNITS[matches[2]]; + if (units == null) + return null; + } + + return count * Number(units); + } } }

1 0

[flashproxy/master] Add facilitator-graph.py.
by dcf＠torproject.org 22 Dec '11

22 Dec '11

commit 297b2a422e989b5d672e5acda93f80d653226bd3 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 22 09:42:37 2011 -0800 Add facilitator-graph.py. This program takes a facilitator log as input and produces a graph of the number of simultaneous proxies. --- experiments/facilitator-graph.py | 135 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) diff --git a/experiments/facilitator-graph.py b/experiments/facilitator-graph.py new file mode 100755 index 0000000..41271a7 --- /dev/null +++ b/experiments/facilitator-graph.py @@ -0,0 +1,135 @@ +#!/usr/bin/env python + +# Makes a graph of flash proxy counts from a facilitator log. + +import datetime +import getopt +import re +import sys + +import matplotlib +import matplotlib.pyplot as plt +import numpy as np + +POLL_INTERVAL = 10.0 + +def usage(f = sys.stdout): + print >> f, """\ +Usage: %s -o OUTPUT [INPUTFILE] + +Makes a graph of flash proxy counts from a facilitator log. + -h, --help show this help. + -o, --output=OUTPUT output file name (required).\ +""" % sys.argv[0] + +output_file_name = None + +opts, args = getopt.gnu_getopt(sys.argv[1:], "ho:", ["help", "output="]) +for o, a in opts: + if o == "-h" or o == "--help": + usage() + sys.exit() + elif o == "-o" or o == "--output": + output_file_name = a + +if not output_file_name: + usage() + sys.exit() + +if len(args) == 0: + input_file = sys.stdin +elif len(args) == 1: + input_file = open(args[0]) +else: + usage() + sys.exit() + +def format_date(d, pos=None): + d = matplotlib.dates.num2date(d) + return d.strftime("%B %d") + +def timedelta_to_seconds(delta): + return delta.days * (24 * 60 * 60) + delta.seconds + delta.microseconds / 1000000.0 + +class Block(object): + def __init__(self, ip, date): + self.ip = ip + self.begin_date = date + self.end_date = date + +prev_date = None +seen = {} +current = [] +blocks = [] +for line in input_file: + m = re.match(r'(\d+-\d+-\d+ \d+:\d+:\d+) proxy ([\d.]+):\d+ connects', line) + if not m: + continue + date_str, ip = m.groups() + date = datetime.datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S") + + if prev_date is None or prev_date != date.date(): + print date.date() + prev_date = date.date() + + block = seen.get(ip) + if block is None: + block = Block(ip, date) + seen[ip] = block + current.append(block) + # Poor man's priority queue: keep the first to expire (oldest) at the + # tail of the list. + current.sort(key = lambda x: x.end_date, reverse = True) + else: + block.end_date = date + + # Delete all those that are now expired. + while current: + block = current[-1] + delta = timedelta_to_seconds(date - block.end_date) + if delta > POLL_INTERVAL * 1.5: + blocks.append(block) + current.pop() + del seen[block.ip] + else: + break + +events = [] +for block in blocks: + events.append(("begin", block.begin_date)) + events.append(("end", block.end_date + datetime.timedelta(seconds = POLL_INTERVAL / 2))) +# Handle any still alive at the end. +while current: + block = current[-1] + events.append(("begin", block.begin_date)) + events.append(("end", date)) + current.pop() + del seen[block.ip] + +events.sort(key = lambda x: x[1]) + +data = [] +num = 0 +for i, event in enumerate(events): + t = event[1] + data.append((t, num)) + if event[0] == "begin": + num += 1 + elif event[0] == "end": + num -= 1 + data.append((t, num)) +data = np.array(data) + +fig = plt.figure() +ax = fig.add_axes([0.10, 0.30, 0.88, 0.60]) +ax.set_ylabel(u"Number of proxies", fontsize=8) +fig.set_size_inches((8, 3)) + +ax.tick_params(direction="out", top="off", right="off") +ax.set_frame_on(False) +ax.xaxis.set_major_formatter(matplotlib.ticker.FuncFormatter(format_date)) +fig.autofmt_xdate() + +plt.fill_between(data[:,0], data[:,1], linewidth=0, color="black") + +fig.savefig(output_file_name)

1 0