- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 28022: Use `/usr/bin/env bash` for bash invocation
by boklm＠torproject.org 16 Oct '18

16 Oct '18

commit c65b5af3d9c565d4e274fbd8606f0404623a19e1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 15 17:24:53 2018 +0000 Bug 28022: Use `/usr/bin/env bash` for bash invocation We use `/usr/bin/env` for invocation in other scripts already. Let's use it in `execdesktop` as well. --- projects/tor-browser/RelativeLink/execdesktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/execdesktop b/projects/tor-browser/RelativeLink/execdesktop index 27328b2..fa6dc0a 100755 --- a/projects/tor-browser/RelativeLink/execdesktop +++ b/projects/tor-browser/RelativeLink/execdesktop @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash TBB_START_PROG="$(grep '^X-TorBrowser-ExecShell' $1 | tail -1 | sed 's/^X-TorBrowser-ExecShell=//' | sed 's/%.//')"

1 0

[tor-browser-build/master] Bug 6111: Update URL for tor-browser-bundle-testsuite.git
by boklm＠torproject.org 15 Oct '18

15 Oct '18

commit ef8b470dc1a1361438f190844f42e18c7bc36375 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 15 16:37:16 2018 +0200 Bug 6111: Update URL for tor-browser-bundle-testsuite.git --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index d84a161..af7e03d 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -4,7 +4,7 @@ nightly_build_cron_hour: 2 nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" -testsuite_git_url: https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +testsuite_git_url: https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true

1 0

[tor-browser-build/master] Bug 28002: fix the precomplete file in the en-US installer
by gk＠torproject.org 12 Oct '18

12 Oct '18

commit 3fad7f22441cd2e106a2d5bd8ba7e4623fac409a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 11 12:30:18 2018 +0200 Bug 28002: fix the precomplete file in the en-US installer The Windows installer for the en-US bundle was created from the $TB_STAGE_DIR instead of the $PKG_DIR where the precomplete file has been regenerated. --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 85d7eaa..9e8cddb 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -294,8 +294,8 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] - find "${TB_STAGE_DIR}" -exec [% c("var/touch") %] {} \; - pushd "${TB_STAGE_DIR}" + find "$PKG_DIR" -exec [% c("var/touch") %] {} \; + pushd "$PKG_DIR" makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe

1 0

[tor-browser-build/master] Bug 27320: Add certutil and signmar to Windows mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit 6ed7eacc5b6b75fe888c67a7810c6bddad815f09 Author: JeremyRand <biolizard89(a)gmail.com> Date: Wed Oct 10 20:15:05 2018 +0000 Bug 27320: Add certutil and signmar to Windows mar-tools These binaries were already being built but were being discarded. Since reproducible builds of these tools for Windows are likely to be useful to some people (even though they're not required for Tor Browser to operate), it seems like they're worth distributing. They're placed in the mar-tools zip because that's where they were already being placed for Linux. --- projects/firefox/build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 489d087..da7640a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -201,6 +201,15 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done [% END %] +[% IF c("var/windows") %] + cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/ + NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssdbm3.dll softokn3.dll" + for LIB in $NSS_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done + cp -a $rootdir/msvcr100.dll $MARTOOLS/ +[% END %] cd $distdir

1 0

[tor-browser-build/master] Bug 27320: Add modutil, pk12util, and shlibsign to mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit 9a0a161ab2732102d89d2397a032abc6ea86131a Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Sep 8 13:32:15 2018 +0000 Bug 27320: Add modutil, pk12util, and shlibsign to mar-tools These binaries were already being built but were being discarded. Since reproducible builds of these tools are likely to be useful to some people (even though they're not required for Tor Browser to operate), it seems like they're worth distributing. They're placed in the mar-tools zip because that's where certutil was already being placed. --- projects/firefox/build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index c9330fa..c73590d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -195,6 +195,9 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util $MARTOOLS/ + cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign $MARTOOLS/ NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do @@ -204,6 +207,9 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/osx") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util $MARTOOLS/ + cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign $MARTOOLS/ NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -212,6 +218,9 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/windows") %] cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign.exe $MARTOOLS/ NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll nssdbm3.dll softokn3.dll" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/

1 0

[tor-browser-build/master] Bug 27320: Add nssckbi library to mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit bec987dfaae5e683a15e09a1e722b0de15161c52 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Sep 8 13:24:59 2018 +0000 Bug 27320: Add nssckbi library to mar-tools This library is needed for a subset of certutil's functionality (specifically, the ability for certutil to change the trust settings of built-in certificates). --- projects/firefox/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1b5a942..c9330fa 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -195,7 +195,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -204,7 +204,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/osx") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssdbm3.dylib libsoftokn3.dylib" + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done @@ -212,7 +212,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/windows") %] cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/ - NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssdbm3.dll softokn3.dll" + NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll nssdbm3.dll softokn3.dll" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done

1 0

