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

[torbrowser/maint-2.3] update git tarball creation command so it gets all the directories
by erinn＠torproject.org 21 Dec '11

21 Dec '11

commit 7549eafab1586a907083e3ca15cfa27f072e1c3a Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 00:26:36 2011 +0100 update git tarball creation command so it gets all the directories --- build-scripts/windows.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 5e8bd38..4d6848a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -499,5 +499,4 @@ SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp SRCDESTPATH=$(SRCDEST)/$(SRCNAME) srcdist: - git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz - + cd .. && git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz

1 0

[torbrowser/maint-2.2] update all tbbs to 2.2.35-2 for new firefox, torbutton, and noscript
by erinn＠torproject.org 21 Dec '11

21 Dec '11

commit d4093089866366908181d8800e2ef832ab532997 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 00:25:55 2011 +0100 update all tbbs to 2.2.35-2 for new firefox, torbutton, and noscript --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 11 +++++++++++ changelog.windows-2.2 | 11 +++++++++++ 10 files changed, 48 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 308a7a3..7d2d9f5 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,9 +6,9 @@ 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) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 5d37e23..8d1e6e9 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,9 +6,9 @@ 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) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index d874e72..5f7ba97 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,10 +6,10 @@ 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 8.0.1 - \_ Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +FirefoxPortable 9.0 + \_ Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a8f9862..58b69c0 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=1 +BUILD_NUM=2 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 817f32a..ea0af58 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=1 +BUILD_NUM=2 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 18f1b1d..568d719 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,13 +6,13 @@ HTTPSEVERY_VER=1.2.1 FIREFOX_VER=9.0 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2.3 +NOSCRIPT_VER=2.2.4 OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.35 -TORBUTTON_VER=1.4.5 +TORBUTTON_VER=1.4.5.1 VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 55447cc..5e8bd38 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 429c50f..cd66053 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=linux + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 23:26:56 CET 2011 + Tor Browser Bundle (2.2.35-1); suite=linux * Update Tor to 0.2.2.35 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 6c88cc0..b50b3c6 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=osx + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 22:20:29 GMT 2011 + Tor Browser Bundle (2.2.35-1); suite=osx * Update Tor to 0.2.2.35 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index bf0ba98..2c4b19d 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=windows + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 23:26:54 CET 2011 + Tor Browser Bundle (2.2.35-1); suite=windows * Update Tor to 0.2.2.35

1 0

[torbrowser/master] update git tarball creation command so it gets all the directories
by erinn＠torproject.org 21 Dec '11

21 Dec '11

commit 7549eafab1586a907083e3ca15cfa27f072e1c3a Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 00:26:36 2011 +0100 update git tarball creation command so it gets all the directories --- build-scripts/windows.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 5e8bd38..4d6848a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -499,5 +499,4 @@ SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp SRCDESTPATH=$(SRCDEST)/$(SRCNAME) srcdist: - git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz - + cd .. && git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz

1 0

[torbrowser/maint-2.3] update all tbbs to 2.2.35-2 for new firefox, torbutton, and noscript
by erinn＠torproject.org 21 Dec '11

21 Dec '11

commit d4093089866366908181d8800e2ef832ab532997 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 00:25:55 2011 +0100 update all tbbs to 2.2.35-2 for new firefox, torbutton, and noscript --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 11 +++++++++++ changelog.windows-2.2 | 11 +++++++++++ 10 files changed, 48 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 308a7a3..7d2d9f5 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,9 +6,9 @@ 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) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 5d37e23..8d1e6e9 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,9 +6,9 @@ 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) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index d874e72..5f7ba97 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,10 +6,10 @@ 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 8.0.1 - \_ Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +FirefoxPortable 9.0 + \_ Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a8f9862..58b69c0 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=1 +BUILD_NUM=2 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 817f32a..ea0af58 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=1 +BUILD_NUM=2 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 18f1b1d..568d719 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,13 +6,13 @@ HTTPSEVERY_VER=1.2.1 FIREFOX_VER=9.0 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2.3 +NOSCRIPT_VER=2.2.4 OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.35 -TORBUTTON_VER=1.4.5 +TORBUTTON_VER=1.4.5.1 VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 55447cc..5e8bd38 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 429c50f..cd66053 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=linux + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 23:26:56 CET 2011 + Tor Browser Bundle (2.2.35-1); suite=linux * Update Tor to 0.2.2.35 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 6c88cc0..b50b3c6 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=osx + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 22:20:29 GMT 2011 + Tor Browser Bundle (2.2.35-1); suite=osx * Update Tor to 0.2.2.35 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index bf0ba98..2c4b19d 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=windows + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 23:26:54 CET 2011 + Tor Browser Bundle (2.2.35-1); suite=windows * Update Tor to 0.2.2.35

