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

[torbrowser/master] update name of windows changelog in windows makefile
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 797fe84498de96470e2bdeee8996c6026240ff53 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 03:04:38 2011 +0100 update name of windows changelog in windows makefile --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9d721db..739317f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -291,7 +291,7 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.win-2.2 $(DOCSDIR)/changelog + cp ../changelog.windows-2.2 $(DOCSDIR)/changelog cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable

1 0

[torbrowser/master] a wild firefox 7.0.1 appears to prove that there is no god
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit bbef1f7a356da590a2cae5d6d389b9ba44740f99 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 03:07:47 2011 +0100 a wild firefox 7.0.1 appears to prove that there is no god --- 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 af6335e..8856a87 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.33 HTTPSEVERY_VER=1.0.3 -FIREFOX_VER=7.0 +FIREFOX_VER=7.0.1 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.1.2.8

1 0

[torbrowser/master] bump all tbb versions, update changelogs and readmes for firefox 7.0.1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 7a8765f0bb3c3fc3eb8affdf753d7272691ffbe3 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 16:34:22 2011 +0100 bump all tbb versions, update changelogs and readmes for firefox 7.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 5448f89..914b537 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) -Firefox (Aurora) 7.0 +Firefox (Aurora) 7.0.1 \_ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index fd6ae31..dcb3e7e 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 7.0 +Firefox (Aurora) 7.0.1 \_ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index bd27aa1..3cc6141 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) -FirefoxPortable 7.0 - \_ Firefox (Aurora) 7.0 +FirefoxPortable 7.0.1 + \_ Firefox (Aurora) 7.0.1 \_ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c37447d..bd16d4d 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 1ea955b..d2de9dc 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/windows.mk b/build-scripts/windows.mk index 739317f..b3e199c 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 df90085..285914c 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=linux + + * Update Firefox to 7.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:32:50 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=linux * Update Firefox to 7 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 75eb8d8..ad31c2e 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=osx + + * Update Firefox to 7.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:31:59 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=osx * Update Firefox to 7 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 510cac2..f183ae4 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=windows + + * Update Firefox to 7.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:32:33 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=windows * Update Firefox to 7

1 0

[torbrowser/master] move all of the extension download locations to one file, and update noscript's url
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit b44210d6f9c79aa5c7e3b9fc0caf8558f6def7c5 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 17:29:57 2011 +0100 move all of the extension download locations to one file, and update noscript's url --- build-scripts/linux.mk | 5 ----- build-scripts/osx.mk | 5 ----- build-scripts/versions.mk | 6 ++++++ build-scripts/windows.mk | 5 ----- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index bd16d4d..090ee8e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -183,11 +183,6 @@ endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi -## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## Where to download Mozilla language packs MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releas… diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d2de9dc..5d5dbc1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -172,11 +172,6 @@ endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi -## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## Where to download Mozilla language packs MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releas… diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 8856a87..f36759c 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -19,6 +19,12 @@ ZLIB_VER=1.2.5 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} +## Extensions +TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi +NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi +BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi +HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi + ## File names for the source packages ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index b3e199c..8bfa747 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -161,11 +161,6 @@ endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi -## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## Where to download Mozilla language packs MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releas…

1 0

[torbrowser/master] update windows version string to remove nonexistent arch type that causes trailing dash in torbrowser.version (closes: #4160)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 022c82c8b67f2ab63135fcd9368834af3f05dbbf Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 4 17:59:43 2011 +0100 update windows version string to remove nonexistent arch type that causes trailing dash in torbrowser.version (closes: #4160) --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8bfa747..1d9bd04 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -469,8 +469,8 @@ print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME)

1 0

[torbrowser/master] add a recommended-versions file for mike's check.tpo user upgrade warning
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4fe8b9435ddef165a1b09ba7a05bfd83818ee579 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:13:26 2011 +0100 add a recommended-versions file for mike's check.tpo user upgrade warning --- build-scripts/recommended-versions | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions new file mode 100644 index 0000000..d04cab1 --- /dev/null +++ b/build-scripts/recommended-versions @@ -0,0 +1,7 @@ +[ +"2.2.33-3-Linux-i686", +"2.2.33-3-Linux-x86_64", +"2.2.33-3-MacOS-i386", +"2.2.33-3-MacOS-x86_64", +"2.2.32-3-Windows" +]

1 0

[torbrowser/master] bump vidalia to 0.2.14, torbutton to 1.4.4., noscript to 2.1.4, all tbb build nums for 2.2.33-3
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 637186da1c90fe0f41d724d13bb806124335922e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:15:21 2011 +0100 bump vidalia to 0.2.14, torbutton to 1.4.4., noscript to 2.1.4, all tbb build nums for 2.2.33-3 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- 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 914b537..c6de227 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index dcb3e7e..1fa2a62 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 3cc6141..8faa57c 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) FirefoxPortable 7.0.1 \_ Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 090ee8e..76949f5 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 5d5dbc1..d131e85 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/versions.mk b/build-scripts/versions.mk index f36759c..035566b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,14 +6,14 @@ HTTPSEVERY_VER=1.0.3 FIREFOX_VER=7.0.1 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.1.2.8 +NOSCRIPT_VER=2.1.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.33 -TORBUTTON_VER=1.4.3 -VIDALIA_VER=0.2.14 +TORBUTTON_VER=1.4.4 +VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 ## Extension IDs diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1d9bd04..19c433f 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 285914c..a6add26 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=linux + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Tue Oct 11 16:01:27 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=linux * Update Firefox to 7.0.1 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ad31c2e..e9b6daa 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=osx + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 10 23:26:02 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=osx * Update Firefox to 7.0.1 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index f183ae4..4ccd526 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=windows + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Tue Oct 11 16:00:57 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=windows * Update Firefox to 7.0.1

