- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-3.6] Bump 3.6 to Firefox 27.7.0.
by mikeperry＠torproject.org 16 Jul '14

16 Jul '14

commit aff7663db9ef47c782f5001ee9869157e6bd0816 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 16 11:51:36 2014 -0700 Bump 3.6 to Firefox 27.7.0. --- gitian/versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 37a0d66..a8a6fb7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,12 +1,12 @@ -TORBROWSER_VERSION=3.6.2 +TORBROWSER_VERSION=3.6.3pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.6.0esr +FIREFOX_VERSION=24.7.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.10.0

1 0

[tor-browser-bundle/master] Update Firefox version to 27.7.0 in nightly and alpha.
by mikeperry＠torproject.org 16 Jul '14

16 Jul '14

commit 4afce310c0a633e9d285e6ae3ea0801d0e12d59e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 16 11:50:14 2014 -0700 Update Firefox version to 27.7.0 in nightly and alpha. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0ea1dc2..104a135 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * All Platforms * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) + * Update Firefox to 24.7.0esr * Update Tor to 0.2.5.5-alpha * Update NoScript to 2.6.8.31 * Script permissions now apply based on URL bar diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e73d2ae..b406f45 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.6.0esr +FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 617c3dd..5398126 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.6.0esr +FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=master

1 0

[tor-browser-bundle/master] Bug 12391: Get mingw-w64 compiled reliably.
by gk＠torproject.org 16 Jul '14

16 Jul '14

commit 5b71d6072028e0d582ad7405597fd615586a0734 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 16 19:24:48 2014 +0000 Bug 12391: Get mingw-w64 compiled reliably. It seems libfaketime is the culprit for the intermittent build failures (which might be nothing else than an instance of bug 11459). The workaround is to omit the compiler (and linker) from this restriction and to cross the fingers that the libgcc* etc. we ship, too, are still getting built deterministically. So far this seems to work out... --- gitian/descriptors/windows/gitian-utils.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index d9bf928..87a0bce 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -36,8 +36,6 @@ files: script: | INSTDIR="$HOME/install" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -79,9 +77,7 @@ script: | # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec" gcc-*/configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ - # XXX: Using $MAKEOPTS (tested with -j4) breaks the build which does not - # happen in a non-gitian environment. This is probably related to bug 11459. - make all-gcc + make $MAKEOPTS all-gcc make install-gcc cd .. # @@ -104,6 +100,13 @@ script: | make install cd .. + # XXX: Build the libraries we include into the bundles deterministically. As + # libfaketime breaks the mingw-w64 build (probably due to bug 11459) we omit + # the compiler and linker from it. It seems we get away with this strategy + # and the libgcc* and libss* which we ship, too, are still built in a + # reproducible fashion. + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME # Building zlib export CFLAGS="-mwindows" export LDFLAGS="-mwindows"

1 0

[tor-browser-bundle/master] Unset TOR_CONTROL_PASSWD in setControlPassword() if autoset to '"secret"'.
by gk＠torproject.org 16 Jul '14

16 Jul '14

commit 798f147f44ff80d2104ed3b0162f17198dd2a4f2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jul 16 02:33:00 2014 +0000 Unset TOR_CONTROL_PASSWD in setControlPassword() if autoset to '"secret"'. * FIXES #12624, a bug caused by the TOR_CONTROL_PASSWD being by default set to '"secret"' in the example, and then mistakenly not unset in the setControlPasswd() function. --- RelativeLink/RelativeLink.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 4e6b7bb..e75482a 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -220,7 +220,12 @@ export LD_LIBRARY_PATH function setControlPortPasswd() { local ctrlPasswd=$1 - test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' && return + + if test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' ; then + unset TOR_CONTROL_PASSWD + return + fi + if test "${ctrlPasswd:0:1}" = $'\"'; then # First 2 chars were '" printf "Using system Tor process.\n" export TOR_CONTROL_PASSWD

1 0

