- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-5.5] Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443
by gk＠torproject.org 14 Mar '16

14 Mar '16

commit 556213e8650bafc05dfceb4799af48e6b762c10a Author: Nima Fatemi <nima(a)torproject.org> Date: Sat Mar 12 18:10:06 2016 +0000 Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443 --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 8990c84..aa0d147 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -30,6 +30,10 @@ pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:137 pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/hardened-builds] Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443
by gk＠torproject.org 14 Mar '16

14 Mar '16

commit 7d674d111387bb0e08263762e1c2ef601b4431c7 Author: Nima Fatemi <nima(a)torproject.org> Date: Sat Mar 12 18:10:06 2016 +0000 Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443 --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 8990c84..aa0d147 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -30,6 +30,10 @@ pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:137 pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Make Mosaddegh and MaBishomarim available on port 80 and 443
by gk＠torproject.org 14 Mar '16

14 Mar '16

commit eed55858ad6d18a52f0440e52ea47bb015b6f248 Author: Nima Fatemi <nima(a)torproject.org> Date: Sat Mar 12 18:10:06 2016 +0000 Make Mosaddegh and MaBishomarim available on port 80 and 443 --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 8990c84..aa0d147 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -30,6 +30,10 @@ pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:137 pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Bug 18405: Adding marsigning check script
by gk＠torproject.org 14 Mar '16

14 Mar '16

commit 8f364f1ce08c74bd47510d586a70d87307981d5f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 7 18:51:15 2016 +0000 Bug 18405: Adding marsigning check script --- tools/marsigning_check.sh | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/tools/marsigning_check.sh b/tools/marsigning_check.sh new file mode 100755 index 0000000..41b3b4d --- /dev/null +++ b/tools/marsigning_check.sh @@ -0,0 +1,107 @@ +#!/bin/sh + +# Copyright (c) 2016, The Tor Project, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: + +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * Neither the names of the copyright owners nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Usage: +# 1) Let SIGNMAR point to your signmar binary +# 2) Let LD_LIBRARY_PATH point to the mar-tools directory +# 3) Change into the directory containing the MAR files and the +# sha256sums-unsigned-build.txt/sha256sums-unsigned-build.incrementals.txt. +# 4) Run /path/to/marsigning_check.sh + +if [ -z "$SIGNMAR" ] +then + echo "The path to your signmar binary is missing!" + exit 1 +fi + +if [ -z "$LD_LIBRARY_PATH" ] +then + echo "The library search path to your mar-tools directory is missing!" + exit 1 +fi + +UNSIGNED_MARS=0 +BADSIGNED_MARS=0 + +mkdir tmp + +for f in `ls *.mar`; do + case $f in + *.incremental.mar) SHA256_TXT=`grep "$f" \ + sha256sums-unsigned-build.incrementals.txt`;; + *) SHA256_TXT=`grep "$f" sha256sums-unsigned-build.txt`;; + esac + + # Test 1: Is the .mar file still unsigned? I.e. does its SHA-256 sum still + # match the one we had before we signed it? If so, notify us later and exit. + if [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + echo "$f has still the SHA-256 sum of the unsigned MAR file!" + UNSIGNED_MARS=`expr $UNSIGNED_MARS + 1` + fi + + # Test 2: Do we get the old SHA-256 sum after stripping the MAR signature? If + # not, notify us later and exit. + if [ "$UNSIGNED_MARS" = "0" ] + then + # At least we seem to have attempted to sign the MAR file. Let's see if we + # succeeded by stripping the signature. This behavior is reproducible. + # Thus, we know if we don't get the same SHA-256 sum we did not sign the + # bundle correctly. + echo "Trying to strip the MAR signature of $f..." + ${SIGNMAR} -r $f tmp/$f + cd tmp + if ! [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + echo "$f does not have the SHA-256 sum of the unsigned MAR file!" + BADSIGNED_MARS=`expr $BADSIGNED_MARS + 1` + fi + cd .. + fi +done + +rm -rf tmp/ + +if ! [ "$UNSIGNED_MARS" = "0" ] +then + echo "We got $UNSIGNED_MARS unsigned MAR file(s), exiting..." + exit 1 +fi + +if ! [ "$BADSIGNED_MARS" = "0" ] +then + echo "We got $BADSIGNED_MARS badly signed MAR file(s), exiting..." + exit 1 +fi + +echo "The signatures are fine." +exit 0

1 0

[torbutton/maint-1.9.4] Fix CHANGELOG (add translations update)
by gk＠torproject.org 08 Mar '16

08 Mar '16

commit f77ddbc5033f1d2261f3cb9bbf0ce16a8c13454c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 8 11:34:01 2016 +0000 Fix CHANGELOG (add translations update) --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 8b2ddb1..3bb3e54 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -2,6 +2,7 @@ * Bug 16990: Don't mishandle multiline commands * Bug 18144: about:tor update arrow position is wrong * Bug 16725: Allow resizing with non-default homepage + * Translation updates 1.9.4.3 * Bug 16990: Show circuit display for connections using multi-party channels

1 0

[tor-browser-bundle/hardened-builds] Add new HTTPS-Everywhere signing key
by gk＠torproject.org 07 Mar '16

07 Mar '16

commit 5815dec2134713a88833578ef6a6b5ab2ebcbc47 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 11:55:59 2016 +0000 Add new HTTPS-Everywhere signing key --- gitian/gpg/https-everywhere.gpg | Bin 188424 -> 194393 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 43aa4e4..fdd8d4f 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.0a3-hardened
by gk＠torproject.org 07 Mar '16

07 Mar '16