1 0

[torbrowser/master] update all tbbs to 2.2.35-2 for new firefox, torbutton, and noscript
by erinn＠torproject.org 21 Dec '11

21 Dec '11

commit d4093089866366908181d8800e2ef832ab532997 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 00:25:55 2011 +0100 update all tbbs to 2.2.35-2 for new firefox, torbutton, and noscript --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 11 +++++++++++ changelog.windows-2.2 | 11 +++++++++++ 10 files changed, 48 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 308a7a3..7d2d9f5 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,9 +6,9 @@ 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) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 5d37e23..8d1e6e9 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,9 +6,9 @@ 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) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index d874e72..5f7ba97 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,10 +6,10 @@ 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 8.0.1 - \_ Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.5 - |_ NoScript 2.2.3 +FirefoxPortable 9.0 + \_ Firefox (Aurora) 9.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.4 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a8f9862..58b69c0 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=1 +BUILD_NUM=2 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 817f32a..ea0af58 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=1 +BUILD_NUM=2 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 18f1b1d..568d719 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,13 +6,13 @@ HTTPSEVERY_VER=1.2.1 FIREFOX_VER=9.0 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2.3 +NOSCRIPT_VER=2.2.4 OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.35 -TORBUTTON_VER=1.4.5 +TORBUTTON_VER=1.4.5.1 VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 55447cc..5e8bd38 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 429c50f..cd66053 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=linux + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 23:26:56 CET 2011 + Tor Browser Bundle (2.2.35-1); suite=linux * Update Tor to 0.2.2.35 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 6c88cc0..b50b3c6 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=osx + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 22:20:29 GMT 2011 + Tor Browser Bundle (2.2.35-1); suite=osx * Update Tor to 0.2.2.35 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index bf0ba98..2c4b19d 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-2); suite=windows + + * Update Firefox to 9.0 + * Update Torbutton to 1.4.5.1 + * Update Noscript to 2.2.4 + * New Firefox patches + - Provide client values only to CSS Media Queries and disable several + Mozilla extensions that seem fingerprintable + + -- Erinn Clark <erinn(a)torproject.org> Wed Dec 21 23:26:54 CET 2011 + Tor Browser Bundle (2.2.35-1); suite=windows * Update Tor to 0.2.2.35

1 0

[stem/master] Replacing runner authenticate with shiny new auth
by atagar＠torproject.org 21 Dec '11

21 Dec '11

commit 22481b03901f84e9bc9d1951cc0f7343fbc6eb84 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 21 09:00:58 2011 -0800 Replacing runner authenticate with shiny new auth The test runner authenticated tor sockets manually for our integ tests. Replacing that with our nice, new general auth function. --- test/runner.py | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/test/runner.py b/test/runner.py index 566644b..6b5f6ea 100644 --- a/test/runner.py +++ b/test/runner.py @@ -345,24 +345,8 @@ class Runner: control_socket = stem.socket.ControlSocketFile(CONTROL_SOCKET_PATH) else: return None - # TODO: replace with higher level authentication functions when we have them if authenticate: - if OPT_COOKIE in conn_opts: - auth_cookie = open(cookie_path, "r") - auth_cookie_contents = auth_cookie.read() - auth_cookie.close() - - control_socket.send("AUTHENTICATE %s" % binascii.b2a_hex(auth_cookie_contents)) - elif OPT_PASSWORD in conn_opts: - control_socket.send("AUTHENTICATE \"%s\"" % CONTROL_PASSWORD) - else: - control_socket.send("AUTHENTICATE") - - authenticate_response = control_socket.recv() - - if str(authenticate_response) != "OK": - # authentication was rejected - logging.error("AUTHENTICATE returned a failure response: %s" % authenticate_response) + stem.connection.authenticate(control_socket, CONTROL_PASSWORD) return control_socket