[tor-browser-bundle/maint-3.6] Update gitian tag (to use tar instead of rsync).
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit 7bdb7f0df642f0613dc0096d3f37f3efd61d212a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 16:26:08 2014 -0700 Update gitian tag (to use tar instead of rsync). --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index b8155a7..37a0d66 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5ad3b82..4906e1c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -22,7 +22,7 @@ LIBFTE_TAG=0.0.2 FTEPROXY_TAG=0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index 5a9f2b8..c76acde 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a88421b..e19ebdc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Update gitian tag (to use tar instead of rsync).
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit 3caa9489db34c573460ed79e2b613b54ebfd0933 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 16:24:34 2014 -0700 Update gitian tag (to use tar instead of rsync). --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 11b35ad..e1b4f55 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 32b0c88..e73d2ae 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index f019dc4..2594f60 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4133d03..617c3dd 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=master MEEK_TAG=master -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3

1 0

[gitian-builder/tor-browser-builder-3] Switch from rsync to tar for copy-to-target.
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit ae72871ea2e1c731ee34bba27a47fcce1b79786e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 15:08:29 2014 -0700 Switch from rsync to tar for copy-to-target. In Ubuntu 14.04, rsync now fails on dangling symlinks. --- libexec/copy-to-target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/copy-to-target b/libexec/copy-to-target index 5843595..82c102a 100755 --- a/libexec/copy-to-target +++ b/libexec/copy-to-target @@ -47,7 +47,7 @@ if [ $# = 0 ] ; then fi if [ -z "$USE_LXC" ]; then - rsync -a -L -e "ssh $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT" $1 $TUSER@localhost:$2 + tar -h -C `dirname "$1"` -cf - `basename "$1"` | ssh $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost -- tar -C "$2" -xf - else config-lxc tar -h -C `dirname "$1"` -cf - `basename "$1"` | sudo lxc-start -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf -

1 0

[tor-browser-bundle/master] Use https for www.python.org URLs.
by gk＠torproject.org 15 Jul '14

15 Jul '14

commit 3fd5de596b16b001773333966c5936c346b65bda Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 14 17:04:12 2014 +0000 Use https for www.python.org URLs. This avoids a 301 redirect to https during fetch-inputs.sh. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index 98fc74d..11b35ad 100755 --- a/gitian/versions +++ b/gitian/versions @@ -101,8 +101,8 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} -PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} -PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 425bbfd..32b0c88 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -101,8 +101,8 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} -PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} -PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… diff --git a/gitian/versions.beta b/gitian/versions.beta index c8a2957..f019dc4 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -103,8 +103,8 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} -PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} -PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e129726..4133d03 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -101,8 +101,8 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} -PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} -PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG…

1 0

[tor-launcher/master] Bug 12451: add option to hide TBB's logo
by brade＠torproject.org 15 Jul '14

15 Jul '14

commit 6cf204d64cb8829ca4a7a8d3bc8d601ff4cf534d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 15 10:22:51 2014 -0400 Bug 12451: add option to hide TBB's logo Use 'make TL_LOGO=- ...' to build without a logo or 'make TL_LOGO=path.png ...' to substitute a custom logo (115 x 80 pixels). --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 940bbdc..f629d52 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See src/LICENSE for licensing information. EXT_NAME=tor-launcher @@ -28,6 +28,13 @@ pkg-prepare: clean @mkdir -p pkg $(eval TMP="$(shell mktemp -d "/tmp/$(EXT_NAME).XXXXXX")") @cp -a "src" "$(TMP)/$(EXT_NAME)" + @if [ -n "$(TL_LOGO)" ]; then \ + if [ "$(TL_LOGO)" = "-" ]; then \ + rm "$(TMP)/$(EXT_NAME)/chrome/skin/tbb-logo.png"; \ + else \ + cp -p "$(TL_LOGO)" "$(TMP)/$(EXT_NAME)/chrome/skin/tbb-logo.png"; \ + fi \ + fi @cp -a chrome.manifest.in "$(TMP)/$(EXT_NAME)"/chrome.manifest @mv "$(TMP)/$(EXT_NAME)"/chrome/locale/en \ "$(TMP)/$(EXT_NAME)"/chrome/locale/en-US

1 0

[tor-launcher/master] Improve error display when tor fails to start.
by brade＠torproject.org 14 Jul '14

14 Jul '14

