- tbb-commits - lists.torproject.org

[torbutton/master] Bug 17164: Don't show text-select cursor on circuit display
by gk＠torproject.org 06 Oct '15

06 Oct '15

commit a6f8dcec3bc11bcfc9ded64943051e2408ee9190 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 25 11:57:42 2015 -0700 Bug 17164: Don't show text-select cursor on circuit display --- src/chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index fc18f05..d3b5edc 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -19,6 +19,7 @@ div#circuit-display { padding: 8px; /* Magically keep popup menu from clipping div: */ display: table-cell; + cursor: default; } /* Format the title text. */

1 0

[tor-browser-bundle/master] LXC is still not ready for prime-time
by gk＠torproject.org 24 Sep '15

24 Sep '15

commit bbdab93d054800d1b395dab7066403ad5fa8b7ab Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 24 09:46:13 2015 +0000 LXC is still not ready for prime-time --- Bundle-Data/Docs/ChangeLog.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7f45827..dce1a3e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -35,8 +35,6 @@ Tor Browser 5.5a3 -- September 22 2015 * Bug 16707: Allow more system fonts to get used on OS X * Linux * Bug 16672: Don't use font whitelisting for Linux users - * Build system - * Bug 12240+12237: Make LXC builds reproducible Tor Browser 5.0.3 -- September 22 2015 * All Platforms

1 0

[tor-browser-bundle/maint-5.0] Fix typo in Changelog
by gk＠torproject.org 22 Sep '15

22 Sep '15

commit 57bd13e2e031acee6429424fde42b470704d8c24 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 22 14:50:32 2015 +0000 Fix typo in Changelog --- 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 ade00f3..f5a4d71 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -9,7 +9,7 @@ Tor Browser 5.0.3 -- September 22 2015 * Translation updates * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) * Bug 16837: Disable Firefox Hotfix updates - * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) + * Bug 16855: Allow blobs to be downloaded on first-party pages (fixes mega.nz) * Bug 16781: Allow saving pdf files in built-in pdf viewer * Bug 16842: Restore Media tab on Page information dialog * Bug 16727: Disable about:healthreport page

1 0

[tor-browser-bundle/master] Fix typos in Changelog
by gk＠torproject.org 22 Sep '15

22 Sep '15

commit ca69d85d27cbed53b251aae23d15e3da8a4e6a39 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 22 14:48:51 2015 +0000 Fix typos in Changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7c7b6b3..7f45827 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -16,7 +16,7 @@ Tor Browser 5.5a3 -- September 22 2015 * Bug 16937: Remove the en-US dictionary from non en-US Tor Browser bundles * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) * Bug 16837: Disable Firefox Hotfix updates - * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) + * Bug 16855: Allow blobs to be downloaded on first-party pages (fixes mega.nz) * Bug 16781: Allow saving pdf files in built-in pdf viewer * Bug 16842: Restore Media tab on Page information dialog * Bug 16727: Disable about:healthreport page @@ -49,7 +49,7 @@ Tor Browser 5.0.3 -- September 22 2015 * Translation updates * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) * Bug 16837: Disable Firefox Hotfix updates - * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) + * Bug 16855: Allow blobs to be downloaded on first-party pages (fixes mega.nz) * Bug 16781: Allow saving pdf files in built-in pdf viewer * Bug 16842: Restore Media tab on Page information dialog * Bug 16727: Disable about:healthreport page

1 0

[tor-browser-bundle/master] We have no fix for 16909 in 5.5a3 yet
by gk＠torproject.org 22 Sep '15

22 Sep '15

commit a5d9b3dc621e521a106c869dde1057bc4cabadd1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 22 14:09:20 2015 +0000 We have no fix for 16909 in 5.5a3 yet --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cddf2d5..7c7b6b3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -36,7 +36,6 @@ Tor Browser 5.5a3 -- September 22 2015 * Linux * Bug 16672: Don't use font whitelisting for Linux users * Build system - * Bug 16909: Bump Ubuntu host requirement to 14.04+ * Bug 12240+12237: Make LXC builds reproducible Tor Browser 5.0.3 -- September 22 2015

1 0

[tor-browser-bundle/master] Use build version 4
by gk＠torproject.org 20 Sep '15

20 Sep '15

commit a20586e9e5a19de7f0b271807a99bdf4c1563df0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 20 06:10:20 2015 +0000 Use build version 4 --- Bundle-Data/Docs/ChangeLog.txt | 2 -- gitian/versions.alpha | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a6784a4..cddf2d5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,6 @@ Tor Browser 5.5a3 -- September 22 2015 * All Platforms * Update Firefox to 38.3.0esr * Update libevent to 2.0.22-stable - * Update HTTPS-Everywhere to 5.1.1 * Update Torbutton to 1.9.4 * Bug 16937: Don't translate the hompepage/spellchecker dictionary string * Bug 16735: about:tor should accommodate different fonts/font sizes @@ -13,7 +12,6 @@ Tor Browser 5.5a3 -- September 22 2015 * Bug 10140: Add new Tor Browser locale (Japanese) * Bug 17102: Don't crash while opening a second Tor Browser * Bug 16983: Isolate favicon requests caused by the tab list dropdown - * Bug 16909: Adapt to HTTPS-Everywhere build changes * Bug 13512: Load a static tab with change notes after an update * Bug 16937: Remove the en-US dictionary from non en-US Tor Browser bundles * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6c3d05a..c856979 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build4 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4

1 0

[tor-browser-bundle/master] Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes"
by gk＠torproject.org 20 Sep '15

20 Sep '15

commit 2b50a8cb7d2f4e43f41f82c13704b9af15ba6b4e Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 20 05:50:49 2015 +0000 Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes" This reverts commit f8a4557bb2a46f06e664e47a57a7065322dbbd35. --- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 25 +++++++++---------------- gitian/descriptors/linux/gitian-bundle.yml | 18 ++++++------------ gitian/descriptors/mac/gitian-bundle.yml | 18 ++++++------------ gitian/descriptors/windows/gitian-bundle.yml | 18 ++++++------------ gitian/fetch-inputs.sh | 9 +-------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 9 files changed, 32 insertions(+), 64 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index f289791..656dddd 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,6 +1,6 @@ QuickStart: - On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run: + On an Ubuntu 12.04+/Debian Wheezy+ machine or VM, run: $ make diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index cc16d0e..32c9b7b 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -6,7 +6,7 @@ if [ ! -f /etc/debian_version ]; then echo "Gitian is dependent upon the Ubuntu Virtualization Tools." echo - echo "You need to run Ubuntu 14.04 LTS/Debian Wheezy or newer." + echo "You need to run Ubuntu 12.04 LTS/Debian Wheezy or newer." exit 1 fi @@ -14,22 +14,15 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then - VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` - if [ "$VERSION" -ge "14" ]; - then - dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null - if [ $? -ne 0 ]; - then - echo "You are missing one or more Gitian build tool dependencies." - echo - echo "Please run:" - echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" - exit 1 - fi - else - echo "Your Ubuntu is too old. You need Ubuntu 14.04 LTS or newer to build Tor Browser with Gitian." + if [ $? -ne 0 ]; + then + echo "You are missing one or more Gitian build tool dependencies." + echo + echo "Please run:" + echo " sudo apt-get install torsocks tor" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" exit 1 fi elif [ $DISTRO = "Debian" ]; diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 81fcdf1..ce743df 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -66,7 +66,7 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/Caches mkdir -p tor-browser/Browser/TorBrowser/Docs/sources/ @@ -100,16 +100,10 @@ script: | cd ../../../ # cd https-everywhere - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -118,7 +112,7 @@ script: | cp *.xpi tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/ cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org/ + cd https-everywhere(a)eff.org/ unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index cfb7888..e250365 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -74,7 +74,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches mkdir -p $TORBROWSER_NAME.app/TorBrowser/Docs/sources @@ -102,16 +102,10 @@ script: | cd ../../../ # cd https-everywhere - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -120,7 +114,7 @@ script: | cp *.xpi ./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ cd $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org + cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index dc8ad05..6028601 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -65,7 +65,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources @@ -90,16 +90,10 @@ script: | cd ../../../ # cd https-everywhere - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -108,7 +102,7 @@ script: | cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org + cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 22162b0..42efa33 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${!URL}" done -# NoScript is magikal and special: +# NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check @@ -281,12 +281,5 @@ obfs4 https://git.torproject.org/pluggable-transports/obfs4.git noto-fonts https://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG EOF -# HTTPS-Everywhere is special, too. We need to initialize the git submodules and -# update them here. Otherwise it would happen during the build. -cd https-everywhere -git submodule init -git submodule update -cd .. - exit 0 diff --git a/gitian/versions b/gitian/versions index 70801b2..b833342 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.2 -HTTPSE_TAG=5.1.0 +HTTPSE_TAG=5.0.7 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ade634a..6c3d05a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build3 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4 -HTTPSE_TAG=5.1.1 +HTTPSE_TAG=5.0.7 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index 8c4cfa9..c2143a0 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=5.1.0 +HTTPSE_TAG=5.0.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Back out changes for bug 16909
by gk＠torproject.org 20 Sep '15

