- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] turn spaces into tabs
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit 6f6e334b672d807e56e4f8c0e1ea3b78187161a1 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 02:11:53 2011 +0100 turn spaces into tabs --- build-scripts/linux.mk | 6 +++--- build-scripts/windows.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 58470fe..c46b5c0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -435,9 +435,9 @@ install-betterprivacy: betterprivacy.xpi ## Language extensions need to be handled differently from other extensions fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) + rm -fr xx + mkdir xx + (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 696e5b2..de36634 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -405,9 +405,9 @@ DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) + rm -fr xx + mkdir xx + (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf

1 0

[torbrowser/maint-2.2] firefox 6.0.2 isn't officially out yet, so add a target that updates langpacks to use the current version we're shipping
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit 4ca40a1370dc7a42f2558d8d3898ac7ef8ab813a Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 02:07:46 2011 +0100 firefox 6.0.2 isn't officially out yet, so add a target that updates langpacks to use the current version we're shipping --- build-scripts/linux.mk | 10 +++++++++- build-scripts/osx.mk | 10 +++++++++- build-scripts/windows.mk | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d05b8c4..58470fe 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -431,8 +431,16 @@ install-betterprivacy: betterprivacy.xpi cp betterprivacy.xpi $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip (cd $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/ && unzip *.zip && rm *.zip); + ## Language extensions need to be handled differently from other extensions -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) +fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) +ifneq ($(LANGCODE), en-US) + rm -fr xx + mkdir xx + (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) +endif + +install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Data/profile/extensions cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d523b7a..7d03546 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -388,7 +388,15 @@ install-extensions: $(DEFAULT_EXTENSIONS) done ## Language extensions need to be handled differently from other extensions -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) + +fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) +ifneq ($(LANGCODE), en-US) + rm -fr xx + mkdir xx + (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) +endif + +install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 01b2413..696e5b2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -402,7 +402,15 @@ copy-files_%: generic-bundle.stamp BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile -install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) + +fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) +ifneq ($(LANGCODE), en-US) + rm -fr xx + mkdir xx + (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) +endif + +install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf ## Make a dummy profile to stop Firefox creating some large files cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions

1 0

r25024: {website} minor fix (website/trunk)
by Runa Sandvik 04 Sep '11

04 Sep '11

Author: runa Date: 2011-09-05 00:36:50 +0000 (Mon, 05 Sep 2011) New Revision: 25024 Modified: website/trunk/wml2po.sh Log: minor fix Modified: website/trunk/wml2po.sh =================================================================== --- website/trunk/wml2po.sh 2011-09-04 23:17:06 UTC (rev 25023) +++ website/trunk/wml2po.sh 2011-09-05 00:36:50 UTC (rev 25024) @@ -195,6 +195,12 @@ svn add "$popath/$pofile" echo "$popath/$pofile" > $tmplog fi + + # Remove po4a comments from download.wml + if [ $wmlfile = "download.wml" ] + then + sed -i 's/PO4ASHARPEND-->//g' "$popath/$pofile" + fi fi # Update the file with po4a-updatepo to make the @@ -240,6 +246,12 @@ echo "$popath/$pofile" > $tmplog else echo "$popath/$pofile" > $tmplog + + if [ $wmlfile = "download.wml" ] + then + sed -i 's/PO4ASHARPEND-->//g' "$popath/$pofile" + fi + fi fi

1 0

[torbrowser/maint-2.2] actually bump libpng version to 1.4.8
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit 6d1fdbf142071089720a8bfd353198a49e8b315d Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 00:53:55 2011 +0100 actually bump libpng version to 1.4.8 --- 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 4107c23..65d9abc 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -5,7 +5,7 @@ RELEASE_VER=2.2.32 HTTPSEVERY_VER=1.0.0development.5 FIREFOX_VER=6.0.2 LIBEVENT_VER=2.0.14-stable -LIBPNG_VER=1.4.3 +LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.1.2.7 OPENSSL_VER=1.0.0d OTR_VER=3.2.0

1 0