commit 5880ff99682b9b94c5a80d8932b8465c04127507 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jul 14 16:44:13 2014 -0400 Improve error display when tor fails to start. --- src/chrome/content/network-settings-wizard.xul | 19 ++++++++++++++++--- src/chrome/content/network-settings.js | 23 +++++++++-------------- src/chrome/skin/network-settings.css | 1 + src/components/tl-process.js | 2 +- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 07fcdcd..da1e275 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -26,8 +26,10 @@ <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> +  <wizardpage label=" " pageid="first" next="proxy" onextra2="onCopyLog();" - onpageshow="setTimeout(function() { showWizardNavButtons(); }, 0);"> + onpageshow="setTimeout(function() { showWizardNavButtons(false); }, 0);"> <hbox class="tbb-header"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -52,7 +54,7 @@ </wizardpage> <wizardpage label=" " pageid="proxy" next="firewall" onextra2="onCopyLog();" - onpageshow="showWizardNavButtons();" + onpageshow="showWizardNavButtons(true);" onpageadvanced="return onWizardProxyNext(this);"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -146,7 +148,10 @@ </vbox> </wizardpage> - <wizardpage label=" " pageid="startingTor" next="first"> +  + <wizardpage label=" " pageid="startingTor" next="notUsed" + onpageshow="setTimeout(function() { showWizardNavButtons(false); }, 0);"> <spring flex="1" /> <hbox> <spring flex="1" /> @@ -163,7 +168,15 @@ </wizardpage> <wizardpage label=" " pageid="errorPanel" next="notUsed" + onpageshow="showWizardNavButtons(false);" onextra2="onCopyLog();"> + <spring flex="1" /> + <hbox> + <spring flex="1" /> + <description id="errorPanelMessage" flex="1"/> + <spring flex="1" /> + </hbox> + <spring flex="1" /> </wizardpage> <wizardpage class="help" label=" " pageid="bridgeHelp" next="notUsed" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 2f1d619..4c922bb 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -305,13 +305,10 @@ function onBridgeTypeRadioChange() } -function showWizardNavButtons() +function showWizardNavButtons(aShowBtns) { - var curPage = getWizard().currentPage; - var isFirstPage = ("first" == curPage.pageid); - - showOrHideButton("back", !isFirstPage, false); - showOrHideButton("next", !isFirstPage && curPage.next, false); + showOrHideButton("back", aShowBtns, false); + showOrHideButton("next", aShowBtns, false); } @@ -340,7 +337,7 @@ var gObserver = { else if (kTorProcessDidNotStartTopic == aTopic) { gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); - showErrorPanel(); + showErrorPanel(aData); } else if (kTorProcessExitedTopic == aTopic) { @@ -443,18 +440,16 @@ function showStartingTorPanel(aTorExited) } showPanel("startingTor"); - var haveWizard = (getWizard() != null); - if (haveWizard) - { - showOrHideButton("back", false, false); - showOrHideButton("next", false, false); - } } -function showErrorPanel() +function showErrorPanel(aErrorMsg) { showPanel("errorPanel"); + var elem = document.getElementById("errorPanelMessage"); + if (elem) + elem.textContent = (aErrorMsg) ? aErrorMsg : ""; + var haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred || gProtocolSvc.TorLogHasWarnOrErr) showCopyLogButton(haveErrorOrWarning); diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index c27878c..b35eb52 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -103,6 +103,7 @@ button.firstAnswer { } wizardpage[pageid="startingTor"] description, +wizardpage[pageid="errorPanel"] description, #startingTor description { font-size: 120%; font-weight: bold; diff --git a/src/components/tl-process.js b/src/components/tl-process.js index fb795dd..2d3a3a3 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -176,8 +176,8 @@ TorProcessService.prototype = else if ((Date.now() - this.mTorProcessStartTime) > this.kControlConnTimeoutMS) { - this.mObsSvc.notifyObservers(null, "TorProcessDidNotStart", null); var s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed"); + this.mObsSvc.notifyObservers(null, "TorProcessDidNotStart", s); TorLauncherUtil.showAlert(null, s); TorLauncherLogger.log(4, s); }

1 0

[tor-launcher/master] Bug 11193: Change "Tor Browser Bundle" to "Tor Browser"
by brade＠torproject.org 11 Jul '14

11 Jul '14