20 Sep '15

commit fc16b4e722d7a956563eb6c008f9b88f5aef8434 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 20 06:47:07 2015 +0000 Back out changes for bug 16909 --- tools/update-packaging/make_full_update.sh | 5 +---- tools/update-packaging/make_incremental_update.sh | 13 +++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 3578ae4..62baf4c 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -11,10 +11,7 @@ . $(dirname "$0")/common.sh # TODO: it would be better to pass this as a command line option. -# Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it -# exists. The extension ID got changed with the version bump to 5.1.0. -ext_path='TorBrowser/Data/Browser/profile.default/extensions' -directories_to_remove="$ext_path/https-everywhere(a)eff.org $ext_path/https-everywhere-eff(a)eff.org" +directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org' # ----------------------------------------------------------------------------- diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index c803809..0e1e3f6 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -64,8 +64,7 @@ check_for_forced_update() { fi # If the file in the skip list ends with /*, do a prefix match. - # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org/* - # to be used to force all HTTPS Everywhere files to be updated. + # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org/* to be used to force all HTTPS Everywhere files to be updated. f_suffix=${f##*/} if [[ $f_suffix = "*" ]]; then f_prefix="${f%\/\*}"; @@ -123,7 +122,7 @@ archivefiles="updatev2.manifest updatev3.manifest" # If the NoScript or HTTPS Everywhere extensions have changed between # releases, add them to the "force updates" list. ext_path='TorBrowser/Data/Browser/profile.default/extensions' -https_everywhere='https-everywhere-eff(a)eff.org' +https_everywhere='https-everywhere(a)eff.org' noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' # NoScript is a packed extension, so we simply compare the old and the new @@ -145,14 +144,12 @@ https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" diff "$olddir/$https_everywhere_install_rdf" \ "$newdir/$https_everywhere_install_rdf" > /dev/null rc=$? -if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then +if [ $rc -gt 1 ]; then notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" exit 2 -elif [ $rc -ge 1 ]; then +elif [ $rc -eq 1 ]; then requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" - # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it - # exists. The extension ID got changed with the version bump to 5.1.0. - directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere" + directories_to_remove="$directories_to_remove $ext_path/$https_everywhere" fi mkdir -p "$workdir"

1 0

[tor-browser-bundle/master] Using build3 now
by gk＠torproject.org 19 Sep '15

19 Sep '15

commit e63503fe2f9ffaace5a42e5d6a4650fe176d12fe Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 19 19:28:10 2015 +0000 Using build3 now --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a5e51f5..ade634a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build3 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Sep '15

19 Sep '15