1 0

[torbrowser/master] Merge branch 'bug4192' into maint-2.2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 8b4c144be4445da48d8749c00475a48ce35a48f0 Merge: 022c82c dd8d5dc Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 10 17:32:55 2011 +0100 Merge branch 'bug4192' into maint-2.2 ...owser-exit-when-not-launched-from-Vidalia.patch | 46 ++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] Fix for 4192.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit dd8d5dcb03ffaf2d15747608178a9d3b2888f559 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Oct 9 22:55:00 2011 -0700 Fix for 4192. It ain't pretty. It just exits if we don't have a TBB profile. --- ...owser-exit-when-not-launched-from-Vidalia.patch | 46 ++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch new file mode 100644 index 0000000..6659770 --- /dev/null +++ b/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -0,0 +1,46 @@ +From 369d7df54fe13dd69a069a43959bdabcc364e6e4 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Sun, 9 Oct 2011 22:50:07 -0700 +Subject: [PATCH] Make Tor Browser exit when not launched from Vidalia + +Turns out the Windows 7 UI encourages users to "dock" their Tor Browser app +for easy relaunch. If they manage to do this, we should fail closed rather +than opened. Hopefully they will get the hint and dock Vidalia instead. + +This is an emergency fix for +https://trac.torproject.org/projects/tor/ticket/4192. We can do a better +localized fix w/ a translated alert menu later, if it seems like this might +actually be common. +--- + browser/base/content/browser.js | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js +index 50f6963..ed2812c 100644 +--- a/browser/base/content/browser.js ++++ b/browser/base/content/browser.js +@@ -1203,6 +1203,21 @@ function BrowserStartup() { + + prepareForStartup(); + ++ // If this is not a TBB profile, exit. ++ // Solves https://trac.torproject.org/projects/tor/ticket/4192 ++ var foundPref = false; ++ try { ++ foundPref = gPrefService.prefHasUserValue("torbrowser.version"); ++ } catch(e) { ++ //dump("No pref: "+e); ++ } ++ if(!foundPref) { ++ var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"] ++ .getService(Components.interfaces.nsIAppStartup); ++ appStartup.quit(3); // Force all windows to close, and then quit. ++ } ++ ++ + if (uriToLoad && !isLoadingBlank) { + if (uriToLoad instanceof Ci.nsISupportsArray) { + let count = uriToLoad.Count(); +-- +1.7.3.4 +

1 0

[torbrowser/master] add script to edit changelogs
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit ad8aa437c15a9a0943d64a9da5d163951d8f41a2 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:13:07 2011 +0100 add script to edit changelogs --- build-scripts/edit-changelog.sh | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/build-scripts/edit-changelog.sh b/build-scripts/edit-changelog.sh new file mode 100755 index 0000000..5d269de --- /dev/null +++ b/build-scripts/edit-changelog.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# Create a consistent template for adding changelog entries +# +# To use this script, simply run ./edit-changelog.sh osx (or linux, or windows) +# +# Copyright Erinn Clark 2011 <erinn(a)torproject.org> +# See LICENSE for licensing information + + +VERSION=$(make -f "$PWD"/$1.mk print-version) +TORNAME="Erinn Clark" +TOREMAIL="erinn(a)torproject.org" + +cat > $PWD/../tmp.changelog.$1 <<EOF +Tor Browser Bundle ($VERSION); suite=$1 + + * + * + * + + -- $TORNAME <$TOREMAIL> $(date) + +EOF + +mv ../changelog.$1-2.2 ../changelog.$1-2.2-old +cat ../tmp.changelog.$1 ../changelog.$1-2.2-old >> ../changelog.$1-2.2 +

1 0