- tor-commits - lists.torproject.org

[torbrowser/master] update changelog and readme for osx tbb 2.2.30
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cf28c99e8ef15655b16b2059ab2672f49778b751 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 10 09:01:28 2011 -0300 update changelog and readme for osx tbb 2.2.30 --- README.OSX-2.2 | 10 +++++----- changelog.osx-2.2 | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 949dd7e..73661e0 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Tumucumaque) 4.0.1 - \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.1.1 - |_ HTTPS-Everywhere 0.9.9.development.6 +Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 5.0 + \_ Torbutton 1.4.0 + |_ NoScript 2.1.1.2 + |_ HTTPS-Everywhere 1.0.0development.4 |_ BetterPrivacy 1.51 Usage diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b4ab673..b5452de 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.30-rc + * Update Firefox to 5.0 + * Update Torbutton to 1.4.0 + * Update HTTPS Everywhere to 1.0.0development.4 + * Update NoScript to 2.1.1.2 + + -- Erinn Clark <erinn(a)torproject.org> Sun Jul 10 08:59:52 ART 2011 + Tor Browser Bundle (2.2.29-1) alpha; suite=osx * Update Tor to 0.2.2.29-beta

1 0

[torbrowser/master] update changelog and readme for tbb linux 2.2.30-1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit bfcebf3f6e1bdfe3950bab680bec72396ad16960 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jul 12 19:29:44 2011 -0300 update changelog and readme for tbb linux 2.2.30-1 --- README.LINUX-2.2 | 10 +++++----- changelog.linux-2.2 | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 8455d06..ffb5a3a 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Tumucumaque) 4.0.1 - \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.1.1 - |_ HTTPS-Everywhere 0.9.9.development.6 +Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 5.0 + \_ Torbutton 1.4.0 + |_ NoScript 2.1.1.2 + |_ HTTPS-Everywhere 1.0.0development.4 |_ BetterPrivacy 1.51 Usage diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index e87f008..ab000f5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=linux + + * Update Tor to 0.2.2.30-rc + * Update Firefox to 5.0 + * Update Torbutton to 1.4.0 + * Update HTTPS Everywhere to 1.0.0development.4 + * Update NoScript to 2.1.1.2 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 + Tor Browser Bundle (2.2.29-1) alpha; suite=linux * Update Tor to 0.2.2.29-beta

1 0

[torbrowser/master] update changelog and readme for tbb windows 2.2.30-1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 941430c279674d8c8a02d93b618a1ab95d3003a5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jul 12 19:30:32 2011 -0300 update changelog and readme for tbb windows 2.2.30-1 --- README.WIN-2.2 | 13 ++++++------- changelog.win-2.2 | 10 ++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.WIN-2.2 b/README.WIN-2.2 index cf382c8..0c16957 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,13 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Polipo 1.0.4.1 -FirefoxPortable 4.0.1 - \_ Firefox 4.0.1 - \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.1.1 - |_ HTTPS-Everywhere 0.9.9.development.6 +Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +FirefoxPortable 5.0 + \_ Firefox (Aurora) 5.0 + \_ Torbutton 1.4.0 + |_ NoScript 2.1.1.2 + |_ HTTPS-Everywhere 1.0.0development.4 |_ BetterPrivacy 1.51 Usage diff --git a/changelog.win-2.2 b/changelog.win-2.2 index 19c2e12..ba6ce71 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=windows + + * Update Tor to 0.2.2.30-rc + * Update Firefox to 5.0 + * Update Torbutton to 1.4.0 + * Update HTTPS Everywhere to 1.0.0development.4 + * Update NoScript to 2.1.1.2 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 + Tor Browser Bundle (2.2.29-1) alpha; suite=windows * Update Tor to 0.2.2.29-beta

1 0