commit 3b9f631f312c8f9e4c84ac4c62a32b2681a9bde6 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 19 19:23:31 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 09e8d4f..3e4afd8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -276,6 +276,7 @@ pref("font.name.sans-serif.ar", "Arial"); pref("font.system.whitelist", "Arial, Batang, Courier New, Euphemia, Gautami, Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); #endif +#ifdef XP_LINUX pref("font.default.lo", "Noto Sans Lao"); pref("font.default.my", "Noto Sans Myanmar"); pref("font.default.x-western", "sans-serif"); @@ -468,3 +469,4 @@ pref("font.name.serif.zh-CN", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); #endif +#endif

1 0

[tor-browser-bundle/master] Using build2
by gk＠torproject.org 19 Sep '15

19 Sep '15

commit 902927e05800f3faca72782e3d78daa7dd77a6ee Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 19 18:44:07 2015 +0000 Using build2 --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1d82c5d..a5e51f5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Sep '15

19 Sep '15

commit a57665ff778db1fb2dbf0f42a379f5b54ebf43b1 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 19 18:40:38 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0ccc83d..09e8d4f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -467,7 +467,4 @@ pref("font.name.serif.x-western", "Tinos, Georgia"); pref("font.name.serif.zh-CN", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); - -#endif - #endif

1 0

[tor-browser/tor-browser-38.3.0esr-5.0-2] Bug 16906: Don't depend on Windows crypto DLLs
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit ac15e62dc45841a3a21f091fcfa3dc0e455ed637 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 17 11:15:41 2015 -0400 Bug 16906: Don't depend on Windows crypto DLLs If not building the Windows Maintenance Service, avoid a dependency on crypt32.dll and wintrust.dll. Also, avoid setting sUsingService inside the updater code; this ensures that all Maintenance Service related codepaths are skipped. --- toolkit/mozapps/update/common/moz.build | 7 +++++-- toolkit/mozapps/update/common/sources.mozbuild | 15 +++++++++------ toolkit/mozapps/update/updater/updater.cpp | 6 ++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index a977b0f..4beb56a 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/toolkit/mozapps/update/common/moz.build @@ -12,13 +12,16 @@ EXPORTS += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += [ - 'certificatecheck.h', 'pathhash.h', - 'registrycertificates.h', 'uachelper.h', 'updatehelper.cpp', 'updatehelper.h', ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + EXPORTS += [ + 'certificatecheck.h', + 'registrycertificates.h', + ] Library('updatecommon') diff --git a/toolkit/mozapps/update/common/sources.mozbuild b/toolkit/mozapps/update/common/sources.mozbuild index 7ec1aff..6b8a9e3 100644 --- a/toolkit/mozapps/update/common/sources.mozbuild +++ b/toolkit/mozapps/update/common/sources.mozbuild @@ -6,16 +6,19 @@ sources = [] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': sources += [ - 'certificatecheck.cpp', 'pathhash.cpp', - 'registrycertificates.cpp', 'uachelper.cpp', 'updatehelper.cpp', ] - OS_LIBS += [ - 'crypt32', - 'wintrust', - ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + sources += [ + 'certificatecheck.cpp', + 'registrycertificates.cpp', + ] + OS_LIBS += [ + 'crypt32', + 'wintrust', + ] sources += [ 'readstrings.cpp', diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 9a01203..31a5dac 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -129,7 +129,9 @@ static bool sUseHardLinks = true; #endif #ifdef XP_WIN +#ifdef MOZ_MAINTENANCE_SERVICE #include "registrycertificates.h" +#endif BOOL PathAppendSafe(LPWSTR base, LPCWSTR extra); BOOL PathGetSiblingFilePath(LPWSTR destinationBuffer, LPCWSTR siblingFilePath, @@ -2031,6 +2033,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, return false; } +#ifdef MOZ_MAINTENANCE_SERVICE // TEST_UPDATER is not available on esr38 //#if !defined(TEST_UPDATER) if (sUsingService && @@ -2038,6 +2041,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, return false; } //#endif +#endif WCHAR dlogFile[MAX_PATH + 1]; if (!PathGetSiblingFilePath(dlogFile, exefullpath, L"uninstall.update")) { @@ -2981,8 +2985,10 @@ int NS_main(int argc, NS_tchar **argv) const int callbackIndex = 6; #if defined(XP_WIN) +#ifdef MOZ_MAINTENANCE_SERVICE sUsingService = getenv("MOZ_USING_SERVICE") != nullptr; putenv(const_cast<char*>("MOZ_USING_SERVICE=")); +#endif // lastFallbackError keeps track of the last error for the service not being // used, in case of an error when fallback is not enabled we write the // error to the update.status file.

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit d55b90fbad7a81bdbee2d0131ac8e5c5712b3026 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 17 11:15:41 2015 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. If not building the Windows Maintenance Service, avoid a dependency on crypt32.dll and wintrust.dll. Also, avoid setting sUsingService inside the updater code; this ensures that all Maintenance Service related codepaths are skipped. --- toolkit/mozapps/update/common/moz.build | 7 +++++-- toolkit/mozapps/update/common/sources.mozbuild | 15 +++++++++------ toolkit/mozapps/update/updater/updater.cpp | 6 ++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index a977b0f..4beb56a 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/toolkit/mozapps/update/common/moz.build @@ -12,13 +12,16 @@ EXPORTS += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += [ - 'certificatecheck.h', 'pathhash.h', - 'registrycertificates.h', 'uachelper.h', 'updatehelper.cpp', 'updatehelper.h', ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + EXPORTS += [ + 'certificatecheck.h', + 'registrycertificates.h', + ] Library('updatecommon') diff --git a/toolkit/mozapps/update/common/sources.mozbuild b/toolkit/mozapps/update/common/sources.mozbuild index 7ec1aff..6b8a9e3 100644 --- a/toolkit/mozapps/update/common/sources.mozbuild +++ b/toolkit/mozapps/update/common/sources.mozbuild @@ -6,16 +6,19 @@ sources = [] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': sources += [ - 'certificatecheck.cpp', 'pathhash.cpp', - 'registrycertificates.cpp', 'uachelper.cpp', 'updatehelper.cpp', ] - OS_LIBS += [ - 'crypt32', - 'wintrust', - ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + sources += [ + 'certificatecheck.cpp', + 'registrycertificates.cpp', + ] + OS_LIBS += [ + 'crypt32', + 'wintrust', + ] sources += [ 'readstrings.cpp', diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 9a01203..31a5dac 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -129,7 +129,9 @@ static bool sUseHardLinks = true; #endif #ifdef XP_WIN +#ifdef MOZ_MAINTENANCE_SERVICE #include "registrycertificates.h" +#endif BOOL PathAppendSafe(LPWSTR base, LPCWSTR extra); BOOL PathGetSiblingFilePath(LPWSTR destinationBuffer, LPCWSTR siblingFilePath, @@ -2031,6 +2033,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, return false; } +#ifdef MOZ_MAINTENANCE_SERVICE // TEST_UPDATER is not available on esr38 //#if !defined(TEST_UPDATER) if (sUsingService && @@ -2038,6 +2041,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, return false; } //#endif +#endif WCHAR dlogFile[MAX_PATH + 1]; if (!PathGetSiblingFilePath(dlogFile, exefullpath, L"uninstall.update")) { @@ -2981,8 +2985,10 @@ int NS_main(int argc, NS_tchar **argv) const int callbackIndex = 6; #if defined(XP_WIN) +#ifdef MOZ_MAINTENANCE_SERVICE sUsingService = getenv("MOZ_USING_SERVICE") != nullptr; putenv(const_cast<char*>("MOZ_USING_SERVICE=")); +#endif // lastFallbackError keeps track of the last error for the service not being // used, in case of an error when fallback is not enabled we write the // error to the update.status file.

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! Bug #13313: Pref 'font.system.whitelist' restricts set of permitted fonts
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit 9878431b2531415aad76c717c68b5b08dec4ffc4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Aug 15 15:09:40 2015 +0000 fixup! Bug #13313: Pref 'font.system.whitelist' restricts set of permitted fonts Don't apply font whitelist in linux -- we'll use a font.conf file instead --- gfx/thebes/gfxFontconfigUtils.cpp | 31 ------------------------------- gfx/thebes/gfxFontconfigUtils.h | 3 --- 2 files changed, 34 deletions(-) diff --git a/gfx/thebes/gfxFontconfigUtils.cpp b/gfx/thebes/gfxFontconfigUtils.cpp index 829a52e..f5d3e9c 100644 --- a/gfx/thebes/gfxFontconfigUtils.cpp +++ b/gfx/thebes/gfxFontconfigUtils.cpp @@ -587,9 +587,6 @@ gfxFontconfigUtils::UpdateFontListInternal(bool aForce) ActivateBundledFonts(); #endif - ApplyWhitelist(); - currentConfig = FcConfigGetCurrent(); - // These FcFontSets are owned by fontconfig FcFontSet *fontSets[] = { FcConfigGetFonts(currentConfig, FcSetSystem) @@ -1090,32 +1087,4 @@ gfxFontconfigUtils::ActivateBundledFonts() } } -void -gfxFontconfigUtils::ApplyWhitelist() -{ - // Get the font family names in the font file loaded in the old configuration. - // If any of the font families are in our whitelist, then add that - // file to the new configuration. Otherwise, leave it out. - FcPattern *pattern = FcPatternCreate(); - FcObjectSet *objectSet = FcObjectSetBuild(FC_FILE, FC_FAMILY, nullptr); - FcFontSet *fontSet = FcFontList(nullptr, pattern, objectSet); - FcConfig *newConfig = FcConfigCreate(); - for (int i = 0; i < fontSet->nfont; ++i) { - FcPattern *font = fontSet->fonts[i]; - FcChar8 *file, *family; - FcPatternGetString(font, FC_FILE, 0, &file); - for (int j = 0; - FcPatternGetString(font, - FC_FAMILY, j, &family) == FcResultMatch; - ++j) { - nsAutoCString strFamily((char *) family); - if (gfxFontUtils::IsFontFamilyNameAllowed(NS_ConvertUTF8toUTF16(strFamily))) { - FcConfigAppFontAddFile(newConfig, file); - break; - } - } - } - FcConfigSetCurrent(newConfig); -} - #endif diff --git a/gfx/thebes/gfxFontconfigUtils.h b/gfx/thebes/gfxFontconfigUtils.h index 7bd0cfc..de9f27f 100644 --- a/gfx/thebes/gfxFontconfigUtils.h +++ b/gfx/thebes/gfxFontconfigUtils.h @@ -310,9 +310,6 @@ protected: nsCString mBundledFontsPath; bool mBundledFontsInitialized; #endif - -private: - void ApplyWhitelist(); }; #endif /* GFX_FONTCONFIG_UTILS_H */

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit 93da48890a7887775e72aadd2ee7123048387d0a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Aug 18 23:06:08 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0610297..0ccc83d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -276,9 +276,6 @@ pref("font.name.sans-serif.ar", "Arial"); pref("font.system.whitelist", "Arial, Batang, Courier New, Euphemia, Gautami, Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); #endif -#ifdef XP_LINUX -pref("font.system.whitelist", "Arimo, Arimo Bold, Arimo Italic, Arimo Bold Italic, Cousine, Tinos, Tinos Bold, Tinos Italic, Tinos Bold Italic, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); - pref("font.default.lo", "Noto Sans Lao"); pref("font.default.my", "Noto Sans Myanmar"); pref("font.default.x-western", "sans-serif");

1 0

[tor-browser-bundle/master] Changelog fixup
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit 77b16011cd5570f518f89e5ee34e9288778d82f5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 14:12:51 2015 +0000 Changelog fixup --- 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 8aed130..a6784a4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -38,7 +38,7 @@ Tor Browser 5.5a3 -- September 22 2015 * Linux * Bug 16672: Don't use font whitelisting for Linux users * Build system - * Bug 16909: Bump Ubuntu host reqirement to 14.04+ + * Bug 16909: Bump Ubuntu host requirement to 14.04+ * Bug 12240+12237: Make LXC builds reproducible Tor Browser 5.0.3 -- September 22 2015

1 0

[tor-browser-bundle/master] Update config.yml for 5.5a3
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit 218ffedbc06654661f7c68acac5f9d5abe6760b6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 13:20:51 2015 +0000 Update config.yml for 5.5a3 --- tools/update-responses/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index fc44ddf..dcef911 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: 5.5a2 + alpha: 5.5a3 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… - 5.5a2: - platformVersion: 38.2.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-55a2-released - download_url: https://www.torproject.org/dist/torbrowser/5.5a2 + 5.5a3: + platformVersion: 38.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-55a3-released + download_url: https://www.torproject.org/dist/torbrowser/5.5a3 incremental_from: - - 5.5a1 + - 5.5a2 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Update the changelog
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit b7876a2ea7b7c161e4164372469134f771a90beb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 14:07:58 2015 +0000 Update the changelog --- Bundle-Data/Docs/ChangeLog.txt | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9f78ac4..8aed130 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,73 @@ +Tor Browser 5.5a3 -- September 22 2015 + * All Platforms + * Update Firefox to 38.3.0esr + * Update libevent to 2.0.22-stable + * Update HTTPS-Everywhere to 5.1.1 + * Update Torbutton to 1.9.4 + * Bug 16937: Don't translate the hompepage/spellchecker dictionary string + * Bug 16735: about:tor should accommodate different fonts/font sizes + * Bug 16887: Update intl.accept_languages value + * Bug 15493: Update circuit display on new circuit info + * Bug 16797: brandShorterName is missing from brand.properties + * Translation updates + * Bug 10140: Add new Tor Browser locale (Japanese) + * Bug 17102: Don't crash while opening a second Tor Browser + * Bug 16983: Isolate favicon requests caused by the tab list dropdown + * Bug 16909: Adapt to HTTPS-Everywhere build changes + * Bug 13512: Load a static tab with change notes after an update + * Bug 16937: Remove the en-US dictionary from non en-US Tor Browser bundles + * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) + * Bug 16837: Disable Firefox Hotfix updates + * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) + * Bug 16781: Allow saving pdf files in built-in pdf viewer + * Bug 16842: Restore Media tab on Page information dialog + * Bug 16727: Disable about:healthreport page + * Bug 16783: Normalize NoScript default whitelist + * Bug 16775: Fix preferences dialog with security slider set to "High" + * Bug 13579: Update download progress bar automatically + * Bug 15646: Reduce keyboard layout fingerprinting in KeyboardEvent + * Bug 17046: Event.timeStamp should not reveal startup time + * Bug 16872: Fix warnings when opening about:downloads + * Bug 17097: Fix intermittent crashes when using the print dialog + * Windows + * Bug 16906: Fix Mingw-w64 compilation/Don't depend on Windows crypto DLLs + * Bug 16707: Allow more system fonts to get used on Windows + * OS X + * Bug 16910: Update copyright year in OS X bundles + * Bug 16707: Allow more system fonts to get used on OS X + * Linux + * Bug 16672: Don't use font whitelisting for Linux users + * Build system + * Bug 16909: Bump Ubuntu host reqirement to 14.04+ + * Bug 12240+12237: Make LXC builds reproducible + +Tor Browser 5.0.3 -- September 22 2015 + * All Platforms + * Update Firefox to 38.3.0esr + * Update Torbutton to 1.9.3.4 + * Bug 16887: Update intl.accept_languages value + * Bug 15493: Update circuit display on new circuit info + * Bug 16797: brandShorterName is missing from brand.properties + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) + * Bug 16837: Disable Firefox Hotfix updates + * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) + * Bug 16781: Allow saving pdf files in built-in pdf viewer + * Bug 16842: Restore Media tab on Page information dialog + * Bug 16727: Disable about:healthreport page + * Bug 16783: Normalize NoScript default whitelist + * Bug 16775: Fix preferences dialog with security slider set to "High" + * Bug 13579: Update download progress bar automatically + * Bug 15646: Reduce keyboard layout fingerprinting in KeyboardEvent + * Bug 17046: Event.timeStamp should not reveal startup time + * Bug 16872: Fix warnings when opening about:downloads + * Bug 17097: Fix intermittent crashes when using the print dialog + * Windows + * Bug 16906: Fix Mingw-w64 compilation breakage + * OS X + * Bug 16910: Update copyright year in OS X bundles + Tor Browser 5.5a2 -- August 28 2015 * All Platforms: * Update Firefox to 38.2.1esr