1 0

[stem/master] Integ test for general auth's password arg
by atagar＠torproject.org 21 Dec '11

21 Dec '11

commit 22e64d083ee9a7f15e3f7333477c9c9dde7609cc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 21 09:37:52 2011 -0800 Integ test for general auth's password arg Testing the various use cases for a password argument (missing argument, incorrect password, and correct password). When we're running connection tests with something other than password auth this is a very dull test (since we succeed without raising a password exception), but when we just have a HashedControlPassword this is a decent test. --- test/integ/connection/authentication.py | 42 +++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 282a377..a79cbb0 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -81,6 +81,48 @@ class TestAuthenticate(unittest.TestCase): finally: control_socket.close() + def test_authenticate_general_password(self): + """ + Tests the authenticate function's password argument. + """ + + # this is a much better test if we're just using password auth, since + # authenticate will work reguardless if there's something else to + # authenticate with + + runner = test.runner.get_runner() + is_password_only = test.runner.TorConnection.PASSWORD == runner.get_connection_type() + + # tests without a password + control_socket = runner.get_tor_socket(False) + auth_function = functools.partial(stem.connection.authenticate, control_socket) + + if is_password_only: + self.assertRaises(stem.connection.MissingPassword, auth_function) + else: + auth_function() + self._exercise_socket(control_socket) + + control_socket.close() + + # tests with the incorrect password + control_socket = runner.get_tor_socket(False) + auth_function = functools.partial(stem.connection.authenticate, control_socket, "blarg") + + if is_password_only: + self.assertRaises(stem.connection.IncorrectPassword, auth_function) + else: + auth_function() + self._exercise_socket(control_socket) + + control_socket.close() + + # tests with the right password + control_socket = runner.get_tor_socket(False) + stem.connection.authenticate(control_socket, test.runner.CONTROL_PASSWORD) + self._exercise_socket(control_socket) + control_socket.close() + def test_authenticate_none(self): """ Tests the authenticate_none function.

1 0

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

21 Dec '11

commit f75660958cc62422d158f9284b7fcfdee9fa9b95 Merge: d7531b2 b5e6bbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 21 11:20:56 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug1240 | 8 ++++++++ src/or/connection.c | 27 ++++++++++----------------- 2 files changed, 18 insertions(+), 17 deletions(-)

1 0

[tor/master] Do not even try to keep going on a socket with socklen==0
by nickm＠torproject.org 21 Dec '11

21 Dec '11

