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

[torbrowser/master] update firefox build target so that it really builds things automatically
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit c2da9ee4f34b7339395ec7ace064c1880af68049 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 15 21:55:24 2011 -0300 update firefox build target so that it really builds things automatically --- build-scripts/osx.mk | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 12d790c..1fa698f 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -101,8 +101,13 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install +FIREFOX_DIR=$(FETCH_DIR)/mozilla-2.0 build-firefox: - echo "We're using a prebuilt firefox. Fix this someday!" + cp ../src/current-patches/*firefox* $(FIREFOX_DIR) + cp patch-firefox-src.sh $(FIREFOX_DIR) + cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig + cd $(FIREFOX_DIR) && ./patch-firefox-src.sh + cd $(FIREFOX_DIR) && make -f client.mk build build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right."

1 0

[torbrowser/master] bump versions: tbb osx to 2.2.24-1-alpha, tor to 0.2.2.24-alpha, vidalia to 0.2.12, and noscript to 2.1.0.1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit b798f34bc132afbf9380272e210cefe5317c8bcc Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Apr 11 14:43:26 2011 +0200 bump versions: tbb osx to 2.2.24-1-alpha, tor to 0.2.2.24-alpha, vidalia to 0.2.12, and noscript to 2.1.0.1 --- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 2b2de3f..dc86ae5 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.23-2-alpha +VERSION=2.2.24-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/build-scripts/versions.mk b/build-scripts/versions.mk index 539bc55..016df29 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,14 +4,14 @@ HTTPSEVERY_VER=0.9.9.development.4 FIREFOX_VER=4.0 LIBEVENT_VER=2.0.10-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.0.9.9 +NOSCRIPT_VER=2.1.0.1 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 -TOR_VER=0.2.2.23-alpha +TOR_VER=0.2.2.24-alpha TORBUTTON_VER=1.3.2-alpha -VIDALIA_VER=0.2.10 +VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5 ## Extension IDs

1 0

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

23 Oct '11

commit 047c5a299f04084c041cc211d537c60e9f06d883 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 22 16:55:29 2011 +0300 Merge branches 'windows-maint-2.2' and 'maint-2.2' into maint-2.2

1 0

[torbrowser/master] update the windows makefile with lots of new build commands and paths so that everything can be built automatically
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 16eb02c879192601f20307128f34186917c21a97 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 22 13:45:41 2011 +0000 update the windows makefile with lots of new build commands and paths so that everything can be built automatically --- build-scripts/windows.mk | 131 +++++++++++++++++++++++++------------------- src/RelativeLink/Makefile | 1 + 2 files changed, 75 insertions(+), 57 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 533d1ee..74e06f0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -55,7 +55,7 @@ WINRAR="/c/Program Files/WinRAR/WinRAR.exe" ## Location of directory for source unpacking -FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) +FETCH_DIR=$(PWD)/build-alpha-windows ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist @@ -65,15 +65,14 @@ source-dance: fetch-source unpack-source ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) ZLIB_OPTS=--prefix=$(BUILT_DIR) -ZLIB_LDFLAGS=-Wl,--nxcompat -Wl,--dynamicbase +ZLIB_LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" build-zlib: - cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_LDFLAGS) ./configure $(ZLIB_OPTS) + cd $(ZLIB_DIR) && LDFLAGS=$(ZLIB_LDFLAGS) ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make cd $(ZLIB_DIR) && make install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib \ - -Wl,--nxcompat -Wl,dynamicbase -I$(BUILT_DIR)/include +OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include build-openssl: cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend @@ -81,24 +80,31 @@ build-openssl: cd $(OPENSSL_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DWIN2K=1 -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX) +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) build-vidalia: -mkdir $(VIDALIA_DIR)/build - cd $(VIDALIA_DIR)/build && cmake -G "MinGW Makefiles" $(VIDALIA_OPTS) .. + cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. + cd $(VIDALIA_DIR)/build && make LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_CFLAGS="-O -g" +LIBEVENT_LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking build-libevent: - cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) ./configure $(LIBEVENT_OPTS) + cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j2 - cd $(LIBEVENT_DIR) && sudo make install + cd $(LIBEVENT_DIR) && make install + +POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) +POLIPO_MAKEFILE=$(CONFIG_SRC)/polipo-Makefile +POLIPO_LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" +build-polipo: + cd $(POLIPO_DIR) && LDFLAGS=$(POLIPO_LDFLAGS) make && PREFIX=$(FETCH_DIR)/built/ make install.binary TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) -TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include" +TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib" -TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(OPENSSL) --with-libevent-dir=$(BUILT_DIR)/lib \ - --prefix=$(BUILT_DIR) --disable-dependency-tracking +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make @@ -121,8 +127,6 @@ OPENSSL=$(COMPILED_LIBS) ZLIB=$(COMPILED_LIBS) LIBEVENT=$(COMPILED_LIBS) -## Location of utility applications -WGET:=$(shell which wget) ## Size of split archive volumes for WinRAR SPLITSIZE=1440k @@ -131,10 +135,10 @@ SPLITSIZE=1440k CONFIG_SRC=config ## Destination for the generic bundle -DEST=generic-bundle +DEST="Generic Bundle" ## Name of the bundle -NAME=TorBrowser +NAME="Tor Browser" ## Where shall we put the finished files for distribution? DISTDIR=tbbwin-alpha-dist @@ -153,7 +157,7 @@ COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif ## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi +DEFAULT_EXTENSIONS=torbutton-alpha.xpi ## Where to download Torbutton from TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTT… @@ -226,7 +230,7 @@ reallyclean: clean virus-scan: $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe - $(VIRUSSCAN) $(POLIPO)/polipo.exe + $(VIRUSSCAN) $(COMPILED_BINS)/polipo.exe $(VIRUSSCAN) $(TOR)/src/or/tor.exe $(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe @@ -257,11 +261,11 @@ directory-structure: install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) cp $(MING)/libgnurx-0.dll $(APPDIR) - cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(QT)/libgcc_s_dw2-1.dll $(APPDIR) - cp $(OPENSSL)/ssleay32.dll $(APPDIR) - cp $(OPENSSL)/libeay32.dll $(APPDIR) + cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) + cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) + cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) - cp $(POLIPO)/polipo.exe $(APPDIR) + cp $(COMPILED_BINS)/polipo.exe $(APPDIR) cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR) ## Fixup @@ -273,40 +277,30 @@ install-docs: mkdir -p $(DOCSDIR)/MinGW mkdir -p $(DOCSDIR)/Polipo cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia - cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor - cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt - cp $(MING)/../COPYING $(DOCSDIR)/MinGW + 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 $(POLIPO)/COPYING $(POLIPO)/README.Windows $(DOCSDIR)/Polipo - cp ../changelog.windows-2.2 $(DOCSDIR)/changelog - cp ../README.WINDOWS-2.2 $(DOCSDIR)/README-TorBrowserBundle - -## Copy over Firefox -install-firefox: - cp -R $(FIREFOX) $(DEST)/FirefoxPortable + cp ../changelog.win-2.2 $(DOCSDIR)/changelog + cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle -## Configure Firefox, Vidalia, Polipo and Tor -configure-apps: - ## Configure Firefox preferences - #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default - cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile - cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js - cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents - cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents - cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/Resources - cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources +## Copy over FirefoxPortable +install-firefoxportable: + cp -r $(FIREFOX) $(DEST)/FirefoxPortable ## Copy over PidginPortable install-pidginportable: ifeq ($(USE_PIDGIN),1) - cp -R $(PIDGIN) $(DEST)/PidginPortable + cp -r $(PIDGIN) $(DEST)/PidginPortable endif ## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor configure-apps: + mkdir -p $(DEST)/FirefoxPortable/Data/profile ## Configure Firefox preferences - cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/ + cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js + cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ ## Set up alternate launcher @@ -344,7 +338,7 @@ launcher: ## ## Torbutton development version -torbutton.xpi: +torbutton-alpha.xpi: $(WGET) -O $@ $(TORBUTTON) ## English comes as default @@ -353,33 +347,33 @@ langpack_en-US.xpi: ## BetterPrivacy betterprivacy.xpi: - $(WGET) --no-check-certificate -O $@ $(BETTERPRIVACY) + $(WGET) -O $@ $(BETTERPRIVACY) ## NoScript development version noscript.xpi: - $(WGET) --no-check-certificate -O $@ $(NOSCRIPT) + $(WGET) -O $@ $(NOSCRIPT) ## HTTPS Everywhere httpseverywhere.xpi: - $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE) + $(WGET) -O $@ $(HTTPSEVERYWHERE) ## Generic language pack rule langpack_%.xpi: - $(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi + $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi ## ## Customize the bundle ## bundle_%: - LANGCODE=$* make bundle-localized + LANGCODE=$* make -f windows.mk bundle-localized compressed-bundle_%: - LANGCODE=$* make compressed-bundle-localized + LANGCODE=$* make -f windows.mk compressed-bundle-localized split-bundle_%: - LANGCODE=$* make split-bundle-localized + LANGCODE=$* make -f windows.mk split-bundle-localized bundle-localized_%.stamp: - make copy-files_$* install-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language + make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-betterprivacy install-noscript patch-vidalia-language patch-firefox-language patch-pidgin-language touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -396,19 +390,41 @@ split-bundle-localized: bundle-localized_$(LANGCODE).stamp copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* mkdir $(NAME)_$* - cp -R $(DEST) $(NAME)_$*/$(NAME) + cp -r $(DEST) $(NAME)_$*/$(NAME) BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ## Make a dummy profile to stop Firefox creating some large files - cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) + cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions ifneq ($(LANGCODE), en-US) - mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip - $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip + mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip + $(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)\(a)firefox.mozilla.org.zip endif rm -fr $(DUMMYPROFILE) +install-torbutton: torbutton-alpha.xpi + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} + cp torbutton-alpha.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}/torbutton.zip + (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} && $(SEVENZIP) x *.zip && rm *.zip) + +install-httpseverywhere: httpseverywhere.xpi + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org + cp httpseverywhere.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip + (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org && $(SEVENZIP) x *.zip && rm *.zip) + +install-betterprivacy: betterprivacy.xpi + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} + cp betterprivacy.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip + (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && $(SEVENZIP) x *.zip && rm *.zip) + +install-noscript: noscript.xpi + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} + cp noscript.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip + (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} && $(SEVENZIP) x *.zip && rm *.zip) + + ## Set the language for Vidalia patch-vidalia-language: ## Patch Vidalia @@ -426,6 +442,7 @@ endif patch-firefox-language: ## Patch Firefox prefs.js ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE) + ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js $(LANGCODE) ### ### Utilities diff --git a/src/RelativeLink/Makefile b/src/RelativeLink/Makefile index ed1aca2..ebf77cd 100644 --- a/src/RelativeLink/Makefile +++ b/src/RelativeLink/Makefile @@ -7,6 +7,7 @@ APPNAME = StartTorBrowserBundle.exe OBJECTS = RelativeLink-res.rc.o RelativeLink.o CFLAGS = -Wall -mwindows -static +CC = gcc all: RelativeLink