1 0

[tor-browser-bundle/master] Version bumps
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit b31622ab3dd86093df32016f99d4ecb4667338b5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 12:12:45 2015 +0000 Version bumps --- gitian/versions.alpha | 12 ++++++------ gitian/versions.nightly | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 679da18..1d82c5d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,18 +7,18 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.2.1esr +FIREFOX_VERSION=38.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 -TORBUTTON_TAG=1.9.3.3 -HTTPSE_TAG=5.1.0 +TORBUTTON_TAG=1.9.4 +HTTPSE_TAG=5.1.1 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 -LIBEVENT_TAG=release-2.0.21-stable +LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 @@ -37,7 +37,7 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8 +GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux OPENSSL_VER=1.0.1p GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f0551f5..85e4128 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -10,7 +10,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.2.1esr +FIREFOX_VERSION=38.3.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -21,7 +21,7 @@ TORBUTTON_TAG=master HTTPSE_TAG=master NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 -LIBEVENT_TAG=release-2.0.21-stable +LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master @@ -40,7 +40,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-7 +GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux OPENSSL_VER=1.0.1p GMP_VER=5.1.3

1 0

[torbutton/master] Release preparations for 1.9.4
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit b5230579335bb13b7d79f414650efd396c08bd84 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 11:31:59 2015 +0000 Release preparations for 1.9.4 This is the first release in the 1.9.4 series. We switched to this new series to avoid the confusion between maint-1.9.3 and non-maintenance 1.9.3 releases. --- src/CHANGELOG | 15 ++++++++++++ src/chrome/locale/ar/brand.properties | 1 + src/chrome/locale/de/aboutDialog.dtd | 2 +- src/chrome/locale/de/aboutTor.dtd | 2 +- src/chrome/locale/de/brand.properties | 1 + src/chrome/locale/es/brand.properties | 1 + src/chrome/locale/eu/brand.properties | 1 + src/chrome/locale/fa/brand.properties | 1 + src/chrome/locale/fr/brand.properties | 1 + src/chrome/locale/it/brand.properties | 1 + src/chrome/locale/ja/brand.properties | 1 + src/chrome/locale/ja/torbutton.dtd | 36 ++++++++++++++--------------- src/chrome/locale/ko/brand.properties | 1 + src/chrome/locale/nl/brand.properties | 1 + src/chrome/locale/pl/brand.properties | 1 + src/chrome/locale/pt/aboutTor.dtd | 4 ++-- src/chrome/locale/pt/brand.dtd | 8 +++---- src/chrome/locale/pt/brand.properties | 1 + src/chrome/locale/pt/torbutton.dtd | 8 +++---- src/chrome/locale/pt/torbutton.properties | 2 +- src/chrome/locale/ru/brand.properties | 1 + src/chrome/locale/sv/aboutTor.dtd | 4 ++-- src/chrome/locale/sv/brand.properties | 3 ++- src/chrome/locale/tr/aboutDialog.dtd | 14 +++++------ src/chrome/locale/tr/aboutTor.dtd | 10 ++++---- src/chrome/locale/tr/brand.dtd | 2 +- src/chrome/locale/tr/brand.properties | 1 + src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/vi/aboutDialog.dtd | 2 +- src/chrome/locale/vi/aboutTor.dtd | 2 +- src/chrome/locale/vi/brand.dtd | 6 ++--- src/chrome/locale/vi/brand.properties | 5 ++-- src/chrome/locale/vi/torbutton.dtd | 34 +++++++++++++-------------- src/chrome/locale/zh-CN/brand.properties | 1 + src/install.rdf | 2 +- 35 files changed, 105 insertions(+), 73 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 05472f6..76fa989 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,18 @@ +1.9.4 + * Bug 16937: Don't translate the hompepage/spellchecker dictionary string + * Bug 16735: about:tor should accommodate different fonts/font sizes + * Bug 16887: Update intl.accept_languages value + * Bug 15493: Update circuit display on new circuit info + * Bug 16797: brandShorterName is missing from brand.properties + * Translation updates + +1.9.3.4 + * Bug 16887: Update intl.accept_languages value + * Bug 15493: Update circuit display on new circuit info + * Bug 16797: brandShorterName is missing from brand.properties + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + 1.9.3.3 * Bug 14429: Make sure the automatic resizing is enabled diff --git a/src/chrome/locale/ar/brand.properties b/src/chrome/locale/ar/brand.properties index b1b159d..3cbd6f2 100644 --- a/src/chrome/locale/ar/brand.properties +++ b/src/chrome/locale/ar/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=متصفح تور brandFullName=متصفح تور vendorShortName=مشروع تور diff --git a/src/chrome/locale/de/aboutDialog.dtd b/src/chrome/locale/de/aboutDialog.dtd index 649f543..063fa21 100644 --- a/src/chrome/locale/de/aboutDialog.dtd +++ b/src/chrome/locale/de/aboutDialog.dtd @@ -16,4 +16,4 @@ <!ENTITY bottomLinks.grow "Helfen Sie beim Ausweiten des Tor-Netzwerks!">  <!ENTITY bottomLinks.license "Lizenzinformationen"> -<!ENTITY tor.TrademarkStatement ""Tor" und das "Onion-Logo" sind eingetragene Warenzeichen von Tor Project, Inc."> +<!ENTITY tor.TrademarkStatement ""Tor" und das "Onion-Logo" sind eingetragene Warenzeichen von the Tor Project, Inc."> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 955ac10..2c9535d 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Über Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "Dieser Browser ist nicht mehr aktuell."> +<!ENTITY aboutTor.outOfDateTorOn.label "ALLERDINGS, ist dieser Browser ist nicht mehr aktuell."> <!ENTITY aboutTor.outOfDateTorOff.label "DIESER Browser ist auch veraltet."> <!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wählen Sie dann Suche nach Tor-Browser-Aktualisierung."> diff --git a/src/chrome/locale/de/brand.properties b/src/chrome/locale/de/brand.properties index 84e9a07..60b05d1 100644 --- a/src/chrome/locale/de/brand.properties +++ b/src/chrome/locale/de/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor-Browser brandShortName=Tor-Browser brandFullName=Tor-Browser vendorShortName=Tor-Projekt diff --git a/src/chrome/locale/es/brand.properties b/src/chrome/locale/es/brand.properties index 035057f..c59e88f 100644 --- a/src/chrome/locale/es/brand.properties +++ b/src/chrome/locale/es/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Navegador Tor brandShortName=Navegador Tor brandFullName=Navegador Tor vendorShortName=Proyecto Tor diff --git a/src/chrome/locale/eu/brand.properties b/src/chrome/locale/eu/brand.properties index 341c4df..9d0b74c 100644 --- a/src/chrome/locale/eu/brand.properties +++ b/src/chrome/locale/eu/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/fa/brand.properties b/src/chrome/locale/fa/brand.properties index fcf2e20..b0589eb 100644 --- a/src/chrome/locale/fa/brand.properties +++ b/src/chrome/locale/fa/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=مرورگر تور brandShortName=مرورگر تور brandFullName=مرورگر تور vendorShortName=پروژهٔ تور diff --git a/src/chrome/locale/fr/brand.properties b/src/chrome/locale/fr/brand.properties index 34bbdf9..1e596f1 100644 --- a/src/chrome/locale/fr/brand.properties +++ b/src/chrome/locale/fr/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Navigateur Tor brandShortName=Navigateur Tor brandFullName=Navigateur Tor vendorShortName=Projet Tor diff --git a/src/chrome/locale/it/brand.properties b/src/chrome/locale/it/brand.properties index 3308a03..d43e654 100644 --- a/src/chrome/locale/it/brand.properties +++ b/src/chrome/locale/it/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ja/brand.properties b/src/chrome/locale/ja/brand.properties index e7f8d56..6f4884f 100644 --- a/src/chrome/locale/ja/brand.properties +++ b/src/chrome/locale/ja/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor ブラウザー brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 31f6db9..0222021 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -1,7 +1,7 @@ <!ENTITY torbutton.prefs.title "Torbutton設定"> -<!ENTITY torbutton.prefs.tor_settings "プロクシ設定"> -<!ENTITY torbutton.prefs.recommended_settings "Firefoxのプロクシ設定を使う"> -<!ENTITY torbutton.prefs.use_privoxy "プロキシを使う"> +<!ENTITY torbutton.prefs.tor_settings "プロキシ設定"> +<!ENTITY torbutton.prefs.recommended_settings "Firefoxのプロキシ設定を使う"> +<!ENTITY torbutton.prefs.use_privoxy "Privoxyを使う"> <!ENTITY torbutton.prefs.use_polipo "Polipoを使う"> <!ENTITY torbutton.prefs.custom_settings "カスタム設定のプロキシを使う"> <!ENTITY torbutton.prefs.proxy.host.http "HTTPプロキシ"> @@ -22,13 +22,13 @@ <!ENTITY torbutton.pref_connection.more_info "詳細情報"> <!ENTITY torbutton.pref_connection_more_info.title "ヘルプ"> <!ENTITY torbutton.pref_connection_more_info.text "Torbuttonは現在オンになっています。もし、非Torの設定を変更する場合は、まずTorbuttonをオフにしてください。Torの設定を変更する場合にはTorbutton設定ウィンドウを使ってください。"> -<!ENTITY torbutton.context_menu.new_identity "新しい識別"> +<!ENTITY torbutton.context_menu.new_identity "新しい匿名"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit "このサイト用の新しい Tor サーキット"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "Torのステータスを変更"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "プライバシーとセキュリティー設定"> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Torbuttonについて..."> <!ENTITY torbutton.context_menu.about.key "A"> @@ -45,7 +45,7 @@ <!ENTITY torbutton.context_menu.openTorWindow "新しいウィンドウでTorのURLを開く"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Torbuttomを初期状態に戻す"> +<!ENTITY torbutton.button.tooltip "Torbuttonを初期状態に戻す"> <!ENTITY torbutton.prefs.privacy_security_settings "プライバシーとセキュリティーの設定"> <!ENTITY torbutton.prefs.block_thread "ブロック履歴がTor中に読みます (重要)"> <!ENTITY torbutton.prefs.block_thwrite "ブロック履歴がTor中に書き込まれます (推奨)"> @@ -55,7 +55,7 @@ <!ENTITY torbutton.prefs.clear_cache "Torのディスクキャッシュをブロックして、Torの切り替え時にすべてのキャッシュをクリアする"> <!ENTITY torbutton.prefs.block_cache "Tor中ディスクとメモリーキャッシュのアクセスをブロックする"> <!ENTITY torbutton.prefs.cookie_jars "非Torのcookieを保護されたjarで保管する"> -<!ENTITY torbutton.prefs.cookie_protection "選択するにはCookie保護ダイアログを使用しましょう"> +<!ENTITY torbutton.prefs.cookie_protection "選択するにはCookie保護ダイアログを使用する"> <!ENTITY torbutton.prefs.mmm_cookies "手動で自分のcookieを管理する (危険)"> <!ENTITY torbutton.prefs.clear_cookies "Tor切り替え時にcookieをクリア"> <!ENTITY torbutton.prefs.disable_plugins "Tor使用中プラグインを無効 (重要)"> @@ -76,9 +76,9 @@ <!ENTITY torbutton.prefs.headers "ヘッダ送信"> <!ENTITY torbutton.prefs.spoof_english "アメリカ英語のブラウザを詐称する"> <!ENTITY torbutton.prefs.refererspoofing "リファラを偽装する"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> +<!ENTITY torbutton.prefs.spoofblank "Tor使用中は空白のリファラに偽装する (一部のサイトを壊すかもしれません)"> <!ENTITY torbutton.prefs.smartspoof "Tor使用中はスマートなリファラ偽装 (クロスドメインのリファラを偽装する)"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> +<!ENTITY torbutton.prefs.nospoof "Tor使用中はリファラ偽装をしない (通常通りリファラを送る)"> <!ENTITY torbutton.prefs.disable_domstorage "Tor使用中はDOMストレージを無効化 (重要)"> <!ENTITY torbutton.prefs.forms "フォーム入力"> <!ENTITY torbutton.prefs.block_tforms "Tor中はパスワードが保存されないようにする (推奨)"> @@ -106,7 +106,7 @@ <!ENTITY torbutton.prefs.restore_defaults "デフォルト設定に戻す"> <!ENTITY torbutton.prefs.test_settings "設定をテストする"> <!ENTITY torbutton.prefs.test_auto "常に最初にFirefoxを起動した後自分のTorの設定をテストする"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> +<!ENTITY torbutton.prefs.disable_livemarks "Tor使用中はライブブックマークの更新を無効化"> <!ENTITY torbutton.prefs.tor_memory_jar "Torのcookieをディスクに書き込まない"> <!ENTITY torbutton.prefs.nontor_memory_jar "非Torのcookieをディスクに書き込まない"> <!ENTITY torbutton.prefs.session_restore "セッションストアに保存し回復するタブ:"> @@ -118,10 +118,10 @@ <!ENTITY torbutton.prefs.no_proxy_warning "警告: 以上のどんなホストネームの使用も避けてください"> <!ENTITY torbutton.prefs.spoofreresh "偽装更新"> <!ENTITY torbutton.prefs.refereroptions "リファラ偽装オプション"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> +<!ENTITY torbutton.prefs.nospoof "Tor使用中はリファラ偽装をしない (通常通りリファラを送る)"> <!ENTITY torbutton.prefs.spoofroot "ページの含んでいるフォルダーを偽装する"> <!ENTITY torbutton.prefs.spoofdomain "ドメインをリファラとして偽装する"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> +<!ENTITY torbutton.prefs.spoofblank "Tor使用中は空白のリファラに偽装する (一部のサイトを壊すかもしれません)"> <!ENTITY torbutton.cookiedialog.title "Cookie保護を管理"> <!ENTITY torbutton.cookiedialog.lockCol "保護済み"> <!ENTITY torbutton.cookiedialog.domainCol "ホスト"> @@ -132,8 +132,8 @@ <!ENTITY torbutton.cookiedialog.unprotectCookie "Cookieの保護を解除"> <!ENTITY torbutton.cookiedialog.removeAllBut "保護されているもの以外削除"> <!ENTITY torbutton.cookiedialog.saveAllCookies "新しいCookieを保護"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCOokieを保護しない"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCookieを保護しない"> +<!ENTITY torbutton.prefs.disable_livemarks "Tor使用中はライブブックマークの更新を無効化"> <!ENTITY torbutton.prefs.dtd_recommended "(推奨)"> <!ENTITY torbutton.prefs.dtd_optional "(オプション)"> <!ENTITY torbutton.prefs.dtd_crucial "(重要)"> @@ -156,7 +156,7 @@ <!ENTITY torbutton.prefs.sec_low_usable_desc "最大の利便性を提供します。"> <!ENTITY torbutton.prefs.sec_low_desc "このレベルでは、全てのブラウザーの機能が有効化されます。"> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType フォントレンダリング機能は無効化されます。"> -<!ENTITY torbutton.prefs.sec_med_low "中の低"> +<!ENTITY torbutton.prefs.sec_med_low "低中"> <!ENTITY torbutton.prefs.sec_gen_desc "このレベルでは、以下の変更が適用されます。(マウスを重ねると詳細を表示)"> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 の映像と音楽は No-Script によりクリックするまで再生されません。"> <!ENTITY torbutton.prefs.sec_html5_tooltip "いくつかのサイトでは、メディアを有効にするために No-Script ツールバーを使う必要があります。"> @@ -168,7 +168,7 @@ <!ENTITY torbutton.prefs.sec_jar_tooltip "Web 上で JAR ファイルが利用されることは稀ですが、 XSS などに使われることがあります。"> <!ENTITY torbutton.prefs.sec_mathml_desc "数式を表示するためのいくつかの機能が無効化されます。"> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML が無効化されます。"> -<!ENTITY torbutton.prefs.sec_med_high "中の上"> +<!ENTITY torbutton.prefs.sec_med_high "高中"> <!ENTITY torbutton.prefs.sec_all_jit_desc "全ての JavaScript のパフォーマンス最適化機能が無効化されます。"> <!ENTITY torbutton.prefs.sec_font_rend_desc "いくつかのフォントレンダリング機能が無効化されます。"> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite フォントレンダリング機能は無効化されます。"> @@ -183,5 +183,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "いくつかのフォントとアイコンは正常に表示されません。"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web サイトが提供するフォントはブロックされます。"> <!ENTITY torbutton.prefs.sec_custom "カスタム値"> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "このサイト用の Tor サーキット"> diff --git a/src/chrome/locale/ko/brand.properties b/src/chrome/locale/ko/brand.properties index 8273888..36b8d8b 100644 --- a/src/chrome/locale/ko/brand.properties +++ b/src/chrome/locale/ko/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor 브라우저 brandFullName=Tor 브라우저 vendorShortName=Tor 프로젝트 diff --git a/src/chrome/locale/nl/brand.properties b/src/chrome/locale/nl/brand.properties index 33caa67..036f97a 100644 --- a/src/chrome/locale/nl/brand.properties +++ b/src/chrome/locale/nl/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/pl/brand.properties b/src/chrome/locale/pl/brand.properties index d40c141..0381bab 100644 --- a/src/chrome/locale/pl/brand.properties +++ b/src/chrome/locale/pl/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Przeglądarka Tor brandShortName=Przeglądarka Tor brandFullName=Przeglądarka Tor vendorShortName=Project Tor diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd index 65aadb6..d3294cf 100644 --- a/src/chrome/locale/pt/aboutTor.dtd +++ b/src/chrome/locale/pt/aboutTor.dtd @@ -8,13 +8,13 @@ <!ENTITY aboutTor.outOfDateTorOn.label "CONTUDO, este navegador está desatualizado."> <!ENTITY aboutTor.outOfDateTorOff.label "TAMBÉM, este navegador está desatualizado."> -<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha Procurar por Atualizações do Navegador Tor"> +<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha 'Procurar por Atualizações do Navegador Tor'"> <!ENTITY aboutTor.check.label "Testar as Configurações da Rede Tor"> <!ENTITY aboutTor.success.label "Parabéns!"> <!ENTITY aboutTor.success2.label "Este navegador está configurado para utilizar o Tor."> -<!ENTITY aboutTor.success3.label "Agora já pode navegar na Internet anonimamente."> +<!ENTITY aboutTor.success3.label "Agora já está livre para navegar na Internet anonimamente."> <!ENTITY aboutTor.failure.label "Ocorreu Algo de Errado!"> <!ENTITY aboutTor.failure2.label "O Tor não está a funcionar neste navegador."> <!ENTITY aboutTor.failure3prefix.label "Para assistência, por favor, contacte"> diff --git a/src/chrome/locale/pt/brand.dtd b/src/chrome/locale/pt/brand.dtd index a39564a..d3566f4 100644 --- a/src/chrome/locale/pt/brand.dtd +++ b/src/chrome/locale/pt/brand.dtd @@ -2,14 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Nagador Tor"> +<!ENTITY brandShorterName "Navegador Tor"> <!ENTITY brandShortName "Navegador Tor"> <!ENTITY brandFullName "Navegador Tor"> <!ENTITY vendorShortName "Projeto Tor"> <!ENTITY trademarkInfo.part1 "O Firefox e os logótipos Firefox são marcas registadas da Fundação Mozilla.">  -<!ENTITY plugins.installed.find "Clique para carregar os plugins do sistema instalados"> -<!ENTITY plugins.installed.enable "Ativar plugins"> -<!ENTITY plugins.installed.disable "Desativar plugins"> +<!ENTITY plugins.installed.find "Clique para carregar os plugi-ns do sistema instalados"> +<!ENTITY plugins.installed.enable "Ativar plug-ins"> +<!ENTITY plugins.installed.disable "Desativar plug-ins"> <!ENTITY plugins.installed.disable.tip "Clique para evitar o carregamento dos plugins do sistema"> diff --git a/src/chrome/locale/pt/brand.properties b/src/chrome/locale/pt/brand.properties index e08b760..1374192 100644 --- a/src/chrome/locale/pt/brand.properties +++ b/src/chrome/locale/pt/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Navegador Tor brandFullName=Navegador Tor vendorShortName=Projeto Tor diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 0bf3ad6..bb521a3 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -1,6 +1,6 @@ <!ENTITY torbutton.prefs.title "Preferências Torbutton"> <!ENTITY torbutton.prefs.tor_settings "Configurações do Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Use as configurações recomendadas do proxy para a minha versão do Firefox"> +<!ENTITY torbutton.prefs.recommended_settings "Utilize as configurações recomendadas do proxy para a minha versão do Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy"> <!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo"> <!ENTITY torbutton.prefs.custom_settings "Utilize as configurações do proxy personalizadas"> @@ -159,11 +159,11 @@ <!ENTITY torbutton.prefs.sec_med_low "Médio-Baixo"> <!ENTITY torbutton.prefs.sec_gen_desc "Neste nível de segurança, aplicam-se as seguintes alterações ('rato sobre' para os detalhes)."> <!ENTITY torbutton.prefs.sec_html5_desc "A multimédia de áudio e vídeo HTML5 torna-se clique-par-reproduzir via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sítios, poderá precisar de usar o botão da barra de ferramentas NoScript para ativar estes objetos de multimédia."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sites, poderá precisar de utilizar o botão da barra de ferramentas NoScript para ativar estes objetos de multimédia."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Algumas otimizações de desempenho JavaScript estão desativadas."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de base JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sítios poderão funcionar muito lentamente."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sites poderão funcionar muito lentamente."> <!ENTITY torbutton.prefs.sec_jar_desc "Os ficheiros JAR remotos estão bloqueados."> <!ENTITY torbutton.prefs.sec_jar_tooltip "Os ficheiros JAR são extremamente raros na Web, mas podem ser uma fonte de XSS e outros ataques."> <!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos de visualização de equações matemáticas estão desativados."> @@ -177,7 +177,7 @@ <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript está desativado por predefinição em todos os sites não HTTPS."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado numa base de per-sítio através do botão da barra de ferramentas NoScript."> <!ENTITY torbutton.prefs.sec_high "Alto"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript está desativado por predefinição em todos os sítios."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript está desativado por predefinição em todos os sites."> <!ENTITY torbutton.prefs.sec_audio_video_desc "A maioria dos formatos de áudio e vídeo estão desativados."> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM é o único codec que se mantém ativado."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipos de letra e ícones poderão ser visualizados incorretamente."> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index ceec3a8..2ec7378 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e s torbutton.slider_notification = Agora, o menu da cebola verde tem um cursor de segurança que o deixa ajustar o seu nível de segurança. Verifique-o! torbutton.slider_notification_button = Abra as definições de segurança -torbutton.maximize_warning = Ao maximizar o Navegador Tor pode permitir que os sítios da Web determinem o tamanho do seu monitor, o que poderá ser utilizado para o rastrear. Nós recomendamos que deixe as janelas do Navegador no seu tamanho original predefinido. +torbutton.maximize_warning = Ao maximizar o Navegador Tor pode permitir que os sites da Web determinem o tamanho do seu monitor, o que poderá ser utilizado para o rastrear. Nós recomendamos que deixe as janelas do Navegador no seu tamanho original predefinido. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este site (%S) tentou extrair informação HTML5, que pode ser usada para identificar claramente o seu computador.\n\nQuer que o navegador Tor permita que o site extraia a informação HTML5? diff --git a/src/chrome/locale/ru/brand.properties b/src/chrome/locale/ru/brand.properties index 93347e1..5f0d9a8 100644 --- a/src/chrome/locale/ru/brand.properties +++ b/src/chrome/locale/ru/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Проект Tor diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index d6406c9..6e261f3 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -25,14 +25,14 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Ytterligare information:"> <!ENTITY aboutTor.torInfo2.label "Land och IP-adress:"> <!ENTITY aboutTor.torInfo3.label "Exitnod:"> <!ENTITY aboutTor.torInfo4.label "Den här servern sparar inte någon information om besökare."> <!ENTITY aboutTor.whatnextQuestion.label "Och nu då?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att försäkra att din identitet förblir skyddad."> +<!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att säkerställa att din identitet förblir skyddad."> <!ENTITY aboutTor.whatnext.label "Tips på hur man förblir anonym »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Du kan hjälpa till!"> diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties index ae59c81..555e01e 100644 --- a/src/chrome/locale/sv/brand.properties +++ b/src/chrome/locale/sv/brand.properties @@ -2,9 +2,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser -vendorShortName=Tor Browser +vendorShortName=Tor-projektet homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion homePageImport=Importera din startsida från %S diff --git a/src/chrome/locale/tr/aboutDialog.dtd b/src/chrome/locale/tr/aboutDialog.dtd index 4958996..0e9100d 100644 --- a/src/chrome/locale/tr/aboutDialog.dtd +++ b/src/chrome/locale/tr/aboutDialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName;, ">  -<!ENTITY project.tpoLink "kar amacı gütmeyen, çevrim içi gizlilik ve özgürlüğünüzü koruyan"> +<!ENTITY project.tpoLink "kar amacı gütmeyen, çevrimiçi gizlilik ve özgürlüğünüzü koruyan"> <!ENTITY project.end "&vendorShortName; tarafından geliştirilmiştir."> -<!ENTITY help.start "Yardım ister misiniz?"> +<!ENTITY help.start "Yardım etmek ister misiniz? ">  -<!ENTITY help.donateLink "Bağış yapın"> -<!ENTITY help.or "ya da"> +<!ENTITY help.donateLink "Bağışta bulunun"> +<!ENTITY help.or " ya da ">  -<!ENTITY help.getInvolvedLink "çalışmalara katılın"> +<!ENTITY help.getInvolvedLink "çalışmalarımızda yer alın"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Sorularınız mı var?">  -<!ENTITY bottomLinks.grow "Tor Ağı'nın Büyümesine Katkıda Bulunun!"> +<!ENTITY bottomLinks.grow "Tor Ağının Büyümesine Yardımcı Olun!">  <!ENTITY bottomLinks.license "Lisans Bilgileri"> -<!ENTITY tor.TrademarkStatement "'Tor' ve 'Soğan Logosu' Tor Project Inc. tarafından tescil edilmiş markalardır."> +<!ENTITY tor.TrademarkStatement "'Tor' ve 'Onion Logo' Tor Project, Inc. tarafından tescillenmiş markalardır."> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 2b7f14a..f6de534 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -6,18 +6,18 @@ <!ENTITY aboutTor.title "Tor Hakkında"> -<!ENTITY aboutTor.outOfDateTorOn.label "BUNUNLA BİRLİKTE, bu tarayıcı güncel değil."> +<!ENTITY aboutTor.outOfDateTorOn.label "ANCAK, bu tarayıcı güncel değil."> <!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayıcı güncel değil."> <!ENTITY aboutTor.outOfDate2.label "Soğan simgesine tıklayın ve ardından Tor Browser Güncellemesini denetleyin."> <!ENTITY aboutTor.check.label "Tor Ağ Ayarlarını Sınayın"> <!ENTITY aboutTor.success.label "Tebrikler!"> -<!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için ayarlandı."> -<!ENTITY aboutTor.success3.label "Artık İnternet üzerinde anonim olarak işlem yapabilirsiniz."> -<!ENTITY aboutTor.failure.label "Bir Şeyler Ters Gitti!"> +<!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için yapılandırıldı."> +<!ENTITY aboutTor.success3.label "Artık Internet'te özgürce ve anonim olarak dolaşabilirsiniz."> +<!ENTITY aboutTor.failure.label "Birşeyler Ters Gitti!"> <!ENTITY aboutTor.failure2.label "Tor bu tarayıcıda çalışmıyor."> -<!ENTITY aboutTor.failure3prefix.label "Yardım almak için şu adresi kullanarak %S ile görüşün"> +<!ENTITY aboutTor.failure3prefix.label "Yardım için lütfen iletişime geçin "> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> diff --git a/src/chrome/locale/tr/brand.dtd b/src/chrome/locale/tr/brand.dtd index 6d9d1ed..6b8bf0c 100644 --- a/src/chrome/locale/tr/brand.dtd +++ b/src/chrome/locale/tr/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Projesi"> -<!ENTITY trademarkInfo.part1 "Firefox ve Firefox logoları Mozilla Vakfı tarafından tescil edilmiş ticari markalardır."> +<!ENTITY trademarkInfo.part1 "Firefox ve Firefox logoları Mozilla Vakfı'nın ticari markalarıdır.">  <!ENTITY plugins.installed.find "Kurulmuş sistem uygulama eklerini yüklemek için tıklayın"> diff --git a/src/chrome/locale/tr/brand.properties b/src/chrome/locale/tr/brand.properties index 9635260..2c16808 100644 --- a/src/chrome/locale/tr/brand.properties +++ b/src/chrome/locale/tr/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Projesi diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 00e9a7a..6039178 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu Ayarları"> <!ENTITY torbutton.prefs.recommended_settings "Firefox sürümüm için önerilen vekil sunucu ayarlarını kullan"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy Kullan"> -<!ENTITY torbutton.prefs.use_polipo "Polipo Kullan"> +<!ENTITY torbutton.prefs.use_polipo "Polipo kullan"> <!ENTITY torbutton.prefs.custom_settings "Özel vekil sunucu ayarları kullanılsın"> <!ENTITY torbutton.prefs.proxy.host.http "HTTP Vekil Sunucusu:"> <!ENTITY torbutton.prefs.proxy.host.https "SSL Vekil Sunucusu:"> diff --git a/src/chrome/locale/vi/aboutDialog.dtd b/src/chrome/locale/vi/aboutDialog.dtd index 844f4e0..d6693ed 100644 --- a/src/chrome/locale/vi/aboutDialog.dtd +++ b/src/chrome/locale/vi/aboutDialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; được phát triển bởi">  <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 6f2f46b..2321976 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -44,6 +44,6 @@ <!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> +<!ENTITY aboutTor.footer.label "Dự án Tor là một US 501(c)(3) không lợi nhuận chuyên dùng cho nghiên cứu, phát triển và giao dục về vô danh và riêng tư trực tuyến"> <!ENTITY aboutTor.learnMore.label "Tìm hiểu thêm về Tor Project"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/vi/brand.dtd b/src/chrome/locale/vi/brand.dtd index 94522e3..6664eca 100644 --- a/src/chrome/locale/vi/brand.dtd +++ b/src/chrome/locale/vi/brand.dtd @@ -2,9 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor Browser"> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> +<!ENTITY brandShorterName "Trình duyệt Tor"> +<!ENTITY brandShortName "Trình duyệt Tor"> +<!ENTITY brandFullName "Trình duyệt Tor"> <!ENTITY vendorShortName "Dự án Tor"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/vi/brand.properties b/src/chrome/locale/vi/brand.properties index 51608eb..87d9b23 100644 --- a/src/chrome/locale/vi/brand.properties +++ b/src/chrome/locale/vi/brand.properties @@ -2,8 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Tor Browser -brandFullName=Tor Browser +brandShorterName=Tor Browser +brandShortName=Trình duyệt Tor +brandFullName=Trình duyệt Tor vendorShortName=Dự án Tor homePageSingleStartMain=Firefox Start, a fast home page with built-in search diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index cd3d3ce..b310687 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -24,19 +24,19 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton hiện đang được hiệu hóa. Nếu bạn muốn thay đổi thiết lập proxy không thuộc chương trình Tor, vui lòng tắt Torbutton và quay trở lại đây. Nếu bạn muốn thay đổi thiết lập từ Tor, vui lòng dùng cửa sổ tùy chỉnh Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Giám định Mới"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit "Vòng Tor mới cho trang này"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "Bật/tắt trạng thái của Tor"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "Cài đặt Riêng tư và Bảo mật..."> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Thông tin về Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "Cài đặt Mạng Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> +<!ENTITY torbutton.context_menu.downloadUpdate "Kiểm tra việc cập nhật trình duyệt Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Bảo vệ Cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Sao chép địa chỉ URL của Tor"> <!ENTITY torbutton.context_menu.copyTor.key "p"> @@ -46,7 +46,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Nhấp để nhận diện Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Cài đặt Riêng tư và Bảo mật"> <!ENTITY torbutton.prefs.block_thread "Chặn việc đọc lịch sử h.đ trong quá trình dùng Tor (cấp thiết)"> <!ENTITY torbutton.prefs.block_thwrite "Chặn việc ghi lịch sử h.đ trong quá trình dùng Tor (khuyến cáo)"> <!ENTITY torbutton.prefs.block_nthread "Chặn việc đọc lịch sử trong quá trình không dùng Tor (tùy chọn)"> @@ -146,21 +146,21 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> -<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> +<!ENTITY torbutton.prefs.priv_caption "Cài đặt Riêng tư"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_caption "Mức độ Bảo mật"> +<!ENTITY torbutton.prefs.sec_low "Thấp (mặc định)"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Điều này cung cấp trải nghiệm tiện lợi nhất"> +<!ENTITY torbutton.prefs.sec_low_desc "Ở mức này, tất cả tính năng của trình duyệt đều được kích hoạt."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Cơ chế kết xuất font SVG OpenType bị vô hiệu."> +<!ENTITY torbutton.prefs.sec_med_low "Trung bình-Thấp"> +<!ENTITY torbutton.prefs.sec_gen_desc "Ở mức bảo mật này, những thay đổi sau sẽ được áp dụng (rê chuột vào để xem chi tiết):"> +<!ENTITY torbutton.prefs.sec_html5_desc "Video và âm thanh HTML5 có thể nhấp để phát qua NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Trên một số trang, có thể bạn cần phải dùng nút thanh công cụ NoScript để kích hoạt những đối tượng đa phương tiện này."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Một số tối ưu hoá JavaScript bị vô hiệu."> <!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."> diff --git a/src/chrome/locale/zh-CN/brand.properties b/src/chrome/locale/zh-CN/brand.properties index 5f9a8c7..4804bae 100644 --- a/src/chrome/locale/zh-CN/brand.properties +++ b/src/chrome/locale/zh-CN/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/install.rdf b/src/install.rdf index 160baa4..db9af4b 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.3.3</em:version> + <em:version>1.9.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