commit b6e860d97f33234e0234d1e60588375dd256a090 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 7 08:04:22 2016 +0000 Release preparations for 6.0a3-hardened --- Bundle-Data/Docs/ChangeLog.txt | 20 ++++++++++++++++++++ gitian/versions.alpha | 16 ++++++++-------- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index d115483..2278042 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,23 @@ +Tor Browser 6.0a3-hardened -- March 8 + * All Platforms + * Update Firefox to 38.7.0esr + * Update Tor to 0.2.8.1-alpha + * Update OpenSSL to 1.0.1s + * Update NoScript to 2.9.0.4 + * Update HTTPS Everywhere to 5.1.4 + * Update Torbutton to 1.9.5.1 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + * Bug 16917: Allow users to more easily set a non-tor SSH proxy + * Translation updates + * Bug 18030: Isolate favicon requests on Page Info dialog + * Bug 18297: Use separate Noto JP,KR,SC,TC fonts + * Bug 18170: Make sure the homepage is shown after an update as well + * Bug 16728: Add test cases for favicon isolation + * Windows + * Bug 18292: Disable staged updates on Windows + Tor Browser 6.0a2-hardened -- February 15 2016 * All Platforms * Update Firefox to 38.6.1esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0ddaa65..b46c736 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,15 +11,15 @@ MULTI_LINGUAL=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.1esr +FIREFOX_VERSION=38.7.0esr TORBROWSER_UPDATE_CHANNEL=hardened TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 -TOR_TAG=tor-0.2.7.6 +TOR_TAG=tor-0.2.8.1-alpha TORLAUNCHER_TAG=0.2.8.3 -TORBUTTON_TAG=1.9.5 -HTTPSE_TAG=5.1.2 +TORBUTTON_TAG=1.9.5.1 +HTTPSE_TAG=5.1.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -42,7 +42,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-9 -OPENSSL_VER=1.0.1q +OPENSSL_VER=1.0.1s GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -62,7 +62,7 @@ GO_VER=1.4.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.9.0.3-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -88,13 +88,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 +OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 +NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 7b59296..2c9e0a8 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.0a2-hardened + hardened: 6.0a3-hardened release: 5.0 versions: 5.0: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a2-hardened: - platformVersion: 38.6.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a2-hardened-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a2-hardened + 6.0a3-hardened: + platformVersion: 38.7.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a3-hardened-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a3-hardened incremental_from: - - 6.0a1-hardened + - 6.0a2-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Add new HTTPS-Everywhere signing key
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 1619b2617cb1d36fc7a572b0a567a46b6a10ba72 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 11:55:59 2016 +0000 Add new HTTPS-Everywhere signing key --- gitian/gpg/https-everywhere.gpg | Bin 188424 -> 194393 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 43aa4e4..fdd8d4f 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[tor-browser-bundle/master] Release preparations for 6.0a3
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 305e873ba4edec89e6224d4df5f9e1bdef6d4760 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 11:52:42 2016 +0000 Release preparations for 6.0a3 --- Bundle-Data/Docs/ChangeLog.txt | 20 ++++++++++++++++++++ gitian/versions.alpha | 16 ++++++++-------- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 79ac5fa..fcee2bb 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,23 @@ +Tor Browser 6.0a3 -- March 8 + * All Platforms + * Update Firefox to 38.7.0esr + * Update Tor to 0.2.8.1-alpha + * Update OpenSSL to 1.0.1s + * Update NoScript to 2.9.0.4 + * Update HTTPS Everywhere to 5.1.4 + * Update Torbutton to 1.9.5.1 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + * Bug 16917: Allow users to more easily set a non-tor SSH proxy + * Translation updates + * Bug 18030: Isolate favicon requests on Page Info dialog + * Bug 18297: Use separate Noto JP,KR,SC,TC fonts + * Bug 18170: Make sure the homepage is shown after an update as well + * Bug 16728: Add test cases for favicon isolation + * Windows + * Bug 18292: Disable staged updates on Windows + Tor Browser 6.0a2-hardened -- February 15 2016 * All Platforms * Update Firefox to 38.6.1esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 10fd209..f94ad7a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,15 +7,15 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.1esr +FIREFOX_VERSION=38.7.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 -TOR_TAG=tor-0.2.7.6 +TOR_TAG=tor-0.2.8.1-alpha TORLAUNCHER_TAG=0.2.9 -TORBUTTON_TAG=1.9.5 -HTTPSE_TAG=5.1.2 +TORBUTTON_TAG=1.9.5.1 +HTTPSE_TAG=5.1.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -38,7 +38,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-9 -OPENSSL_VER=1.0.1q +OPENSSL_VER=1.0.1s GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -58,7 +58,7 @@ GO_VER=1.4.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.9.0.3-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -84,13 +84,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 +OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 +NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 2827471..a28f18a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.0a2 + alpha: 6.0a3 release: 5.5 versions: 5.5: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a2: - platformVersion: 38.6.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a2-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a2 + 6.0a3: + platformVersion: 38.7.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a3-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a3 incremental_from: - - 6.0a1 + - 6.0a2 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-38.6.1esr-6.0-1] Bug 18292: Staged updates fail on Windows
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 39f394ef4f103cec0599687118dd7298b3c3981a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 15 10:44:25 2016 -0500 Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index dfe317f..0dd4e5b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -21,6 +21,11 @@ pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues +#ifdef XP_WIN +// For now, disable staged updates on Windows (see #18292). +pref("app.update.staging.enabled", false); +#endif + // Disable "Slow startup" warnings and associated disk history // (bug #13346) pref("browser.slowStartup.notificationDisabled", true);

1 0