commit 3800f076154152ca5446cd8ea8ec33a46d0b9bf4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jul 11 13:37:27 2014 -0400 Bug 11193: Change "Tor Browser Bundle" to "Tor Browser" Update the logo that is displayed in the network settings wizard. --- src/chrome/skin/network-settings.css | 5 +++-- src/chrome/skin/tbb-logo.png | Bin 15395 -> 20231 bytes 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index b1f7f92..c27878c 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -89,8 +89,9 @@ button.firstAnswer { .tbb-logo { list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); - width: 198px; - height: 70px; + width: 115px; + height: 80px; + margin-right: 20px; } #bridgeCustomEntry { diff --git a/src/chrome/skin/tbb-logo.png b/src/chrome/skin/tbb-logo.png index d6744ae..5499203 100644 Binary files a/src/chrome/skin/tbb-logo.png and b/src/chrome/skin/tbb-logo.png differ

1 0

[tor-browser-bundle/master] Use meek 0.9. Bump NoScript version.
by gk＠torproject.org 07 Jul '14

07 Jul '14

commit 6ce9149bfbfb25b425465e3ed5ed0d0542790d04 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 7 09:17:51 2014 +0000 Use meek 0.9. Bump NoScript version. --- Bundle-Data/Docs/ChangeLog.txt | 6 +++--- gitian/versions.alpha | 8 ++++---- gitian/versions.nightly | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1e2aecd..0ea1dc2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,10 @@ -Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 +Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * All Platforms * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Tor to 0.2.5.5-alpha - * Update NoScript to 2.6.8.30rc4 - * Update HTTPS Everywhere to 3.5.3 + * Update NoScript to 2.6.8.31 * Script permissions now apply based on URL bar + * Update HTTPS Everywhere to 3.5.3 * Update Torbutton to 1.6.11.0 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a724e48..425bbfd 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.8 +MEEK_TAG=0.9 GITIAN_TAG=tor-browser-builder-3.x-5 @@ -49,7 +49,7 @@ GO_VER=1.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.31-fn+sm+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 +NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -99,7 +99,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://secure.informaction.com/download/betas/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 13f49a3..e129726 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -49,7 +49,7 @@ GO_VER=1.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.31-fn+sm+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 +NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -99,7 +99,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://secure.informaction.com/download/betas/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_…

1 0

[tor-launcher/master] Bug 11471: Text does not fit the dialog size.
by brade＠torproject.org 30 Jun '14

30 Jun '14

commit 7a56563f3bc52f2031fc998c743247f43d488a9c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 30 16:20:38 2014 -0400 Bug 11471: Text does not fit the dialog size. Increase the progress window width slightly and allow for three lines in the description field. --- src/chrome/content/progress.xul | 4 ++-- src/chrome/skin/progress.css | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul index fe85e39..473dab9 100644 --- a/src/chrome/content/progress.xul +++ b/src/chrome/content/progress.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -32,7 +32,7 @@ <spacer flex="1" /> </vbox> <separator orient="vertical" /> - <vbox> + <vbox flex="1"> <label id="progressHeading" value="&torprogress.heading;" /> <description id="progressDesc" /> </vbox> diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css index 711a679..d718452 100644 --- a/src/chrome/skin/progress.css +++ b/src/chrome/skin/progress.css @@ -1,12 +1,12 @@ /* - * Copyright (c) 2013, The Tor Project, Inc. + * Copyright (c) 2014, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: */ dialog { - width: 370px; + width: 400px; } #progressHeading { @@ -27,7 +27,7 @@ dialog { } #progressDesc { - height: 32px; + height: 48px; } #progressMeter {

1 0

[tor-launcher/master] Bug 11471: Text does not fit the dialog size.
by brade＠torproject.org 30 Jun '14

30 Jun '14

