- tor-commits - lists.torproject.org

[torbrowser/master] bump firefox to 7.0, tor to 0.2.2.33, and downgrade https-everywhere to 1.0.3
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 07c4e10d6a6240aa79a9c70767839a98caea8498 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 00:07:49 2011 +0100 bump firefox to 7.0, tor to 0.2.2.33, and downgrade https-everywhere to 1.0.3 --- build-scripts/versions.mk | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1e36e0f..c44c3b5 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,17 +2,16 @@ RELEASE_VER=2.2.32 -HTTPSEVERY_VER=1.0.0development.5 -FIREFOX_VER=6.0.2 +HTTPSEVERY_VER=1.0.3 +FIREFOX_VER=7.0 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.1.2.7 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.32 +TOR_VER=0.2.2.33 TORBUTTON_VER=1.4.3 VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0

1 0

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

24 Oct '11

commit 8140d34b1cfa2626f0a81002c45500326d2c95ed Merge: 689b151 98c3b35 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 15:42:18 2011 +0100 Merge branch 'bug4093' into maint-2.2 src/RelativeLink/RelativeLink.sh | 4 +--- src/RelativeLink/RelativeLinkOSX.sh | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-)

1 0

[torbrowser/master] give windows makefile the ability to use both normal wget and the python wget steven made
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit ff24c49c8444afcb0d8606c7997daa8cfef56fb5 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 03:04:12 2011 +0100 give windows makefile the ability to use both normal wget and the python wget steven made --- build-scripts/windows.mk | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d62aeff..9d721db 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -50,7 +50,8 @@ PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) PWD:=$(shell pwd) PYTHON=/c/Python26/python.exe SEVENZIP="/c/Program Files/7-Zip/7z.exe" -WGET=$(PYTHON) $(PWD)/pyget.py +PYGET=$(PYTHON) $(PWD)/pyget.py +WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py WINRAR="/c/Program Files/WinRAR/WinRAR.exe" CC=gcc @@ -346,7 +347,7 @@ launcher: ## Torbutton development version torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) + $(PYGET) -O $@ $(TORBUTTON) ## English comes as default langpack_en-US.xpi: @@ -354,19 +355,19 @@ langpack_en-US.xpi: ## BetterPrivacy betterprivacy.xpi: - $(WGET) -O $@ $(BETTERPRIVACY) + $(PYGET) -O $@ $(BETTERPRIVACY) ## NoScript development version noscript.xpi: - $(WGET) -O $@ $(NOSCRIPT) + $(PYGET) -O $@ $(NOSCRIPT) ## HTTPS Everywhere httpseverywhere.xpi: - $(WGET) -O $@ $(HTTPSEVERYWHERE) + $(PYGET) -O $@ $(HTTPSEVERYWHERE) ## Generic language pack rule langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi + $(PYGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi ## ## Customize the bundle

1 0

[torbrowser/master] bump all tbb versions to 2.2.33-1, update changelogs and readmes
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit eb42c2f2ca4e144b036f082508635c5a2bda12ed Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 16:14:09 2011 +0100 bump all tbb versions to 2.2.33-1, update changelogs and readmes --- README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 10 +++++----- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 12 ++++++++++++ changelog.windows-2.2 | 12 ++++++++++++ 10 files changed, 55 insertions(+), 20 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 2f23ecf..5448f89 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0.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 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 0f63125..fd6ae31 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0.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 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 90f8fc7..bd27aa1 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 6.0.2 - \_ Firefox (Aurora) 6.0.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 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 3d6c6bf..c37447d 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=4 +BUILD_NUM=1 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d19576e..1ea955b 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=4 +BUILD_NUM=1 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c44c3b5..af6335e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,20 +1,20 @@ #!/usr/bin/make -RELEASE_VER=2.2.32 +RELEASE_VER=2.2.33 HTTPSEVERY_VER=1.0.3 FIREFOX_VER=7.0 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.1.2.7 -OPENSSL_VER=1.0.0d +NOSCRIPT_VER=2.1.2.8 +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 -ZLIB_VER=1.4.0 +ZLIB_VER=1.2.5 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 741887c..d62aeff 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=4 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 15edc9c..df90085 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-1); suite=linux + + * Update Firefox to 7 + * Update OpenSSL to 1.0.0e (closes: #3996) + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:52:32 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=linux * Fix Makefile to allow for automatic retrieval of Qt and libpng (closes: #2255) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 72c0058..75eb8d8 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.33-1); suite=osx + + * Update Firefox to 7 + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + * Stop TBB from logging so much information to the system by only allowing + dyld log library loads to syslog when it is in debug mode (closes: #4093) + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:44:48 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=osx * New Firefox patches diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index b09bbf3..510cac2 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.33-1); suite=windows + + * Update Firefox to 7 + * Update OpenSSL to 1.0.0e (closes: #3996) + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + * Begin building Vidalia with DEP/ASLR + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:51:02 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=windows * Disable automatic port selection to accommodate Windows users with

1 0

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

24 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 24 Oct '11

24 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 24 Oct '11

24 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 24 Oct '11

24 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 24 Oct '11

24 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 24 Oct '11

24 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