1 0

[torbrowser/master] update windows changelog for tbb with firefox4 for windows
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 98d7c61b8cd473d470fc821cb42a9c6c2f75768e Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Apr 25 00:00:03 2011 +0300 update windows changelog for tbb with firefox4 for windows --- changelog.win-2.2 | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index fa800eb..0d83cfd 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -4,8 +4,10 @@ Tor Browser Bundle (2.2.24-1) alpha; suite=windows * Update Tor to 0.2.2.24-alpha * Update Torbutton to 1.3.2-alpha * Update OpenSSL to 1.0.0d + * Update Libevent to 2.0.10-stable * Update HTTPS-Everywhere to 0.9.9.development.4 * Add NoScript 2.0.9.9 * Add BetterPrivacy 1.49 + * The Opa Heinz release - -- Erinn Clark <erinn(a)torproject.org> Tue Apr 19 01:38:53 IDT 2011 + -- Erinn Clark <erinn(a)torproject.org> Sun Apr 24 23:56:34 IDT 2011

1 0

[torbrowser/master] add windows firefox 4 prefs
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 147f793c6d257a53ba6d1e3c77693355e39f4866 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 22 13:50:29 2011 +0000 add windows firefox 4 prefs --- build-scripts/config/windows-4.0.js | 175 +++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js new file mode 100644 index 0000000..b35a3a8 --- /dev/null +++ b/build-scripts/config/windows-4.0.js @@ -0,0 +1,175 @@ +# Mozilla User Preferences + +/* Do not edit this file. + * + * If you make changes to this file while the application is running, + * the changes will be overwritten when the application exits. + * + * To make a manual change to preferences, you can visit the URL about:config + * For more information, see http://www.mozilla.org/unix/customizing.html#prefs + */ + +user_pref("app.update.auto", false); +user_pref("app.update.enabled", false); +user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538); +user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535); +user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538); +user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822); +user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539); +user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000); +user_pref("browser.cache.disk.capacity", 0); +user_pref("browser.cache.disk.enable", false); +user_pref("browser.cache.disk.smart_size.enabled", false); +user_pref("browser.cache.disk.smart_size.first_run", false); +user_pref("browser.cache.offline.enable", false); +user_pref("browser.chrome.favicons", false); +user_pref("browser.chrome.image_icons.max_size", 0); +user_pref("browser.chrome.site_icons", false); +user_pref("browser.download.manager.retention", 1); +user_pref("browser.download.useDownloadDir", false); +user_pref("browser.formfill.enable", false); +user_pref("browser.history_expire_days.mirror", 0); +user_pref("browser.microsummary.updateGenerators", false); +user_pref("browser.migration.version", 5); +user_pref("browser.places.importBookmarksHTML", false); +user_pref("browser.places.importDefaults", false); +user_pref("browser.places.leftPaneFolderId", -1); +user_pref("browser.places.migratePostDataAnnotations", false); +user_pref("browser.places.smartBookmarksVersion", 2); +user_pref("browser.places.updateRecentTagsUri", false); +user_pref("browser.preferences.advanced.selectedTabIndex", 0); +user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.rights.3.shown", true); +user_pref("browser.safebrowsing.enabled", false); +user_pref("browser.safebrowsing.malware.enabled", false); +user_pref("browser.search.suggest.enabled", false); +user_pref("browser.search.update", false); +user_pref("browser.sessionstore.privacy_level", 2); +user_pref("browser.sessionstore.resume_session_once", true); +user_pref("browser.shell.checkDefaultBrowser", false); +user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); +user_pref("browser.startup.homepage_override.buildID", "20110325121920"); +user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); +user_pref("browser.urlbar.autocomplete.enabled", false); +user_pref("browser.zoom.siteSpecific", false); +user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); +user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); +user_pref("dom.event.contextmenu.enabled", false); +user_pref("dom.storage.enabled", false); +user_pref("extensions.bootstrappedAddons", "{}"); +user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); +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.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.lastAppVersion", "4.0"); +user_pref("extensions.pendingOperations", false); +user_pref("extensions.torbutton.fresh_install", false); +user_pref("extensions.torbutton.http_port", 8118); +user_pref("extensions.torbutton.http_proxy", "127.0.0.1"); +user_pref("extensions.torbutton.https_port", 8118); +user_pref("extensions.torbutton.https_proxy", "127.0.0.1"); +user_pref("extensions.torbutton.locked_mode", true); +user_pref("extensions.torbutton.normal_exit", true); +user_pref("extensions.torbutton.proxies_applied", true); +user_pref("extensions.torbutton.restore_tor", true); +user_pref("extensions.torbutton.saved.auto_update", false); +user_pref("extensions.torbutton.saved.share_proxy_settings", false); +user_pref("extensions.torbutton.saved.socks_version", 5); +user_pref("extensions.torbutton.saved.type", 1); +user_pref("extensions.torbutton.settings_applied", true); +user_pref("extensions.torbutton.socks_host", "127.0.0.1"); +user_pref("extensions.torbutton.socks_port", 9050); +user_pref("extensions.torbutton.startup", true); +user_pref("extensions.torbutton.tor_enabled", true); +user_pref("extensions.torbutton.tor_memory_jar", true); +user_pref("extensions.torbutton.tz_string", "UTC+00:00"); +user_pref("extensions.update.enabled", false); +user_pref("extensions.update.notifyUser", false); +user_pref("general.appname.override", "Netscape"); +user_pref("general.appversion.override", "5.0 (Windows; en-US)"); +user_pref("general.buildID.override", "0"); +user_pref("general.oscpu.override", "Windows NT 6.1"); +user_pref("general.platform.override", "Win32"); +user_pref("general.productSub.override", "20100401"); +user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"); +user_pref("general.useragent.vendor", ""); +user_pref("general.useragent.vendorSub", ""); +user_pref("geo.enabled", false); +user_pref("geo.wifi.uri", ""); +user_pref("intl.accept_languages", "en-us, en"); +user_pref("intl.charsetmenu.browser.cache", "UTF-8"); +user_pref("network.cookie.cookieBehavior", 1); +user_pref("network.cookie.lifetimePolicy", 2); +user_pref("network.cookie.prefsMigrated", true); +user_pref("network.hosts.pop_server", ""); +user_pref("network.protocol-handler.external-default", false); +user_pref("network.protocol-handler.external.mailto", false); +user_pref("network.protocol-handler.external.news", false); +user_pref("network.protocol-handler.external.nntp", false); +user_pref("network.protocol-handler.external.snews", false); +user_pref("network.protocol-handler.warn-external.mailto", true); +user_pref("network.protocol-handler.warn-external.news", true); +user_pref("network.protocol-handler.warn-external.nntp", true); +user_pref("network.protocol-handler.warn-external.snews", true); +user_pref("network.proxy.http", "127.0.0.1"); +user_pref("network.proxy.http_port", 8118); +user_pref("network.proxy.no_proxies_on", "127.0.0.1"); +user_pref("network.proxy.socks", "127.0.0.1"); +user_pref("network.proxy.socks_port", 9050); +user_pref("network.proxy.socks_remote_dns", true); +user_pref("network.proxy.ssl", "127.0.0.1"); +user_pref("network.proxy.ssl_port", 8118); +user_pref("network.proxy.type", 1); +user_pref("network.security.ports.banned", "8118,8123,9050,9051"); +user_pref("noscript.ABE.enabled", false); +user_pref("noscript.ABE.notify", false); +user_pref("noscript.ABE.wanIpAsLocal", false); +user_pref("noscript.autoReload", false); +user_pref("noscript.contentBlocker", true); +user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); +user_pref("noscript.firstRunRedirection", false); +user_pref("noscript.global", true); +user_pref("noscript.gtemp", ""); +user_pref("noscript.opacizeObject", 3); +user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); +user_pref("noscript.policynames", ""); +user_pref("noscript.secureCookies", true); +user_pref("noscript.showAllowPage", false); +user_pref("noscript.showBaseDomain", false); +user_pref("noscript.showDistrust", false); +user_pref("noscript.showRecentlyBlocked", false); +user_pref("noscript.showRevokeTemp", false); +user_pref("noscript.showTemp", false); +user_pref("noscript.showTempAllowPage", false); +user_pref("noscript.showTempToPerm", false); +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"); +user_pref("plugin.expose_full_path", true); +user_pref("plugin.scan.4xPluginFolder", false); +user_pref("plugin.scan.Acrobat", "99.0"); +user_pref("plugin.scan.Quicktime", "99.0"); +user_pref("plugin.scan.SunJRE", "99.0"); +user_pref("plugin.scan.WindowsMediaPlayer", "99.0"); +user_pref("plugin.scan.plid.all", false); +user_pref("privacy.sanitize.migrateFx3Prefs", true); +user_pref("security.enable_java", false); +user_pref("signon.rememberSignons", false); +user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825); +user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536"); +user_pref("urlclassifier.tableversion.goog-black-url", "1.23256"); +user_pref("urlclassifier.tableversion.goog-white-domain", "1.481"); +user_pref("urlclassifier.tableversion.goog-white-url", "1.371"); +user_pref("xpinstall.whitelist.add", ""); +user_pref("xpinstall.whitelist.add.36", "");