commit b5e6bbc01dc5d89285aba8a1440a2f5833e531a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 14:37:52 2011 -0500 Do not even try to keep going on a socket with socklen==0 Back in #1240, r1eo linked to information about how this could happen with older Linux kernels in response to nmap. Bugs #4545 and #4547 are about how our approach to trying to deal with this condition was broken and stupid. Thanks to wanoskarnet for reminding us about #1240. This is a fix for the abovementioned bugs, and is a bugfix on 0.1.0.3-rc. --- changes/bug1240 | 8 ++++++++ src/or/connection.c | 27 ++++++++++----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/changes/bug1240 b/changes/bug1240 new file mode 100644 index 0000000..6570664 --- /dev/null +++ b/changes/bug1240 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - When running with an older Linux kernel that erroneously responds + to strange nmap behavior by having accept() return successfully + with a zero-length socket, just close the connection. Previously, + we would try harder to learn the remote address: but there was no + such remote address to learn, and our method for trying to learn + it was incorrect. Fixes bugs #1240, #4745, and #4747. Bugfix on + 0.1.0.3-rc. Reported and diagnosed by "r1eo". diff --git a/src/or/connection.c b/src/or/connection.c index 2049f42..d36a37a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1076,7 +1076,12 @@ connection_create_listener(const struct sockaddr *listensockaddr, } /** Do basic sanity checking on a newly received socket. Return 0 - * if it looks ok, else return -1. */ + * if it looks ok, else return -1. + * + * Notably, some TCP stacks can erroneously have accept() return successfully + * with socklen 0, when the client sends an RST before the accept call (as + * nmap does). We want to detect that, and not go on with the connection. + */ static int check_sockaddr(struct sockaddr *sa, int len, int level) { @@ -1142,7 +1147,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) tor_socket_t news; /* the new socket */ connection_t *newconn; /* information about the remote peer when connecting to other routers */ - char addrbuf[256]; + char addrbuf[256]; /*XXX023 use sockaddr_storage instead*/ struct sockaddr *remote = (struct sockaddr*)addrbuf; /* length of the remote address. Must be whatever accept() needs. */ socklen_t remotelen = (socklen_t)sizeof(addrbuf); @@ -1186,21 +1191,9 @@ connection_handle_listener_read(connection_t *conn, int new_type) uint16_t port; if (check_sockaddr(remote, remotelen, LOG_INFO)<0) { log_info(LD_NET, - "accept() returned a strange address; trying getsockname()."); - remotelen=sizeof(addrbuf); - memset(addrbuf, 0, sizeof(addrbuf)); - if (getsockname(news, remote, &remotelen)<0) { - int e = tor_socket_errno(news); - log_warn(LD_NET, "getsockname() for new connection failed: %s", - tor_socket_strerror(e)); - } else { - if (check_sockaddr((struct sockaddr*)addrbuf, remotelen, - LOG_WARN) < 0) { - log_warn(LD_NET,"Something's wrong with this conn. Closing it."); - tor_close_socket(news); - return 0; - } - } + "accept() returned a strange address; closing connection."); + tor_close_socket(news); + return 0; } if (check_sockaddr_family_match(remote->sa_family, conn) < 0) {

1 0

[tor/master] Convert a couple of char[256]s into sockaddr_storage
by nickm＠torproject.org 21 Dec '11

21 Dec '11

commit 8cdeaedf86fe802f5a6f590da61e8100683fed57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 21 11:23:13 2011 -0500 Convert a couple of char[256]s into sockaddr_storage --- src/or/connection.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 8775584..4cdfb7a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1122,14 +1122,14 @@ connection_handle_listener_read(connection_t *conn, int new_type) tor_socket_t news; /* the new socket */ connection_t *newconn; /* information about the remote peer when connecting to other routers */ - char addrbuf[256]; /*XXX023 use sockaddr_storage instead*/ - struct sockaddr *remote = (struct sockaddr*)addrbuf; + struct sockaddr_storage addrbuf; + struct sockaddr *remote = (struct sockaddr*)&addrbuf; /* length of the remote address. Must be whatever accept() needs. */ socklen_t remotelen = (socklen_t)sizeof(addrbuf); const or_options_t *options = get_options(); tor_assert((size_t)remotelen >= sizeof(struct sockaddr_in)); - memset(addrbuf, 0, sizeof(addrbuf)); + memset(&addrbuf, 0, sizeof(addrbuf)); news = tor_accept_socket(conn->s,remote,&remotelen); if (!SOCKET_OK(news)) { /* accept() error */ @@ -1296,7 +1296,7 @@ connection_connect(connection_t *conn, const char *address, { tor_socket_t s; int inprogress = 0; - char addrbuf[256]; + struct sockaddr_storage addrbuf; struct sockaddr *dest_addr; int dest_addr_len; const or_options_t *options = get_options(); @@ -1364,8 +1364,8 @@ connection_connect(connection_t *conn, const char *address, if (options->ConstrainedSockets) set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize); - memset(addrbuf,0,sizeof(addrbuf)); - dest_addr = (struct sockaddr*) addrbuf; + memset(&addrbuf,0,sizeof(addrbuf)); + dest_addr = (struct sockaddr*) &addrbuf; dest_addr_len = tor_addr_to_sockaddr(addr, port, dest_addr, sizeof(addrbuf)); tor_assert(dest_addr_len > 0);

1 0