commit c1f170510a8b8a9ad79b181f412c4355e9312056 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 30 11:22:59 2014 -0400 Bug 11471: Text does not fit the dialog size. This is a partial fix (network settings wizard only). Also fixed a nuisance: the torWarning CSS class was being added more than once to the "Copy Tor Log To Clipboard" button. --- src/chrome/content/network-settings.js | 66 +++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index c6b6cf2..2f1d619 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -177,10 +177,50 @@ function initDialog() showPanel(); } + // Resize this window to fit content. sizeToContent() alone will not do + // the job (it has many limitations and it is buggy). + sizeToContent(); + let w = maxWidthOfContent(); + if (w) + { + let windowFrameWidth = window.outerWidth - window.innerWidth; + w += windowFrameWidth; + + if (w > window.outerWidth) + window.resizeTo(w, window.outerHeight); + } + TorLauncherLogger.log(2, "initDialog done"); } +// For now, we assume that the wizard buttons are the widest portion. +// TODO: return a value for the settings dialog (non-wizard case). +function maxWidthOfContent() +{ + let haveWizard = (getWizard() != null); + if (!haveWizard) + return undefined; + + // Show all buttons so we can get an accurate width measurement. + // They will be hidden, as necessary, by the wizard. + let buttons = "back,next,cancel,extra2,help".split(','); + for (let i = 0; i < buttons.length; ++i) + showOrHideButton(buttons[i], true, false); + + let btn = document.documentElement.getButton("cancel"); + let btnContainer = btn.parentElement; + + const kWarningIconWidth = 20; // skin/warning.png is 16 plus some margin + let r = btnContainer.getBoundingClientRect(); + + // Hide copy log button if appropriate. + restoreCopyLogVisibility(); + + return Math.ceil((2 * r.left) + r.width + kWarningIconWidth); +} + + function getWizard() { var elem = document.getElementById("TorNetworkSettings"); @@ -434,13 +474,31 @@ function showCopyLogButton(aHaveErrorOrWarning) if (aHaveErrorOrWarning) { var clz = copyLogBtn.getAttribute("class"); - copyLogBtn.setAttribute("class", clz ? clz + " torWarning" - : "torWarning"); + if (!clz) + copyLogBtn.setAttribute("class", "torWarning"); + else if (clz.indexOf("torWarning") < 0) + copyLogBtn.setAttribute("class", clz + " torWarning"); } } } +function restoreCopyLogVisibility() +{ + if (!getWizard()) + return; + + var copyLogBtn = document.documentElement.getButton("extra2"); + if (!copyLogBtn) + return; + + if (copyLogBtn.hasAttribute("wizardCanCopyLog")) + copyLogBtn.removeAttribute("hidden"); + else + copyLogBtn.setAttribute("hidden", true); +} + + function showOrHideButton(aID, aShow, aFocus) { var btn = setButtonAttr(aID, "hidden", !aShow); @@ -649,9 +707,7 @@ function closeHelp() { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); - var copyLogBtn = document.documentElement.getButton("extra2"); - if (copyLogBtn && copyLogBtn.hasAttribute("wizardCanCopyLog")) - copyLogBtn.removeAttribute("hidden"); + restoreCopyLogVisibility(); restoreButtonLabel("next"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance)

1 0

