- tor-commits - lists.torproject.org

[torbrowser/master] bump versions for new alpha ff4 bundle releases
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 0d3eb8a45775292543c41c5ea7393f504a4dc0aa Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 2 04:18:25 2011 +0300 bump versions for new alpha ff4 bundle releases --- build-scripts/versions.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 8eab139..63eff7b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,17 +1,17 @@ #!/usr/bin/make HTTPSEVERY_VER=0.9.9.development.4 -FIREFOX_VER=4.0 +FIREFOX_VER=4.0.1 LIBEVENT_VER=2.0.10-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.0.1 +NOSCRIPT_VER=2.1.0.3 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.24-alpha -TORBUTTON_VER=1.3.2-alpha +TOR_VER=0.2.2.25-alpha +TORBUTTON_VER=1.3.3-alpha VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5

1 0

[torbrowser/master] bump osx ff4 bundle to 2.2.25-1-alpha
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 6b9901d0d33d3f9d82e68ab161f2c13648a63ce5 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 2 04:19:17 2011 +0300 bump osx ff4 bundle to 2.2.25-1-alpha --- README.OSX-2.2 | 12 ++++++------ build-scripts/osx.mk | 2 +- changelog.osx-2.2 | 9 +++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 0daa56b..c2e35e7 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,13 +4,13 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.23-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Minefield) 4.0 - \_ Torbutton 1.3.2-alpha - |_ NoScript 2.0.9.9 +Vidalia 0.2.12 (with Qt 4.6.2) +Tor 0.2.2.25-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Tumucumaque) 4.0.1 + \_ Torbutton 1.3.3-alpha + |_ NoScript 2.1.0.3 |_ HTTPS-Everywhere 0.9.9.development.4 - |_ BetterPrivacy 1.49 + |_ BetterPrivacy 1.50 Usage ----- diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index c5e5f5a..fd4dd61 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -144,7 +144,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.24-1-alpha +VERSION=2.2.25-1-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index c7643c9..173caad 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.25-1) alpha; suite=osx + + * Update Tor to 0.2.2.25-alpha + * Update Torbutton to 1.3.3-alpha + * Update BetterPrivacy to 1.50 + * Update NoScript to 2.1.0.3 + + -- Erinn Clark <erinn(a)torproject.org> Tue May 3 11:49:53 IDT 2011 + Tor Browser Bundle (2.2.24-1) alpha; suite=osx * Update Tor to 0.2.2.24-alpha

1 0

[torbrowser/master] update filenames
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit e83bea26b2b720f8247ed5c668fc5bd707977b6c Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 2 03:00:25 2011 +0300 update filenames --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index dc86ae5..c5e5f5a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -264,9 +264,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-0.2.2 $(DOCSDIR)/changelog + cp ../changelog.osx-2.2 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-0.2.2 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.2 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox:

1 0

[torbrowser/master] update firefox prefs and set enabledScopes to 1 to hopefully disable system-wide plugin searching
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit d6893633c3c35dac2041f8abcd7e1e170f74fabf Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:26:51 2011 +0300 update firefox prefs and set enabledScopes to 1 to hopefully disable system-wide plugin searching --- build-scripts/config/no-polipo-4.0.js | 8 +++----- build-scripts/config/windows-4.0.js | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 086d602..1192ec8 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -60,13 +60,12 @@ user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macro user_pref("extensions.bprivacy.donotaskforfolder", true); user_pref("extensions.bprivacy.donotaskonexit", true); user_pref("extensions.bprivacy.initiated", true); -user_pref("extensions.checkCompatibility.4.0", false); +user_pref("extensions.checkCompatibility.4.*", false); user_pref("extensions.checkUpdateSecurity", false); user_pref("extensions.databaseSchema", 3); -user_pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.0.9.9,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.49,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.2-alpha,{972ce4c6-7e08-4474-a285-3208198ce6fd}:4.0"); +user_pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha"); user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); -user_pref("extensions.enabledScopes", 5); -user_pref("extensions.lastAppVersion", "4.0"); +user_pref("extensions.enabledScopes", 1); user_pref("extensions.pendingOperations", false); user_pref("extensions.torbutton.fresh_install", false); user_pref("extensions.torbutton.locked_mode", true); @@ -139,7 +138,6 @@ user_pref("noscript.showUntrusted", false); user_pref("noscript.subscription.lastCheck", -142148139); user_pref("noscript.temp", ""); user_pref("noscript.untrusted", ""); -user_pref("noscript.version", "2.0.9.9"); user_pref("places.history.enabled", false); user_pref("places.history.expiration.transient_current_max_pages", 120795); user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm"); diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index b35a3a8..bf90262 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -66,7 +66,7 @@ user_pref("extensions.checkUpdateSecurity", false); user_pref("extensions.databaseSchema", 3); user_pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.0.9.9,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.49,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.2-alpha,{972ce4c6-7e08-4474-a285-3208198ce6fd}:4.0"); user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); -user_pref("extensions.enabledScopes", 5); +user_pref("extensions.enabledScopes", 1); user_pref("extensions.lastAppVersion", "4.0"); user_pref("extensions.pendingOperations", false); user_pref("extensions.torbutton.fresh_install", false);