[tor-browser-bundle/master] Update keys for mikeperry.
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit b85282d99813e05a2a1a2883c12301aeaff85044 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 17 16:12:08 2015 -0700 Update keys for mikeperry. --- gitian/gpg/mikeperry.gpg | Bin 15716 -> 21696 bytes gitian/gpg/torbrowser.gpg | Bin 18844 -> 18952 bytes gitian/gpg/torbutton.gpg | Bin 49582 -> 55562 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/mikeperry.gpg b/gitian/gpg/mikeperry.gpg index 7f14ee3..8615796 100644 Binary files a/gitian/gpg/mikeperry.gpg and b/gitian/gpg/mikeperry.gpg differ diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index dc44e33..d1033d4 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index b60a95e..e4a03dd 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser/tor-browser-38.3.0esr-5.0-2] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit c15e86cd0f082d63d37fddff1efc35a428cb8eca Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Sep 9 06:06:43 2015 -0700 fixup! Bug #13670.1: Isolate favicon requests by first party --- browser/base/content/tabbrowser.xml | 3 ++- dom/base/ThirdPartyUtil.cpp | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 49d4207..6033b71 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -5042,7 +5042,7 @@ class="tab-throbber" role="presentation" layer="true" /> - <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed,firstparty" + <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed" anonid="tab-icon-image" class="tab-icon-image" validate="never" @@ -5292,6 +5292,7 @@ aMenuitem.setAttribute("busy", aTab.getAttribute("busy")); aMenuitem.removeAttribute("image"); } else { + aMenuitem.setAttribute("firstparty", aTab.getAttribute("firstparty")); aMenuitem.setAttribute("image", aTab.getAttribute("image")); aMenuitem.removeAttribute("busy"); } diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index 5cffc71..618d55b 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -594,16 +594,22 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // to a particular web site should be assigned that site's first party. if (aNode && aNode->IsElement() && aNode->OwnerDoc() && nsContentUtils::IsChromeDoc(aNode->OwnerDoc())) { - nsString firstparty; - aNode->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); - if (!firstparty.IsEmpty()) { - nsCOMPtr<nsIURI> tempURI; - rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); - if (rv != NS_OK) { - return rv; - } else { - NS_ADDREF(*aOutput = tempURI); - return NS_OK; + nsTArray<nsINode*> nodeAncestors; + nsContentUtils::GetAncestors(aNode, nodeAncestors); + for (nsINode* nodeAncestor : nodeAncestors) { + if (nodeAncestor->IsElement()) { + nsString firstparty; + nodeAncestor->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); + if (!firstparty.IsEmpty()) { + nsCOMPtr<nsIURI> tempURI; + rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); + if (rv != NS_OK) { + return rv; + } else { + NS_ADDREF(*aOutput = tempURI); + return NS_OK; + } + } } } }

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit 0a287d3bcce4d9e75d1f77af355c19b9292a23c0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Sep 9 06:06:43 2015 -0700 fixup! Bug #13670.1: Isolate favicon requests by first party --- browser/base/content/tabbrowser.xml | 3 ++- dom/base/ThirdPartyUtil.cpp | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 49d4207..6033b71 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -5042,7 +5042,7 @@ class="tab-throbber" role="presentation" layer="true" /> - <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed,firstparty" + <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed" anonid="tab-icon-image" class="tab-icon-image" validate="never" @@ -5292,6 +5292,7 @@ aMenuitem.setAttribute("busy", aTab.getAttribute("busy")); aMenuitem.removeAttribute("image"); } else { + aMenuitem.setAttribute("firstparty", aTab.getAttribute("firstparty")); aMenuitem.setAttribute("image", aTab.getAttribute("image")); aMenuitem.removeAttribute("busy"); } diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index 5cffc71..618d55b 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -594,16 +594,22 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // to a particular web site should be assigned that site's first party. if (aNode && aNode->IsElement() && aNode->OwnerDoc() && nsContentUtils::IsChromeDoc(aNode->OwnerDoc())) { - nsString firstparty; - aNode->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); - if (!firstparty.IsEmpty()) { - nsCOMPtr<nsIURI> tempURI; - rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); - if (rv != NS_OK) { - return rv; - } else { - NS_ADDREF(*aOutput = tempURI); - return NS_OK; + nsTArray<nsINode*> nodeAncestors; + nsContentUtils::GetAncestors(aNode, nodeAncestors); + for (nsINode* nodeAncestor : nodeAncestors) { + if (nodeAncestor->IsElement()) { + nsString firstparty; + nodeAncestor->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); + if (!firstparty.IsEmpty()) { + nsCOMPtr<nsIURI> tempURI; + rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); + if (rv != NS_OK) { + return rv; + } else { + NS_ADDREF(*aOutput = tempURI); + return NS_OK; + } + } } } }

1 0

[tor-browser-bundle/master] Importing stable changelog
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit f35e7155b0837a3a300df9414d5112860188c105 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 08:26:41 2015 +0000 Importing stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 083c339..9f78ac4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 5.5a2 -- August 26 2015 +Tor Browser 5.5a2 -- August 28 2015 * All Platforms: * Update Firefox to 38.2.1esr * Update NoScript to 2.6.9.36 @@ -6,6 +6,13 @@ Tor Browser 5.5a2 -- August 26 2015 * Linux * Bug 16860: Avoid duplicate desktop icons on Gnome and Unity +Tor Browser 5.0.2 -- August 27 2015 + * All Platforms + * Update Firefox to 38.2.1esr + * Update NoScript to 2.6.9.36 + * Linux + * Bug 16860: Avoid duplicate icons on Unity and Gnome + Tor Browser 5.0.1 -- August 18 2015 * All Platforms * Bug 16771: Fix crash on some websites due to blob URIs

1 0