[torbrowser/master] eradicate polipo from the windows bundle
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit aee3d6e71cdd367b845b39aae851af3a4270f263 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:02:58 2011 -0300 eradicate polipo from the windows bundle --- build-scripts/config/torrc | 1 + build-scripts/config/vidalia.conf.ff | 3 --- build-scripts/windows.mk | 16 +--------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 2d63da9..29154fb 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,4 +8,5 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. +SocksPort 9050 SocksListenAddress 127.0.0.1 diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index ef312a8..03ed00a 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -2,9 +2,6 @@ BrowserDirectory=FirefoxPortable BrowserExecutable=tbb-firefox.exe LanguageCode=en -ProxyExecutable=.\\App\\polipo.exe -ProxyExecutableArguments=-c .\\Data\\Polipo\\polipo.conf -RunProxyAtStart=true [Tor] ControlPort=9051 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index bf15a48..1836741 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -41,7 +41,6 @@ WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin" ## Location of bundle components VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) TOR=$(FETCH_DIR)/tor-$(TOR_VER) -POLIPO=$(FETCH_DIR)/polipo-$(POLIPO_VER) FIREFOX=$(FETCH_DIR)/FirefoxPortable-$(FIREFOX_VER) PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) @@ -95,12 +94,6 @@ build-libevent: cd $(LIBEVENT_DIR) && make -j2 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 -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib" @@ -230,7 +223,6 @@ reallyclean: clean virus-scan: $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe - $(VIRUSSCAN) $(COMPILED_BINS)/polipo.exe $(VIRUSSCAN) $(TOR)/src/or/tor.exe $(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe @@ -253,7 +245,6 @@ directory-structure: mkdir -p $(APPDIR) mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia - mkdir -p $(DATADIR)/Polipo mkdir -p $(DOCSDIR) ## Package up all the Vidalia and Tor pre-requisites @@ -265,7 +256,6 @@ install-binaries: cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) - cp $(COMPILED_BINS)/polipo.exe $(APPDIR) cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR) ## Fixup @@ -275,12 +265,10 @@ install-docs: mkdir -p $(DOCSDIR)/Tor mkdir -p $(DOCSDIR)/Qt mkdir -p $(DOCSDIR)/MinGW - mkdir -p $(DOCSDIR)/Polipo cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia 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.win-2.2 $(DOCSDIR)/changelog cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle @@ -294,7 +282,7 @@ ifeq ($(USE_PIDGIN),1) cp -r $(PIDGIN) $(DEST)/PidginPortable endif -## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor +## Configure Firefox, FirefoxPortable, Vidalia, and Tor configure-apps: mkdir -p $(DEST)/FirefoxPortable/Data/profile @@ -323,8 +311,6 @@ ifeq ($(USE_PIDGIN),1) else cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif - ## Configure Polipo - cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo ## Configure Tor cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor cp $(TOR)/src/config/geoip $(DEST)/Data/Tor

1 0

[torbrowser/master] bump all firefox versions to 5.0.1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 57cd4944d034a04a413c0394b8a11329e9d3d989 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 09:59:37 2011 -0300 bump all firefox versions to 5.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 4 ++-- changelog.osx-2.2 | 6 ++++++ changelog.win-2.2 | 6 ++++++ 9 files changed, 22 insertions(+), 10 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index ffb5a3a..c871c74 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0 +Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 73661e0..88564a6 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0 +Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 0c16957..dbe8ffb 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 5.0 - \_ Firefox (Aurora) 5.0 +FirefoxPortable 5.0.1 + \_ Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e8303f1..1a59db4 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -35,7 +35,7 @@ include $(PWD)/versions.mk ## Architecture -ARCH_TYPE=x86_64 +ARCH_TYPE=i386 ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) @@ -149,7 +149,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-2-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 4dc8589..af23c30 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.30 HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=5.0 +FIREFOX_VER=5.0.1 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4100940..bf15a48 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=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-2-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ab000f5..f9119c5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,12 +1,12 @@ Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.30-rc - * Update Firefox to 5.0 + * Update Firefox to 5.0.1 * Update Torbutton to 1.4.0 * Update HTTPS Everywhere to 1.0.0development.4 * Update NoScript to 2.1.1.2 - -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.29-1) alpha; suite=linux diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b5452de..888aaf5 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.30-2) alpha; suite=osx + + * Update Firefox to 5.0.1 + + - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=osx * Update Tor to 0.2.2.30-rc diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ba6ce71..ee916bc 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.30-2) alpha; suite=windows + + * Update Firefox to 5.0.1 + + - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=windows * Update Tor to 0.2.2.30-rc

1 0

[torbrowser/master] enable addon update checking for windows tbb
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit efe17a37d519fd544c22ac534a5bbbccfc9d5a7e Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:05:07 2011 -0300 enable addon update checking for windows tbb --- build-scripts/config/windows-4.0.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index fc73c6c..13fda1f 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -62,7 +62,7 @@ user_pref("extensions.bprivacy.donotaskforfolder", true); user_pref("extensions.bprivacy.donotaskonexit", true); user_pref("extensions.bprivacy.initiated", true); user_pref("extensions.checkCompatibility.4.*", false); -user_pref("extensions.checkUpdateSecurity", false); +user_pref("extensions.checkUpdateSecurity", true); user_pref("extensions.databaseSchema", 3); 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"); @@ -88,8 +88,8 @@ 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("extensions.update.enabled", true); +user_pref("extensions.update.notifyUser", true); user_pref("general.appname.override", "Netscape"); user_pref("general.appversion.override", "5.0 (Windows; en-US)"); user_pref("general.buildID.override", "0");

1 0

[torbrowser/master] Fix the 3rd firefox patch.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f799f2a0b743a185b4aa6b1cb5b058c7a51f5670 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Aug 20 10:23:09 2011 -0700 Fix the 3rd firefox patch. --- ...-Make-Intermediate-Cert-Store-memory-only.patch | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch index 9c568a0..68d426d 100644 --- a/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,4 +1,4 @@ -From 2bdee82990bbda960d23d6122bf89d422bb63211 Mon Sep 17 00:00:00 2001 +From c50f65a9f11e09332c2c97678b685d2bdcad7d62 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 19 Aug 2011 17:58:23 -0700 Subject: [PATCH 3/3] Firefox6: Make Intermediate Cert Store memory-only. @@ -8,17 +8,18 @@ This patch makes the intermediate SSL cert store exist in memory only. The pref must be set before startup in prefs.js. https://trac.torproject.org/projects/tor/ticket/2949 --- - security/manager/ssl/src/nsNSSComponent.cpp | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) + security/manager/ssl/src/nsNSSComponent.cpp | 15 ++++++++++++++- + 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp -index 7a8569b..5261c5e 100644 +index 7a8569b..828c3eb 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -1729,6 +1729,22 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox) +@@ -1729,8 +1729,21 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox) // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; +- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", + PRBool nocertdb = false; + mPrefBranch->GetBoolPref("security.nocertdb", &nocertdb); + @@ -32,12 +33,11 @@ index 7a8569b..5261c5e 100644 + init_rv = ::NSS_NoDB_Init(NULL); + } else { + init_rv = ::NSS_Initialize(profileStr.get(), "", "", -+ SECMOD_DB, init_flags); -+ } -+ - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", SECMOD_DB, init_flags); ++ } + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); -- 1.7.3.4

1 0

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

23 Oct '11

commit 47c49cd1a98edf4dee0cfb72a2183c02cd43ca82 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 16:14:28 2011 +0200 Merge branches 'ff6-minimal' and 'maint-2.2' into maint-2.2

1 0

[torbrowser/master] update firefox-build target
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit a818cff3a7d842ebcab7ca9efc7fb191f16e419e Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 16:41:12 2011 +0200 update firefox-build target --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1a59db4..7151ddf 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -103,7 +103,7 @@ build-tor: FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - cp ../src/current-patches/*Firefox5* $(FIREFOX_DIR) + 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

1 0

[torbrowser/master] bump experimental TBBs to 2.2.31, tor to 0.2.2.31-rc, Firefox to 6.0, update other versions too
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cdc9067b126c9cf6e9ea5c62e16d816b83e8e8e9 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 20 21:02:03 2011 +0200 bump experimental TBBs to 2.2.31, tor to 0.2.2.31-rc, Firefox to 6.0, update other versions too --- README.LINUX-2.2 | 9 ++++----- README.OSX-2.2 | 9 ++++----- README.WIN-2.2 | 9 ++++----- build-scripts/versions.mk | 14 +++++++------- changelog.linux-2.2 | 12 ++++++++++++ changelog.osx-2.2 | 14 +++++++++++++- changelog.win-2.2 | 14 +++++++++++++- 7 files changed, 57 insertions(+), 24 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index c871c74..47f2684 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0.1 +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 88564a6..750e540 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0.1 +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index dbe8ffb..519c64f 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,13 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) FirefoxPortable 5.0.1 - \_ Firefox (Aurora) 5.0.1 + \_ Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index af23c30..e116326 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,21 +1,21 @@ #!/usr/bin/make -RELEASE_VER=2.2.30 +RELEASE_VER=2.2.31 -HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=5.0.1 -LIBEVENT_VER=2.0.12-stable +HTTPSEVERY_VER=1.0.0development.5 +FIREFOX_VER=6.0 +LIBEVENT_VER=2.0.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.2 +NOSCRIPT_VER=2.1.2.6 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.30-rc +TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.4.0 VIDALIA_VER=0.2.12 -ZLIB_VER=1.2.5 +ZLIB_VER=1.4.0 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index f9119c5..20d8bc5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.30-rc diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 888aaf5..ff6763d 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,8 +1,20 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-2) alpha; suite=osx * Update Firefox to 5.0.1 - - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.30-1) alpha; suite=osx diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ee916bc..bde8ad4 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,8 +1,20 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-2) alpha; suite=windows * Update Firefox to 5.0.1 - - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.30-1) alpha; suite=windows

1 0