[tor-browser-bundle/master] Update Torbutton to 1.6.11.0. Downgrade meek to 0.8.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 4ecc40a4a45508b513321767f77b9e6e67f01c15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 27 09:47:58 2014 -0700 Update Torbutton to 1.6.11.0. Downgrade meek to 0.8. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions.alpha | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f3ea6ce..1e2aecd 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,8 +5,10 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * Update NoScript to 2.6.8.30rc4 * Update HTTPS Everywhere to 3.5.3 * Script permissions now apply based on URL bar - * Update Torbutton to 1.6.10.1 + * Update Torbutton to 1.6.11.0 * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. * Update Tor Launcher to 0.2.6.0 * Bug 11641: Reorganize bundle directory structure to mimic Firefox * Bug 10819: Create a preference to enable/disable third party isolation diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 479b6df..a724e48 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.6.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha TORLAUNCHER_TAG=0.2.6.0 -TORBUTTON_TAG=1.6.10.1 +TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 @@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.8 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[torbutton/master] Bug 9268: Fix some resizing corner cases.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 32003e19d4a0f41d5c9bdc12fa6db6e6e3836e9a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 26 15:10:48 2014 +0000 Bug 9268: Fix some resizing corner cases. We now take the DPI value into account when calculating the width and height of the browser window. Furthermore, using GetAvailRect() helps to take care of taskbars that could influence the available height. At least two corner-corner cases remain: 1) On some Linux machines the height of the titlebar is not included in outerHeight(). Thus, we guess with a pretty safe margin. 2) On some systems retrieving the available height is giving the screen height back which could lead to problems if taskbars are available. Fixing those two problems (and presumably others yet to be reported) is out of the scope for this patch. However, in order to give the user the option to overwrite the miscalculation two preferences extensions.torbutton.window.innerWidth extensions.torbutton.window.innerHeigth are consulted. If they are set their values are used when resizing the inner window. --- src/chrome/content/torbutton.js | 91 ++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 589e7c5..b149a30 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -44,6 +44,9 @@ var m_tb_control_pass = null; var m_tb_orig_BrowserOnAboutPageLoad = null; +var m_tb_domWindowUtils = window.QueryInterface(Ci.nsIInterfaceRequestor). + getInterface(Ci.nsIDOMWindowUtils); + // Bug 1506 P1: This object is only for updating the UI for toggling and style var torbutton_window_pref_observer = { @@ -2896,10 +2899,6 @@ var torbutton_resizelistener = progress.removeProgressListener(this); return; } - var screenMan = Components.classes["@mozilla.org/gfx/screenmanager;1"]. - getService(Components.interfaces.nsIScreenManager); - var junk = {}, availWidth = {}, availHeight = {}; - screenMan.primaryScreen.GetRect(junk, junk, availWidth, availHeight); // We need to set the inner width to an initial value because it has none // at this point... Choosing "300" as this works even on Windows @@ -2907,26 +2906,78 @@ var torbutton_resizelistener = win.innerWidth = 300; win.innerHeight = 300; - torbutton_log(3, "About to resize new window: " + window.outerWidth + - "x" + window.outerHeight + " inner: " + win.innerWidth + "x" + win. - innerHeight + " in state " + window.windowState + " Have " + - availWidth.value + "x" + availHeight.value); + var screenMan = Components.classes["@mozilla.org/gfx/screenmanager;1"]. + getService(Components.interfaces.nsIScreenManager); + var junk = {}, availWidth = {}, availHeight = {}; + screenMan.primaryScreen.GetAvailRect(junk, junk, availWidth, availHeight); + + torbutton_log(3, "About to resize window: " + + window.outerWidth + "x" + window.outerHeight + + " inner: " + win.innerWidth + "x" + win.innerHeight + + " in state " + window.windowState + + " Available: " + availWidth.value + "x" + + availHeight.value); + + var diff_height = window.outerHeight - win.innerHeight; + var diff_width = window.outerWidth - win.innerWidth; + var delta_fix = 0; + + // The following block tries to cope with funny corner cases where the + // title bar is not included in window.outerHeight. What could happen in + // this case? Well, assume the difference between window.outerHeight and + // win.innerHeight is 39. And lets further assume the available height is + // 725x539. If we resize the window in this case we get 600x500 for the + // inner window. And the outer window has a height of 539 *plus* the + // height of the titlebar (as it occupies some screen space at least + // after resizing) which probably leads to parts of the browser being not + // visible. + if (window.outerHeight == window.innerHeight) { + // XXX: Let's assume a reasonable safety margin. + // |delta_fix = Math.floor(window.mozInnerScreenY) - window.screenY;| + // is not working at this stage of the browser start-up. Although it + // would give us slightly better values. But calling it later makes + // the resizing visible even on fast computers which is bad for UX. + delta_fix = Math.floor(diff_height / 2); + } - var maxHeight = availHeight.value - - (window.outerHeight - win.innerHeight) - 51; - var maxWidth = availWidth.value - (window.outerWidth - win.innerWidth); - torbutton_log(3, "Got max dimensions: " + maxWidth + "x" + maxHeight); + // Check the DPI value and take it into acctount later when calculating + // the max* values. + var dpi = m_tb_domWindowUtils.screenPixelsPerCSSPixel; + + // We can't use screen resolution here as it does not account for e.g. + // taskbars. We can't use window.screen.avail* either as it does not + // report correct values on some platforms when used at this stage in the + // startup process. Therefore, we resort to nsIScreenManager. + // XXX: Note though, there are probably still some OS/window manager + // configurations where this approach is not working. E.g. on a Debian + // with XFCE the available height is the same as the screen height. + // This is said to happen as well on Windows with Aero: + // https://stackoverflow.com/questions/3044230/ + // difference-between-screen-availheight-and-window-height + var maxHeight = Math.floor(availHeight.value / dpi) - + (diff_height + delta_fix); + var maxWidth = Math.floor(availWidth.value / dpi) - diff_width ; var width; var height; - if (maxWidth > 1000) { - width = 1000; - } else { - width = Math.floor(maxWidth/200.0)*200; + // Allow the user to overwrite the Torbutton logic in case it is still + // wrong when resizing the window. + try { + width = m_tb_prefs.getIntPref("extensions.torbutton.window.innerWidth"); + } catch(e) { + if (maxWidth > 1000) { + width = 1000; + } else { + width = Math.floor(maxWidth/200.0)*200; + } } - height = Math.floor(maxHeight/100.0)*100; + try { + height = m_tb_prefs.getIntPref("extensions.torbutton.window.innerHeight"); + } catch(e) { + height = Math.floor(maxHeight/100.0)*100; + } var handler = function() { if (window.windowState === 1) { @@ -2973,8 +3024,8 @@ var torbutton_resizelistener = // instead of assignment or resizeTo() win.resizeBy(width - win.innerWidth, height - win.innerHeight); torbutton_log(3, "Resized new window from: " + win.innerWidth + "x" + - win.innerHeight + " to " + width + "x" + height + " in state " + - window.windowState); + win.innerHeight + " to " + width + "x" + height + + " in state " + window.windowState); // Resizing within this progress listener does not always work as overlays // of other extensions might still influence the height/width of the @@ -2992,7 +3043,7 @@ var torbutton_resizelistener = win.innerWidth + " x " + win.innerHeight); setTimeout(function() { win.resizeBy(width - win.innerWidth, - height - win.innerHeight); + height - win.innerHeight); torbutton_log(3, "Mutation observer: Window " + "dimensions are (after resizing again): " + win. innerWidth + " x " + win.innerHeight);