1 0

[torbrowser/master] fix version name
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 9e2aab2df1b8294e78acab08aa823154f7f9ebb6 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Apr 25 00:01:15 2011 +0300 fix version name --- 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 74e06f0..836a4fa 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -145,8 +145,8 @@ DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) VERSION=2.2.24-1-alpha -DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION)- -IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION)- +DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) +IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/master] change filenames from 0.2.2 to 2.2 to reflect actual versioning practices
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 5f2b5e79d8d990ff0579814723d2959ab3d0e679 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 22 16:58:49 2011 +0300 change filenames from 0.2.2 to 2.2 to reflect actual versioning practices --- README.LINUX-0.2.2 | 30 ------------------------------ README.LINUX-2.2 | 30 ++++++++++++++++++++++++++++++ README.OSX-0.2.2 | 24 ------------------------ README.OSX-2.2 | 24 ++++++++++++++++++++++++ changelog.linux-0.2.2 | 21 --------------------- changelog.linux-2.2 | 21 +++++++++++++++++++++ changelog.osx-0.2.2 | 27 --------------------------- changelog.osx-2.2 | 27 +++++++++++++++++++++++++++ 8 files changed, 102 insertions(+), 102 deletions(-) diff --git a/README.LINUX-0.2.2 b/README.LINUX-0.2.2 deleted file mode 100644 index 0e24ab2..0000000 --- a/README.LINUX-0.2.2 +++ /dev/null @@ -1,30 +0,0 @@ -Tor Browser Bundle for GNU/Linux -=============== - -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 - |_ HTTPS-Everywhere 0.9.9.development.4 - |_ BetterPrivacy 1.49 - -Usage ------ - -Extract the bundle with: - -tar -xvzf tor-browser-gnu-linux*.tar.gz - -This will create a directory named tor-browser_LANG. Click on this directory or -cd into it and execute the 'start-tor-browser' script. This will start Vidalia. -Once Tor has successfully opened a circuit, Firefox will automatically be -opened. - -To exit, close Firefox. Vidalia will automatically clean up and exit. - -For more information about bugfixes and other package changes, see the -changelog in tor-browser_LANG/Docs/changelog. diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 new file mode 100644 index 0000000..0e24ab2 --- /dev/null +++ b/README.LINUX-2.2 @@ -0,0 +1,30 @@ +Tor Browser Bundle for GNU/Linux +=============== + +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 + |_ HTTPS-Everywhere 0.9.9.development.4 + |_ BetterPrivacy 1.49 + +Usage +----- + +Extract the bundle with: + +tar -xvzf tor-browser-gnu-linux*.tar.gz + +This will create a directory named tor-browser_LANG. Click on this directory or +cd into it and execute the 'start-tor-browser' script. This will start Vidalia. +Once Tor has successfully opened a circuit, Firefox will automatically be +opened. + +To exit, close Firefox. Vidalia will automatically clean up and exit. + +For more information about bugfixes and other package changes, see the +changelog in tor-browser_LANG/Docs/changelog. diff --git a/README.OSX-0.2.2 b/README.OSX-0.2.2 deleted file mode 100644 index 0daa56b..0000000 --- a/README.OSX-0.2.2 +++ /dev/null @@ -1,24 +0,0 @@ -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 - |_ HTTPS-Everywhere 0.9.9.development.4 - |_ BetterPrivacy 1.49 - -Usage ------ - -Unzip the TorBrowser zip file that you downloaded. Click on the -TorBrowser_LANG.app which will launch Vidalia and then Firefox. - -To exit, close Firefox and Vidalia. - -For more information about bugfixes and other package changes, see the -changelog in TorBrowser_LANG.app/Contents/Resources/changelog. diff --git a/README.OSX-2.2 b/README.OSX-2.2 new file mode 100644 index 0000000..0daa56b --- /dev/null +++ b/README.OSX-2.2 @@ -0,0 +1,24 @@ +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 + |_ HTTPS-Everywhere 0.9.9.development.4 + |_ BetterPrivacy 1.49 + +Usage +----- + +Unzip the TorBrowser zip file that you downloaded. Click on the +TorBrowser_LANG.app which will launch Vidalia and then Firefox. + +To exit, close Firefox and Vidalia. + +For more information about bugfixes and other package changes, see the +changelog in TorBrowser_LANG.app/Contents/Resources/changelog. diff --git a/changelog.linux-0.2.2 b/changelog.linux-0.2.2 deleted file mode 100644 index ba8451c..0000000 --- a/changelog.linux-0.2.2 +++ /dev/null @@ -1,21 +0,0 @@ -Tor Browser Bundle (2.2.24-1) alpha; suite=linux - - * Update Tor to 0.2.2.24-alpha - * Update Vidalia to 0.2.12 - * Update NoScript to 2.1.0.1 - * Fix missing extensions by putting them in the right location (closes: #2828) - * Disable plugin searching (closes: #2827) - - -- Erinn Clark <erinn(a)torproject.org> Wed Apr 13 00:08:55 CEST 2011 - -Tor Browser Bundle (2.2.23-1) alpha; suite=linux - - * Create new bundles for Firefox 4, both i386 and x86_64 - * Update Tor to 0.2.2.23-alpha - * Update Torbutton to 1.3.2-alpha - * Update OpenSSL to 1.0.0d - * Update HTTPS-Everywhere to 0.9.9.development.4 - * Update NoScript to 2.0.9.9 - * Update BetterPrivacy to 1.49 - - -- Erinn Clark <erinn(a)torproject.org> Thu Mar 31 15:49:06 CEST 2011 diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 new file mode 100644 index 0000000..ba8451c --- /dev/null +++ b/changelog.linux-2.2 @@ -0,0 +1,21 @@ +Tor Browser Bundle (2.2.24-1) alpha; suite=linux + + * Update Tor to 0.2.2.24-alpha + * Update Vidalia to 0.2.12 + * Update NoScript to 2.1.0.1 + * Fix missing extensions by putting them in the right location (closes: #2828) + * Disable plugin searching (closes: #2827) + + -- Erinn Clark <erinn(a)torproject.org> Wed Apr 13 00:08:55 CEST 2011 + +Tor Browser Bundle (2.2.23-1) alpha; suite=linux + + * Create new bundles for Firefox 4, both i386 and x86_64 + * Update Tor to 0.2.2.23-alpha + * Update Torbutton to 1.3.2-alpha + * Update OpenSSL to 1.0.0d + * Update HTTPS-Everywhere to 0.9.9.development.4 + * Update NoScript to 2.0.9.9 + * Update BetterPrivacy to 1.49 + + -- Erinn Clark <erinn(a)torproject.org> Thu Mar 31 15:49:06 CEST 2011 diff --git a/changelog.osx-0.2.2 b/changelog.osx-0.2.2 deleted file mode 100644 index c7643c9..0000000 --- a/changelog.osx-0.2.2 +++ /dev/null @@ -1,27 +0,0 @@ -Tor Browser Bundle (2.2.24-1) alpha; suite=osx - - * Update Tor to 0.2.2.24-alpha - * Update Vidalia to 0.2.12 - * Update NoScript to 2.1.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Mon Apr 11 14:28:08 CEST 2011 - -Tor Browser Bundle (2.2.23-2) alpha; suite=osx - - * Update Firefox prefs to show the toggle buttons for NoScript and Torbutton - * Make Vidalia stop linking to an OpenSSL that isn't present on the user's system - in i386 bundle (closes: #2813) - - -- Erinn Clark <erinn(a)torproject.org> Tue Mar 29 23:55:49 CEST 2011 - -Tor Browser Bundle (2.2.23-1) alpha; suite=osx - - * Create new bundles for Firefox 4, both i386 and x86_64 (closes: #2140) - * Update Tor to 0.2.2.23-alpha - * Update Torbutton to 1.3.2-alpha - * Update OpenSSL to 1.0.0d - * Update HTTPS-Everywhere to 0.9.9.development.4 - * Update NoScript to 2.0.9.9 - * Update BetterPrivacy to 1.49 - - -- Erinn Clark <erinn(a)torproject.org> Sun Mar 27 23:27:39 CEST 2011 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 new file mode 100644 index 0000000..c7643c9 --- /dev/null +++ b/changelog.osx-2.2 @@ -0,0 +1,27 @@ +Tor Browser Bundle (2.2.24-1) alpha; suite=osx + + * Update Tor to 0.2.2.24-alpha + * Update Vidalia to 0.2.12 + * Update NoScript to 2.1.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Apr 11 14:28:08 CEST 2011 + +Tor Browser Bundle (2.2.23-2) alpha; suite=osx + + * Update Firefox prefs to show the toggle buttons for NoScript and Torbutton + * Make Vidalia stop linking to an OpenSSL that isn't present on the user's system + in i386 bundle (closes: #2813) + + -- Erinn Clark <erinn(a)torproject.org> Tue Mar 29 23:55:49 CEST 2011 + +Tor Browser Bundle (2.2.23-1) alpha; suite=osx + + * Create new bundles for Firefox 4, both i386 and x86_64 (closes: #2140) + * Update Tor to 0.2.2.23-alpha + * Update Torbutton to 1.3.2-alpha + * Update OpenSSL to 1.0.0d + * Update HTTPS-Everywhere to 0.9.9.development.4 + * Update NoScript to 2.0.9.9 + * Update BetterPrivacy to 1.49 + + -- Erinn Clark <erinn(a)torproject.org> Sun Mar 27 23:27:39 CEST 2011

1 0

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

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

23 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