[torbutton/master] Release preparations for 1.9.5.1
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit d95f13fe12f13f9501a19dff77e4ad2d2320499a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 11:22:28 2016 +0000 Release preparations for 1.9.5.1 CHANGELOG update, translation update, version bump --- src/CHANGELOG | 7 +++++++ src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ar/torbutton.dtd | 6 +++--- src/chrome/locale/ar/torbutton.properties | 10 +++++----- src/chrome/locale/eu/aboutTor.dtd | 6 +++--- src/chrome/locale/it/torbutton.dtd | 2 +- src/chrome/locale/nl/torbutton.dtd | 2 +- src/install.rdf | 2 +- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 3c24227..fc5e96a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.5.1 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + * Bug 16017: Allow users to more easily set a non-tor SSH proxy + * Translation updates + 1.9.5 * Bug 16990: Show circuit display for connections using multi-party channels * Bug 18019: Avoid empty prompt shown after non-en-US update diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index ce40b98..41fd873 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -3,4 +3,4 @@ <!ENTITY aboutTBUpdate.linkPrefix "للحصول على أحدث المعلومات حول هذا الإصدار."> <!ENTITY aboutTBUpdate.linkLabel "زُر موقعنا"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "تغير سجل:"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index ebcbf72..b9f7205 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -161,7 +161,7 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "بعض محسنات نصوص الجافا معطلة"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "سكربت في بعض المواقع قد تعمل بشكل بطيئ"> <!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> @@ -170,13 +170,13 @@ <!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "بعض ميزات إظهار الخطوط معطلة "> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc "بعض الانواع من الصور معطله"> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "عالٍ"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "معضم صيغ السمعيات والمرئيات معطلة"> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> <!ENTITY torbutton.prefs.sec_webfonts_desc "من الممكن أن بعض الخطوط والايقونات معروضة خطأ"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 6828a3e..4603989 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -2,12 +2,12 @@ torbutton.button.tooltip.disabled = فعّل تور torbutton.button.tooltip.enabled = عطّل تور torbutton.circuit_display.internet = انترنت torbutton.circuit_display.ip_unknown = IP غير معروف -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = موقع اونيون torbutton.circuit_display.this_browser = هذا المتصفح -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = مُرحل torbutton.circuit_display.tor_bridge = جسر torbutton.circuit_display.unknown_country = بلد غير معروف -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = يضيف متصفح تور هذا الهامش لابقاء نافذتك غير مميزه، لتقليل امكانيه تقفيك عبر الانترنت. torbutton.panel.tooltip.disabled = انقر لتفعيل تور torbutton.panel.tooltip.enabled = انقر لتعطيل تور torbutton.panel.plugins.disabled = انقر لتفعيل الملحقات @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = متصفح تور torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = تكبير متصفح تور قد يسمح لبعض المواقع بالتعرف على حجم شاشتك، واستخدام هذه المعلومات لتقفيك. نوصي بابقاء نافذه متصف تور على حجمها الافتراضي. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=هذا الموقع (٪ S) حاول استخراج بيانات الصورة HTML5، والتي يمكن استخدامها لتحديد مكانك وتحديد الكومبيوتر.\n\nهل تريد أن يسمح متصفح Tor لهذا الموقع لاستخراج بيانات الصورة ؟ @@ -72,7 +72,7 @@ canvas.neverAccessKey=ط # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem +profileProblemTitle=%Sمشكله في ملف شخصي profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 76020fc..7524fc2 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Tori buruz"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "KONUTZ: nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu"> <!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Ongi etorri Tor Browserera"> +<!ENTITY aboutTor.success2.label "Tor sarera konektatuta."> <!ENTITY aboutTor.success3.label "Aske zara orain Internet anonimotasunez nabigatzeko."> <!ENTITY aboutTor.failure.label "Zerbait gaizki joan da!"> <!ENTITY aboutTor.failure2.label "Tor ez da nabigatzaile honetan funtzionatzen ari."> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index c92526f..f08b41d 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -180,6 +180,6 @@ <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM è l'unico codec che rimane abilitato."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati."> -<!ENTITY torbutton.prefs.sec_custom "Valori Customizzabili"> +<!ENTITY torbutton.prefs.sec_custom "Valori personalizzati"> <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 1522697..08e3703 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -1,4 +1,4 @@ -<!ENTITY torbutton.prefs.title "Torbutton voorkeuren"> +<!ENTITY torbutton.prefs.title "Torbutton Voorkeuren"> <!ENTITY torbutton.prefs.tor_settings "Proxy-instellingen"> <!ENTITY torbutton.prefs.recommended_settings "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy gebruiken"> diff --git a/src/install.rdf b/src/install.rdf index b75ddbe..531ab16 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.9.5</em:version> + <em:version>1.9.5.1</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] Bug 16917: Allow users to more easily set a non-tor SSH proxy.
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 06800f1c9c0a3c2adf850f9ad70e7ee8c3e645d0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 18 14:22:47 2016 -0800 Bug 16917: Allow users to more easily set a non-tor SSH proxy. Creates a hidden torbutton pref, which if set, allows Tor Browser to work with non-Tor proxies (by disabling our use of SOCKS u+p auth). Enabling this pref also enables NoScript ABE (to prevent proxied connections from hitting localhost/RFC1918) and executes New Identity. --- src/chrome/content/torbutton.js | 40 ++++++++++++++++++++++++++++++++- src/chrome/content/torbutton_util.js | 4 ++++ src/components/domain-isolator.js | 21 +++++++++++++++++ src/defaults/preferences/preferences.js | 1 + 4 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bf45fea..ce49a57 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -233,6 +233,9 @@ var torbutton_unique_pref_observer = case "extensions.torbutton.block_disk": torbutton_update_disk_prefs(); break; + case "extensions.torbutton.use_nontor_proxy": + torbutton_use_nontor_proxy(); + break; case "extensions.torbutton.resist_fingerprinting": case "extensions.torbutton.spoof_english": torbutton_update_fingerprinting_prefs(); @@ -2004,11 +2007,41 @@ function torbutton_clear_image_caches() } } +/* Called when we switch the use_nontor_proxy pref in either direction. + * + * Enables/disables domain isolation and NoScript ABE, and then does + * new identity + */ +function torbutton_use_nontor_proxy() +{ + let nontor_mode = m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy"); + let domainIsolator = Cc["@torproject.org/domain-isolator;1"] + .getService(Ci.nsISupports).wrappedJSObject; + + if (m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { + // We need to enable ABE because non-tor proxies won't reject localhost + // and RFC1918, and we should block them. (The default ABE policy does this). + m_tb_prefs.setBoolPref("noscript.ABE.enabled", true); + + // Disable domain isolation + domainIsolator.disableIsolation(); + } else { + m_tb_prefs.setBoolPref("noscript.ABE.enabled", false); + + domainIsolator.enableIsolation(); + } + + // Always reset our identity if the proxy has changed from tor + // to non-tor. + torbutton_do_new_identity(); +} + function torbutton_do_tor_check() { let checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"] .getService(Ci.nsISupports).wrappedJSObject; if (checkSvc.kCheckNotInitiated != checkSvc.statusOfTorCheck || + m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy") || !m_tb_prefs.getBoolPref("extensions.torbutton.test_enabled")) return; // Only do the check once. @@ -3161,7 +3194,12 @@ function torbutton_close_window(event) { var enumerator = wm.getEnumerator("navigator:browser"); while(enumerator.hasMoreElements()) { var win = enumerator.getNext(); - if(win != window) { + // For some reason, when New Identity is called from a pref + // observer (ex: torbutton_use_nontor_proxy) on an ASAN build, + // we sometimes don't have this symbol set in the new window yet. + // However, the new window will run this init later in that case, + // as it does in the OSX case. + if(win != window && "torbutton_do_main_window_startup" in win) { torbutton_log(3, "Found another window"); win.torbutton_do_main_window_startup(); m_tb_is_main_window = false; diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index 1ec6dcc..68276d0 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -148,6 +148,10 @@ function torbutton_check_status() { return false; } + if (torprefs.getBoolPref("use_nontor_proxy")) { + return true; + } + if (torbutton_check_socks_remote_dns()) remote_dns = liveprefs.getBoolPref("socks_remote_dns"); else diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 93c7f65..caf45cf 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -53,6 +53,10 @@ let tor = tor || {}; // A mutable map that records what nonce we are using for each domain. tor.noncesForDomains = {}; +// __tor.isolationEabled__. +// A bool that controls if we use SOCKS auth for isolation or not. +tor.isolationEnabled = true; + // __tor.unknownDirtySince__. // Specifies when the current catch-all circuit was first used tor.unknownDirtySince = Date.now(); @@ -96,6 +100,9 @@ tor.newCircuitForDomain = function(domain) { // combination. tor.isolateCircuitsByDomain = function () { mozilla.registerProxyChannelFilter(function (aChannel, aProxy) { + if (!tor.isolationEnabled) + return aProxy; + try { let channel = aChannel.QueryInterface(Ci.nsIChannel), firstPartyURI = mozilla.thirdPartyUtil.getFirstPartyURIFromChannel(channel, true) @@ -145,6 +152,12 @@ DomainIsolator.prototype = { observe: function (subject, topic, data) { if (topic === "profile-after-change") { logger.eclog(3, "domain isolator: set up isolating circuits by domain"); + + let prefs = Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefBranch); + if (prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { + tor.isolationEnabled = false; + } tor.isolateCircuitsByDomain(); } }, @@ -152,6 +165,14 @@ DomainIsolator.prototype = { tor.newCircuitForDomain(domain); }, + enableIsolation: function() { + tor.isolationEnabled = true; + }, + + disableIsolation: function() { + tor.isolationEnabled = false; + }, + wrappedJSObject: null }; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 46bfc0e..548f4ed 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -33,6 +33,7 @@ pref("extensions.torbutton.test_failed",false); pref("extensions.torbutton.no_proxies_on",""); pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions"); pref("extensions.torbutton.versioncheck_enabled",true); +pref("extensions.torbutton.use_nontor_proxy",false); // XXX: wtf prefs? These seem not actually connected, but govern // if user wants own tor proxy settings