1 0

[torbutton/master] Write changelog and bump version for 1.6.11.0.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 2a8e082315364149fd64129bc56e6f861132a5d4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 27 09:45:38 2014 -0700 Write changelog and bump version for 1.6.11.0. --- src/CHANGELOG | 7 ++++++- src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 9d4336b..a1c1428 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,5 +1,10 @@ +1.6.11.0 + 27 Jun 2014 + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + 1.6.10.1 - 5 Jun 2014 + 26 Jun 2014 * Bug #12221: Remove obsolete Javascript components from the toggle era 1.6.10.0 diff --git a/src/install.rdf b/src/install.rdf index 9da99e3..5eb071a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.10.1</em:version> + <em:version>1.6.11.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_9268_final_stopgap_rebased'
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 8e38c9f33fbfcccfd9b4071360a976b67c340cee Merge: 7d3a231 32003e1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 27 09:34:08 2014 -0700 Merge remote-tracking branch 'gk/bug_9268_final_stopgap_rebased' src/chrome/content/torbutton.js | 91 ++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 20 deletions(-)

1 0

[torbutton/master] Bug 10819: Bind new third party isolation pref to the Torbutton pref.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit e4504d77dad74914803c902d3296de6c5c493e7f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 27 09:42:46 2014 -0700 Bug 10819: Bind new third party isolation pref to the Torbutton pref. This makes the UI option apply to this new pref. --- src/chrome/content/torbutton.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b149a30..3e7cf62 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1995,7 +1995,11 @@ function torbutton_update_fingerprinting_prefs() { function torbutton_update_thirdparty_prefs() { var mode = m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty"); - + + try { + m_tb_prefs.setBoolPref("privacy.thirdparty.isolate", mode); + } catch(e) {} + if (mode) { m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 1); } else {

1 0

[tor-browser-bundle/master] It's really everywhere.
by gk＠torproject.org 27 Jun '14

27 Jun '14

commit faeb0db23b056ef72e6ae214fa09d61683873f13 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 27 10:57:08 2014 +0000 It's really everywhere. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 93cfb62..f3ea6ce 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Tor to 0.2.5.5-alpha * Update NoScript to 2.6.8.30rc4 - * Update HTTPS Everyhwere to 3.5.3 + * Update HTTPS Everywhere to 3.5.3 * Script permissions now apply based on URL bar * Update Torbutton to 1.6.10.1 * Bug 12221: Remove obsolete Javascript components from the toggle era

1 0

[tor-browser-bundle/master] HTTPS-E update and use NoScript RC in nightlies.
by gk＠torproject.org 27 Jun '14

27 Jun '14

commit 59414cf80c23ba48eb18b021bcbd2a4e33997216 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 27 10:50:01 2014 +0000 HTTPS-E update and use NoScript RC in nightlies. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 6 +++--- gitian/versions.nightly | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 74e08b2..93cfb62 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Tor to 0.2.5.5-alpha * Update NoScript to 2.6.8.30rc4 + * Update HTTPS Everyhwere to 3.5.3 * Script permissions now apply based on URL bar * Update Torbutton to 1.6.10.1 * Bug 12221: Remove obsolete Javascript components from the toggle era diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 71c4e44..479b6df 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha TORLAUNCHER_TAG=0.2.6.0 TORBUTTON_TAG=1.6.10.1 -HTTPSE_TAG=3.5.1 # XXX: HTTPSE_VER is used instead, pending #11630 +HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -43,7 +43,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 +HTTPSE_VER=3.5.3 GO_VER=1.2 ## File names for the source packages @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 -HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 +HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a429df7..13f49a3 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,13 +43,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 +HTTPSE_VER=3.5.3 GO_VER=1.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.28-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -77,8 +77,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275 -HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 +NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 +HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -99,7 +99,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://secure.informaction.com/download/betas/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_…

1 0

[tor-browser-bundle/master] Updating the Changelog.
by gk＠torproject.org 27 Jun '14

27 Jun '14

commit 78edef5f32782e4bf70698eb4aeca1bebf0394a4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 27 10:23:23 2014 +0000 Updating the Changelog. We only create debug files for Linux currently. Thus, moving the entry for bug 12249 to the Linux section. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c808735..74e08b2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -8,11 +8,11 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * Bug 12221: Remove obsolete Javascript components from the toggle era * Update Tor Launcher to 0.2.6.0 * Bug 11641: Reorganize bundle directory structure to mimic Firefox - * Bug 12249: Don't create PT debug files anymore * Bug 10819: Create a preference to enable/disable third party isolation * Linux: * Bug 10178: Make it easier to set an alternate Tor control port and password * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation + * Bug 12249: Don't create PT debug files anymore Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms

1 0

[tor-browser-bundle/master] Updating the Changelog.
by gk＠torproject.org 27 Jun '14

27 Jun '14

commit c77afc56dac9e558387b3d3806429d0d619d4c57 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 27 09:41:24 2014 +0000 Updating the Changelog. --- Bundle-Data/Docs/ChangeLog.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index bd917c3..c808735 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * All Platforms - * Include the Meek Pluggable Transport (version 0.9) + * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Tor to 0.2.5.5-alpha * Update NoScript to 2.6.8.30rc4 * Script permissions now apply based on URL bar @@ -8,10 +8,11 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * Bug 12221: Remove obsolete Javascript components from the toggle era * Update Tor Launcher to 0.2.6.0 * Bug 11641: Reorganize bundle directory structure to mimic Firefox - * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation + * Bug 12249: Don't create PT debug files anymore * Bug 10819: Create a preference to enable/disable third party isolation * Linux: * Bug 10178: Make it easier to set an alternate Tor control port and password + * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms

1 0

[tor-browser-bundle/master] Initial changelog for 4.0-alpha-1.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 3f0562f0f9a20b84a6e6c4096fccfc44aac1519e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 26 18:52:29 2014 -0700 Initial changelog for 4.0-alpha-1. --- Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7ad5f87..bd917c3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,18 @@ +Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 + * All Platforms + * Include the Meek Pluggable Transport (version 0.9) + * Update Tor to 0.2.5.5-alpha + * Update NoScript to 2.6.8.30rc4 + * Script permissions now apply based on URL bar + * Update Torbutton to 1.6.10.1 + * Bug 12221: Remove obsolete Javascript components from the toggle era + * Update Tor Launcher to 0.2.6.0 + * Bug 11641: Reorganize bundle directory structure to mimic Firefox + * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation + * Bug 10819: Create a preference to enable/disable third party isolation + * Linux: + * Bug 10178: Make it easier to set an alternate Tor control port and password + Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms * Update HTTPS-Everywhere to 3.5.1

1 0

[tor-browser-bundle/master] Update NoScript to use the cascading-permissions rc.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 9545316020b3fab65e5cdcebfcb7ab8abca59b55 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 26 18:20:25 2014 -0700 Update NoScript to use the cascading-permissions rc. --- gitian/versions.alpha | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4674a5f..71c4e44 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -49,7 +49,7 @@ GO_VER=1.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.28-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript-2.6.8.30rc4.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275 +NOSCRIPT_HASH=303c9ed4d7b3d587307eebfdbc31d87958e3ea804efa568b58e1bff97b99f208 HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -99,7 +99,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://secure.informaction.com/download/betas/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_…

1 0