[torbrowser/maint-2.2] update #3666 description courtesy of mikeperry
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit f41758010c2216ba82b27d8bb8fcacfc85616899 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 00:47:48 2011 +0100 update #3666 description courtesy of mikeperry --- changelog.linux-2.2 | 2 +- changelog.osx-2.2 | 2 +- changelog.win-2.2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ed7ee50..470125a 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -2,7 +2,7 @@ Tor Browser Bundle (2.2.32-3) alpha; suite=linux * Update Firefox to 6.0.2 * New Firefox patches - - Add a string-based cacheKey (closes: #3666) + - Improve cache APIs to enable better isolation (closes: #3666) - Provide auth headers to on-modify-request (closes: #3907) - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index d850cda..40d67cb 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -2,7 +2,7 @@ Tor Browser Bundle (2.2.32-3) alpha; suite=osx * Update Firefox to 6.0.2 * New Firefox patches - - Add a string-based cacheKey (closes: #3666) + - Improve cache APIs to enable better isolation (closes: #3666) - Provide auth headers to on-modify-request (closes: #3907) - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ebede68..113f416 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -2,7 +2,7 @@ Tor Browser Bundle (2.2.32-3) alpha; suite=windows * Update Firefox to 6.0.2 * New Firefox patches - - Add a string-based cacheKey (closes: #3666) + - Improve cache APIs to enable better isolation (closes: #3666) - Provide auth headers to on-modify-request (closes: #3907) - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) - Enable HTTP pipelining in TBB prefs.js too (closes: #3913)

1 0

[torbrowser/maint-2.2] [2525 Linux] Make RelativeLink.sh work when run using a relative symlink
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit c9742f2ed77b02d8240d66dc1d4660891386eb11 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 03:25:11 2011 -0400 [2525 Linux] Make RelativeLink.sh work when run using a relative symlink --- src/RelativeLink/RelativeLink.sh | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 579612c..222bb6d 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -133,17 +133,32 @@ fi # If this script is being run through a symlink, we need to know where # in the filesystem the script itself is, not where the symlink is. myname="$0" -while [ -L "$myname" ]; do +if [ -L "$myname" ]; then # XXX readlink is not POSIX, but is present in GNU coreutils # and on FreeBSD. Unfortunately, the -f option (which follows # a whole chain of symlinks until it reaches a non-symlink - # path name) is a GNUism, so we can't safely use it. (Using - # it would be rude to FreeBSD users who currently have no - # other officially supported choice than TBB for Linux, and - # might even break compatibility with older versions of the - # GNU utility.) - myname="`readlink -n "$myname"`" -done + # path name) is a GNUism, so we have to have a fallback for + # FreeBSD. Fortunately, FreeBSD has realpath instead; + # unfortunately, that's also non-POSIX and is not present in + # GNU coreutils. + # + # If this launcher were a C program, we could just use the + # realpath function, which *is* POSIX. Too bad POSIX didn't + # make that function accessible to shell scripts. + + # If realpath is available, use it; it Does The Right Thing. + possibly_my_real_name="`realpath "$myname" 2>/dev/null`" + if [ "$?" -eq 0 ]; then + myname="$possibly_my_real_name" + else + # realpath is not available; hopefully readlink -f works. + myname="`readlink -f "$myname" 2>/dev/null`" + if [ "$?" -ne 0 ]; then + # Ugh. + complain "start-tor-browser cannot be run using a symlink on this operating system." + fi + fi +fi # Try to be agnostic to where we're being started from, chdir to where # the script is.

1 0

[torbrowser/maint-2.2] Merge branch 'bug2525' into maint-2.2
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit c2be90ce4415e5253bce489e8efb35ec9d21602f Merge: 0fb2298 c9742f2 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Sep 4 23:53:18 2011 +0100 Merge branch 'bug2525' into maint-2.2 src/RelativeLink/RelativeLink.sh | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-)

1 0