[tor-browser-build/master] Bug 27320: Add certutil and signmar to macOS mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit b40b18fc4b0e87b8536be04383258b2cd4e4c69b Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Sep 8 12:25:01 2018 +0000 Bug 27320: Add certutil and signmar to macOS mar-tools These binaries were already being built but were being discarded. Since reproducible builds of these tools for macOS are likely to be useful to some people (even though they're not required for Tor Browser to operate), it seems like they're worth distributing. They're placed in the mar-tools zip because that's where they were already being placed for Linux. --- projects/firefox/build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index da7640a..1b5a942 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -201,6 +201,14 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done [% END %] +[% IF c("var/osx") %] + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssdbm3.dylib libsoftokn3.dylib" + for LIB in $NSS_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done +[% END %] [% IF c("var/windows") %] cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/

1 0

[tor-launcher/master] Bug 27994: Use the new Tor Browser logo
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit 87d1731c48b9f3f10825390999b14a8199976bd0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Oct 10 16:49:42 2018 -0400 Bug 27994: Use the new Tor Browser logo --- src/chrome/skin/network-settings.css | 1 - src/chrome/skin/tbb-logo.svg | 192 ++++++++++------------------------- 2 files changed, 56 insertions(+), 137 deletions(-) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index c6a9f0b..40ca0f0 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -89,7 +89,6 @@ button.firstAnswer { .tbb-logo { list-style-image: url("chrome://torlauncher/skin/tbb-logo.svg"); - width: 40em; height: 60px; } diff --git a/src/chrome/skin/tbb-logo.svg b/src/chrome/skin/tbb-logo.svg index 8be32c2..240425a 100644 --- a/src/chrome/skin/tbb-logo.svg +++ b/src/chrome/skin/tbb-logo.svg @@ -1,137 +1,57 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" - viewBox="0 0 328.6 66.3" enable-background="new 0 0 328.6 66.3" xml:space="preserve"> -<g> - <g> - <g> - <path fill="#68B044" d="M138.8,28.3h11.9c7.6,0,13.3,2.3,13.3,9.2c0,3.5-2,7-6.4,8.1v0.2c5.4,0.9,8.4,3.8,8.4,8.8 - c0,7.5-6.1,10.9-14.3,10.9h-12.9V28.3z M150.1,43.7c5.2,0,7.4-2,7.4-5.5c0-3.4-2.4-4.8-7.2-4.8h-4.8v10.3H150.1z M151,60.4 - c5.5,0,8.5-2.1,8.5-6.3c0-3.9-3-5.7-8.5-5.7h-5.6v12H151z"/> - </g> - <g> - <path fill="#68B044" d="M170.7,37.6h5.4l0.5,5h0.2c2-3.6,5-5.6,7.9-5.6c1.4,0,2.3,0.2,3.2,0.6l-1.1,5.7c-1-0.3-1.7-0.5-2.9-0.5 - c-2.2,0-4.9,1.5-6.6,5.8v17.1h-6.6V37.6z"/> - </g> - <g> - <path fill="#68B044" d="M201.4,36.9c7,0,13.3,5.4,13.3,14.7c0,9.3-6.3,14.7-13.3,14.7c-7,0-13.3-5.4-13.3-14.7 - C188.1,42.2,194.5,36.9,201.4,36.9z M201.4,60.9c4.1,0,6.6-3.7,6.6-9.3c0-5.6-2.5-9.4-6.6-9.4s-6.6,3.7-6.6,9.4 - C194.9,57.2,197.3,60.9,201.4,60.9z"/> - </g> - <g> - <path fill="#68B044" d="M216.7,37.6h6.6l3.4,14.5c0.6,2.7,1,5.3,1.5,8h0.2c0.5-2.7,1.1-5.4,1.8-8l3.6-14.5h6l3.7,14.5 - c0.7,2.7,1.3,5.3,1.9,8h0.2c0.5-2.7,1-5.4,1.5-8l3.4-14.5h6.2l-7.1,28h-7.8l-3.3-13.1c-0.6-2.6-1.1-5.2-1.7-8.2h-0.2 - c-0.5,3-1,5.6-1.7,8.2l-3.2,13h-7.5L216.7,37.6z"/> - </g> - <g> - <path fill="#68B044" d="M261,58.2c2.5,1.9,4.9,3.1,7.8,3.1c3,0,4.4-1.4,4.4-3.4c0-2.3-3-3.4-6-4.5c-3.7-1.4-7.9-3.5-7.9-8.2 - c0-4.9,3.9-8.4,10.2-8.4c3.9,0,7,1.6,9.3,3.4l-3,4c-1.9-1.4-3.9-2.4-6.2-2.4c-2.8,0-4.1,1.3-4.1,3.1c0,2.2,2.8,3.1,5.8,4.2 - c3.8,1.4,8,3.3,8,8.5c0,4.8-3.8,8.7-10.9,8.7c-3.8,0-7.9-1.7-10.6-3.9L261,58.2z"/> - </g> - <g> - <path fill="#68B044" d="M294.9,36.9c7.6,0,11.6,5.5,11.6,13.3c0,1.3-0.1,2.4-0.3,3.1h-17.8c0.6,5.1,3.8,7.9,8.3,7.9 - c2.4,0,4.4-0.7,6.5-2.1l2.2,4.1c-2.7,1.8-6,3-9.6,3c-7.8,0-13.8-5.4-13.8-14.7C282,42.5,288.4,36.9,294.9,36.9z M300.8,49.1 - c0-4.4-1.9-7.1-5.7-7.1c-3.3,0-6.2,2.5-6.7,7.1H300.8z"/> - </g> - <g> - <path fill="#68B044" d="M311.4,37.6h5.4l0.5,5h0.2c2-3.6,5-5.6,7.9-5.6c1.4,0,2.3,0.2,3.2,0.6l-1.1,5.7c-1-0.3-1.7-0.5-2.9-0.5 - c-2.2,0-4.9,1.5-6.6,5.8v17.1h-6.6V37.6z"/> - </g> - </g> - <g> - <g> - <rect x="120.4" y="6.2" fill="#494949" width="3" height="58"/> - </g> - </g> - <g> - <g> - <g id="layer3_17_" transform="translate(-92,-63.999774)"> - <g id="layer5_17_"> - <g id="path2554_28_"> - <g> - <path fill="#68B044" d="M152.1,68.8l-1.7,6.8c2.4-4.8,6.3-8.4,10.7-11.6c-3.2,3.8-6.2,7.5-8,11.3c3.1-4.3,7.2-6.7,11.8-8.2 - c-6.2,5.5-11,11.4-14.8,17.3l-3-1.3C147.7,78.3,149.5,73.5,152.1,68.8L152.1,68.8z"/> - </g> - </g> - <g id="path2534_7_"> - <g> - <path fill="#F5F8DE" d="M144.2,81.8l5.6,2.3c0,1.4-0.1,5.8,0.8,7.1c9.4,12.1,7.8,36.2-1.9,36.8c-14.7,0-20.4-10-20.4-19.2 - c0-8.4,10.1-14,16.1-18.9C146,88.6,145.7,85.6,144.2,81.8L144.2,81.8z"/> - </g> - </g> - <g id="path2536_18_"> - <g> - <path fill="#7E4798" d="M149.9,84l2,1c-0.2,1.3,0.1,4.3,1.4,5.1c5.9,3.7,11.5,7.7,13.7,11.7c7.8,14.1-5.5,27.2-17,25.9 - c6.2-4.6,8.1-14.1,5.7-24.5c-1-4.1-2.4-7.7-5.1-11.9C149.6,89.4,150,86.9,149.9,84L149.9,84z"/> - </g> - </g> - </g> - <g id="layer4_17_"> - <g id="path2540_18_"> - <g> - <path fill="#010101" d="M147.6,90.8c-0.4,2.2-0.9,6.2-2.8,7.6c-0.8,0.6-1.6,1.1-2.5,1.7c-3.4,2.3-6.9,4.5-8.4,10.2 - c-0.3,1.2,0,2.5,0.2,3.7c0.9,3.4,3.3,7.2,5.2,9.3c0,0.1,0.4,0.3,0.4,0.4c1.6,1.9,2.1,2.4,8,3.7l-0.1,0.7 - c-3.6-1-6.5-1.8-8.4-4c0,0-0.3-0.4-0.3-0.4c-2-2.3-4.4-6.1-5.3-9.7c-0.3-1.4-0.6-2.5-0.2-4c1.6-5.8,5.2-8.1,8.7-10.5 - c0.8-0.5,1.8-1,2.5-1.6C146,96.8,146.8,93.5,147.6,90.8L147.6,90.8z"/> - </g> - </g> - <g id="path2542_18_"> - <g> - <path fill="#010101" d="M149.1,99.9c0,2.5-0.2,3.7,0.4,5.5c0.4,1,1.7,2.5,2.1,3.9c0.5,1.9,1.1,3.9,1,5.2c0,1.4-0.1,4.1-0.7,7 - c-0.5,2.4-1.6,4.4-3.4,5.5c-1.9-0.4-4.1-1-5.4-2.2c-2.5-2.2-4.8-5.9-5.1-9.1c-0.2-2.6,2.2-6.5,5.6-8.4 - c2.9-1.7,3.5-3.6,4.1-6.6c-0.9,2.7-1.7,4.9-4.4,6.3c-4,2.1-6.1,5.6-5.9,9c0.3,4.3,2,7.2,5.4,9.5c1.4,1,4.1,2.1,5.8,2.3v-0.2 - c1.3-0.2,2.9-2.3,3.7-5.1c0.7-2.5,1-5.8,0.9-7.8c0-1.2-0.6-3.8-1.5-6.1c-0.5-1.3-1.3-2.6-1.9-3.5 - C149.4,104.2,149.4,102.2,149.1,99.9z"/> - </g> - </g> - <g id="path2544_18_"> - <g> - <path fill="#010101" d="M148.7,109.7c0,1.7,0.7,3.8,1,6c0.2,1.6,0.1,3.3,0.1,4.7c0,1.7-0.6,4.6-1.4,6.1 - c-0.7-0.3-1-0.7-1.5-1.3c-0.6-0.8-1-1.6-1.3-2.6c-0.3-0.7-0.6-1.5-0.8-2.5c-0.2-1.4-0.1-3.7,1.5-6c1.2-1.8,1.5-2,2-4 - c-0.6,1.9-1,2-2.3,3.6c-1.5,1.7-1.7,4.2-1.7,6.3c0,0.9,0.3,1.8,0.7,2.7c0.4,1,0.7,1.9,1.2,2.6c0.8,1.2,1.8,1.8,2.3,1.9 - c0,0,0,0,0,0c0,0,0,0,0,0v-0.1c0.9-1,1.5-2.1,1.7-3.1c0.2-1.2,0.3-2.5,0.4-4c0.1-1.2,0-2.9-0.3-4.6 - C149.8,113.4,149,111.2,148.7,109.7L148.7,109.7z"/> - </g> - </g> - <g id="path2550_18_"> - <g> - <path fill="#010101" d="M149,88.7c0,2.5,0.2,7.1,0.9,8.9c0.2,0.6,2,3.3,3.2,6.6c0.9,2.3,1,4.4,1.2,5 - c0.6,2.7-0.1,7.3-1.1,11.6c-0.5,2.3-2.1,5.2-4,6.4l-0.4,0.7c1,0,3.6-2.6,4.5-5.7c1.5-5.3,2.1-7.8,1.4-13.7 - c-0.1-0.6-0.3-2.5-1.2-4.6c-1.3-3.2-3.2-6.2-3.5-6.9C149.7,96,149.1,91.7,149,88.7L149,88.7z"/> - </g> - </g> - <g id="path2552_18_"> - <g> - <path fill="#010101" d="M149.9,84.3c-0.1,2.5-0.2,4.6,0.3,6.4c0.5,2.1,3.2,5,4.3,8.4c2.1,6.5,1.6,15,0,21.6 - c-0.6,2.3-3.3,5.7-6,6.8l2,0.5c1.1,0,3.9-2.7,5-5.7c1.8-4.7,2.1-10.3,1.4-16.3c0-0.6-1-5.7-1.9-7.8c-1.3-3.2-3.3-5.4-4.1-7.4 - c-0.6-1.5-0.8-5.4-0.4-6.3L149.9,84.3z"/> - </g> - </g> - </g> - </g> - <g id="path2528_14_"> - <g> - <path fill="#7E4798" d="M2.7,6.2H41c1.4,0,2.7,1.2,2.7,2.7v11.3c0,1.5-1.2,2.7-2.7,2.7h-7.9c-1.8,0-2.5,1-2.5,2.1v37 - c0,1.2-1,2.2-2.2,2.2h-13c-1.2,0-2.1-1-2.1-2.2V24.7c0-1.1-1-1.8-1.9-1.8H2.7c-1.5,0-2.7-1.2-2.7-2.7V8.9 - C0,7.4,1.2,6.2,2.7,6.2z"/> - </g> - </g> - <g id="path2532_14_"> - <g> - <path fill="#7E4798" d="M100.9,21.2h3.4c1.2,0,2.2,1,2.2,2.2v12.1c0,1.6,0.1,2.2-1.8,2.2c-3.8,0-5.5,2-5.5,4.2v20.5 - c0,1-0.9,1.8-2,1.8H85.1c-1.1,0-2-0.8-2-1.8V39.1c0-0.4,0-1,0-1.3c0.7-8.6,7.4-15.5,16-16.4C99.4,21.3,100.5,21.2,100.9,21.2 - L100.9,21.2z"/> - </g> - </g> - </g> - <g> - <g> - <path fill="#010101" d="M72,32.8c-2.1-1.9-4.6-3.4-7.3-4.9c-1.2-0.7-4.9-3.5-3.6-7.6l-9.3-3.8l-0.6,0.5c3.1,5.6,1.5,8.5,0,9.6 - c-3.1,2.1-7.6,4.8-9.9,7.2c-4.3,4.4-5.6,8.7-5.2,14.3c0.4,7.2,5.6,13.1,12.6,15.5c3.1,1,5.9,1.1,9,1.1c5.1,0,10.3-1.3,14-4.5 - c4-3.3,6.4-8.3,6.4-13.5C78.1,41.2,75.9,36.3,72,32.8z M70.6,58.9c-3.4,2.9-9.7,4.8-13,4.7c-3.7-0.2-7.3-0.8-10.4-2.3 - c-5.6-2.7-9.3-8.5-9.5-13.3c-0.5-9.7,4.1-12.5,8.4-16c2.4-2,5.8-3,7.7-6.5c0.4-0.8,0.6-2.5,0.1-4.2c-0.2-0.6-1.1-2.8-1.4-3.2 - l7,3.1c-0.9,3.2,1.8,6.5,3.9,7.7c2.1,1.2,5.5,3.4,7.5,5.3c3.6,3.2,5.5,7.7,5.5,12.5C76.3,51.2,74.3,55.8,70.6,58.9z"/> - </g> - </g> - </g> -</g> +<?xml version="1.0" encoding="UTF-8"?> +<svg width="210px" height="42px" viewBox="0 0 210 42" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.799999952"> + <g transform="translate(-154.000000, -173.000000)" fill="#010101" fill-rule="nonzero"> + <g transform="translate(154.000000, 173.000000)"> + <g transform="translate(88.085106, 17.181818)"> + <path d="M0.510638298,0.190909091 L8.10638298,0.190909091 C12.9574468,0.190909091 16.5957447,1.65454545 16.5957447,6.04545455 C16.5957447,8.27272727 15.3191489,10.5 12.5106383,11.2 L12.5106383,11.3272727 C15.9574468,11.9 17.8723404,13.7454545 17.8723404,16.9272727 C17.8723404,21.7 13.9787234,23.8636364 8.74468085,23.8636364 L0.510638298,23.8636364 L0.510638298,0.190909091 Z M7.72340426,9.99090909 C11.0425532,9.99090909 12.4468085,8.71818182 12.4468085,6.49090909 C12.4468085,4.32727273 10.9148936,3.43636364 7.85106383,3.43636364 L4.78723404,3.43636364 L4.78723404,9.99090909 L7.72340426,9.99090909 Z M8.29787234,20.6181818 C11.8085106,20.6181818 13.7234043,19.2818182 13.7234043,16.6090909 C13.7234043,14.1272727 11.8085106,12.9818182 8.29787234,12.9818182 L4.72340426,12.9818182 L4.72340426,20.6181818 L8.29787234,20.6181818 Z" id="Shape"></path> + <path d="M20.8723404,6.10909091 L24.3191489,6.10909091 L24.6382979,9.29090909 L24.7659574,9.29090909 C26.0425532,7 27.9574468,5.72727273 29.8085106,5.72727273 C30.7021277,5.72727273 31.2765957,5.85454545 31.8510638,6.10909091 L31.1489362,9.73636364 C30.5106383,9.54545455 30.0638298,9.41818182 29.2978723,9.41818182 C27.893617,9.41818182 26.1702128,10.3727273 25.0851064,13.1090909 L25.0851064,23.9909091 L20.8723404,23.9909091 L20.8723404,6.10909091 Z" id="Shape"></path> + <path d="M40.4680851,5.66363636 C44.9361702,5.66363636 48.9574468,9.1 48.9574468,15.0181818 C48.9574468,20.9363636 44.9361702,24.3727273 40.4680851,24.3727273 C36,24.3727273 31.9787234,20.9363636 31.9787234,15.0181818 C31.9787234,9.03636364 36.0638298,5.66363636 40.4680851,5.66363636 Z M40.4680851,20.9363636 C43.0851064,20.9363636 44.6808511,18.5818182 44.6808511,15.0181818 C44.6808511,11.4545455 43.0851064,9.03636364 40.4680851,9.03636364 C37.8510638,9.03636364 36.2553191,11.3909091 36.2553191,15.0181818 C36.3191489,18.5818182 37.8510638,20.9363636 40.4680851,20.9363636 Z" id="Shape"></path> + <path d="M50.2340426,6.10909091 L54.4468085,6.10909091 L56.6170213,15.3363636 C57,17.0545455 57.2553191,18.7090909 57.5744681,20.4272727 L57.7021277,20.4272727 C58.0212766,18.7090909 58.4042553,16.9909091 58.8510638,15.3363636 L61.1489362,6.10909091 L64.9787234,6.10909091 L67.3404255,15.3363636 C67.787234,17.0545455 68.1702128,18.7090909 68.5531915,20.4272727 L68.6808511,20.4272727 C69,18.7090909 69.3191489,16.9909091 69.6382979,15.3363636 L71.8085106,6.10909091 L75.7659574,6.10909091 L71.2340426,23.9272727 L66.2553191,23.9272727 L64.1489362,15.5909091 C63.7659574,13.9363636 63.4468085,12.2818182 63.0638298,10.3727273 L62.9361702,10.3727273 C62.6170213,12.2818182 62.2978723,13.9363636 61.8510638,15.5909091 L59.8085106,23.8636364 L55.0212766,23.8636364 L50.2340426,6.10909091 Z" id="Shape"></path> + <path d="M78.5106383,19.2181818 C80.106383,20.4272727 81.6382979,21.1909091 83.4893617,21.1909091 C85.4042553,21.1909091 86.2978723,20.3 86.2978723,19.0272727 C86.2978723,17.5636364 84.3829787,16.8636364 82.4680851,16.1636364 C80.106383,15.2727273 77.4255319,13.9363636 77.4255319,10.9454545 C77.4255319,7.82727273 79.9148936,5.6 83.9361702,5.6 C86.4255319,5.6 88.4042553,6.61818182 89.8723404,7.76363636 L87.9574468,10.3090909 C86.7446809,9.41818182 85.4680851,8.78181818 84,8.78181818 C82.212766,8.78181818 81.3829787,9.60909091 81.3829787,10.7545455 C81.3829787,12.1545455 83.1702128,12.7272727 85.0851064,13.4272727 C87.5106383,14.3181818 90.1914894,15.5272727 90.1914894,18.8363636 C90.1914894,21.8909091 87.7659574,24.3727273 83.2340426,24.3727273 C80.8085106,24.3727273 78.1914894,23.2909091 76.4680851,21.8909091 L78.5106383,19.2181818 Z" id="Shape"></path> + <path d="M100.148936,5.66363636 C105,5.66363636 107.553191,9.16363636 107.553191,14.1272727 C107.553191,14.9545455 107.489362,15.6545455 107.361702,16.1 L96,16.1 C96.3829787,19.3454545 98.4255319,21.1272727 101.297872,21.1272727 C102.829787,21.1272727 104.106383,20.6818182 105.446809,19.7909091 L106.851064,22.4 C105.12766,23.5454545 103.021277,24.3090909 100.723404,24.3090909 C95.7446809,24.3090909 91.9148936,20.8727273 91.9148936,14.9545455 C91.9148936,9.22727273 96,5.66363636 100.148936,5.66363636 Z M103.914894,13.4272727 C103.914894,10.6272727 102.702128,8.90909091 100.276596,8.90909091 C98.1702128,8.90909091 96.3191489,10.5 96,13.4272727 L103.914894,13.4272727 Z" id="Shape"></path> + <path d="M110.680851,6.10909091 L114.12766,6.10909091 L114.446809,9.29090909 L114.574468,9.29090909 C115.851064,7 117.765957,5.72727273 119.617021,5.72727273 C120.510638,5.72727273 121.085106,5.85454545 121.659574,6.10909091 L120.957447,9.73636364 C120.319149,9.54545455 119.87234,9.41818182 119.106383,9.41818182 C117.702128,9.41818182 115.978723,10.3727273 114.893617,13.1090909 L114.893617,23.9909091 L110.680851,23.9909091 L110.680851,6.10909091 Z" id="Shape"></path> + </g> + <rect id="Rectangle-path" x="76.5957447" y="5.09090909" width="1.91489362" height="36.9090909"></rect> + <g id="Black"> + <g id="Group"> + <g id="layer3_20_" transform="translate(26.263210, 0.000104)"> + <g id="layer5_20_" transform="translate(9.675919, 0.000000)"> + <g id="path2554_21_"> + <path d="M3.17923066,3.12366045 L2.0734113,7.53353402 C3.63998873,4.40987357 6.17415809,2.06712824 9.07693392,-7.10542736e-15 C6.95744681,2.4346177 5.02226293,4.8692354 3.87036776,7.34978928 C5.85162745,4.54768212 8.52402424,3.03178808 11.5189517,1.97525587 C7.51035649,5.51234196 4.33112583,9.37098134 1.93518388,13.1836845 L-2.84217094e-14,12.3568332 C0.322530647,9.27910897 1.47442581,6.15544852 3.17923066,3.12366045 Z" id="Shape"></path> + </g> + <g id="path2536_21_" transform="translate(1.382274, 12.862131)"> + <path d="M0.322530647,0.137808549 L1.65872904,0.826851294 C1.52050162,1.69963877 1.70480485,3.62895846 2.58024517,4.08832029 C6.45061294,6.47700181 10.0445259,9.04942806 11.4728759,11.6677905 C16.5412146,20.8090909 7.92503875,29.3072848 0.41468226,28.4804335 C4.46935325,25.4945816 5.66732422,19.3391331 4.1468226,12.5865141 C3.54783711,9.96815172 2.58024517,7.5794702 0.875440327,4.8692354 C0.13822742,3.62895846 0.41468226,1.97525587 0.322530647,0.137808549 Z" id="Shape"></path> + </g> + </g> + <g id="layer4_20_" transform="translate(0.000000, 12.862131)"> + <g id="path2540_21_" transform="translate(0.000000, 4.134256)"> + <path d="M9.90629844,0.367489464 C9.6298436,1.79151114 9.30731295,4.36393739 8.06326617,5.32859723 C7.5564323,5.69608669 7.00352262,6.06357616 6.45061294,6.43106562 C4.19289841,7.94695966 1.98125969,9.37098134 0.96759194,12.9999398 C0.737212907,13.7808549 0.921516134,14.6077062 1.10581936,15.3886213 C1.65872904,17.6394943 3.22530647,20.0281758 4.46935325,21.4521975 C4.46935325,21.4981337 4.69973228,21.6818784 4.69973228,21.7278146 C5.71340003,22.9221553 6.03593067,23.2896448 9.90629844,24.1624323 L9.81414682,24.5758579 C7.46428068,23.9786875 5.57517261,23.3815172 4.33112583,22.0034317 C4.33112583,21.9574955 4.10074679,21.7737508 4.10074679,21.7737508 C2.81062421,20.3037929 1.19797097,17.823239 0.645061294,15.4804937 C0.41468226,14.56177 0.230379033,13.8267911 0.506833873,12.8621312 C1.56657743,9.09536424 3.87036776,7.5794702 6.17415809,6.01763998 C6.68099197,5.69608669 7.32605326,5.37453341 7.83288714,4.96110777 C8.89263069,4.27206502 9.39946456,2 .11306442 9.90629844,0.367489464 Z" id="Shape"></path> + </g> + <g id="path2542_21_" transform="translate(3.225306, 10.105960)"> + <path d="M7.69465972,0.367489464 C7.74073552,1.97525587 7.5564323,2.80210716 7.97111456,3.95051174 C8.20149359,4.63955449 9.07693392,5.55827815 9.30731295,6.47700181 C9.6298436,7.67134256 9.99845005,9.00349187 9.99845005,9.83034317 C9.99845005,10.7490668 9.95237424,12.4946418 9.53769198,14.3320891 C9.21516134,15.8479831 8.52402424,17.1801325 7.32605326,17.9151114 C6.08200648,17.6854305 4.65365647,17.2260686 3.82429195,16.4910897 C2.16556291,15.067068 0.737212907,12.6783865 0.55290968,10.6112583 C0.41468226,8.91161951 1.98125969,6.38512944 4.19289841,5.1448525 C6.03593067,4.04238411 6.49668874,2.84804335 6.911371,0.826851294 C6.35846132,2.57242625 5.80555164,3.99644792 4.00859518,4.96110777 C1.3822742,6.33919326 0.0460758067,8.59006623 0.184303227,10.795003 C0.368606453,13.5971102 1.47442581,15.4804937 3.68606453,16.9963877 C4.60758067,17.6394943 6.35846132,18.328537 7.46428068,18.5122818 L7.46428068,18.3744732 C8.2936452,18.2366647 9.35338876,16.8 585792 9.90629844,15.067068 C10.3670565,13.4133654 10.5513597,11.3462372 10.5052839,10.0140879 C10.4592081,9.23317279 10.1366775,7.5794702 9.49161618,6.06357616 C9.16908553,5.23672486 8.61617585,4.40987357 8.2936452,3.81270319 C7.87896294,3.12366045 7.87896294,1.83744732 7.69465972,0.367489464 Z" id="Shape"></path> + </g> + <g id="path2544_21_" transform="translate(7.372129, 16.537026)"> + <path d="M3.27138227,0.229680915 C3.31745808,1.33214931 3.73214034,2.7102348 3.91644357,4.13425647 C4.05467099,5.19078868 4.00859518,6.24732089 3.96251937,7.16604455 C3.91644357,8.22257676 3.59391292,10.1518964 3.08707905,11.1165563 C2.62632098,10.8868754 2.44201775,10.6571945 2.11948711,10.289705 C1.75088065,9.78440698 1.47442581,9.23317279 1.24404678,8.63600241 C1.05974355,8.17664058 0.82936452,7.62540638 0.737212907,7.028236 C0.598985487,6.10951234 0.645061294,4.63955449 1.70480485,3.16959663 C2.53416937,1.97525587 2.71847259,1.8833835 2.99492743,0.551234196 C2.62632098,1.74557495 2.34986614,1.8833835 1.47442581,2.89397953 C0.506833873,3.99644792 0.368606453,5.65015051 0.368606453,6.98229982 C0.368606453,7.53353402 0.598985487,8.17664058 0.82936452,8.72787477 C1.05974355,9.32504515 1.29012259,9.96815172 1.61265323,10.4275135 C2.11948711,11.1624925 2.7645484,11.6218543 3.08707905,11.6677905 C3.08707905,11.6677905 3.08707905,11.6677905 3.08707905 ,11.6677905 C3.08707905,11.6677905 3.08707905,11.6677905 3.08707905,11.6677905 L3.08707905,11.6218543 C3.68606453,10.9328116 4.05467099,10.289705 4.19289841,9.60066225 C4.33112583,8.77381096 4.37720163,7.99289585 4.46935325,7.028236 C4.56150486,6.20138471 4.51542905,5.1448525 4.28505002,4.04238411 C4.00859518,2.66429862 3.50176131,1.24027694 3.27138227,0.229680915 Z" id="Shape"></path> + </g> + <g id="path2550_21_" transform="translate(10.597436, 3.215533)"> + <path d="M0.230379033,0 C0.27645484,1.60776641 0.368606453,4.5936183 0.82936452,5.78795906 C0.96759194,6.20138471 2.11948711,7.94695966 2.90277582,10.1059603 C3.4556855,11.5759181 3.59391292,12.9540036 3.68606453,13.3674293 C4.05467099,15.1130042 3.59391292,18.0988561 2.99492743,20.9009633 C2.67239679,22.4168573 1.61265323,24.3002408 0.41468226,25.0352197 L0.184303227,25.4486454 C0.875440327,25.4027092 2.53416937,23.7949428 3.13315485,21.7278146 C4.1468226,18.2826008 4.51542905,16.6748344 4.05467099,12.8161951 C4.00859518,12.4487056 3.82429195,11.1624925 3.22530647,9.83034317 C2.34986614,7.76321493 1.10581936,5.78795906 0.96759194,5.37453341 C0.645061294,4.73142685 0.27645484,1.8833835 0.230379033,0 Z" id="Shape"></path> + </g> + <g id="path2552_21_" transform="translate(10.136677, 0.000000)"> + <path d="M1.24404678,0.275617098 C1.15189517,1.92931969 1.15189517,3.21553281 1.42835001,4.45580975 C1.75088065,5.78795906 3.50176131,7.71727875 4.23897421,9.92221553 C5.62124841,14.1483444 5.25264196,19.6606863 4.28505002,23.9327514 C3.91644357,25.4486454 2.16556291,27.6535822 0.368606453,28.3426249 L1.65872904,28.6641782 C2.34986614,28.618242 4.19289841,26.9186033 4.93011131,24.9892836 C6.08200648,21.9115593 6.31238552,18.2826008 5.85162745,14.4239615 C5.80555164,14.056472 5.20656615,10.7490668 4.60758067,9.37098134 C3.77821615,7.3038531 2.44201775,5.83389524 1.98125969,4.54768212 C1.61265323,3.58302228 1.47442581,1.01059603 1.70480485,0.505298013 L1.24404678,0.275617098 Z" id="Shape"></path> + </g> + </g> + </g> + <g id="path2528_16_" transform="translate(0.000000, 3.674895)"> + <path d="M1.75088065,0.367489464 L26.6778921,0.367489464 C27.5994082,0.367489464 28.4287727,1.14840458 28.4287727,2.11306442 L28.4287727,9.4628537 C28.4287727,10.4275135 27.5994082,11.2084287 26.6778921,11.2084287 L21.5634775,11.2084287 C20.4115824,11.2084287 19.9047485,11.8515352 19.9047485,12.5865141 L19.9047485,36.6111379 C19.9047485,37.4379892 19.2596872,38.0351595 18.4763985,38.0351595 L9.99845005,38.0351595 C9.21516134,38.0351595 8.61617585,37.4379892 8.61617585,36.6111379 L8.61617585,12.3568332 C8.61617585,11.6218543 7.92503875,11.1624925 7.41820488,11.1624925 L1.75088065,11.1624925 C0.783288714,11.1624925 0,10.3815774 0,9.41691752 L0,2.06712824 C0,1.14840458 0.783288714,0.367489464 1.75088065,0.367489464 Z" id="Shape"></path> + </g> + <g id="path2532_17_" transform="translate(53.908694, 13.780855)"> + <path d="M11.7954065,0 L14.0070452,0 C14.8364098,0 15.481471,0.643106562 15.481471,1.42402167 L15.481471,9.27910897 C15.481471,10.289705 15.5275469,10.7031306 14.2835001,10.7031306 C11.8414823,10.7031306 10.735663,11.9893438 10.735663,13.4133654 L10.735663,26.6889223 C10.735663,27.2860927 10.1366775,27.8373269 9.44554037,27.8373269 L1.52050162,27.8373269 C0.82936452,27.8373269 0.230379033,27.3320289 0.230379033,26.6889223 L0.230379033,11.5759181 C0.230379033,11.300301 0.230379033,10.9328116 0.27645484,10.7031306 C0.6911371,5.09891632 5.11441454,0.643106562 10.6895871,0.045936183 C10.8278146,0.045936183 11.4728759,0 11.7954065,0 Z" id="Shape"></path> + </g> + </g> + <path d="M46.8590954,21.2684527 C45.522897,20.074112 43.864168,19.063516 42.1132873,18.0988561 C41.3299986,17.6854305 38.9340566,15.802047 39.7634212,13.1377483 L33.7274905,10.6571945 L33.3128082,10.9787477 C35.3401437,14.6077062 34.2804002,16.5370259 33.2667324,17.1801325 C31.2393969,18.5582179 28.2905453,20.3037929 26.8621953,21.8196869 C24.0515711,24.7136665 23.2222066,27.4698374 23.4986614,31.0528597 C23.7751162,35.6924142 27.1386501,39.5510536 31.700155,41.0669476 C33.6814147,41.7100542 35.5244469,41.8019266 37.5517824,41.8019266 C40.8231647,41.8019266 44.2327744,40.9291391 46.6747922,38.907947 C49.3011131,36.7489464 50.8216148,33.4874774 50.8216148,30.1341361 C50.8216148,26.7807947 49.3932648,23.5652619 46.8590954,21.2684527 Z M45.9836551,38.2189043 C43.7259405,40.0563516 39.6712696,41.3425647 37.5057066,41.2506924 C35.1097647,41.1128838 32.7598985,40.7453943 30.6864872,39.7347983 C27.0464985,37.9892234 24.6505566,34.1765202 24.4662533,31.0987959 C24.143722 7,24.8055388 27.1847259,23.0140277 29.9953501,20.7172185 C31.5619276,19.4310054 33.7735663,18.7878989 35.0176131,16.4910897 C35.2479921,15.9857917 35.3862195,14.8833233 35.1097647,13.7349187 C34.9715373,13.3214931 34.4186276,11.9434076 34.1882486,11.6218543 L38.7036776,13.5971102 C38.1507679,15.6642384 39.8555728,17.823239 41.237847,18.6041541 C42.6201212,19.3850692 44.7856841,20.8550271 46.1218825,22.0493679 C48.4717486,24.1164961 49.6697196,27.0564118 49.6697196,30.1341361 C49.6697196,33.2118603 48.379597,36.2436484 45.9836551,38.2189043 Z" id="Shape"></path> + </g> + </g> + </g> + </g> </svg>

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] squash! Bug 2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 10 Oct '18

10 Oct '18

commit 482dd99c9507ae456578ba1fedfb4cc714e87ecc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Sat Sep 29 21:18:21 2018 -0500 squash! Bug 2176: Rebrand Firefox to TorBrowser Also fix bug 27905. --- browser/branding/official/locales/en-US/tor-browser-brand.ftl | 5 +++++ browser/components/preferences/in-content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/branding/official/locales/en-US/tor-browser-brand.ftl b/browser/branding/official/locales/en-US/tor-browser-brand.ftl new file mode 100644 index 000000000000..817ce1b3f17c --- /dev/null +++ b/browser/branding/official/locales/en-US/tor-browser-brand.ftl @@ -0,0 +1,5 @@ +# For Tor Browser, we use a new file (different than the brand.ftl file +# that is used by Firefox) to avoid picking up the -brand-short-name values +# that Mozilla includes in the Firefox language packs. + +-brand-short-name = Tor Browser diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index f107ece67d04..91e1cf94ebb4 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -90,7 +90,7 @@ data-l10n-id="pref-page" data-l10n-attrs="title"> - <link rel="localization" href="branding/brand.ftl"/> + <link rel="localization" href="branding/tor-browser-brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/preferences/preferences.ftl"/> <script type="text/javascript" src="chrome://global/content/l10n.js"></script>

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 680300 - Part 3: Make the client.navigate() not to reference the baseURL if it navigates to a view-source URL r=asuth
by gk＠torproject.org 09 Oct '18

09 Oct '18

commit d098b183150a7feb83f159ad731fc42537252863 Author: Tim Huang <tihuang(a)mozilla.com> Date: Mon Sep 24 18:22:26 2018 +0000 Bug 680300 - Part 3: Make the client.navigate() not to reference the baseURL if it navigates to a view-source URL r=asuth The suppressing of the error NS_ERROR_UNKNOWN_PROTOCOL will break the web-platform-test 'windowclient-navigate.https.html' since navigating to an invalid view-source url through the client API won't receive any error due to the suppressing. So the test will time-out since it waits for an error. While navigating to an invalid view-source url with its inner url as relative, this will pass the validity check we have right now and do the navigation because of it takes account the baseURL while doing the check. The invalid view-source url will be resolved into a valid view-source url in the case. Fortunately, we won't encounter any issue in the test in the past since the docShell will block this loading because it's loading a view-source url inside an iframe and reports a NS_ERROR_UNKNOWN_PROTOCOL error. But, we should faild with a NS_ERROR_MALFORMED_URI error when doing the URL validity check. For addressing this, this patch makes the client.navigate to not take the baseURL into account if it is a view-source URL. Differential Revision: https://phabricator.services.mozilla.com/D6587 --HG-- extra : moz-landing-system : lando --- dom/clients/manager/ClientNavigateOpChild.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dom/clients/manager/ClientNavigateOpChild.cpp b/dom/clients/manager/ClientNavigateOpChild.cpp index b6a8e70b7356..1e6cc50da41d 100644 --- a/dom/clients/manager/ClientNavigateOpChild.cpp +++ b/dom/clients/manager/ClientNavigateOpChild.cpp @@ -15,6 +15,7 @@ #include "nsIWebProgressListener.h" #include "nsNetUtil.h" #include "nsPIDOMWindow.h" +#include "nsURLHelper.h" namespace mozilla { namespace dom { @@ -185,8 +186,24 @@ ClientNavigateOpChild::DoNavigate(const ClientNavigateOpConstructorArgs& aArgs) return ref.forget(); } + // There is an edge case for view-source url here. According to the wpt test + // windowclient-navigate.https.html, a view-source URL with a relative inner + // URL should be treated as an invalid URL. However, we will still resolve it + // into a valid view-source URL since the baseURL is involved while creating + // the URI. So, an invalid view-source URL will be treated as a valid URL + // in this case. To address this, we should not take the baseURL into account + // for the view-source URL. + bool shouldUseBaseURL = true; + nsAutoCString scheme; + if (NS_SUCCEEDED(net_ExtractURLScheme(aArgs.url(), scheme)) && + scheme.LowerCaseEqualsLiteral("view-source")) { + shouldUseBaseURL = false; + } + nsCOMPtr<nsIURI> url; - rv = NS_NewURI(getter_AddRefs(url), aArgs.url(), nullptr, baseURL); + rv = NS_NewURI(getter_AddRefs(url), aArgs.url(), + nullptr, shouldUseBaseURL ? baseURL.get() + : nullptr); if (NS_FAILED(rv)) { ref = ClientOpPromise::CreateAndReject(rv, __func__); return ref.forget();

1 0