1 0

[torbutton/master] fixup! Bug 16917: Allow users to more easily set a non-tor SSH proxy.
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 8f40dd361efd3704a65ac8647f814f0415399da0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 10:10:01 2016 +0000 fixup! Bug 16917: Allow users to more easily set a non-tor SSH proxy. --- src/chrome/content/torbutton.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ce49a57..63d3493 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2014,7 +2014,6 @@ function torbutton_clear_image_caches() */ function torbutton_use_nontor_proxy() { - let nontor_mode = m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy"); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject;

1 0

[torbutton/master] Bug 16725: Allow resizing with non-default homepage
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 896e3d6525db8e7c4dd95edf95a59c63a727a578 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 19 09:51:18 2016 +0000 Bug 16725: Allow resizing with non-default homepage --- src/chrome/content/torbutton.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 25b61fb..bf45fea 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1115,10 +1115,6 @@ function torbutton_on_abouttor_load(aDoc) { m_tb_prefs. setBoolPref("extensions.torbutton.show_slider_notification", false); } - - // OS-specific window maximization on start-up should be done by now. Disable - // the respective preference to make sure the user is seeing our notification. - m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, false); } function torbutton_is_abouttor_doc(aDoc) { @@ -3428,6 +3424,11 @@ var torbutton_resizelistener = setTimeout(function() { resizeInnerWindowTo(width, height); quantizeBrowserSize(window, 100, 100); + // OS-specific window maximization on start-up should + // be done by now. Disable the respective preference + // to make sure the user is seeing our notification. + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, + false); }, 0); mut_observer.disconnect(); }

1 0

[tor-browser-bundle/maint-5.5] Fix up broken HTTPS-E key
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit a3ec494a4aeda4435ccd98de5d6709756cf690fb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 3 09:46:22 2016 +0000 Fix up broken HTTPS-E key --- gitian/gpg/https-everywhere.gpg | Bin 194394 -> 194393 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 86fce24..fdd8d4f 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[tor-browser-bundle/maint-5.5] Release preparations for 5.5.3
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit 10e4f9e121c3bc2eaf97f4d24a17b3dcb90393ad Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 3 09:21:08 2016 +0000 Release preparations for 5.5.3 --- Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ gitian/versions | 12 ++++++------ tools/update-responses/config.yml | 13 ++++++------- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e257d11..c84ed0a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser 5.5.3 -- March 8 2016 + * All Platforms + * Update Firefox to 38.7.0esr + * Update OpenSSL to 1.0.1s + * Update NoScript to 2.9.0.4 + * Update HTTPS Everywhere to 5.1.4 + * Update Torbutton to 1.9.4.4 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + * Translation updates + * Bug 18030: Isolate favicon requests on Page Info dialog + * Bug 18297: Use separate Noto JP,KR,SC,TC fonts + * Bug 18170: Make sure the homepage is shown after an update as well + * Windows + * Bug 18292: Disable staged updates on Windows + Tor Browser 5.5.2 -- February 12 2016 * All Platforms * Update Firefox to 38.6.1esr diff --git a/gitian/versions b/gitian/versions index 81bc055..6e00e0a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -7,14 +7,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.1esr +FIREFOX_VERSION=38.7.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 -TORBUTTON_TAG=1.9.4.3 +TORBUTTON_TAG=1.9.4.4 HTTPSE_TAG=5.1.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 @@ -38,7 +38,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux -OPENSSL_VER=1.0.1q +OPENSSL_VER=1.0.1s GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -59,7 +59,7 @@ GO_VER=1.4.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.9.0.3-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -87,13 +87,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 +OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 +NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 922cf7c..59635b5 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.5.2 + release: 5.5.3 versions: - 5.5.2: - platformVersion: 38.6.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-552-released - download_url: https://www.torproject.org/dist/torbrowser/5.5.2 + 5.5.3: + platformVersion: 38.7.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-553-released + download_url: https://www.torproject.org/dist/torbrowser/5.5.3 incremental_from: - - 5.5 - - 5.5.1 + - 5.5.2 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-5.5] Bump HTTPS-Everywhere version
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit 6f0377fe746773f4defe7eb963203b2ccb96c481 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 2 07:17:07 2016 +0000 Bump HTTPS-Everywhere version We bump the version to 5.1.4 and add the new signing key --- gitian/gpg/https-everywhere.gpg | Bin 188424 -> 194394 bytes gitian/versions | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 43aa4e4..86fce24 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ diff --git a/gitian/versions b/gitian/versions index dbe56fa..81bc055 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3 -HTTPSE_TAG=5.1.2 +HTTPSE_TAG=5.1.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable

1 0

[torbutton/maint-1.9.4] Release preparations
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit 90fa61653ca822e3e9fe4dca08d19cb4f54c1ba7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 3 08:22:48 2016 +0000 Release preparations Bump version to 1.9.4.4, update CHANGELOG and update translations --- src/CHANGELOG | 5 +++++ src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ar/torbutton.dtd | 6 +++--- src/chrome/locale/ar/torbutton.properties | 10 +++++----- src/chrome/locale/eu/aboutTor.dtd | 6 +++--- src/chrome/locale/it/torbutton.dtd | 2 +- src/install.rdf | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 933eeeb..8b2ddb1 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.9.4.4 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + 1.9.4.3 * Bug 16990: Show circuit display for connections using multi-party channels * Bug 18019: Avoid empty prompt shown after non-en-US update diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index ce40b98..41fd873 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -3,4 +3,4 @@ <!ENTITY aboutTBUpdate.linkPrefix "للحصول على أحدث المعلومات حول هذا الإصدار."> <!ENTITY aboutTBUpdate.linkLabel "زُر موقعنا"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "تغير سجل:"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index ebcbf72..b9f7205 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -161,7 +161,7 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "بعض محسنات نصوص الجافا معطلة"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "سكربت في بعض المواقع قد تعمل بشكل بطيئ"> <!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> @@ -170,13 +170,13 @@ <!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "بعض ميزات إظهار الخطوط معطلة "> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc "بعض الانواع من الصور معطله"> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "عالٍ"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "معضم صيغ السمعيات والمرئيات معطلة"> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> <!ENTITY torbutton.prefs.sec_webfonts_desc "من الممكن أن بعض الخطوط والايقونات معروضة خطأ"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 6828a3e..4603989 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -2,12 +2,12 @@ torbutton.button.tooltip.disabled = فعّل تور torbutton.button.tooltip.enabled = عطّل تور torbutton.circuit_display.internet = انترنت torbutton.circuit_display.ip_unknown = IP غير معروف -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = موقع اونيون torbutton.circuit_display.this_browser = هذا المتصفح -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = مُرحل torbutton.circuit_display.tor_bridge = جسر torbutton.circuit_display.unknown_country = بلد غير معروف -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = يضيف متصفح تور هذا الهامش لابقاء نافذتك غير مميزه، لتقليل امكانيه تقفيك عبر الانترنت. torbutton.panel.tooltip.disabled = انقر لتفعيل تور torbutton.panel.tooltip.enabled = انقر لتعطيل تور torbutton.panel.plugins.disabled = انقر لتفعيل الملحقات @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = متصفح تور torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = تكبير متصفح تور قد يسمح لبعض المواقع بالتعرف على حجم شاشتك، واستخدام هذه المعلومات لتقفيك. نوصي بابقاء نافذه متصف تور على حجمها الافتراضي. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=هذا الموقع (٪ S) حاول استخراج بيانات الصورة HTML5، والتي يمكن استخدامها لتحديد مكانك وتحديد الكومبيوتر.\n\nهل تريد أن يسمح متصفح Tor لهذا الموقع لاستخراج بيانات الصورة ؟ @@ -72,7 +72,7 @@ canvas.neverAccessKey=ط # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem +profileProblemTitle=%Sمشكله في ملف شخصي profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 76020fc..7524fc2 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Tori buruz"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "KONUTZ: nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu"> <!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Ongi etorri Tor Browserera"> +<!ENTITY aboutTor.success2.label "Tor sarera konektatuta."> <!ENTITY aboutTor.success3.label "Aske zara orain Internet anonimotasunez nabigatzeko."> <!ENTITY aboutTor.failure.label "Zerbait gaizki joan da!"> <!ENTITY aboutTor.failure2.label "Tor ez da nabigatzaile honetan funtzionatzen ari."> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index c92526f..f08b41d 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -180,6 +180,6 @@ <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM è l'unico codec che rimane abilitato."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati."> -<!ENTITY torbutton.prefs.sec_custom "Valori Customizzabili"> +<!ENTITY torbutton.prefs.sec_custom "Valori personalizzati"> <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito"> diff --git a/src/install.rdf b/src/install.rdf index 0e59a9a..da11107 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.9.4.3</em:version> + <em:version>1.9.4.4</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/maint-1.9.4] Bug 16725: Allow resizing with non-default homepage
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit 8efd31f48447b454de98708fa899ab7bc12f85ae Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 19 09:51:18 2016 +0000 Bug 16725: Allow resizing with non-default homepage --- src/chrome/content/torbutton.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 25b61fb..bf45fea 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1115,10 +1115,6 @@ function torbutton_on_abouttor_load(aDoc) { m_tb_prefs. setBoolPref("extensions.torbutton.show_slider_notification", false); } - - // OS-specific window maximization on start-up should be done by now. Disable - // the respective preference to make sure the user is seeing our notification. - m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, false); } function torbutton_is_abouttor_doc(aDoc) { @@ -3428,6 +3424,11 @@ var torbutton_resizelistener = setTimeout(function() { resizeInnerWindowTo(width, height); quantizeBrowserSize(window, 100, 100); + // OS-specific window maximization on start-up should + // be done by now. Disable the respective preference + // to make sure the user is seeing our notification. + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, + false); }, 0); mut_observer.disconnect(); }

1 0

[torbutton/maint-1.9.4] Bug 16690: Don't mishandle multiline commands
by gk＠torproject.org 01 Mar '16

01 Mar '16

commit e9fc7e9e3becded38c87e92a864c44bcd68219c5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Feb 5 17:38:42 2016 -0800 Bug 16690: Don't mishandle multiline commands Also, when logging, don't show a bunch of extra newlines. See https://trac.torproject.org/16990#comment:28 --- src/modules/tor-control-port.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index c5010de..e1ee6bc 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -27,11 +27,11 @@ Cu.import("resource://gre/modules/Services.jsm"); // Logging function let log; if ((typeof console) !== "undefined") { - log = x => console.log(typeof(x) === "string" ? x : JSON.stringify(x)); + log = x => console.log(typeof(x) === "string" ? x.trimRight().replace(/\r\n/g, "\n") : JSON.stringify(x)); } else { let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; - log = x => logger.eclog(3, x); + log = x => logger.eclog(3, x.trimRight().replace(/\r\n/g, "\n")); } // ### announce this file @@ -113,7 +113,7 @@ io.asyncSocket = function (host, port, onInputData, onError) { let totalString = pendingWrites.join(""); try { outputStream.write(totalString, totalString.length); - log("controlPort << " + aString + "\n"); + log("controlPort << " + totalString); } catch (err) { onError(err); } @@ -156,13 +156,26 @@ io.onDataFromOnLine = function (onLine) { // callback that expects individual lines. io.onLineFromOnMessage = function (onMessage) { // A private variable that stores the last unfinished line. - let pendingLines = []; + let pendingLines = [], + // A private variable to monitor whether we are receiving a multiline + // value, beginning with ###+ and ending with a single ".". + multilineValueInProgress = false; // Return a callback that expects individual lines. return function (line) { // Add to the list of pending lines. pendingLines.push(line); + // 'Multiline values' are possible. We avoid interrupting one by detecting it + // and waiting for a terminating "." on its own line. + // (See control-spec section 3.9 and https://trac.torproject.org/16990#comment:28 + if (line.match(/^\d\d\d\+.+?=$/) && pendingLines.length === 1) { + multilineValueInProgress = true; + } + if (multilineValueInProgress && line.match(/^\.$/)) { + multilineValueInProgress = false; + } // If line is the last in a message, then pass on the full multiline message. - if (line.match(/^\d\d\d /) && + if (!multilineValueInProgress && + line.match(/^\d\d\d /) && (pendingLines.length === 1 || pendingLines[0].substring(0,3) === line.substring(0,3))) { // Combine pending lines to form message.

1 0

[torbutton/master] Bug 16690: Don't mishandle multiline commands
by gk＠torproject.org 01 Mar '16

01 Mar '16

commit 5bffe0559f6fbf25d425c19f32d75b5ba0ae1a99 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Feb 5 17:38:42 2016 -0800 Bug 16690: Don't mishandle multiline commands Also, when logging, don't show a bunch of extra newlines. See https://trac.torproject.org/16990#comment:28 --- src/modules/tor-control-port.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index c5010de..e1ee6bc 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -27,11 +27,11 @@ Cu.import("resource://gre/modules/Services.jsm"); // Logging function let log; if ((typeof console) !== "undefined") { - log = x => console.log(typeof(x) === "string" ? x : JSON.stringify(x)); + log = x => console.log(typeof(x) === "string" ? x.trimRight().replace(/\r\n/g, "\n") : JSON.stringify(x)); } else { let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; - log = x => logger.eclog(3, x); + log = x => logger.eclog(3, x.trimRight().replace(/\r\n/g, "\n")); } // ### announce this file @@ -113,7 +113,7 @@ io.asyncSocket = function (host, port, onInputData, onError) { let totalString = pendingWrites.join(""); try { outputStream.write(totalString, totalString.length); - log("controlPort << " + aString + "\n"); + log("controlPort << " + totalString); } catch (err) { onError(err); } @@ -156,13 +156,26 @@ io.onDataFromOnLine = function (onLine) { // callback that expects individual lines. io.onLineFromOnMessage = function (onMessage) { // A private variable that stores the last unfinished line. - let pendingLines = []; + let pendingLines = [], + // A private variable to monitor whether we are receiving a multiline + // value, beginning with ###+ and ending with a single ".". + multilineValueInProgress = false; // Return a callback that expects individual lines. return function (line) { // Add to the list of pending lines. pendingLines.push(line); + // 'Multiline values' are possible. We avoid interrupting one by detecting it + // and waiting for a terminating "." on its own line. + // (See control-spec section 3.9 and https://trac.torproject.org/16990#comment:28 + if (line.match(/^\d\d\d\+.+?=$/) && pendingLines.length === 1) { + multilineValueInProgress = true; + } + if (multilineValueInProgress && line.match(/^\.$/)) { + multilineValueInProgress = false; + } // If line is the last in a message, then pass on the full multiline message. - if (line.match(/^\d\d\d /) && + if (!multilineValueInProgress && + line.match(/^\d\d\d /) && (pendingLines.length === 1 || pendingLines[0].substring(0,3) === line.substring(0,3))) { // Combine pending lines to form message.

1 0

[tor-browser/tor-browser-38.6.1esr-6.0-1] squash! Bug #13749.2: Regression tests for first-party isolation of cache
by gk＠torproject.org 19 Feb '16

19 Feb '16

commit df2cdeb77b7133ea672920caa8c2eac5d69f71c6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Feb 17 22:19:31 2016 -0800 squash! Bug #13749.2: Regression tests for first-party isolation of cache Also checks first-party isolation of favicons: https://bugs.torproject.org/16728 --- netwerk/test/browser/browser.ini | 1 + netwerk/test/browser/browser_cacheFirstParty.js | 21 ++++++++++++--------- netwerk/test/browser/firstPartyGrandParent.html | 4 +++- netwerk/test/browser/firstPartyParent.html | 4 +++- netwerk/test/browser/thirdPartyChild.favicon.ico | Bin 0 -> 1150 bytes 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index ca711b7..5ab1546 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -14,6 +14,7 @@ support-files = thirdPartyChild.worker.xhr.html thirdPartyChild.xhr.html thirdPartyChild.track.vtt + thirdPartyChild.favicon.ico [browser_cacheFirstParty.js] [browser_NetUtil.js] diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index c23f669..c1b5ee6 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -4,12 +4,13 @@ // ("privacy.thirdparty.isolate" pref is set to 2) then when a loaded file is cached, // it is indexed by the URL-bar domain. -// In this test, a number of files are loaded (via IFRAME, LINK, SCRIPT, IMG, OBJECT, -// EMBED, AUDIO, VIDEO, TRACK and XMLHttpRequest) by parent pages with different URL bar -// domains. When isolation is active, we test to confirm that a separate copy of each file -// is cached for each different parent domain. We also test to make sure that when -// isolation is inactive, a single copy of the child page is cached and reused for all -// parent domains. +// In this test, a number of files are loaded (via IFRAME, LINK [both CSS +// and Favicon], SCRIPT, IMG, OBJECT, EMBED, AUDIO, VIDEO, TRACK and +// XMLHttpRequest) by parent pages with different URL bar domains. When +// isolation is active, we test to confirm that a separate copy of each file is +// cached for each different parent domain. We also test to make sure that when +// isolation is inactive, a single copy of the child page is cached +// and reused for all parent domains. // In this file, functions are defined in call stack order (later functions call earlier // functions). Comments are formatted for docco. @@ -104,13 +105,15 @@ let privacyPref = "privacy.thirdparty.isolate", // share cached embedded objects. duplicatedDomains = [].concat(domains, domains), // We will check cache for example.net content from - // iframe, link, script, img, object, embed, xhr, audio, video, track + // iframe, link (css), script, img, object, embed, xhr, audio, video, + // track, favicon suffixes = ["iframe.html", "link.css", "script.js", "img.png", "object.png", - "embed.png", "xhr.html", "worker.xhr.html", "audio.ogg", "video.ogv", "track.vtt" ]; + "embed.png", "xhr.html", "worker.xhr.html", "audio.ogg", + "video.ogv", "track.vtt", "favicon.ico" ]; // __checkCachePopulation(pref, numberOfDomains)__. // Check if the number of entries found in the cache for each -// embedded file type matches the number we expect, given the +// embedded file type matches the number we expect, given the // number of domains and the isolation state. let checkCachePopulation = function* (pref, numberOfDomains) { let expectedEntryCount = (pref === 2) ? numberOfDomains : 1; diff --git a/netwerk/test/browser/firstPartyGrandParent.html b/netwerk/test/browser/firstPartyGrandParent.html index c990831..969b429 100644 --- a/netwerk/test/browser/firstPartyGrandParent.html +++ b/netwerk/test/browser/firstPartyGrandParent.html @@ -1,7 +1,9 @@ <!DOCTYPE html> <html> <head> -<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <link rel="icon" type="image/ico" + href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.favicon.ico"> </head> <frameset cols="50%,50%"> <frame src="http://example.net/browser/netwerk/test/browser/firstPartyParent.html"> diff --git a/netwerk/test/browser/firstPartyParent.html b/netwerk/test/browser/firstPartyParent.html index 7f2f5c8..fa29a74 100644 --- a/netwerk/test/browser/firstPartyParent.html +++ b/netwerk/test/browser/firstPartyParent.html @@ -5,6 +5,8 @@ <head> <link rel="stylesheet" type="text/css" href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.link.css"> + <link rel="icon" type="image/ico" + href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.favicon.ico"> </head> <body> <div>firstPartyParent.html</div> @@ -26,7 +28,7 @@ <source src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.audio.ogg" type="audio/ogg"> <track src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.track.vtt" - kind="subtitles"> + kind="subtitles"> </audio> <video id="video" diff --git a/netwerk/test/browser/thirdPartyChild.favicon.ico b/netwerk/test/browser/thirdPartyChild.favicon.ico new file mode 100644 index 0000000..48060b1 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.favicon.ico differ

1 0

[tor-browser/tor-browser-38.6.1esr-5.5-1] Bug 18170: After update, only changelog tab shown
by gk＠torproject.org 18 Feb '16

18 Feb '16

commit 17015208f6a990a22a89980bf495618009cf1ef8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 3 15:22:12 2016 -0500 Bug 18170: After update, only changelog tab shown When in permanent private browsing mode, always return false for isAutomaticRestoreEnabled. This ensures that there will not be any confusion inside nsBrowserContentHandler.defaultArgs as to whether a one time session restore will occur. Also, for consistency and in case someone looks at the pref, avoid setting browser.sessionstore.resume_session = true during browser shutdown. This bug occurred when staging was not used during the update process. On Windows it always occurred because staging is not used even when it should be (see #18292). --- browser/components/nsBrowserGlue.js | 4 +++- browser/components/sessionstore/SessionStore.jsm | 5 ++++- browser/components/sessionstore/nsSessionStartup.js | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 61e070f..20fefe6 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -226,7 +226,9 @@ BrowserGlue.prototype = { if (!this._saveSession && !aForce) return; - Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true); + if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { + Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true); + } // This method can be called via [NSApplication terminate:] on Mac, which // ends up causing prefs not to be flushed to disk, so we need to do that diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm index 64017f7..3b963bf 100644 --- a/browser/components/sessionstore/SessionStore.jsm +++ b/browser/components/sessionstore/SessionStore.jsm @@ -1165,7 +1165,10 @@ let SessionStoreInternal = { */ onQuitApplication: function ssi_onQuitApplication(aData) { if (aData == "restart") { - this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); + if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { + this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); + } + // The browser:purge-session-history notification fires after the // quit-application notification so unregister the // browser:purge-session-history notification to prevent clearing diff --git a/browser/components/sessionstore/nsSessionStartup.js b/browser/components/sessionstore/nsSessionStartup.js index 7c09a61..faf7863 100644 --- a/browser/components/sessionstore/nsSessionStartup.js +++ b/browser/components/sessionstore/nsSessionStartup.js @@ -291,6 +291,10 @@ SessionStartup.prototype = { * @returns bool */ isAutomaticRestoreEnabled: function () { + if (PrivateBrowsingUtils.permanentPrivateBrowsing) { + return false; + } + return Services.prefs.getBoolPref("browser.sessionstore.resume_session_once") || Services.prefs.getIntPref("browser.startup.page") == BROWSER_STARTUP_RESUME_SESSION; },

1 0

[tor-browser/tor-browser-38.6.1esr-6.0-1] Bug 18170: After update, only changelog tab shown
by gk＠torproject.org 18 Feb '16

18 Feb '16

commit 7c8b836e87bc2e5251ff085d48114d61678544d3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 3 15:22:12 2016 -0500 Bug 18170: After update, only changelog tab shown When in permanent private browsing mode, always return false for isAutomaticRestoreEnabled. This ensures that there will not be any confusion inside nsBrowserContentHandler.defaultArgs as to whether a one time session restore will occur. Also, for consistency and in case someone looks at the pref, avoid setting browser.sessionstore.resume_session = true during browser shutdown. This bug occurred when staging was not used during the update process. On Windows it always occurred because staging is not used even when it should be (see #18292). --- browser/components/nsBrowserGlue.js | 4 +++- browser/components/sessionstore/SessionStore.jsm | 5 ++++- browser/components/sessionstore/nsSessionStartup.js | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 61e070f..20fefe6 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -226,7 +226,9 @@ BrowserGlue.prototype = { if (!this._saveSession && !aForce) return; - Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true); + if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { + Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true); + } // This method can be called via [NSApplication terminate:] on Mac, which // ends up causing prefs not to be flushed to disk, so we need to do that diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm index 64017f7..3b963bf 100644 --- a/browser/components/sessionstore/SessionStore.jsm +++ b/browser/components/sessionstore/SessionStore.jsm @@ -1165,7 +1165,10 @@ let SessionStoreInternal = { */ onQuitApplication: function ssi_onQuitApplication(aData) { if (aData == "restart") { - this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); + if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { + this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); + } + // The browser:purge-session-history notification fires after the // quit-application notification so unregister the // browser:purge-session-history notification to prevent clearing diff --git a/browser/components/sessionstore/nsSessionStartup.js b/browser/components/sessionstore/nsSessionStartup.js index 7c09a61..faf7863 100644 --- a/browser/components/sessionstore/nsSessionStartup.js +++ b/browser/components/sessionstore/nsSessionStartup.js @@ -291,6 +291,10 @@ SessionStartup.prototype = { * @returns bool */ isAutomaticRestoreEnabled: function () { + if (PrivateBrowsingUtils.permanentPrivateBrowsing) { + return false; + } + return Services.prefs.getBoolPref("browser.sessionstore.resume_session_once") || Services.prefs.getIntPref("browser.startup.page") == BROWSER_STARTUP_RESUME_SESSION; },

1 0

[tor-browser/tor-browser-38.6.1esr-6.0-1] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 18 Feb '16

18 Feb '16

commit 222689b3944533ebb97c809b8b6f508975dd45e3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Jan 17 23:32:59 2016 -0800 fixup! Bug #13670.1: Isolate favicon requests by first party Fixes https://bugs.torproject.org/18030, "Favicons loaded via the Page Info dialog are not going over the same circuit as the URL bar domain" --- browser/base/content/pageinfo/pageInfo.js | 2 ++ dom/base/nsContentUtils.cpp | 2 +- dom/base/nsImageLoadingContent.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 4c75d65..6183532 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -970,6 +970,8 @@ function makePreview(row) var newImage = new Image; newImage.id = "thepreviewimage"; + // Ensure "Media" items are fetched over the first-party domain. + newImage.setAttribute("firstparty", gWindow.top.document.location); var physWidth = 0, physHeight = 0; var width = 0, height = 0; diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 5d3dea7..67cd53b 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3000,7 +3000,7 @@ nsContentUtils::LoadImage(nsIURI* aURI, nsINode* aLoadingNode, NS_PRECONDITION(aLoadingPrincipal, "Must have a principal"); NS_PRECONDITION(aRequest, "Null out param"); - nsCOMPtr<nsIDocument> aLoadingDocument(aLoadingNode ? aLoadingNode->GetCurrentDoc() : nullptr); + nsCOMPtr<nsIDocument> aLoadingDocument(aLoadingNode ? aLoadingNode->OwnerDoc() : nullptr); imgLoader* imgLoader = GetImgLoaderForDocument(aLoadingDocument); if (!imgLoader) { diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp index 55c2bd7..64ec1d4 100644 --- a/dom/base/nsImageLoadingContent.cpp +++ b/dom/base/nsImageLoadingContent.cpp @@ -932,7 +932,7 @@ nsImageLoadingContent::LoadImage(nsIURI* aNewURI, nsCOMPtr<nsIContent> content = do_QueryInterface(static_cast<nsIImageLoadingContent*>(this)); nsresult rv; - rv = nsContentUtils::LoadImage(aNewURI, aDocument, + rv = nsContentUtils::LoadImage(aNewURI, content, aDocument->NodePrincipal(), aDocument->GetDocumentURI(), aDocument->GetReferrerPolicy(),

1 0