[torbrowser/maint-2.2] bump all tbbs to 2.2.32-3, update noscript to 2.1.2.7, update all changelogs and READMEs in preparation for new release
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit b56f6324bdd748d58fdb55f6179c28904063ba83 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 00:37:11 2011 +0100 bump all tbbs to 2.2.32-3, update noscript to 2.1.2.7, update all changelogs and READMEs in preparation for new release --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 13 +++++++++++++ changelog.osx-2.2 | 13 +++++++++++++ changelog.win-2.2 | 14 ++++++++++++++ 10 files changed, 54 insertions(+), 14 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index e4ac63e..b1f441c 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,9 +6,9 @@ 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.1 - \_ Torbutton 1.4.1 - |_ NoScript 2.1.2.6 +Firefox (Aurora) 6.0.2 + \_ Torbutton 1.4.2 + |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 185d11c..5358d96 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,9 +6,9 @@ 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.1 - \_ Torbutton 1.4.1 - |_ NoScript 2.1.2.6 +Firefox (Aurora) 6.0.2 + \_ Torbutton 1.4.2 + |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 723df9a..e054a10 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,10 +6,10 @@ 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.1 - \_ Firefox (Aurora) 6.0.1 - \_ Torbutton 1.4.1 - |_ NoScript 2.1.2.6 +FirefoxPortable 6.0.2 + \_ Firefox (Aurora) 6.0.2 + \_ Torbutton 1.4.2 + |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 1b6aa12..d05b8c4 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bdef4dc..d523b7a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f2f3288..4107c23 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,7 +6,7 @@ HTTPSEVERY_VER=1.0.0development.5 FIREFOX_VER=6.0.2 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.2.6 +NOSCRIPT_VER=2.1.2.7 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 200237b..01b2413 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 020c116..ed7ee50 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,16 @@ +Tor Browser Bundle (2.2.32-3) alpha; suite=linux + + * Update Firefox to 6.0.2 + * New Firefox patches + - Add a string-based cacheKey (closes: #3666) + - Provide auth headers to on-modify-request (closes: #3907) + - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) + - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) + * Update Torbutton to 1.4.2 + * Update NoScript to 2.1.2.7 + * Update libpng to 1.4.8 (closes: #3906) + * Make the TBB launch script work when using a relative symlink (closes: #2525) + Tor Browser Bundle (2.2.32-2) alpha; suite=linux * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 9326450..d850cda 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,16 @@ +Tor Browser Bundle (2.2.32-3) alpha; suite=osx + + * Update Firefox to 6.0.2 + * New Firefox patches + - Add a string-based cacheKey (closes: #3666) + - Provide auth headers to on-modify-request (closes: #3907) + - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) + - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) + * Update Torbutton to 1.4.2 + * Update NoScript to 2.1.2.7 + + -- Erinn Clark <erinn(a)torproject.org> Mon Sep 5 00:10:55 BST 2011 + Tor Browser Bundle (2.2.32-2) alpha; suite=osx * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely diff --git a/changelog.win-2.2 b/changelog.win-2.2 index abfbef2..ebede68 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,17 @@ +Tor Browser Bundle (2.2.32-3) alpha; suite=windows + + * Update Firefox to 6.0.2 + * New Firefox patches + - Add a string-based cacheKey (closes: #3666) + - Provide auth headers to on-modify-request (closes: #3907) + - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) + - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) + * Update Torbutton to 1.4.2 + * Update NoScript to 2.1.2.7 + * Add missing C runtime libraries so WinXP users can use TBB again. Fix found by velope. + + -- Erinn Clark <erinn(a)torproject.org> Mon Sep 5 00:10:55 BST 2011 + Tor Browser Bundle (2.2.32-2) alpha; suite=windows * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely

1 0

[torbrowser/maint-2.2] [Linux] Stop shipping libcrypto.a and libssl.a in TBB for Linux
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit 07d32eaaade14ad0a24ea9f6c05ef8f5c9b5994d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 04:54:17 2011 -0400 [Linux] Stop shipping libcrypto.a and libssl.a in TBB for Linux The .a files are never used at runtime -- they are only used when statically linking a program. --- 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 1df7377..1b6aa12 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -288,7 +288,7 @@ install-binaries: # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) # OpenSSL - cp -d $(OPENSSL)/libcrypto.a $(OPENSSL)/libssl.a $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) + cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) # Vidalia cp $(VIDALIA) $(APPDIR) cp $(TOR) $(APPDIR)

1 0

[torbrowser/maint-2.2] give all bundles pipelining prefs in prefs.js
by erinn＠torproject.org 04 Sep '11

04 Sep '11

commit e47a7e529eb36627d3d6fc0f23c33cdc1be3c281 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Sep 5 00:37:49 2011 +0100 give all bundles pipelining prefs in prefs.js --- build-scripts/config/no-polipo-4.0.js | 4 ++++ build-scripts/config/windows-4.0.js | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index ae792bd..908402d 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -99,6 +99,10 @@ 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.http.pipelining", true); +user_pref("network.http.pipelining.maxrequests", 10); +user_pref("network.http.pipelining.ssl", true); +user_pref("network.http.proxy.pipelining", true); user_pref("network.hosts.pop_server", ""); user_pref("network.protocol-handler.external-default", false); user_pref("network.protocol-handler.external.mailto", false); diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 6330c6f..3029145 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -107,6 +107,10 @@ 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.http.pipelining", true); +user_pref("network.http.pipelining.maxrequests", 10); +user_pref("network.http.pipelining.ssl", true); +user_pref("network.http.proxy.pipelining", true); user_pref("network.hosts.pop_server", ""); user_pref("network.protocol-handler.external-default", false); user_pref("network.protocol-handler.external.mailto", false);

1 0