1 0

[torbrowser/master] remember to add new firefox version to linux and osx changelogs
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 84de12972c202cd8ba39a0561b47d29707c471af Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:49:35 2011 +0300 remember to add new firefox version to linux and osx changelogs --- changelog.linux-2.2 | 1 + changelog.osx-2.2 | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 0bdd1c8..bd4603d 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,6 +1,7 @@ Tor Browser Bundle (2.2.25-1) alpha; suite=linux * Update Tor to 0.2.2.25-alpha + * Update Firefox to 4.0.1 * Update Torbutton to 1.3.3-alpha * Update BetterPrivacy to 1.50 * Update NoScript to 2.1.0.3 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 173caad..33c25d3 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,6 +1,7 @@ Tor Browser Bundle (2.2.25-1) alpha; suite=osx * Update Tor to 0.2.2.25-alpha + * Update Firefox to 4.0.1 * Update Torbutton to 1.3.3-alpha * Update BetterPrivacy to 1.50 * Update NoScript to 2.1.0.3

1 0

[torbrowser/master] update linux makefile for 2.2.25-1-alpha release
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 6d992cad30409ad8a6fe6e15e4e91001e7ff8b13 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:28:58 2011 +0300 update linux makefile for 2.2.25-1-alpha release --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 90b2678..b9a7f26 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -154,7 +154,7 @@ NAME=tor-browser DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.24-1-alpha +VERSION=2.2.25-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/master] update linux and windows READMEs with version information
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit e3cfccbc16f505762a6d93e0a8e11036abd32dc3 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:48:53 2011 +0300 update linux and windows READMEs with version information --- README.LINUX-2.2 | 10 +++++----- README.WIN-2.2 | 12 +++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 0e24ab2..9fd5214 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.24-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Minefield) 4.0 - \_ Torbutton 1.3.2-alpha - |_ NoScript 2.1.0.1 +Tor 0.2.2.25-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Tumucumaque) 4.0.1 + \_ Torbutton 1.3.3-alpha + |_ NoScript 2.1.0.3 |_ HTTPS-Everywhere 0.9.9.development.4 - |_ BetterPrivacy 1.49 + |_ BetterPrivacy 1.50 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 12de05c..4c6351b 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,12 +5,14 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.24-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.25-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 -FirefoxPortable 4.0 - \_ Firefox 4.0 - \_ Torbutton 1.3.2-alpha - \_ HTTPS Everywhere 0.9.9.development.4 +FirefoxPortable 4.0.1 + \_ Firefox 4.0.1 + \_ Torbutton 1.3.3-alpha + |_ NoScript 2.1.0.3 + |_ HTTPS-Everywhere 0.9.9.development.4 + |_ BetterPrivacy 1.50 Usage -----

1 0

[torbrowser/master] update linux changelog for 2.2.25-1-alpha release
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit bc171f5f87ca0746e2ba5bf3a62f37ddcc51423d Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:28:01 2011 +0300 update linux changelog for 2.2.25-1-alpha release --- changelog.linux-2.2 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ba8451c..0bdd1c8 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.25-1) alpha; suite=linux + + * Update Tor to 0.2.2.25-alpha + * Update Torbutton to 1.3.3-alpha + * Update BetterPrivacy to 1.50 + * Update NoScript to 2.1.0.3 + + -- Erinn Clark <erinn(a)torproject.org> Tue May 3 11:49:53 IDT 2011 + Tor Browser Bundle (2.2.24-1) alpha; suite=linux * Update Tor to 0.2.2.24-alpha

1 0

[torbrowser/master] update windows version to 2.2.25-1-alpha
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit c158d5bdaa8340f4e6ff73fd9bb9c6d0654754c9 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:49:19 2011 +0300 update windows version to 2.2.25-1-alpha --- build-scripts/windows.mk | 2 +- changelog.win-2.2 | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 836a4fa..252a0e5 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -144,7 +144,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.24-1-alpha +VERSION=2.2.25-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index 0d83cfd..31723fd 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.25-1) alpha; suite=windows + + * Update Tor to 0.2.2.25-alpha + * Update Firefox to 4.0.1 + * Update Torbutton to 1.3.3-alpha + * Update BetterPrivacy to 1.50 + * Update NoScript to 2.1.0.3 + + -- Erinn Clark <erinn(a)torproject.org> Tue May 3 11:49:53 IDT 2011 + Tor Browser Bundle (2.2.24-1) alpha; suite=windows * Create new bundle for Firefox 4

1 0

[torbrowser/master] update changelog and readme filenames in linux makefile
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit e6dd5bc098b6c9e1ce302677a44e92b8a5e7566b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 3 02:58:11 2011 +0300 update changelog and readme filenames in linux makefile --- build-scripts/linux.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b9a7f26..01fc13f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -289,9 +289,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-0.2.2 $(DOCSDIR)/changelog + cp ../changelog.linux-2.2 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-0.2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.2 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox:

1 0