- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1578075 - Increase stack size of paint thread/workers on OSX Catalina or higher to workaround crash from recursion in CoreText. r=jrmuizel, a=RyanVM
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit 632458daf11b954319219ea62e259f50b4fd9ed3 Author: Ryan Hunt <rhunt(a)eqrion.net> Date: Tue Sep 10 15:20:34 2019 +0000 Bug 1578075 - Increase stack size of paint thread/workers on OSX Catalina or higher to workaround crash from recursion in CoreText. r=jrmuizel, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D45370 --HG-- extra : source : cd0ea6dafa051426035949cfbbfdeb04c1c05661 extra : intermediate-source : ffefc518e569164c2c2e62258504bdc69d111bb3 --- gfx/layers/PaintThread.cpp | 24 +++++++++++++++++++++++- widget/cocoa/nsCocoaFeatures.h | 1 + widget/cocoa/nsCocoaFeatures.mm | 5 +++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp index 3ee7c86760ea..c35bf472d682 100644 --- a/gfx/layers/PaintThread.cpp +++ b/gfx/layers/PaintThread.cpp @@ -19,7 +19,11 @@ #include "mozilla/Preferences.h" #include "mozilla/SharedThreadPool.h" #include "mozilla/SyncRunnable.h" +#ifdef XP_MACOSX +#include "nsCocoaFeatures.h" +#endif #include "nsIPropertyBag2.h" +#include "nsIThreadManager.h" #include "nsServiceManagerUtils.h" #include "prsystem.h" @@ -69,11 +73,28 @@ void PaintThread::Start() { } } +static uint32_t GetPaintThreadStackSize() { +#ifndef XP_MACOSX + return nsIThreadManager::DEFAULT_STACK_SIZE; +#else + // Workaround bug 1578075 by increasing the stack size of paint threads + if (nsCocoaFeatures::OnCatalinaOrLater()) { + static const uint32_t kCatalinaPaintThreadStackSize = 512 * 1024; + static_assert(kCatalinaPaintThreadStackSize >= nsIThreadManager::DEFAULT_STACK_SIZE, + "update default stack size of paint " + "workers"); + return kCatalinaPaintThreadStackSize; + } + return nsIThreadManager::DEFAULT_STACK_SIZE; +#endif +} + bool PaintThread::Init() { MOZ_ASSERT(NS_IsMainThread()); RefPtr<nsIThread> thread; - nsresult rv = NS_NewNamedThread("PaintThread", getter_AddRefs(thread)); + nsresult rv = NS_NewNamedThread("PaintThread", getter_AddRefs(thread), + nullptr, GetPaintThreadStackSize()); if (NS_FAILED(rv)) { return false; } @@ -102,6 +123,7 @@ void PaintThread::InitPaintWorkers() { if (count != 1) { mPaintWorkers = SharedThreadPool::Get(NS_LITERAL_CSTRING("PaintWorker"), count); + mPaintWorkers->SetThreadStackSize(GetPaintThreadStackSize()); } } diff --git a/widget/cocoa/nsCocoaFeatures.h b/widget/cocoa/nsCocoaFeatures.h index a4581c4d3195..0cc5a2d5c165 100644 --- a/widget/cocoa/nsCocoaFeatures.h +++ b/widget/cocoa/nsCocoaFeatures.h @@ -24,6 +24,7 @@ class nsCocoaFeatures { static bool OnSierraOrLater(); static bool OnHighSierraOrLater(); static bool OnMojaveOrLater(); + static bool OnCatalinaOrLater(); static bool IsAtLeastVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix = 0); diff --git a/widget/cocoa/nsCocoaFeatures.mm b/widget/cocoa/nsCocoaFeatures.mm index 77bd3507e35f..41ca60e3b721 100644 --- a/widget/cocoa/nsCocoaFeatures.mm +++ b/widget/cocoa/nsCocoaFeatures.mm @@ -21,6 +21,7 @@ #define MAC_OS_X_VERSION_10_12_HEX 0x000010C0 #define MAC_OS_X_VERSION_10_13_HEX 0x000010D0 #define MAC_OS_X_VERSION_10_14_HEX 0x000010E0 +#define MAC_OS_X_VERSION_10_15_HEX 0x000010F0 #include "nsCocoaFeatures.h" #include "nsCocoaUtils.h" @@ -165,6 +166,10 @@ bool Gecko_OnHighSierraOrLater() { return nsCocoaFeatures::OnHighSierraOrLater() return (OSXVersion() >= MAC_OS_X_VERSION_10_14_HEX); } +/* static */ bool nsCocoaFeatures::OnCatalinaOrLater() { + return (OSXVersion() >= MAC_OS_X_VERSION_10_15_HEX); +} + /* static */ bool nsCocoaFeatures::IsAtLeastVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix) { return OSXVersion() >= GetVersion(aMajor, aMinor, aBugFix);

1 0

[tor-browser-build/master] Merge branch 'bug_27493'
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit ec79824470dcd6815ffd903c8c9974808859f9e5 Merge: 74f1468 e361790 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 26 19:38:08 2019 +0000 Merge branch 'bug_27493' projects/firefox/mozconfig-android-aarch64 | 1 + projects/firefox/mozconfig-android-armv7 | 1 + projects/firefox/mozconfig-android-x86 | 1 + projects/firefox/mozconfig-linux-i686 | 4 ---- projects/firefox/mozconfig-linux-x86_64 | 4 ---- projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/firefox/mozconfig-windows-i686 | 2 -- projects/firefox/mozconfig-windows-x86_64 | 2 -- 8 files changed, 3 insertions(+), 15 deletions(-) diff --cc projects/firefox/mozconfig-linux-i686 index 0a05864,da6cddf..95d14c1 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@@ -18,8 -16,10 +16,7 @@@ export BINDGEN_CFLAGS='--gcc-toolchain= ac_add_options --target=i686-linux-gnu -# XXX: gold and lld break when linking libxul, resort to bfd -ac_add_options --enable-linker=bfd - ac_add_options --enable-optimize - #ac_add_options --disable-optimize ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 @@@ -36,7 -38,3 +33,6 @@@ ac_add_options --disable-webrt # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection - #ac_add_options --disable-ctypes + +# Bug 31448: ld.gold fails if we don't disable debug-symbols +ac_add_options --disable-debug-symbols diff --cc projects/firefox/mozconfig-windows-i686 index eaa704f,86e86e7..60cf1c1 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@@ -19,11 -19,12 +19,9 @@@ ac_add_options --with-toolchain-prefix= ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" - mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug -# Until we build on a 64bit host we need to hack around linker errors due to -# memory constraints -ac_add_options --disable-debug-symbols ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --enable-official-branding

1 0

[tor-browser-build/master] Bug 27493: Clean up mozconfig options
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit e361790e2540af786386b6a13ac9477d82267db7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 3 11:38:14 2019 +0000 Bug 27493: Clean up mozconfig options --- projects/firefox/mozconfig-android-aarch64 | 1 + projects/firefox/mozconfig-android-armv7 | 1 + projects/firefox/mozconfig-android-x86 | 1 + projects/firefox/mozconfig-linux-i686 | 4 ---- projects/firefox/mozconfig-linux-x86_64 | 4 ---- projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/firefox/mozconfig-windows-i686 | 2 -- projects/firefox/mozconfig-windows-x86_64 | 2 -- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 index f5c1474..368ba6f 100644 --- a/projects/firefox/mozconfig-android-aarch64 +++ b/projects/firefox/mozconfig-android-aarch64 @@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --without-google-play-services +ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index 75e1d78..35eac27 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --without-google-play-services +ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index be1efd6..8447347 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --without-google-play-services +ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index c8f19a4..da6cddf 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -2,9 +2,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 # We want to build with clang now and point to the GCC toolchain until #29041 is # fixed. We explicitly need to define the host compiler as well as for some @@ -22,7 +20,6 @@ ac_add_options --target=i686-linux-gnu ac_add_options --enable-linker=bfd ac_add_options --enable-optimize -#ac_add_options --disable-optimize ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 @@ -41,4 +38,3 @@ ac_add_options --disable-webrtc # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection -#ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 12f1b28..e0a764f 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -2,9 +2,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 # We want to build with clang now and point to the GCC toolchain until #29041 is # fixed. We explicitly need to define the host compiler as well as for some @@ -17,7 +15,6 @@ HOST_CXX=$CXX export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --enable-optimize -#ac_add_options --disable-optimize ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 @@ -36,4 +33,3 @@ ac_add_options --disable-webrtc # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection -#ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 07dd023..29e6617 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -27,9 +27,7 @@ ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-application=browser ac_add_options --enable-strip @@ -48,4 +46,3 @@ ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection -# ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 5538bc1..86e86e7 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -19,9 +19,7 @@ ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug # Until we build on a 64bit host we need to hack around linker errors due to diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index c95525b..2a128ae 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -19,9 +19,7 @@ ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize

1 0

[tor-browser-build/master] Bug 31844: Use DESTDIR instead of --prefix when building OpenSSL
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit abdfbfdb3f4122300c3f3f5e745af1c74a559102 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 25 12:54:00 2019 +0200 Bug 31844: Use DESTDIR instead of --prefix when building OpenSSL This is fixing CVE-2019-1552: http://cve.circl.lu/cve/CVE-2019-1552 In oder to avoid changing the OPENSSLDIR to a directory that might be writable on the user system, we don't set the --prefix/--openssldir option anymore and use DESTDIR to select the packaging installation directory. --- projects/openssl/build | 5 +++-- projects/openssl/config | 2 ++ projects/tor/build | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 40dc526..d53185e 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -14,10 +14,11 @@ export CC='gcc -m32' export CC="cc [% c("var/FLAGS") %]" [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' -./Configure --prefix=$distdir [% c('var/configure_opts') %] +./Configure [% c('var/configure_opts') %] make -make install +make DESTDIR="$distdir" install cd /var/tmp/dist +ln -s '[% c("var/openssldir") %]' openssl/openssl [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/openssl/config b/projects/openssl/config index 27b9526..f648598 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -3,6 +3,7 @@ version: 1.1.1d filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: + openssldir: 'usr/local' container: use_container: 1 @@ -17,6 +18,7 @@ targets: var: flag_mwindows: '' configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"' + openssldir: 'Program Files[% IF c("var/windows-i686") %] (x86)[% END %]/OpenSSL' osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 diff --git a/projects/tor/build b/projects/tor/build index 0705626..2d10fb3 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -30,7 +30,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz libeventdir=/var/tmp/dist/libevent -openssldir=/var/tmp/dist/openssl +openssldir=/var/tmp/dist/openssl/openssl [% IF c("var/windows") %] [% IF c("var/nightly") %]

1 0

[tor-browser-build/master] Bug 31844: Update openssl linux Configure targets
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 74f146865135f2a655c936164ffa2f5c25a4d05e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 26 20:35:07 2019 +0200 Bug 31844: Update openssl linux Configure targets With the linux-generic64 target the build is broken if we don't add the no-asm option: https://github.com/openssl/openssl/issues/9839 We fix that by switching to the linux-x86_64 target. At the same time we also switch the linux-generic32 target to linux-x86. --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 2fc46ea..0a60c24 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -10,10 +10,10 @@ var: targets: linux-x86_64: var: - configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-generic64 + configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-x86_64 linux-i686: var: - configure_opts: -shared linux-generic32 + configure_opts: -shared linux-x86 windows: var: flag_mwindows: ''

1 0

[tor-browser-build/master] Bug 31844: Fix unquoted paths in OpenSSL Windows build
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 7bab743e199ea3d3ba8ca3f5ba5289609035f37c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 25 14:10:12 2019 +0200 Bug 31844: Fix unquoted paths in OpenSSL Windows build The default OPENSSLDIR on Windows builds contain spaces and parenthesis, which break the build as the unquoted path is used in several places. We fix this by escaping the spaces and parenthesis. This is fixing part of the issues mentioned in: https://github.com/openssl/openssl/issues/9520 --- projects/openssl/build | 3 +++ projects/openssl/config | 2 ++ projects/openssl/escape-openssldir.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/projects/openssl/build b/projects/openssl/build index d53185e..3ee3571 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -13,6 +13,9 @@ export CC='gcc -m32' ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] +[% IF c("var/windows") -%] + patch -p1 < $rootdir/escape-openssldir.patch +[% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] make diff --git a/projects/openssl/config b/projects/openssl/config index f648598..2fc46ea 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -29,3 +29,5 @@ input_files: project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' sha256sum: 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 + - filename: escape-openssldir.patch + enable: '[% c("var/windows") %]' diff --git a/projects/openssl/escape-openssldir.patch b/projects/openssl/escape-openssldir.patch new file mode 100644 index 0000000..684a179 --- /dev/null +++ b/projects/openssl/escape-openssldir.patch @@ -0,0 +1,28 @@ +diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl +index 7db7578a4b..e5ba20b589 100644 +--- a/Configurations/unix-Makefile.tmpl ++++ b/Configurations/unix-Makefile.tmpl +@@ -215,6 +215,7 @@ INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet + $prefix_dev -} + INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir); + $x =~ s|\\|/|g; ++ $x =~ s/([ ])/\\$1/g; + $x -} + OPENSSLDIR_dev={- # + # The logic here is that if no --openssldir was given, +@@ -239,6 +240,7 @@ OPENSSLDIR_dev={- # + $openssldir_dev -} + OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir); + $x =~ s|\\|/|g; ++ $x =~ s/([ ])/\\$1/g; + $x -} + LIBDIR={- our $libdir = $config{libdir} || "lib"; + File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -} +@@ -253,6 +255,7 @@ ENGINESDIR_dev={- use File::Spec::Win32; + $enginesdir_dev -} + ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir); + $x =~ s|\\|/|g; ++ $x =~ s/([ ])/\\$1/g; + $x -} + # In a Windows environment, $(DESTDIR) is harder to contatenate with other + # directory variables, because both may contain devices. What we do here is

1 0

[tor-browser-build/master] Bug 31192 - Follow Mozilla for Android SDK config
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit cb97c6e9fd52e4a3871c8a1c2f77a00911f7d0ac Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 26 17:07:06 2019 +0000 Bug 31192 - Follow Mozilla for Android SDK config --- projects/firefox/mozconfig-android-aarch64 | 3 ++- projects/firefox/mozconfig-android-armv7 | 3 ++- projects/firefox/mozconfig-android-x86 | 3 ++- projects/firefox/mozconfig-android-x86_64 | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 index f5c1474..3d997bc 100644 --- a/projects/firefox/mozconfig-android-aarch64 +++ b/projects/firefox/mozconfig-android-aarch64 @@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1 CC="clang" CXX="clang++" +ac_add_options --with-android-min-sdk=21 + ac_add_options --enable-optimize ac_add_options --enable-official-branding @@ -12,7 +14,6 @@ ac_add_options --target=aarch64-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle -ac_add_options --with-android-version=21 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser ac_add_options --with-l10n-base=/var/tmp/dist/locales diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index 75e1d78..2ef6138 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1 CC="clang" CXX="clang++" +ac_add_options --with-android-min-sdk=16 + ac_add_options --enable-optimize ac_add_options --enable-official-branding @@ -12,7 +14,6 @@ ac_add_options --target=arm-linux-androideabi ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle -ac_add_options --with-android-version=16 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser ac_add_options --with-l10n-base=/var/tmp/dist/locales diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index be1efd6..966ef3f 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1 CC="clang" CXX="clang++" +ac_add_options --with-android-min-sdk=16 + ac_add_options --enable-optimize ac_add_options --enable-official-branding @@ -12,7 +14,6 @@ ac_add_options --target=i686-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle -ac_add_options --with-android-version=16 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser ac_add_options --with-l10n-base=/var/tmp/dist/locales diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64 index 55bc883..17c3906 100644 --- a/projects/firefox/mozconfig-android-x86_64 +++ b/projects/firefox/mozconfig-android-x86_64 @@ -14,7 +14,6 @@ ac_add_options --target=x86_64-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle -ac_add_options --with-android-version=21 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser ac_add_options --with-l10n-base=/var/tmp/dist/locales

1 0

[tor-browser-build/master] Bug 31192 - Add Android x86_64 build support
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit f89da2a9b03b70e1ec2e99248b86a96f989d3bed Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 18 20:19:32 2019 +0000 Bug 31192 - Add Android x86_64 build support --- Makefile | 15 ++++++++++ README | 2 ++ README.HACKING | 18 ++++++++---- README.MAKEFILE | 8 +++--- projects/android-toolchain/build | 3 +- projects/firefox/mozconfig-android-x86_64 | 48 +++++++++++++++++++++++++++++++ projects/release/build | 3 ++ projects/release/config | 12 ++++++++ projects/rust/config | 4 +++ projects/tor-browser/build.android | 5 ++++ rbm.conf | 9 ++++++ 11 files changed, 116 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 94a26f6..9f61bfb 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ release-android-armv7: submodule-update release-android-x86: submodule-update $(rbm) build release --target release --target torbrowser-android-x86 +release-android-x86_64: submodule-update + $(rbm) build release --target release --target torbrowser-android-x86_64 + release-android-aarch64: submodule-update $(rbm) build release --target release --target torbrowser-android-aarch64 @@ -44,6 +47,9 @@ alpha-android-armv7: submodule-update alpha-android-x86: submodule-update $(rbm) build release --target alpha --target torbrowser-android-x86 +alpha-android-x86_64: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-x86_64 + alpha-android-aarch64: submodule-update $(rbm) build release --target alpha --target torbrowser-android-aarch64 @@ -77,6 +83,9 @@ nightly-android-armv7: submodule-update nightly-android-x86: submodule-update $(rbm) build release --target nightly --target torbrowser-android-x86 +nightly-android-x86_64: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-x86_64 + nightly-android-aarch64: submodule-update $(rbm) build release --target nightly --target torbrowser-android-aarch64 @@ -110,6 +119,9 @@ alpha_nightly-android-armv7: submodule-update alpha_nightly-android-x86: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 +alpha_nightly-android-x86_64: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-x86_64 + alpha_nightly-android-aarch64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-aarch64 @@ -140,6 +152,9 @@ testbuild-android-armv7: submodule-update testbuild-android-x86: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-x86 +testbuild-android-x86_64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-x86_64 + testbuild-android-aarch64: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-aarch64 diff --git a/README b/README index 2ea5630..481db2e 100644 --- a/README +++ b/README @@ -79,7 +79,9 @@ name to the makefile target: $ make nightly-windows-i686 $ make nightly-osx-x86_64 $ make nightly-android-armv7 + $ make nightly-android-aarch64 $ make nightly-android-x86 + $ make nightly-android-x86_64 When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. diff --git a/README.HACKING b/README.HACKING index 081a3d5..0d3eeb8 100644 --- a/README.HACKING +++ b/README.HACKING @@ -45,16 +45,18 @@ The targets are usually used to select: - the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, - torbrowser-android-armv7, torbrowser-android-x86 + torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86, + torbrowser-android-x86_64 - the channel: release, nightly, alpha The targets torbrowser-linux-x86_64, torbrowser-linux-i686, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, -torbrowser-android-armv7, and torbrowser-android-x86 are special cases. They do -not contain options directly, instead they contain a list of other targets. For -instance, the torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and -linux targets. You should define an option under the linux target if it applies -to Linux on both architectures, or under the linux-x86_64 if it only applies to +torbrowser-android-armv7, torbrowser-android-x86, torbrowser-android-aarch64, +torbrowser-android-x86_64 are special cases. They do not contain options +directly, instead they contain a list of other targets. For instance, the +torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux +targets. You should define an option under the linux target if it applies to +Linux on both architectures, or under the linux-x86_64 if it only applies to the x86_64 architecture. An option that is defined at the root of rbm.conf can be overridden by @@ -156,8 +158,12 @@ $platform should be one of the following: - torbrowser-android-armv7 + - torbrowser-android-aarch64 + - torbrowser-android-x86 + - torbrowser-android-x86_64 + For example, to see tor's build script for linux x86_64 on the alpha channel, you can use: diff --git a/README.MAKEFILE b/README.MAKEFILE index addff64..e106ca4 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -8,7 +8,7 @@ Build Tor Browser for the release channel, for all supported platforms. The resulting build can be found in directory release/$version. release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86} + android-x86,android-x86_64,android-aarch64} ----------------------------------------------------------------------- Same as release, for the selected platform only. @@ -18,7 +18,7 @@ Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory alpha/$version. alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86} + android-x86,android-x86_64,android-aarch64} --------------------------------------------------------------------- Same as alpha, for the selected platform only. @@ -32,7 +32,7 @@ components. The resulting build can be found in directory nightly/$date nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86} + android-x86,android-x86_64,android-aarch64} ----------------------------------------------------------------------- Same as nightly, for the selected platform only. @@ -43,7 +43,7 @@ This is the same as 'make alpha', but the output directory is different. The resulting build can be found in directory alpha_nightly/$date alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86} + android-x86,android-x86_64,android-aarch64} ----------------------------------------------------------------------------- The same as alpha_nightly, for the selected platform only. diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 42e961c..f4defc5 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -20,8 +20,9 @@ rm -fR android-ndk-r17b # The architectures we support ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm -./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86 ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64 +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86 +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86_64") %] --arch x86_64 --install-dir=./x86_64 # Tool Archives cd $SDK_HOME diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64 new file mode 100644 index 0000000..55bc883 --- /dev/null +++ b/projects/firefox/mozconfig-android-x86_64 @@ -0,0 +1,48 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 +CC="clang" +CXX="clang++" + +ac_add_options --with-android-min-sdk=21 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-application=mobile/android +ac_add_options --target=x86_64-linux-android +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk +ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle +ac_add_options --with-android-version=21 + +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales + +# We do not use Tor Launcher on Android: +ac_add_options --disable-tor-launcher + +if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then +# Because Google Play will likely be the primary distribution medium, +# we disable updating and rely on Google Play by default. The +# Developer Policy explicitly prohibits in-app updating: +# An app distributed via Google Play may not modify, replace, or +# update itself using any method other than Google Plays update +# mechanism. +# https://play.google.com/about/privacy-security-deception/malicious-behavior/ + + ac_add_options --disable-tor-browser-update + ac_add_options --disable-signmar + ac_add_options --disable-verify-mar +fi + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +ac_add_options --enable-proxy-bypass-protection diff --git a/projects/release/build b/projects/release/build index 347d9a8..c1badd6 100644 --- a/projects/release/build +++ b/projects/release/build @@ -10,6 +10,9 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-android-x86") -%] mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-android-x86_64") -%] + mv [% c('input_files_by_name/android-x86_64') %]/* "$destdir"/ +[% END -%] [% IF c("var/torbrowser-android-aarch64") -%] mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/ [% END -%] diff --git a/projects/release/config b/projects/release/config index 524eadf..d1aee8c 100644 --- a/projects/release/config +++ b/projects/release/config @@ -17,6 +17,7 @@ targets: - torbrowser-osx-x86_64 - torbrowser-android-armv7 - torbrowser-android-x86 + - torbrowser-android-x86_64 - torbrowser-android-aarch64 - torbrowser-src torbrowser-android-armv7: @@ -25,6 +26,9 @@ targets: torbrowser-android-x86: var: torbrowser-android-x86: 1 + torbrowser-android-x86_64: + var: + torbrowser-android-x86_64: 1 torbrowser-android-aarch64: var: torbrowser-android-aarch64: 1 @@ -121,6 +125,14 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-android-x86 + - name: android-x86_64 + project: tor-browser + enable: '[% c("var/torbrowser-android-x86_64") %]' + target: + - '[% c("var/containers_target") %]' + - '[% c("var/build_target") %]' + - torbrowser-android-x86_64 + - name: android-aarch64 project: tor-browser enable: '[% c("var/torbrowser-android-aarch64") %]' diff --git a/projects/rust/config b/projects/rust/config index dbde815..03d7be0 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -22,6 +22,10 @@ targets: var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=i686-linux-android --set=target.i686-linux-android.cc=$ANDROID_NDK_HOME/x86/bin/i686-linux-android-gcc + android-x86_64: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-linux-android --set=target.x86_64-linux-android.cc=$ANDROID_NDK_HOME/x86_64/bin/x86_64-linux-android-gcc + android-aarch64: var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=aarch64-linux-android --set=target.aarch64-linux-android.cc=$ANDROID_NDK_HOME/arm64/bin/aarch64-linux-android-gcc diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index b90c8b9..9f255da 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -24,6 +24,11 @@ zip -d $apk lib/\* zip_src => [ 'lib/x86/*' ], zip_args => '$apk', }) %] +[% ELSIF c("var/android-x86_64") %] + [% c('zip', { + zip_src => [ 'lib/x86_64/*' ], + zip_args => '$apk', + }) %] [% ELSIF c("var/android-armv7") %] [% c('zip', { zip_src => [ 'lib/armeabi-v7a/*' ], diff --git a/rbm.conf b/rbm.conf index e6379f8..008fab7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -191,6 +191,14 @@ targets: var: android-x86: 1 osname: android-x86 + torbrowser-android-x86_64: + - android-x86_64 + - android + android-x86_64: + arch: x86_64 + var: + android-x86_64: 1 + osname: android-x86_64 torbrowser-android-aarch64: - android-aarch64 - android @@ -209,6 +217,7 @@ targets: android_min_api_aarch64: 21 android_min_api_armv7: 16 android_min_api_x86: 16 + android_min_api_x86_64: 21 snowflake: 0 container: suite: stretch

1 0

[tor-browser-build/master] Bug 31192 - Pick up new tor-android-service commit
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 2d3807e3a2b072f7d3d9bb24419e0b0e6688b26a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 24 16:58:59 2019 +0000 Bug 31192 - Pick up new tor-android-service commit --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 762a813..db8f5ac 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 8d307a63a95a31d3578715ca407066062f9d7f5e +git_hash: 50d01b1fbc6e776d0b39f42f644137dd25a92c7a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 30380 - Add patch for canceling Dormant by startup
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit e30f06ac6c40a32354fe01a2613fb3c2a63e630c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 26 00:52:18 2019 +0000 Bug 30380 - Add patch for canceling Dormant by startup --- projects/tor-onion-proxy-library/build | 1 + .../tor-onion-proxy-library/canceldormant.patch | 46 ++++++++++++++++++++++ projects/tor-onion-proxy-library/config | 1 + 3 files changed, 48 insertions(+) diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 605f017..41cc815 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -18,6 +18,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Patch projects cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch +patch -p1 < $rootdir/canceldormant.patch # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/canceldormant.patch b/projects/tor-onion-proxy-library/canceldormant.patch new file mode 100644 index 0000000..8d48af1 --- /dev/null +++ b/projects/tor-onion-proxy-library/canceldormant.patch @@ -0,0 +1,46 @@ +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java +index 5f5adac..da6747f 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java +@@ -187,4 +187,9 @@ public class DefaultSettings implements TorSettings { + public boolean useSocks5() { + return false; + } ++ ++ @Override ++ public boolean hasDormantCanceledByStartup() { ++ return false; ++ } + } +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index e324d9f..99e5693 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -503,6 +503,16 @@ public final class TorConfigBuilder { + return virtualAddressNetwork(settings.getVirtualAddressNetwork()); + } + ++ public TorConfigBuilder dormantCanceledByStartup() { ++ buffer.append("DormantCanceledByStartup 1").append('\n'); ++ return this; ++ } ++ ++ @SettingsConfig ++ public TorConfigBuilder domantCanceledByStartupFromSettings() { ++ return settings.hasDormantCanceledByStartup() ? dormantCanceledByStartup() : this; ++ } ++ + /** + * Adds bridges from a resource stream. This relies on the TorInstaller to know how to obtain this stream. + * These entries may be type-specified like: +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java +index 2d515d1..43f01ef 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java +@@ -77,4 +77,6 @@ public interface TorSettings { + String transPort(); + + boolean useSocks5(); ++ ++ boolean hasDormantCanceledByStartup(); + } diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 02b69ac..c2bd1a4 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -29,3 +29,4 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch + - filename: canceldormant.patch

1 0

[tor-android-service/master] Update tor libraries to 0.4.1.5 (from tor-android: commit-95432556b84df208fd36175fda0c495ffc421ecf)
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit dc4ae061fab5d0f35e93b296a3f618baf6af8f36 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Sep 22 12:12:12 2019 -0700 Update tor libraries to 0.4.1.5 (from tor-android: commit-95432556b84df208fd36175fda0c495ffc421ecf) --- service/src/main/jniLibs/arm64-v8a/libTor.so | Bin 7774616 -> 8610184 bytes service/src/main/jniLibs/armeabi-v7a/libTor.so | Bin 7774616 -> 8129728 bytes service/src/main/jniLibs/armeabi/libTor.so | Bin 7774616 -> 0 bytes service/src/main/jniLibs/x86/libTor.so | Bin 7791604 -> 9020648 bytes service/src/main/jniLibs/x86_64/libTor.so | Bin 7791604 -> 8254824 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/service/src/main/jniLibs/arm64-v8a/libTor.so b/service/src/main/jniLibs/arm64-v8a/libTor.so index 9ff0e9d..5fc7361 100755 Binary files a/service/src/main/jniLibs/arm64-v8a/libTor.so and b/service/src/main/jniLibs/arm64-v8a/libTor.so differ diff --git a/service/src/main/jniLibs/armeabi-v7a/libTor.so b/service/src/main/jniLibs/armeabi-v7a/libTor.so index 9ff0e9d..b001906 100755 Binary files a/service/src/main/jniLibs/armeabi-v7a/libTor.so and b/service/src/main/jniLibs/armeabi-v7a/libTor.so differ diff --git a/service/src/main/jniLibs/armeabi/libTor.so b/service/src/main/jniLibs/armeabi/libTor.so deleted file mode 100755 index 9ff0e9d..0000000 Binary files a/service/src/main/jniLibs/armeabi/libTor.so and /dev/null differ diff --git a/service/src/main/jniLibs/x86/libTor.so b/service/src/main/jniLibs/x86/libTor.so index 6f93a98..dabda5c 100755 Binary files a/service/src/main/jniLibs/x86/libTor.so and b/service/src/main/jniLibs/x86/libTor.so differ diff --git a/service/src/main/jniLibs/x86_64/libTor.so b/service/src/main/jniLibs/x86_64/libTor.so index 6f93a98..55be241 100755 Binary files a/service/src/main/jniLibs/x86_64/libTor.so and b/service/src/main/jniLibs/x86_64/libTor.so differ

1 0

[tor-android-service/master] Merge remote-tracking branch 'sysrqb/bug31192_00'
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 50d01b1fbc6e776d0b39f42f644137dd25a92c7a Merge: 8d307a6 ccaf68c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 26 14:58:05 2019 +0000 Merge remote-tracking branch 'sysrqb/bug31192_00' .../android/service/AndroidTorSettings.java | 5 +++++ .../org/torproject/android/service/TorService.java | 4 ++-- service/src/main/jniLibs/arm64-v8a/libTor.so | Bin 7774616 -> 8610184 bytes service/src/main/jniLibs/armeabi-v7a/libTor.so | Bin 7774616 -> 8129728 bytes service/src/main/jniLibs/armeabi/libTor.so | Bin 7774616 -> 0 bytes service/src/main/jniLibs/x86/libTor.so | Bin 7791604 -> 9020648 bytes service/src/main/jniLibs/x86_64/libTor.so | Bin 7791604 -> 8254824 bytes 7 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor-android-service/master] Bug 31192 - Bump Tor version number string
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit ccaf68ccb3ae3de23990f65d0504a2e19bf01897 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 26 14:41:35 2019 +0000 Bug 31192 - Bump Tor version number string --- service/src/main/java/org/torproject/android/service/TorService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index dea4bd2..16d2537 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -31,7 +31,7 @@ import java.util.concurrent.Executors; public final class TorService extends Service implements TorServiceConstants, OrbotConstants { - public final static String TOR_VERSION = "0.3.5.8-rc-openssl1.0.2p"; + public final static String TOR_VERSION = "0.4.1.5-rc-openssl1.0.2p"; private static final int NOTIFY_ID = 1; private static final int ERROR_NOTIFY_ID = 3; private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1"; @@ -454,4 +454,4 @@ public final class TorService extends Service implements TorServiceConstants, Or builder.torExecutable(exe); return builder.build(); } -} \ No newline at end of file +}

1 0

[tor-android-service/master] Bug 30380 - Support DormantCanceledByStartup
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 5bc203890cd66a10110f94b3dcd921fc5a6c90b9 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 26 00:54:12 2019 +0000 Bug 30380 - Support DormantCanceledByStartup --- .../main/java/org/torproject/android/service/AndroidTorSettings.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java b/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java index a875857..4759376 100644 --- a/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java +++ b/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java @@ -218,4 +218,9 @@ public class AndroidTorSettings implements TorSettings { public boolean useSocks5() { return Prefs.useVpn() && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP; } + + @Override + public boolean hasDormantCanceledByStartup() { + return true; + } }

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1573276 - Always allow localization in error pages r=johannh, peterv
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 9c1877056070c4de048b18e201fcb3dfcb1e1a02 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 25 10:39:45 2019 +0000 Bug 1573276 - Always allow localization in error pages r=johannh,peterv Differential Revision: https://phabricator.services.mozilla.com/D43216 --HG-- extra : moz-landing-system : lando --- .../content/test/about/browser_aboutCertError.js | 23 ++++++++++++++++++++ browser/base/content/test/about/head.js | 13 ++++++----- dom/base/Document.cpp | 8 ++++--- dom/base/nsContentUtils.cpp | 25 +++++++++++++++++++++- dom/base/nsContentUtils.h | 9 ++++---- dom/security/nsContentSecurityManager.cpp | 6 +++++- parser/htmlparser/nsExpatDriver.cpp | 22 +++++++++++-------- 7 files changed, 83 insertions(+), 23 deletions(-) diff --git a/browser/base/content/test/about/browser_aboutCertError.js b/browser/base/content/test/about/browser_aboutCertError.js index 1544bab15f99..3e9a13dd99f3 100644 --- a/browser/base/content/test/about/browser_aboutCertError.js +++ b/browser/base/content/test/about/browser_aboutCertError.js @@ -459,3 +459,26 @@ add_task(async function checkBadStsCertHeadline() { BrowserTestUtils.removeTab(gBrowser.selectedTab); } }); + +add_task(async function checkSandboxedIframe() { + info( + "Loading a bad sts cert error in a sandboxed iframe and check that the correct headline is shown" + ); + let useFrame = true; + let sandboxed = true; + let tab = await openErrorPage(BAD_CERT, useFrame, sandboxed); + let browser = tab.linkedBrowser; + + let titleContent = await ContentTask.spawn(browser, {}, async function() { + // Cannot test for error in the Advanced section since it's currently not present + // in a sandboxed iframe. + let doc = content.document.querySelector("iframe").contentDocument; + let titleText = doc.querySelector(".title-text"); + return titleText.textContent; + }); + ok( + titleContent.endsWith("Security Issue"), + "Did Not Connect: Potential Security Issue" + ); + BrowserTestUtils.removeTab(gBrowser.selectedTab); +}); diff --git a/browser/base/content/test/about/head.js b/browser/base/content/test/about/head.js index 82fa5dcd540d..74f961dcefae 100644 --- a/browser/base/content/test/about/head.js +++ b/browser/base/content/test/about/head.js @@ -44,17 +44,20 @@ function getPEMString(cert) { ); } -function injectErrorPageFrame(tab, src) { +function injectErrorPageFrame(tab, src, sandboxed) { return ContentTask.spawn( tab.linkedBrowser, - { frameSrc: src }, - async function({ frameSrc }) { + { frameSrc: src, frameSandboxed: sandboxed }, + async function({ frameSrc, frameSandboxed }) { let loaded = ContentTaskUtils.waitForEvent( content.wrappedJSObject, "DOMFrameContentLoaded" ); let iframe = content.document.createElement("iframe"); iframe.src = frameSrc; + if (frameSandboxed) { + iframe.setAttribute("sandbox", "allow-scripts"); + } content.document.body.appendChild(iframe); await loaded; // We will have race conditions when accessing the frame content after setting a src, @@ -67,7 +70,7 @@ function injectErrorPageFrame(tab, src) { ); } -async function openErrorPage(src, useFrame) { +async function openErrorPage(src, useFrame, sandboxed) { let dummyPage = getRootDirectory(gTestPath).replace( "chrome://mochitests/content", @@ -78,7 +81,7 @@ async function openErrorPage(src, useFrame) { if (useFrame) { info("Loading cert error page in an iframe"); tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, dummyPage); - await injectErrorPageFrame(tab, src); + await injectErrorPageFrame(tab, src, sandboxed); } else { let certErrorLoaded; tab = await BrowserTestUtils.openNewForegroundTab( diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index eebeada1c63c..cdeabc4dc7b9 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -3225,11 +3225,13 @@ DocumentL10n* Document::GetL10n() { return mDocumentL10n; } bool Document::DocumentSupportsL10n(JSContext* aCx, JSObject* aObject) { nsCOMPtr<nsIPrincipal> callerPrincipal = nsContentUtils::SubjectPrincipal(aCx); - return nsContentUtils::PrincipalAllowsL10n(callerPrincipal); + nsGlobalWindowInner* win = xpc::WindowOrNull(aObject); + return nsContentUtils::PrincipalAllowsL10n( + callerPrincipal, win ? win->GetDocumentURI() : nullptr); } void Document::LocalizationLinkAdded(Element* aLinkElement) { - if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal(), GetDocumentURI())) { return; } @@ -3260,7 +3262,7 @@ void Document::LocalizationLinkAdded(Element* aLinkElement) { } void Document::LocalizationLinkRemoved(Element* aLinkElement) { - if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal(), GetDocumentURI())) { return; } diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 66134cdb691f..cfae3ef224b3 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -250,6 +250,7 @@ #include "nsThreadManager.h" #include "nsIBidiKeyboard.h" #include "ReferrerInfo.h" +#include "nsAboutProtocolUtils.h" #if defined(XP_WIN) // Undefine LoadImage to prevent naming conflict with Windows. @@ -1676,8 +1677,30 @@ bool nsContentUtils::OfflineAppAllowed(nsIPrincipal* aPrincipal) { return NS_SUCCEEDED(rv) && allowed; } +static bool IsErrorPage(nsIURI* aURI) { + if (!aURI) { + return false; + } + + if (!aURI->SchemeIs("about")) { + return false; + } + + nsAutoCString name; + nsresult rv = NS_GetAboutModuleName(aURI, name); + NS_ENSURE_SUCCESS(rv, false); + + return name.EqualsLiteral("certerror") || name.EqualsLiteral("neterror") || + name.EqualsLiteral("blocked"); +} + /* static */ -bool nsContentUtils::PrincipalAllowsL10n(nsIPrincipal* aPrincipal) { +bool nsContentUtils::PrincipalAllowsL10n(nsIPrincipal* aPrincipal, + nsIURI* aDocumentURI) { + if (IsErrorPage(aDocumentURI)) { + return true; + } + // The system principal is always allowed. if (IsSystemPrincipal(aPrincipal)) { return true; diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 46818cc43a1b..2bf27250e68b 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1984,11 +1984,12 @@ class nsContentUtils { static bool OfflineAppAllowed(nsIPrincipal* aPrincipal); /** - * Determine whether the principal is allowed access to the localization - * system. We don't want the web to ever see this but all our UI including in - * content pages should pass this test. + * Determine whether the principal or document is allowed access to the + * localization system. We don't want the web to ever see this but all our UI + * including in content pages should pass this test. */ - static bool PrincipalAllowsL10n(nsIPrincipal* aPrincipal); + static bool PrincipalAllowsL10n(nsIPrincipal* aPrincipal, + nsIURI* aDocumentURI); /** * If offline-apps.allow_by_default is true, we set offline-app permission diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index e7a0a9d1a72b..10ee46858654 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -333,7 +333,11 @@ static nsresult DoCheckLoadURIChecks(nsIURI* aURI, nsILoadInfo* aLoadInfo) { // same principal check as Fluent. if (aLoadInfo->InternalContentPolicyType() == nsIContentPolicy::TYPE_INTERNAL_DTD) { - return nsContentUtils::PrincipalAllowsL10n(aLoadInfo->TriggeringPrincipal()) + RefPtr<Document> doc; + aLoadInfo->GetLoadingDocument(getter_AddRefs(doc)); + return nsContentUtils::PrincipalAllowsL10n( + aLoadInfo->TriggeringPrincipal(), + doc ? doc->GetDocumentURI() : nullptr) ? NS_OK : NS_ERROR_DOM_BAD_URI; } diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp index 9f2321cd2831..73a0e65328f0 100644 --- a/parser/htmlparser/nsExpatDriver.cpp +++ b/parser/htmlparser/nsExpatDriver.cpp @@ -628,33 +628,37 @@ nsresult nsExpatDriver::OpenInputStreamFromExternalDTD(const char16_t* aFPIStr, nsContentUtils::GetSystemPrincipal(), nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, nsIContentPolicy::TYPE_DTD); + NS_ENSURE_SUCCESS(rv, rv); } else { NS_ASSERTION( mSink == nsCOMPtr<nsIExpatSink>(do_QueryInterface(mOriginalSink)), "In nsExpatDriver::OpenInputStreamFromExternalDTD: " "mOriginalSink not the same object as mSink?"); nsContentPolicyType policyType = nsIContentPolicy::TYPE_INTERNAL_DTD; - nsCOMPtr<nsIPrincipal> loadingPrincipal; if (mOriginalSink) { nsCOMPtr<Document> doc; doc = do_QueryInterface(mOriginalSink->GetTarget()); if (doc) { - loadingPrincipal = doc->NodePrincipal(); if (doc->SkipDTDSecurityChecks()) { policyType = nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD; } + rv = NS_NewChannel(getter_AddRefs(channel), uri, doc, + nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | + nsILoadInfo::SEC_ALLOW_CHROME, + policyType); + NS_ENSURE_SUCCESS(rv, rv); } } - if (!loadingPrincipal) { - loadingPrincipal = + if (!channel) { + nsCOMPtr<nsIPrincipal> nullPrincipal = mozilla::NullPrincipal::CreateWithoutOriginAttributes(); + rv = NS_NewChannel(getter_AddRefs(channel), uri, nullPrincipal, + nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | + nsILoadInfo::SEC_ALLOW_CHROME, + policyType); + NS_ENSURE_SUCCESS(rv, rv); } - rv = NS_NewChannel(getter_AddRefs(channel), uri, loadingPrincipal, - nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | - nsILoadInfo::SEC_ALLOW_CHROME, - policyType); } - NS_ENSURE_SUCCESS(rv, rv); nsAutoCString absURL; rv = uri->GetSpec(absURL);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit a07356ac7693bec4ed1b206bdbeb64287cb2a7f6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 19 02:13:08 2019 +0000 fixup! Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true --- mobile/android/chrome/content/browser.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index dbecd308a3dc..fc66e8b4f23e 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -4413,9 +4413,14 @@ Tab.prototype = { // Must be called after appendChild so the docShell has been created. this.setActive(false); + // Create a Private tab if it was explicitly requested or if the pref + // |browser.privatebrowsing.autostart| is true. If the pref is true, then all tabs are created + // as private tabs. The first clause covers new tabs requested by a user. The preference check + // is important because extensions directly open tabs (usually not private tabs) and bypass the + // private tab checks. let isPrivate = (("isPrivate" in aParams) && aParams.isPrivate) || Services.prefs.getBoolPref("browser.privatebrowsing.autostart"); if (isPrivate) { - attrs['privateBrowsingId'] = 1; + attrs.privateBrowsingId = 1; } this.browser.docShell.setOriginAttributes(attrs);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31720: Enable website suggestions in address bar
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 683863bc344137462c60c6ae001d1333df41297d Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Sep 18 18:32:24 2019 +0000 Bug 31720: Enable website suggestions in address bar --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index f03548e30ced..5d6f725dc1c5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -1452,7 +1452,9 @@ public class BrowserApp extends GeckoApp // Website suggestions for address bar inputs should not be enabled when running in automation. // After the upgrade to support library v.26 it could fail otherwise unrelated Robocop tests // See https://bugzilla.mozilla.org/show_bug.cgi?id=1385464#c3 - if (!isInAutomation) { + // But only disable it when this isn't Tor Browser, because isInAutomation is overloaded such + // that it is |true| in Tor Browser. + if (!isInAutomation || AppConstants.isTorBrowser()) { mBrowserToolbar.setOnFilterListener(new BrowserToolbar.OnFilterListener() { @Override public void onFilter(String searchText, AutocompleteHandler handler) {

1 0

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

25 Sep '19

commit fa3095e61aacd345601435a0e91ee2b44e1a9b07 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 12:56:39 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 31575: Disable newtabpage --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 10c31084adcc..09386d32a12c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -106,6 +106,7 @@ pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now. +pref("browser.newtabpage.enabled", false); pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) pref("browser.search.region", "US"); pref("browser.search.geoip.url", "");

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31575: Replace Firefox Home (newtab) with about:tor
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit e11a1889ae871a9ced871346f5f9eb3e0a9ab6d3 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 13:04:34 2019 +0200 Bug 31575: Replace Firefox Home (newtab) with about:tor Patching AboutNewTabService so that AboutNewTab is not loaded to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. --- browser/components/newtab/AboutNewTabService.jsm | 29 +--------------------- browser/components/preferences/in-content/home.xul | 4 +-- .../preferences/in-content/preferences.xul | 5 +++- browser/modules/HomePage.jsm | 2 +- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/browser/components/newtab/AboutNewTabService.jsm b/browser/components/newtab/AboutNewTabService.jsm index 8995d82d543b..117b9d6347cd 100644 --- a/browser/components/newtab/AboutNewTabService.jsm +++ b/browser/components/newtab/AboutNewTabService.jsm @@ -10,9 +10,6 @@ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm"); -ChromeUtils.defineModuleGetter(this, "AboutNewTab", - "resource:///modules/AboutNewTab.jsm"); - const TOPIC_APP_QUIT = "quit-application-granted"; const TOPIC_LOCALES_CHANGE = "intl:app-locales-changed"; const TOPIC_CONTENT_DOCUMENT_INTERACTIVE = "content-document-interactive"; @@ -47,12 +44,6 @@ function AboutNewTabService() { this.toggleActivityStream(true); this.initialized = true; this.alreadyRecordedTopsitesPainted = false; - - if (IS_MAIN_PROCESS) { - AboutNewTab.init(); - } else if (IS_PRIVILEGED_PROCESS) { - Services.obs.addObserver(this, TOPIC_CONTENT_DOCUMENT_INTERACTIVE); - } } /* @@ -179,11 +170,6 @@ AboutNewTabService.prototype = { } case TOPIC_APP_QUIT: this.uninit(); - if (IS_MAIN_PROCESS) { - AboutNewTab.uninit(); - } else if (IS_PRIVILEGED_PROCESS) { - Services.obs.removeObserver(this, TOPIC_CONTENT_DOCUMENT_INTERACTIVE); - } break; case TOPIC_LOCALES_CHANGE: this.updatePrerenderedPath(); @@ -243,20 +229,7 @@ AboutNewTabService.prototype = { * the newtab page has no effect on the result of this function. */ get defaultURL() { - // Generate the desired activity stream resource depending on state, e.g., - // resource://activity-stream/prerendered/ar/activity-stream.html - // resource://activity-stream/prerendered/en-US/activity-stream-prerendered.html - // resource://activity-stream/prerendered/static/activity-stream-debug.html - return [ - "resource://activity-stream/prerendered/", - this._activityStreamPath, - "activity-stream", - this._activityStreamPrerender ? "-prerendered" : "", - // Debug version loads dev scripts but noscripts separately loads scripts - this._activityStreamDebug && !this._privilegedContentProcess ? "-debug" : "", - this._privilegedContentProcess ? "-noscripts" : "", - ".html", - ].join(""); + return "about:tor"; }, /* diff --git a/browser/components/preferences/in-content/home.xul b/browser/components/preferences/in-content/home.xul index 8c38ba68c2af..fc555a2f56af 100644 --- a/browser/components/preferences/in-content/home.xul +++ b/browser/components/preferences/in-content/home.xul @@ -37,7 +37,7 @@ class="check-home-page-controlled" data-preference-related="browser.startup.homepage"> <menupopup> - <menuitem value="0" data-l10n-id="home-mode-choice-default" /> + <menuitem value="0" label="&aboutTor.title;" /> <menuitem value="2" data-l10n-id="home-mode-choice-custom" /> <menuitem value="1" data-l10n-id="home-mode-choice-blank" /> </menupopup> @@ -79,7 +79,7 @@ onsyncfrompreference="return gHomePane.syncFromNewTabPref();" onsynctopreference="return gHomePane.syncToNewTabPref(this.value);"> <menupopup> - <menuitem value="0" data-l10n-id="home-mode-choice-default" /> + <menuitem value="0" label="&aboutTor.title;" /> <menuitem value="1" data-l10n-id="home-mode-choice-blank" /> </menupopup> </menulist> diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index 13c7bcc74ad8..3b07e4596907 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -17,7 +17,10 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?> <?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> -<!DOCTYPE page> +<!DOCTYPE page [ +<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> + %aboutTorDTD; +]> <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" diff --git a/browser/modules/HomePage.jsm b/browser/modules/HomePage.jsm index f888f185c6a8..2519f3eaa754 100644 --- a/browser/modules/HomePage.jsm +++ b/browser/modules/HomePage.jsm @@ -17,7 +17,7 @@ ChromeUtils.defineModuleGetter( ); const kPrefName = "browser.startup.homepage"; -const kDefaultHomePage = "about:home"; +const kDefaultHomePage = "about:tor"; function getHomepagePref(useDefault) { let homePage;

1 0

[tor-browser-build/master] Bug 25483: Add pion-webrtc and dependencies.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 273e09799eb5b39f498de866a327c2c7b173b304 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 29 02:43:26 2019 +0000 Bug 25483: Add pion-webrtc and dependencies. This was partially automated and generated from the "go mod" graph of pion-webrtc. Upgrade goxnet to da137c7871d7 (which allows removing a formerly nightly-only case, because the new commit is even newer than that one). Upgrade goxsys to fae7ac547cb7. We're using an updated version v2.1.3 of webrtc to include our upstreamed fix. I didn't bump all the way up to v2.1.4 because they moved to requiring Go 1.13. --- projects/genny/config | 21 ++++++++++++++++ projects/ginkgo/config | 21 ++++++++++++++++ projects/go-difflib/config | 19 ++++++++++++++ projects/go-spew/config | 19 ++++++++++++++ projects/gocheck/config | 17 +++++++++++++ projects/goerrors/config | 17 +++++++++++++ projects/gofsnotify/config | 21 ++++++++++++++++ projects/gomega/config | 45 +++++++++++++++++++++++++++++++++ projects/gomock/config | 19 ++++++++++++++ projects/goprotobuf/config | 19 ++++++++++++++ projects/gotail/config | 17 +++++++++++++ projects/gotomb/config | 17 +++++++++++++ projects/goxnet/config | 7 +++++- projects/goxsys/config | 3 ++- projects/goxtools/config | 19 ++++++++++++++ projects/goyaml/config | 21 ++++++++++++++++ projects/objx/config | 17 +++++++++++++ projects/pion-datachannel/config | 36 +++++++++++++++++++++++++++ projects/pion-dtls/config | 27 ++++++++++++++++++++ projects/pion-ice/config | 42 +++++++++++++++++++++++++++++++ projects/pion-logging/config | 17 +++++++++++++ projects/pion-mdns/config | 24 ++++++++++++++++++ projects/pion-quic/config | 24 ++++++++++++++++++ projects/pion-rtcp/config | 21 ++++++++++++++++ projects/pion-rtp/config | 17 +++++++++++++ projects/pion-sctp/config | 30 ++++++++++++++++++++++ projects/pion-sdp/config | 21 ++++++++++++++++ projects/pion-srtp/config | 39 +++++++++++++++++++++++++++++ projects/pion-stun/config | 21 ++++++++++++++++ projects/pion-transport/config | 28 +++++++++++++++++++++ projects/pion-turn/config | 36 +++++++++++++++++++++++++++ projects/pion-webrtc/config | 54 ++++++++++++++++++++++++++++++++++++++++ projects/qtls/config | 24 ++++++++++++++++++ projects/quic-go/config | 39 +++++++++++++++++++++++++++++ projects/testify/config | 30 ++++++++++++++++++++++ 35 files changed, 847 insertions(+), 2 deletions(-) diff --git a/projects/genny/config b/projects/genny/config new file mode 100644 index 0000000..ecdf983 --- /dev/null +++ b/projects/genny/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/cheekybits/genny +git_hash: d2cf3cdd35ce0d789056c4bc02a4d6349c947caf # v1.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/cheekybits/genny + go_lib_deps: + - goxtools + +input_files: + - project: container-image + - name: go + project: go + - name: goxtools + project: goxtools diff --git a/projects/ginkgo/config b/projects/ginkgo/config new file mode 100644 index 0000000..c4ad9ec --- /dev/null +++ b/projects/ginkgo/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/onsi/ginkgo +git_hash: 2e1be8f7d90e9d3e3e58b0ce470f2f14d075406f # v1.7.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/onsi/ginkgo + go_lib_deps: + - gotail + +input_files: + - project: container-image + - name: go + project: go + - name: gotail + project: gotail diff --git a/projects/go-difflib/config b/projects/go-difflib/config new file mode 100644 index 0000000..e8d34df --- /dev/null +++ b/projects/go-difflib/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pmezard/go-difflib +git_hash: 792786c7400a136282c1664665ae0a8db921c6c2 # v1.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pmezard/go-difflib + go_lib_install: + - github.com/pmezard/go-difflib/difflib + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/go-spew/config b/projects/go-spew/config new file mode 100644 index 0000000..946fb96 --- /dev/null +++ b/projects/go-spew/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/davecgh/go-spew +git_hash: 8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/davecgh/go-spew + go_lib_install: + - github.com/davecgh/go-spew/spew + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gocheck/config b/projects/gocheck/config new file mode 100644 index 0000000..a78af0f --- /dev/null +++ b/projects/gocheck/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gopkg.in/check.v1 +git_hash: 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: gopkg.in/check.v1 + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goerrors/config b/projects/goerrors/config new file mode 100644 index 0000000..c9a34e8 --- /dev/null +++ b/projects/goerrors/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pkg/errors +git_hash: ba968bfe8b2f7e042a574c888954fccecfa385b4 # v0.8.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pkg/errors + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gofsnotify/config b/projects/gofsnotify/config new file mode 100644 index 0000000..1f47eaa --- /dev/null +++ b/projects/gofsnotify/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gopkg.in/fsnotify.v1 +git_hash: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9 # v1.4.7 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: gopkg.in/fsnotify.v1 + go_lib_deps: + - goxsys + +input_files: + - project: container-image + - name: go + project: go + - name: goxsys + project: goxsys diff --git a/projects/gomega/config b/projects/gomega/config new file mode 100644 index 0000000..81cc986 --- /dev/null +++ b/projects/gomega/config @@ -0,0 +1,45 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/onsi/gomega +git_hash: 65fb64232476ad9046e57c26cd0bff3d3a8dc6cd # v1.4.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/onsi/gomega + go_lib_deps: + - ginkgo + - gofsnotify + - goprotobuf + - gotail + - gotomb + - goxnet + - goxsys + - goxtext + - goyaml + +input_files: + - project: container-image + - name: go + project: go + - name: ginkgo + project: ginkgo + - name: gofsnotify + project: gofsnotify + - name: goprotobuf + project: goprotobuf + - name: gotail + project: gotail + - name: gotomb + project: gotomb + - name: goxnet + project: goxnet + - name: goxsys + project: goxsys + - name: goxtext + project: goxtext + - name: goyaml + project: goyaml diff --git a/projects/gomock/config b/projects/gomock/config new file mode 100644 index 0000000..53229ac --- /dev/null +++ b/projects/gomock/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/mock +git_hash: 51421b967af1f557f93a59e0057aaf15ca02e29c # v1.2.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/golang/mock + go_lib_install: + - github.com/golang/mock/gomock + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goprotobuf/config b/projects/goprotobuf/config new file mode 100644 index 0000000..cd496f1 --- /dev/null +++ b/projects/goprotobuf/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/protobuf +git_hash: aa810b61a9c79d51363740d207bb46cf8e620ed5 # v1.2.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/golang/protobuf + go_lib_install: + - github.com/golang/protobuf/proto + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gotail/config b/projects/gotail/config new file mode 100644 index 0000000..d83c668 --- /dev/null +++ b/projects/gotail/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/hpcloud/tail +git_hash: a30252cb686a21eb2d0b98132633053ec2f7f1e5 # v1.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/hpcloud/tail + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gotomb/config b/projects/gotomb/config new file mode 100644 index 0000000..3794d7e --- /dev/null +++ b/projects/gotomb/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gopkg.in/tomb.v1 +git_hash: dd632973f1e7218eb1089048e0798ec9ae7dceb8 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: gopkg.in/tomb.v1 + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goxnet/config b/projects/goxnet/config index ae574c6..f6a2c29 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 +git_hash: da137c7871d730100384dbcf36e6f8fa493aef5b filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,8 +12,13 @@ var: go_lib: golang.org/x/net go_lib_install: - golang.org/x/net/proxy + - golang.org/x/net/dns/dnsmessage + go_lib_deps: + - goxsys input_files: - project: container-image - name: go project: go + - name: goxsys + project: goxsys diff --git a/projects/goxsys/config b/projects/goxsys/config index 64a7213..9f02aef 100644 --- a/projects/goxsys/config +++ b/projects/goxsys/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/golang/sys -git_hash: 11f53e03133963fb11ae0588e08b5e0b85be8be5 +git_hash: fae7ac547cb717d141c433a2a173315e216b64c4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,6 +12,7 @@ var: go_lib: golang.org/x/sys go_lib_install: - golang.org/x/sys/cpu + - golang.org/x/sys/unix input_files: - project: container-image diff --git a/projects/goxtools/config b/projects/goxtools/config new file mode 100644 index 0000000..474cf09 --- /dev/null +++ b/projects/goxtools/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://go.googlesource.com/tools +git_hash: aed303cbaa74a4d974e6e79dae05b2901ff009e8 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/tools + go_lib_install: + - golang.org/x/tools/imports + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goyaml/config b/projects/goyaml/config new file mode 100644 index 0000000..fd81e4c --- /dev/null +++ b/projects/goyaml/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gopkg.in/yaml.v2 +git_hash: 51d6538a90f86fe93ac480b35f37b2be17fef232 # v2.2.2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: gopkg.in/yaml.v2 + go_lib_deps: + - gocheck + +input_files: + - project: container-image + - name: go + project: go + - name: gocheck + project: gocheck diff --git a/projects/objx/config b/projects/objx/config new file mode 100644 index 0000000..80b1947 --- /dev/null +++ b/projects/objx/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/stretchr/objx +git_hash: facf9a85c22f48d2f52f2380e4efce1768749a89 # v0.1.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/stretchr/objx + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config new file mode 100644 index 0000000..50094d6 --- /dev/null +++ b/projects/pion-datachannel/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/datachannel +git_hash: 401bef0a9b89c2ca212c908999709ff1967c9617 # v1.4.5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/datachannel + go_lib_deps: + - go-spew + - goerrors + - pion-logging + - pion-sctp + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: go-spew + project: go-spew + - name: goerrors + project: goerrors + - name: pion-logging + project: pion-logging + - name: pion-sctp + project: pion-sctp + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config new file mode 100644 index 0000000..af2a17f --- /dev/null +++ b/projects/pion-dtls/config @@ -0,0 +1,27 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/dtls +git_hash: 91d652d3f91d6c08c193e4d297067f8f653775f9 # v1.5.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/dtls + go_lib_deps: + - goxcrypto + - pion-logging + - pion-transport + +input_files: + - project: container-image + - name: go + project: go + - name: goxcrypto + project: goxcrypto + - name: pion-logging + project: pion-logging + - name: pion-transport + project: pion-transport diff --git a/projects/pion-ice/config b/projects/pion-ice/config new file mode 100644 index 0000000..8946852 --- /dev/null +++ b/projects/pion-ice/config @@ -0,0 +1,42 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/ice +git_hash: 45cb33ebe6b557dbf50a7779cd713aeedbc84813 # v0.5.13 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/ice + go_lib_deps: + - goxnet + - goxsys + - pion-logging + - pion-mdns + - pion-stun + - pion-transport + - pion-turn + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: goxnet + project: goxnet + - name: goxsys + project: goxsys + - name: pion-logging + project: pion-logging + - name: pion-mdns + project: pion-mdns + - name: pion-stun + project: pion-stun + - name: pion-transport + project: pion-transport + - name: pion-turn + project: pion-turn + - name: testify + project: testify diff --git a/projects/pion-logging/config b/projects/pion-logging/config new file mode 100644 index 0000000..40e8619 --- /dev/null +++ b/projects/pion-logging/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/logging +git_hash: 0387f8acdeb20faf48e539e74906dd633851f3a8 # v0.2.2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/logging + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-mdns/config b/projects/pion-mdns/config new file mode 100644 index 0000000..05eb8c4 --- /dev/null +++ b/projects/pion-mdns/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/mdns +git_hash: c5bfa7641a9decf65f7597ba5299c3ee36feb28e # v0.0.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/mdns + go_lib_deps: + - goxnet + - pion-logging + +input_files: + - project: container-image + - name: go + project: go + - name: goxnet + project: goxnet + - name: pion-logging + project: pion-logging diff --git a/projects/pion-quic/config b/projects/pion-quic/config new file mode 100644 index 0000000..69b3c00 --- /dev/null +++ b/projects/pion-quic/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/quic +git_hash: 4c18aa106035bd68c2f9f054ae8b9a57850967c7 # v0.1.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/quic + go_lib_deps: + - pion-transport + - quic-go + +input_files: + - project: container-image + - name: go + project: go + - name: pion-transport + project: pion-transport + - name: quic-go + project: quic-go diff --git a/projects/pion-rtcp/config b/projects/pion-rtcp/config new file mode 100644 index 0000000..dd76451 --- /dev/null +++ b/projects/pion-rtcp/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/rtcp +git_hash: 02c67df9b6f60eafcbb9dfe0e46dbdc4a20fa74f # v1.2.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/rtcp + go_lib_deps: + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: testify + project: testify diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config new file mode 100644 index 0000000..0f586ec --- /dev/null +++ b/projects/pion-rtp/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/rtp +git_hash: 23312f4b270b6a469355099f9cfb96d871240098 # v1.1.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/rtp + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config new file mode 100644 index 0000000..8615bd4 --- /dev/null +++ b/projects/pion-sctp/config @@ -0,0 +1,30 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/sctp +git_hash: 321ee3612199dd7363fc63ec4e111db50c22faf1 # v1.6.9 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/sctp + go_lib_deps: + - goerrors + - pion-logging + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: goerrors + project: goerrors + - name: pion-logging + project: pion-logging + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config new file mode 100644 index 0000000..7f95bc0 --- /dev/null +++ b/projects/pion-sdp/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/sdp +git_hash: 03441e3c706c7c3b719ee75194049a31cbb2eb7e # v2.3.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/sdp + go_lib_deps: + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: testify + project: testify diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config new file mode 100644 index 0000000..eac420c --- /dev/null +++ b/projects/pion-srtp/config @@ -0,0 +1,39 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/srtp +git_hash: 0741c018e441a3502045133280347b9deba1e9d8 # v1.2.6 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/srtp + go_lib_deps: + - go-spew + - goerrors + - pion-logging + - pion-rtcp + - pion-rtp + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: go-spew + project: go-spew + - name: goerrors + project: goerrors + - name: pion-logging + project: pion-logging + - name: pion-rtcp + project: pion-rtcp + - name: pion-rtp + project: pion-rtp + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/pion-stun/config b/projects/pion-stun/config new file mode 100644 index 0000000..aeba0af --- /dev/null +++ b/projects/pion-stun/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/stun +git_hash: 8136435b6d3ad36535081253a032468235a43581 # v0.3.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/stun + go_lib_deps: + - goerrors + +input_files: + - project: container-image + - name: go + project: go + - name: goerrors + project: goerrors diff --git a/projects/pion-transport/config b/projects/pion-transport/config new file mode 100644 index 0000000..be3d385 --- /dev/null +++ b/projects/pion-transport/config @@ -0,0 +1,28 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/transport +git_hash: 6903e3cd05a899ca7284753a4b6cb265655c28ff # v0.8.6 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/transport + go_lib_deps: + - pion-logging + - testify + go_lib_install: + - github.com/pion/transport/packetio + - github.com/pion/transport/test + - github.com/pion/transport/vnet + +input_files: + - project: container-image + - name: go + project: go + - name: pion-logging + project: pion-logging + - name: testify + project: testify diff --git a/projects/pion-turn/config b/projects/pion-turn/config new file mode 100644 index 0000000..06a6f14 --- /dev/null +++ b/projects/pion-turn/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/turn +git_hash: cab8f88798429b68b7cfb4db7c12fc6d205e91e2 # v1.3.5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/turn + go_lib_deps: + - go-spew + - goerrors + - pion-logging + - pion-stun + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: go-spew + project: go-spew + - name: goerrors + project: goerrors + - name: pion-logging + project: pion-logging + - name: pion-stun + project: pion-stun + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config new file mode 100644 index 0000000..0f22dbb --- /dev/null +++ b/projects/pion-webrtc/config @@ -0,0 +1,54 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/webrtc +git_hash: 5bceb0126f92c42015a1e143e24ae84122b8f0b0 # v2.1.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/webrtc + go_lib_deps: + - pion-datachannel + - pion-dtls + - pion-ice + - pion-logging + - pion-quic + - pion-rtcp + - pion-rtp + - pion-sctp + - pion-sdp + - pion-srtp + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: pion-datachannel + project: pion-datachannel + - name: pion-dtls + project: pion-dtls + - name: pion-ice + project: pion-ice + - name: pion-logging + project: pion-logging + - name: pion-quic + project: pion-quic + - name: pion-rtcp + project: pion-rtcp + - name: pion-rtp + project: pion-rtp + - name: pion-sctp + project: pion-sctp + - name: pion-sdp + project: pion-sdp + - name: pion-srtp + project: pion-srtp + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/qtls/config b/projects/qtls/config new file mode 100644 index 0000000..55f4444 --- /dev/null +++ b/projects/qtls/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/marten-seemann/qtls +git_hash: 65ca381cd298d7e0aef0de8ba523a870ec5a96fe # v0.2.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/marten-seemann/qtls + go_lib_deps: + - goxcrypto + - goxsys + +input_files: + - project: container-image + - name: go + project: go + - name: goxcrypto + project: goxcrypto + - name: goxsys + project: goxsys diff --git a/projects/quic-go/config b/projects/quic-go/config new file mode 100644 index 0000000..c2361a4 --- /dev/null +++ b/projects/quic-go/config @@ -0,0 +1,39 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/lucas-clemente/quic-go +git_hash: 907071221cf97f75398d9cf8b1174e94f56e8f96 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/lucas-clemente/quic-go + go_lib_deps: + - genny + - ginkgo + - gomega + - gomock + - goxcrypto + - goxnet + - qtls + +input_files: + - project: container-image + - name: go + project: go + - name: genny + project: genny + - name: ginkgo + project: ginkgo + - name: gomega + project: gomega + - name: gomock + project: gomock + - name: goxcrypto + project: goxcrypto + - name: goxnet + project: goxnet + - name: qtls + project: qtls diff --git a/projects/testify/config b/projects/testify/config new file mode 100644 index 0000000..9b20867 --- /dev/null +++ b/projects/testify/config @@ -0,0 +1,30 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/stretchr/testify +git_hash: 221dbe5ed46703ee255b1da0dec05086f5035f62 # v1.4.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/stretchr/testify + go_lib_deps: + - go-difflib + - go-spew + - goyaml + - objx + +input_files: + - project: container-image + - name: go + project: go + - name: go-difflib + project: go-difflib + - name: go-spew + project: go-spew + - name: goyaml + project: goyaml + - name: objx + project: objx

1 0

[tor-browser-build/master] Bug 25483: Use snowflake from the cohosh/pion branch.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 4ff2be0b02e322716f06829e49c50f39795bf43c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 29 03:05:45 2019 +0000 Bug 25483: Use snowflake from the cohosh/pion branch. Switched to using the pion/webrtc library and modified the targets to build snowflake on all platforms. --- projects/snowflake/build | 31 ++-------------------- projects/snowflake/config | 30 +++------------------ .../PTConfigs/windows/torrc-defaults-appendix | 3 +++ projects/tor-browser/build | 15 +++-------- rbm.conf | 7 +++-- 5 files changed, 18 insertions(+), 68 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 6534329..5309318 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -1,31 +1,13 @@ #!/bin/bash [% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% IF c("var/linux") %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" - # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with - # the prebuilt libwebrtc-magic.a libraries. Since we build our own - # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, - # using CGO_CXXFLAGS. - export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" -[% END -%] distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR -[% IF c("var/osx") %] - export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CC="$clangdir/bin/clang" - export CXX="$clangdir/bin/clang++" -[% END %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/go-webrtc') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -35,16 +17,7 @@ mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" cd client -[% IF c("var/osx") -%] - # Without faketime, snowflake-client would contain the timestamp of the - # temporary client.a file created during "go build". - # The -tmpdir flag overrides what would otherwise be a randomly generated - # path, /tmp/go-link-RANDOMNUM/go.o. - mkdir -p /var/tmp/go-link.tmpdir - [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' -[% ELSE -%] - go build -ldflags '-s' -[% END -%] +go build -ldflags '-s' cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd .. diff --git a/projects/snowflake/config b/projects/snowflake/config index cef0930..1f74d48 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,42 +1,20 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: cd650fa0097f948b15dddd889ad2e6908b58bd66 +git_url: https://github.com/cohosh/snowflake +git_hash: 49a899be452a58db27ecc94223b0c527bf8d4927 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: use_container: 1 -targets: - linux-i686: - var: - arch_deps: - - pkg-config - - libx11-dev:i386 - linux-x86_64: - var: - arch_deps: - - pkg-config - - libx11-dev - osx-x86_64: - var: - arch_deps: - - pkg-config - - faketime - input_files: - project: container-image - name: go project: go - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - name: binutils - project: binutils - enable: '[% c("var/linux") %]' - - name: go-webrtc - project: go-webrtc - name: uniuri project: uniuri - name: goptlib project: goptlib + - name: pion-webrtc + project: pion-webrtc diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 18b8460..af16b3c 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -1,2 +1,5 @@ ## obfs4proxy configuration ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe + +## snowflake configuration +ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index ed69f19..67419a8 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -108,19 +108,12 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -[% IF c("var/linux") || c("var/osx") -%] - [% IF ! c("var/snowflake") %] - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$GENERATEDPREFSPATH" - [% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" - [% END %] -[% END -%] -[% IF c("var/windows") -%] - # We don't have snowflake available on Windows (yet). +[% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ >> "$GENERATEDPREFSPATH" -[% END -%] +[% ELSE %] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" +[% END %] [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" diff --git a/rbm.conf b/rbm.conf index 581bd0e..e6379f8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -247,7 +247,7 @@ targets: var: linux: 1 compiler: gcc - # We only build snowflake for linux and macOS on the alpha and nightly + # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' container: @@ -299,6 +299,9 @@ targets: flag_mwindows: '-mwindows' compiler: mingw-w64 faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 + # We only build snowflake on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python @@ -324,7 +327,7 @@ targets: LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" macosx_deployment_target: '10.9' locale_ja: ja-JP-mac - # We only build snowflake for linux and macOS on the alpha and nightly + # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps:

1 0

[tor-browser-build/master] Bug 25483: Remove depot_tools, go-webrtc, webrtc projects.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 52ebafd72bdbbd713d080a5a5828fefd2c6cf0d7 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 29 03:24:50 2019 +0000 Bug 25483: Remove depot_tools, go-webrtc, webrtc projects. Remove mentions of webrtc and gclient from README. --- README | 6 +- projects/depot_tools/build | 8 -- projects/depot_tools/config | 5 - projects/go-webrtc/config | 63 ----------- projects/webrtc/build | 163 --------------------------- projects/webrtc/config | 123 --------------------- projects/webrtc/webrtc-linux.patch | 25 ----- projects/webrtc/webrtc-mac.patch | 220 ------------------------------------- 8 files changed, 2 insertions(+), 611 deletions(-) diff --git a/README b/README index 6aa763e..2ea5630 100644 --- a/README +++ b/README @@ -15,9 +15,7 @@ from containers. The sources of most components are downloaded using git, which needs to be installed. Some components are downloaded using mercurial which also -needs to be installed. The sources of webrtc are downloaded using -gclient, which requires GTK+ 2.0 development files and curl to be -installed. +needs to be installed. You also need a few perl modules installed: - YAML::XS @@ -44,7 +42,7 @@ If you are running Debian or Ubuntu, you can install them with: libio-captureoutput-perl libjson-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - libfile-copy-recursive-perl git libgtk2.0-dev curl runc \ + libfile-copy-recursive-perl git runc \ mercurial The build system is based on rbm, which is included as a git submodule diff --git a/projects/depot_tools/build b/projects/depot_tools/build deleted file mode 100644 index ac0f21b..0000000 --- a/projects/depot_tools/build +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/depot_tools/config b/projects/depot_tools/config deleted file mode 100644 index a1848dc..0000000 --- a/projects/depot_tools/config +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_hash: 7d9d9233cb657e968831238346917b0b64abb4c1 -git_url: https://chromium.googlesource.com/chromium/tools/depot_tools.git -filename: '[% project %]-[% c("version") %].tar.gz' diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config deleted file mode 100644 index fcf6e89..0000000 --- a/projects/go-webrtc/config +++ /dev/null @@ -1,63 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/keroserene/go-webrtc.git -git_hash: ed20e74ef428d6149a95bab8e63afb47af55c204 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/keroserene/go-webrtc - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - [% IF c("var/linux") %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" - [% END -%] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/webrtc') %] - # Replace the prebuilt webrtc library with our own one. - rm -rf include/ lib/ - cp -a /var/tmp/dist/webrtc/{include,lib} . - [% IF c("var/linux") -%] - # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. - export CGO_CXXFLAGS="-D__STDC_FORMAT_MACROS=1" - export CGO_LDFLAGS=-latomic - [% END -%] - [% IF c("var/osx") -%] - export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CC="$clangdir/bin/clang" - export CXX="$clangdir/bin/clang++" - [% END -%] - -targets: - linux-i686: - var: - arch_deps: - - pkg-config - - libx11-dev:i386 - linux-x86_64: - var: - arch_deps: - - pkg-config - - libx11-dev - osx-x86_64: - var: - arch_deps: - - pkg-config - -input_files: - - project: container-image - - name: go - project: go - - name: webrtc - project: webrtc - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - name: binutils - project: binutils - enable: '[% c("var/linux") %]' diff --git a/projects/webrtc/build b/projects/webrtc/build deleted file mode 100644 index 2ede64b..0000000 --- a/projects/webrtc/build +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/bash -set -e -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -mkdir -p /var/tmp/dist - -[% IF c("var/linux") %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" -[% END -%] -[% IF c("var/osx") -%] - # src/build/toolchain/mac/filter_libtool.py wants libtool to be called exactly "libtool". - ln -sf x86_64-apple-darwin11-libtool $cctoolsdir/libtool - export AR=x86_64-apple-darwin11-ar - # Certain cross-compiling flags are set in webrtc-mac.patch because the build - # system doesn't honor CFLAGS etc. environment variables. -[% ELSE -%] - AR=ar -[% END -%] - -# Setting up depot_tools -# https://dev.chromium.org/developers/how-tos/install-depot-tools -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/depot_tools') %] -export PATH="$PATH:/var/tmp/dist/depot_tools" -# Disable automatic updating. -export DEPOT_TOOLS_UPDATE=0 - -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf webrtc-sources-[% c('version') %].tar.gz - -builddir=/var/tmp/build/[% project %]/src -cd $builddir - -[% IF c("var/linux") -%] - patch -p1 < $rootdir/webrtc-linux.patch -[% END -%] -[% IF c("var/osx") -%] - patch -p1 < $rootdir/webrtc-mac.patch -[% END -%] - -[% IF c("var/linux") -%] - # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. - cd tools/gn - # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. - CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean - cd ../.. - # This is where bootstrap.py stashes the built gn. - GN="$PWD/out_bootstrap/gn" -[% END -%] -[% IF c("var/osx") -%] - # The linux descriptor builds its own copy of gn, using tools/gn/bootstrap/bootstrap.py. - # I tried that here, but for some reason the gn so built doesn't work. On "gn gen", - # it crashes with this error: - # [0624/022439.767916:FATAL:command_gen.cc(59)] Check failed: !rule.empty(). - # Instead, use the gn packaged with depot_tools. - GN="/var/tmp/dist/depot_tools/gn" - - # Hardcode the output of some utility programs that otherwise require Xcode - # tools, like xcode-select, xcodebuild, sw_vers, and xcrun. This probably - # needs to be kept in sync with the SDK version. - cat <<EOF > build/mac/find_sdk.py -print("$sysrootdir") -print("10.11") -EOF - cat <<EOF > build/config/mac/sdk_info.py -print("machine_os_build=\"[% c("var/macosx_deployment_target") %]\"") -print("sdk_build=\"10.11\"") -print("sdk_path=\"$sysrootdir\"") -print("sdk_platform_path=\"$sysrootdir\"") -print("sdk_version=\"10.11\"") -print("xcode_build=\"7.3\"") -print("xcode_version=\"0730\"") -EOF -[% END -%] - - -[% IF c("var/linux") -%] - export CC=gcc - export CXX=g++ -[% END -%] -[% IF c("var/linux-i686") -%] - GYP_DEFINES+=" target_arch=ia32" - export CC='gcc -m32' - export CXX='g++ -m32' - export CFLAGS=-m32 - export CXXFLAGS=-m32 - export LDFLAGS=-m32 -[% END -%] - -export GN_ARGS="" -# For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". -# https://gn.googlesource.com/gn/+/master/docs/cross_compiles.md -# Not debug. -GN_ARGS+=" is_debug=false" -# There are warnings from unused returns. -GN_ARGS+=" treat_warnings_as_errors=false" -# Build static libraries. -GN_ARGS+=" is_component_build=false" -# Do not use bundled utilities. -GN_ARGS+=" is_clang=false use_sysroot=false" -# Use libstdc++, not libc++. -GN_ARGS+=" use_custom_libcxx=false" -[% IF c("var/linux") -%] - GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" - GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" - # Make extra sure we don't use bundled binutils. - rm -rf third_party/binutils/Linux_* - # Avoid some dependencies. - GN_ARGS+=" use_ozone=true use_gconf=false" - GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" - # Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? - #GN_ARGS+=" rtc_include_tests=false" -[% END -%] -[% IF c("var/osx") -%] - GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"[% c("var/macosx_deployment_target") %]\"" - GN_ARGS+=" clang_use_chrome_plugins=false" - GN_ARGS+=" clang_base_path=\"$clangdir\"" - # No lld in our toolchain currently. - GN_ARGS+=" use_lld=false" - # Avoid some dependencies. - GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" - # Tests are needed for field_trial, metrics_default, and pc_test_utils targets - # (which include code needed by go-webrtc). - GN_ARGS+=" rtc_include_tests=true" - # Make sure not to use bundled clang and binutils. - rm -rf third_party/llvm-build - rm -rf third_party/binutils -[% END -%] -rm -rf out/Release -"$GN" gen out/Release --args="$GN_ARGS" -ninja -C out/Release webrtc field_trial metrics_default pc_test_utils -# The cctools ar doesn't have the 'D' deterministic option of GNU ar, but the -# ZERO_AR_DATE environment variable similarly sets timestamps within the -# archive to zero. -# https://opensource.apple.com/source/cctools/cctools-886/ar/archive.c.auto.h… -# https://codereview.chromium.org/699083004/ -# .o files under out/Release/obj/ are the build outputs. Don't include .o -# files from elsewhere under out/ because they are build helpers and things -# like that, not necessarily of the target architecture, and anyway are not -# needed. -# https://bugs.torproject.org/22832 -find out/Release/obj -name '*.o' -print0 | sort -z \ - | [% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %] xargs -0 -- "$AR" crs libwebrtc-magic.a - -mkdir -p $distdir -cd $distdir -mkdir -p include lib -cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] -INCLUDE_DIR="$PWD/include" -cd $builddir -find . -type f -name '*.h' -print0 | while IFS= read -r -d '' h; -do - mkdir -p "$INCLUDE_DIR/$(dirname "$h")" - cp -f "$h" "$INCLUDE_DIR/$h" -done - -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/webrtc/config b/projects/webrtc/config deleted file mode 100644 index ff2792e..0000000 --- a/projects/webrtc/config +++ /dev/null @@ -1,123 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("var/webrtc_tag") %]' -filename: 'webrtc-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - webrtc_tag: 88f5d9180eae78a6162cccd78850ff416eb82483 - -input_files: - - project: container-image - - project: webrtc - pkg_type: fetch_sources - - project: depot_tools - name: depot_tools - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - project: binutils - name: binutils - enable: '[% c("var/linux") %]' - - filename: webrtc-linux.patch - enable: '[% c("var/linux") %]' - - filename: webrtc-mac.patch - enable: '[% c("var/osx") %]' - -targets: - linux: - var: - webrtc: - os: linux - linux-i686: - var: - webrtc: - lib_path: lib/libwebrtc-linux-386-magic.a - sort_deps: 0 - arch_deps: - - lib32asound2-dev - - lib64expat1 - - libexpat1-dev:i386 - - libglib2.0-dev:i386 - - libgtk-3-dev:i386 - - libudev-dev:i386 - - libx11-dev:i386 - - libxext-dev:i386 - - libxrandr-dev:i386 - - pkg-config - - hardening-wrapper - linux-x86_64: - var: - webrtc: - lib_path: lib/libwebrtc-linux-amd64-magic.a - arch_deps: - - libasound2-dev - - libexpat1-dev - - libglib2.0-dev - - libgtk-3-dev - - libudev-dev - - libx11-dev - - libxext-dev - - libxrandr-dev - - pkg-config - osx-x86_64: - var: - webrtc: - lib_path: lib/libwebrtc-darwin-amd64-magic.a - arch_deps: - - libglib2.0-dev - - pkg-config - - python-biplist - -steps: - fetch_sources: - var: - container: - use_container: 0 - filename: 'webrtc-sources-[% c("var/webrtc_tag") %].tar.gz' - fetch_sources: | - #!/bin/bash - [% c("var/set_default_env") -%] - # WebRTC is special, having its own build system that brings in lots of Chromium dependencies. - # https://webrtc.org/native-code/development/ - tar xf [% c('input_files_by_name/depot_tools') %] - export PATH="$rootdir/depot_tools:$PATH" - # Use --no-history because the whole checkout with history is about 12 GB. - # JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. - # default-java comes from the package default-jdk-headless. - export JAVA_HOME=/usr/lib/jvm/default-java - clone_dir='[% c("basedir") %]/gclient/webrtc' - mkdir -p "$clone_dir" - cd "$clone_dir" - if [ ! -d "src" ]; - then - # "fetch" is part of depot_tools. - #fetch --nohooks --no-history webrtc - # FIXME: To avoid the unconditional `gclient sync` in the call to fetch, - # we inline the result of a `fetch --dry-run` - gclient root - gclient config --spec 'solutions = [ - { - "managed": False, - "name": "src", - "url": "https://chromium.googlesource.com/external/webrtc.git", - "custom_deps": {}, - "deps_file": "DEPS", - "safesync_url": "", - }, - ] - ' - gclient sync --nohooks --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] - cd src - git submodule foreach 'git config -f $toplevel/.git/config submodule.$name.ignore all' - git config --add remote.origin.fetch '+refs/tags/*:refs/tags/*' - git config diff.ignoreSubmodules all - cd .. - fi - # "gclient" is part of depot_tools. This download takes a long time the first time. - gclient sync --force --delete_unversioned_trees --reset --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] - cd .. - tar --exclude .git -czf [% dest_dir _ '/' _ c('filename') %] webrtc - input_files: - - project: depot_tools - name: depot_tools - pkg_type: build diff --git a/projects/webrtc/webrtc-linux.patch b/projects/webrtc/webrtc-linux.patch deleted file mode 100644 index efeebbb..0000000 --- a/projects/webrtc/webrtc-linux.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2d7897d479a13cbf68335140b61228cd5552dfd9 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:14:32 -0700 -Subject: [PATCH] Disable some settings in build_overrides. - ---- - build_overrides/build.gni | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build_overrides/build.gni b/build_overrides/build.gni -index 81cb3e73ae..5304a64ce8 100644 ---- a/build_overrides/build.gni -+++ b/build_overrides/build.gni -@@ -10,7 +10,7 @@ - enable_java_templates = true - - # Some non-Chromium builds don't use Chromium's third_party/binutils. --linux_use_bundled_binutils_override = true -+linux_use_bundled_binutils_override = false - - # Variable that can be used to support multiple build scenarios, like having - # Chromium specific targets in a client project's GN file etc. --- -2.11.0 - diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch deleted file mode 100644 index d1144af..0000000 --- a/projects/webrtc/webrtc-mac.patch +++ /dev/null @@ -1,220 +0,0 @@ -From df1a0923f1534a238e9773000dd03dd7b55e2c72 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:03:16 -0700 -Subject: [PATCH 1/6] Disable assertions that prevent cross-compiling for mac. - ---- - config/BUILDCONFIG.gn | 4 ++-- - toolchain/mac/BUILD.gn | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 48ed140c7..15e06808c 100644 ---- a/build/config/BUILDCONFIG.gn -+++ b/build/config/BUILDCONFIG.gn -@@ -238,8 +238,8 @@ if (target_os == "android") { - } else if (target_os == "ios") { - _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" - } else if (target_os == "mac") { -- assert(host_os == "mac", "Mac cross-compiles are unsupported.") -- _default_toolchain = host_toolchain -+ # assert(host_os == "mac", "Mac cross-compiles are unsupported.") -+ _default_toolchain = "//build/toolchain/mac:clang_$host_cpu" - } else if (target_os == "win") { - # On Windows we use the same toolchain for host and target by default. - # Beware, win cross builds mostly don't work yet, see docs/win_cross.md -diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn -index fc113d6a3..7a0171700 100644 ---- a/build/toolchain/mac/BUILD.gn -+++ b/build/toolchain/mac/BUILD.gn -@@ -14,7 +14,7 @@ if (is_ios) { - import("//build/config/mac/mac_sdk.gni") - import("//build/config/mac/symbols.gni") - --assert(host_os == "mac") -+# assert(host_os == "mac") - - import("//build/toolchain/cc_wrapper.gni") - import("//build/toolchain/clang_static_analyzer.gni") --- -2.11.0 - -From c9cdc59ebb986392367115105ecbc1f5b511130d Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:04:26 -0700 -Subject: [PATCH 2/6] Hardcode cross-compiling flags in config/mac/BUILD.gn. - -The build system doesn't provide a general way to set flags externally. -"No way to provide extra CFLAGS/CXXFLAGS/LDFLAGS" -https://bugs.chromium.org/p/chromium/issues/detail?id=595653 ---- - config/mac/BUILD.gn | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn -index 4c681e88c..26fbcac2b 100644 ---- a/build/config/mac/BUILD.gn -+++ b/build/config/mac/BUILD.gn -@@ -57,6 +57,11 @@ config("runtime_library") { - "-isysroot", - rebase_path(sysroot, root_build_dir), - "-mmacosx-version-min=$mac_deployment_target", -+ "-target", -+ "x86_64-apple-darwin11", -+ "-Wno-unknown-warning-option", -+ "-B", -+ "/var/tmp/dist/macosx-toolchain/cctools/bin", - ] - - asmflags = common_flags --- -2.11.0 - -From 86d0882084c8b0595d693cce43e96b01182814b7 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Tue, 4 Dec 2018 07:37:42 +0000 -Subject: [PATCH 3/6] Remove -instcombine-lower-dbg-declare=0 from cflags. - -Not supported in our current version of llvm: -clang (LLVM option parsing): Unknown command line argument '-instcombine-lower-dbg-declare=0'. Try: 'clang (LLVM option parsing) -help' -clang (LLVM option parsing): Did you mean '-combiner-use-tbaa=0'? ---- - config/compiler/BUILD.gn | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn -index a6ba4ea6..e775f9f5 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -427,10 +427,10 @@ config("compiler") { - if (is_clang && !is_nacl && current_toolchain == host_toolchain && - target_os != "chromeos") { - cflags += [ -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -+ # "-Xclang", -+ # "-mllvm", -+ # "-Xclang", -+ # "-instcombine-lower-dbg-declare=0", - ] - } - --- -2.11.0 - -From 96d243466006263e99b08ebf8b6085c60b736ccc Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:06:06 -0700 -Subject: [PATCH 4/6] Port build/config/mac/plist_util.py to biplist. - -So as not to require the plutil command. plutil was only being used to -convert between XML and binary plist formats, because versions of the -plistlib module before Python 3.4 only support the XML format. The -biplist library handles both formats natively. - -FAILED: gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist -python ../../build/config/mac/plist_util.py merge -f=xml1 -o=gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist ../../build/config/mac/BuildInfo.plist ../../webrtc/examples/objc/AppRTCMobile/mac/Info.plist -Traceback (most recent call last): - File "../../build/config/mac/plist_util.py", line 254, in <module> - sys.exit(Main()) - File "../../build/config/mac/plist_util.py", line 250, in Main - args.func(args) - File "../../build/config/mac/plist_util.py", line 207, in _Execute - data = MergePList(data, LoadPList(filename)) - File "../../build/config/mac/plist_util.py", line 121, in LoadPList - subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) - File "/usr/lib/python2.7/subprocess.py", line 535, in check_call - retcode = call(*popenargs, **kwargs) - File "/usr/lib/python2.7/subprocess.py", line 522, in call - return Popen(*popenargs, **kwargs).wait() - File "/usr/lib/python2.7/subprocess.py", line 710, in __init__ - errread, errwrite) - File "/usr/lib/python2.7/subprocess.py", line 1335, in _execute_child - raise child_exception -OSError: [Errno 2] No such file or directory ---- - config/mac/plist_util.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/build/config/mac/plist_util.py b/build/config/mac/plist_util.py -index bba0208a5..019dcf918 100644 ---- a/build/config/mac/plist_util.py -+++ b/build/config/mac/plist_util.py -@@ -3,7 +3,7 @@ - # found in the LICENSE file. - - import argparse --import plistlib -+import biplist - import os - import re - import subprocess -@@ -89,6 +89,7 @@ def Interpolate(value, substitutions): - - def LoadPList(path): - """Loads Plist at |path| and returns it as a dictionary.""" -+ return biplist.readPlist(path) - fd, name = tempfile.mkstemp() - try: - subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) -@@ -100,6 +101,7 @@ def LoadPList(path): - - def SavePList(path, format, data): - """Saves |data| as a Plist to |path| in the specified |format|.""" -+ return biplist.writePlist(data, path, {"xml1": False, "binary1": True}[format]) # doesn't handle "json" format - fd, name = tempfile.mkstemp() - try: - # "plutil" does not replace the destination file but update it in place, --- -2.11.0 - -From eb3787dd670900cc2c3020c9323a9d95983c8887 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Tue, 4 Dec 2018 05:16:04 +0000 -Subject: [PATCH 5/6] Override use_system_xcode=true. - ---- - build_overrides/build.gni | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/build_overrides/build.gni b/build_overrides/build.gni -index 81cb3e73ae..b683ea850c 100644 ---- a/build_overrides/build.gni -+++ b/build_overrides/build.gni -@@ -46,3 +46,5 @@ if (host_os == "mac") { - "hermetic toolchain if the minimum OS version is not met.") - use_system_xcode = _result == 0 - } -+ -+use_system_xcode = true --- -2.11.0 - -From 5df71ea8f31fd25a05c6b6b881c8126b25b5475c Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:11:14 -0700 -Subject: [PATCH 6/6] Disable the desktop_capture module. - -It's causing an error related to CoreGraphics.h and hopefully we don't -need it. ---- - modules/BUILD.gn | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/modules/BUILD.gn b/modules/BUILD.gn -index 465f32d3c4..578cdbd57e 100644 ---- a/modules/BUILD.gn -+++ b/modules/BUILD.gn -@@ -17,7 +17,6 @@ group("modules") { - "audio_processing", - "bitrate_controller", - "congestion_controller", -- "desktop_capture", - "media_file", - "pacing", - "remote_bitrate_estimator", --- -2.11.0 -

1 0

[tor-browser-build/master] Pick up mobile bridge changes for #31664
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit f13ad8814b2024c2fe02c8a163534d99c545cf86 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 25 06:24:28 2019 +0000 Pick up mobile bridge changes for #31664 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index cc9eded..762a813 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: e7ca52e09c9bad0635ad1f2e77a23534f071b53c +git_hash: 8d307a63a95a31d3578715ca407066062f9d7f5e git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-android-service/master] Add three new default obfs4 bridges.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 8d307a63a95a31d3578715ca407066062f9d7f5e Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 23 08:38:29 2019 -0700 Add three new default obfs4 bridges. These bridges are run by Karlstad University in Sweden. See the following ticket for more details: <https://bugs.torproject.org/31164> --- service/src/main/assets/common/bridges.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index c1c00a6..89b6404 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -7,4 +7,7 @@ obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpd obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0 obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0 obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0 +obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0 +obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0 +obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[tor-browser-build/master] Merge remote-tracking branch 'phw/project/31164'
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit e5922c8fc4c518112f2b32f57319306770071c3e Merge: 4739eb7 12e86d1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 25 06:17:28 2019 +0000 Merge remote-tracking branch 'phw/project/31164' projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser-build/master] Add three new default obfs4 bridges.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 12e86d1fbb3e024a04f93cb370b265f5f81fc56e Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 23 08:35:20 2019 -0700 Add three new default obfs4 bridges. These bridges are run by Karlstad University in Sweden. See the following ticket for more details: <https://bugs.torproject.org/31164> --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index de9f98b..aa464d6 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -12,6 +12,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.98:443 01 pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Update OpenSSL to 1.1.1d
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 4739eb773e74edf1f0df7d7ed9ac79b6a0ddf92c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 19:02:50 2019 +0000 Update OpenSSL to 1.1.1d --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 1a3da33..27b9526 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1c +version: 1.1.1d filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90 + sha256sum: 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2

1 0

[tor-browser-build/master] Bug 31584: Clean up mingw-w64 project
by boklm＠torproject.org 23 Sep '19

23 Sep '19

commit 67a38dec8014e4ba33dc062527e74df2aca1f3db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 16 06:41:49 2019 +0000 Bug 31584: Clean up mingw-w64 project We bump the GCC version to a supported one (9.2.0). The obvious choice would have been 8.3.0 as we use for our Linux bundles. But, alas, that one is crashing when cross-compiling Rust for 64bit Windows. --- projects/mingw-w64/build | 11 ++---- projects/mingw-w64/config | 5 ++- projects/mingw-w64/libtool-sort.patch | 67 ----------------------------------- projects/tor/build | 3 ++ 4 files changed, 7 insertions(+), 79 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 4be660d..111205c 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -22,17 +22,10 @@ cd /var/tmp/build mkdir gcc cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz -# https://gcc.gnu.org/ml/gcc-patches/2018-06/msg01115.html -# From gcc commit 494c17dc2bf45b8155fb9a14178ab48f01bc12a8 -# libtool: Sort output of 'find' to enable deterministic builds. -patch -p1 -d gcc-[% c("var/gcc_version") %] < $rootdir/libtool-sort.patch -# We don't want to link against msvcrt.dll due to bug 9084 and want to use -# pthreads, too, as this is needed for ESR60, at least due to bug 1406542. -[% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec -sed 's/msvcrt/msvcr100 -lpthread/' -i $distdir/msvcr100.spec # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +# Rust requires enabling pthreads gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index b088c8e..1ccbcdf 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -6,7 +6,7 @@ version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 6.4.0 + gcc_version: 9.2.0 deps: - automake - build-essential @@ -30,7 +30,6 @@ targets: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.xz' - sha256sum: 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 + sha256sum: ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 - name: binutils project: binutils - - filename: libtool-sort.patch diff --git a/projects/mingw-w64/libtool-sort.patch b/projects/mingw-w64/libtool-sort.patch deleted file mode 100644 index 7c7fa85..0000000 --- a/projects/mingw-w64/libtool-sort.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 494c17dc2bf45b8155fb9a14178ab48f01bc12a8 Mon Sep 17 00:00:00 2001 -From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Thu, 5 Jul 2018 19:13:45 +0000 -Subject: [PATCH 1/1] * libtool.m4: Sort output of 'find' to enable - deterministic builds. * ltmain.sh: Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@262451 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - ChangeLog | 5 +++++ - libtool.m4 | 8 ++++---- - ltmain.sh | 4 ++-- - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/libtool.m4 b/libtool.m4 -index 24d13f3..940faaa 100644 ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -6005,20 +6005,20 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -diff --git a/ltmain.sh b/ltmain.sh -index 9503ec8..79f9ba8 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -2917,7 +2917,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +2932,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" --- -2.9.3 - diff --git a/projects/tor/build b/projects/tor/build index 6b684a0..0705626 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -39,6 +39,9 @@ openssldir=/var/tmp/dist/openssl [% END %] tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] zlibdir=/var/tmp/build/zlib + # XXX: It's a bit unfortunate but we need the pthread dll here as libevent + # gets compiled with pthread support once it is enabled in GCC, which we need + # to do as otherwise the Rust compilaton breaks. mingwlibs=/var/tmp/dist/mingw-w64/[% c("arch") %]-w64-mingw32/bin/ cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ $gcclibs/*.dll $mingwlibs/libwinpthread-1.dll $distdir/Tor/

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31584_v4'
by boklm＠torproject.org 23 Sep '19

23 Sep '19

commit 17c61f4b647f0e0bf759d78ad49520770914524e Merge: b16662a 67a38de Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 23 19:24:47 2019 +0200 Merge remote-tracking branch 'gk/bug_31584_v4' projects/mingw-w64/build | 11 ++---- projects/mingw-w64/config | 5 ++- projects/mingw-w64/libtool-sort.patch | 67 ----------------------------------- projects/tor/build | 3 ++ 4 files changed, 7 insertions(+), 79 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "libssp test"
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 672bd49039cafa175f37b5bb3eaf850271e8a3a0 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 16:00:33 2019 +0000 Revert "libssp test" This reverts commit c153996e3cbc072eb2ae68ae5c532848b1ac9c3b. --- build/moz.configure/toolchain.configure | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 3bcf403bceec..68364075f006 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1676,10 +1676,12 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target # Enable only if hardening is not disabled and ASAN is # not on as ASAN will catch the crashes for us if compiler_is_gccish and not asan: - flags.append("-fstack-protector-strong") - ldflags.append("-fstack-protector-strong") - js_flags.append("-fstack-protector-strong") - js_ldflags.append("-fstack-protector-strong") + # mingw-clang cross-compile toolchain has bugs with stack protector + if target.os != 'WINNT' or c_compiler == 'gcc': + flags.append("-fstack-protector-strong") + ldflags.append("-fstack-protector-strong") + js_flags.append("-fstack-protector-strong") + js_ldflags.append("-fstack-protector-strong") # ASLR ------------------------------------------------ # ASLR (dynamicbase) is enabled by default in clang-cl; but the

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up latest Torbutton changes
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 3c4e7292004b11e7f1dcd12dba6d3fd40edf0594 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 15:56:18 2019 +0000 Pick up latest Torbutton changes --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 903d676ccf33..2abe720e3f1d 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 903d676ccf33e36938438a595b71e781ef13bbe1 +Subproject commit 2abe720e3f1dbe1b49b41fe78719f318407babd0

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] libssp test
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit c153996e3cbc072eb2ae68ae5c532848b1ac9c3b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 09:38:13 2019 +0000 libssp test --- build/moz.configure/toolchain.configure | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 68364075f006..3bcf403bceec 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1676,12 +1676,10 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target # Enable only if hardening is not disabled and ASAN is # not on as ASAN will catch the crashes for us if compiler_is_gccish and not asan: - # mingw-clang cross-compile toolchain has bugs with stack protector - if target.os != 'WINNT' or c_compiler == 'gcc': - flags.append("-fstack-protector-strong") - ldflags.append("-fstack-protector-strong") - js_flags.append("-fstack-protector-strong") - js_ldflags.append("-fstack-protector-strong") + flags.append("-fstack-protector-strong") + ldflags.append("-fstack-protector-strong") + js_flags.append("-fstack-protector-strong") + js_ldflags.append("-fstack-protector-strong") # ASLR ------------------------------------------------ # ASLR (dynamicbase) is enabled by default in clang-cl; but the

1 0

[torbutton/master] Bug 30943: Show version number on mobile
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 2abe720e3f1dbe1b49b41fe78719f318407babd0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 18 20:45:14 2019 +0000 Bug 30943: Show version number on mobile --- chrome/skin/aboutTor.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index baa92b42..555d1742 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -312,7 +312,7 @@ body:not([showmanual]) .showForManual { display: none; } -body[mobile] #torbrowser-info, +body[mobile] #torbrowser-changelog-link, body[mobile] .searchbox, body[mobile] .top .heading2, body[mobile] #manual,

1 0

[tor-launcher/master] Bug 31491: clean up the old meek http helper browser profiles
by gk＠torproject.org 22 Sep '19

22 Sep '19

commit d78a233bc597c8df63e794f880a1a7f54fb9cebd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 16:01:42 2019 -0400 Bug 31491: clean up the old meek http helper browser profiles On macOS, remove the old meek and moat http helper browser profiles that may be present under TorBrowser-Data/Tor/PluggableTransports/. Removal is only attempted once; this is controlled by the Boolean pref extensions.torlauncher.should_remove_meek_helper_profiles. --- src/components/tl-process.js | 2 ++ src/defaults/preferences/torlauncher-prefs.js | 7 ++++++ src/modules/tl-util.jsm | 36 +++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 3aa45e4..49abc0a 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -112,6 +112,8 @@ TorProcessService.prototype = Cr.NS_ERROR_NOT_INITIALIZED); } + TorLauncherUtil.removeMeekAndMoatHelperProfiles(); + if (TorLauncherUtil.shouldOnlyConfigureTor) { this._controlTor(true, false); diff --git a/src/defaults/preferences/torlauncher-prefs.js b/src/defaults/preferences/torlauncher-prefs.js index cc6b1a7..55fe38c 100644 --- a/src/defaults/preferences/torlauncher-prefs.js +++ b/src/defaults/preferences/torlauncher-prefs.js @@ -5,6 +5,13 @@ pref("extensions.torlauncher.prompt_for_locale", true); pref("extensions.torlauncher.start_tor", true); pref("extensions.torlauncher.prompt_at_startup", true); +// This pref controls whether Tor Launcher will try to remove the old +// meek and moat http helper browser profiles. This only has an effect +// on macOS; for Windows and Linux profile removal is handled by the +// updater (since on those platforms the profiles are embedded within +// the browser install directory). +pref("extensions.torlauncher.should_remove_meek_helper_profiles", true); + pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=note, 5=warn pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog pref("extensions.torlauncher.max_tor_log_entries", 1000); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 14ac76f..c54acb9 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -758,6 +758,42 @@ let TorLauncherUtil = // Public } } catch(e) {} }, + + removeMeekAndMoatHelperProfiles: function() + { + function removeDirectory(aParentDir, aName) + { + try + { + let dir = aParentDir.clone(); + dir.appendRelativePath(aName); + if (dir.exists()) + dir.remove(true); + } + catch (e) + { + TorLauncherLogger.log(5, "Failed to remove " + aName + ": " + e); + } + } + + const kPrefRemoveHelperProfiles = + "extensions.torlauncher.should_remove_meek_helper_profiles"; + if (this.getBoolPref(kPrefRemoveHelperProfiles, false)) + { + // Only attempt removal once. + this.setBoolPref(kPrefRemoveHelperProfiles, false); + + if (this.isMac) + { + let ptProfilesDir = this.getTorFile("pt-profiles-dir", true); + if (ptProfilesDir) + { + removeDirectory(ptProfilesDir, "profile.meek-http-helper"); + removeDirectory(ptProfilesDir, "profile.moat-http-helper"); + } + } + } + }, };

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31491: clean up the old meek http helper browser profiles
by gk＠torproject.org 22 Sep '19

22 Sep '19

commit e0b00a89e00e8f808c8d36e1f792e96d3d3a0f7c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 14:59:45 2019 -0400 Bug 31491: clean up the old meek http helper browser profiles On Linux and Windows, arrange for the updater to remove the old meek and moat http helper profiles by adding appropriate directives to browser/installer/removed-files.in (on macOS, the cleanup will be done by Tor Launcher). --- browser/installer/removed-files.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index 5d642d296ad8..732caf50db73 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -8,6 +8,20 @@ # file and directory removals automatically so this file should not be used in # the vast majority of cases. +#ifndef XP_MACOSX +# Tor Browser no longer uses http helper profiles for meek and moat. +# For macOS, the profiles are created under TorBrowser-Data and +# Tor Launcher takes care of removing them during browser startup. +# For Linux and Windows, the profiles were embedded in the install +# directory and, if meek or moat was ever used, extra files that +# were not part of the browser package will have been created within +# the profile directories. The following two lines cause "rmrfdir" +# directives to be added to our MAR files to cause the updater to +# recursively remove these profile directories and everything in them. +TorBrowser/Data/Browser/profile.meek-http-helper/* +TorBrowser/Data/Browser/profile.moat-http-helper/* +#endif + # When to use removed-files.in file to remove files and directories: # * Empty directories that were accidentally added to the installation # directory.

1 0

[tor-browser-build/master] Bug 31646: Update abicheck to require GLIBCXX_3.4.25
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit b16662aad8d9932819fea73746860ce9d8c711a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 19 19:13:25 2019 +0200 Bug 31646: Update abicheck to require GLIBCXX_3.4.25 This is also fixing bug 31380. --- projects/firefox/abicheck.cc | 40 ++++++++++++++-------------------------- projects/gcc/config | 3 +++ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc index cbecafa..ba5f858 100644 --- a/projects/firefox/abicheck.cc +++ b/projects/firefox/abicheck.cc @@ -1,35 +1,23 @@ /* * Bug 25485: Browser/TorBrowser/Tor/libstdc++.so.6: version `CXXABI_1.3.11' not found - * This program is borrowed from - * https://en.cppreference.com/w/cpp/error/uncaught_exception and is useful in - * determining the latest C++ ABI. Specifically this program requires - * `GLIBCXX_3.4.22` which we use to compare the version of the installed - * libstdc++.so.6 and the bundled version. If the program executes - * successfully, that means we should use the system version of libstdc++.so.6 - * and if not, that means we should use the bundled version. + * Bug 31646: Update abicheck to require newer libstdc++.so.6 + * This program is useful in determining if the libstdc++.so.6 installed + * on the system is recent enough. Specifically this program requires + * `GLIBCXX_3.4.25` which should be provided by libstdc++.so.6 from + * gcc >= 8.0.0. If the program executes successfully, that means we + * should use the system version of libstdc++.so.6 and if not, that means + * we should use the bundled version. + * + * We use std::random_device::entropy() in order to require GLIBCXX_3.4.25: + * https://github.com/gcc-mirror/gcc/blob/gcc-8_3_0-release/libstdc%2B%2B-v3/c… */ #include <iostream> -#include <exception> -#include <stdexcept> - -struct Foo { - int count = std::uncaught_exceptions(); - ~Foo() { - std::cout << (count == std::uncaught_exceptions() - ? "~Foo() called normally\n" - : "~Foo() called during stack unwinding\n"); - } -}; +#include <random> int main() { - Foo f; - try { - Foo f; - std::cout << "Exception thrown\n"; - throw std::runtime_error("test exception"); - } catch (const std::exception& e) { - std::cout << "Exception caught: " << e.what() << '\n'; - } + std::random_device rd; + std::cout << "entropy: " << rd.entropy() << std::endl; + return 0; } diff --git a/projects/gcc/config b/projects/gcc/config index d776a2c..a56089a 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -1,5 +1,8 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +# Note: When updating the gcc version, if this includes a libstdc++ +# ABI change we should also update projects/firefox/abicheck.cc to +# require the new version. version: 8.3.0 var: container:

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1557729 - Use principal for permission post prompts instead of URI. r=xeonchen
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit f970a6e8a14d8f80f15be22fa1ed6b091b4d596b Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Fri Jun 14 15:49:25 2019 +0000 Bug 1557729 - Use principal for permission post prompts instead of URI. r=xeonchen Differential Revision: https://phabricator.services.mozilla.com/D35033 --HG-- extra : moz-landing-system : lando --- browser/modules/PermissionUI.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/modules/PermissionUI.jsm b/browser/modules/PermissionUI.jsm index a45c551e1b8f..58a2f293c714 100644 --- a/browser/modules/PermissionUI.jsm +++ b/browser/modules/PermissionUI.jsm @@ -569,8 +569,8 @@ var PermissionPromptPrototype = { if (PrivateBrowsingUtils.isBrowserPrivate(browser)) { scope = SitePermissions.SCOPE_SESSION; } - SitePermissions.set( - principal.URI, + SitePermissions.setForPrincipal( + principal, this.permissionKey, promptAction.action, scope

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1568521 Tracking protection doorhanger's Enable/Disable states don't work r=VladBaicu
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit c6eb1efb7d3ca6a9b5e19f6ec352ee1b129efbd3 Author: Andrei Lazar <andrei.a.lazar(a)softvision.ro> Date: Wed Jul 24 16:00:32 2019 +0000 Bug 1568521 Tracking protection doorhanger's Enable/Disable states don't work r=VladBaicu Now using lastURI instead of principal and now we are using the right functions in order to test permissions. Differential Revision: https://phabricator.services.mozilla.com/D39190 --HG-- extra : moz-landing-system : lando --- mobile/android/chrome/content/PermissionsHelper.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mobile/android/chrome/content/PermissionsHelper.js b/mobile/android/chrome/content/PermissionsHelper.js index b25920872635..39556e756c84 100644 --- a/mobile/android/chrome/content/PermissionsHelper.js +++ b/mobile/android/chrome/content/PermissionsHelper.js @@ -145,6 +145,7 @@ var PermissionsHelper = { * @return A permission value defined in nsIPermissionManager. */ getPermission: function getPermission(aPrincipal, aType) { + let aURI = BrowserApp.selectedBrowser.lastURI; // Password saving isn't a nsIPermissionManager permission type, so handle // it seperately. if (aType == "password") { @@ -164,10 +165,10 @@ var PermissionsHelper = { // Geolocation consumers use testExactPermissionForPrincipal if (aType == "geolocation") { - return Services.perms.testExactPermissionForPrincipal(aPrincipal, aType); + return Services.perms.testExactPermissionFromPrincipal(aPrincipal, aType); } - return Services.perms.testPermissionForPrincipal(aPrincipal, aType); + return Services.perms.testPermissionFromPrincipal(aPrincipal, aType); }, /**

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit 87b3cdb0862a4912b0c3318ad63954dbf42bc774 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 10:46:05 2019 -0400 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. --- browser/app/profile/000-tor-browser.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b2cecfdb1a82..10c31084adcc 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -23,12 +23,13 @@ pref("app.update.badge", true); pref("app.update.notifyDuringDownload", true); pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues -// Disable staged updates on all platforms. +#ifndef XP_MACOSX +// Disable staged updates on platforms other than macOS. // Staged updates do not work on Windows due to #18292. // Also, on Windows and Linux any changes that are made to the browser profile // or Tor data after an update is staged will be lost. -// What about macOS? For consistency, we disable staged updates there too. pref("app.update.staging.enabled", false); +#endif // No need to contact the Kinto-based blocklist system in addition to the old // one which is still used, see bug 22071.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] squash! Bug 13379: Sign our MAR files.
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit 74c3ea2d5152e3687cb9026c93cdd043e90beb76 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 10:34:56 2019 -0400 squash! Bug 13379: Sign our MAR files. Also includes the fix for bug 18900. --- toolkit/xre/nsUpdateDriver.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index c5e4f4260119..2e909d16abcc 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -435,7 +435,8 @@ static bool CopyUpdaterIntoUpdateDir(nsIFile* greDir, nsIFile* appDir, */ /** * Appends the specified path to the library path. - * This is used so that updater can find libmozsqlite3.so and other shared libs. + * This is used so that the updater can find libnss3.dylib and other + * shared libs. * * @param pathToAppend A new library path to prepend to the dynamic linker's * search path. @@ -731,7 +732,7 @@ static void ApplyUpdate(nsIFile* greDir, nsIFile* updateDir, nsIFile* appDir, #if defined(TOR_BROWSER_UPDATE) && defined(MOZ_VERIFY_MAR_SIGNATURE) && \ defined(MAR_NSS) && defined(XP_MACOSX) // On macOS, append the app directory to the shared library search path - // so the system can located the shared libraries that are needed by the + // so the system can locate the shared libraries that are needed by the // updater, e.g., libnss3.dylib). nsAutoCString appPath; nsresult rv2 = appDir->GetNativePath(appPath);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] squash! Bug 25702: Update Tor Browser icon to follow design guidelines
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit d41c386fa1fc365e4962d96f5d99df063ba72dba Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 10:51:26 2019 -0400 squash! Bug 25702: Update Tor Browser icon to follow design guidelines - Use the Tor Browser icon within devtools/client/themes/images/. --- .../images/aboutdebugging-firefox-aurora.svg | 35 +++++++++++++++++--- .../themes/images/aboutdebugging-firefox-beta.svg | 35 +++++++++++++++++--- .../themes/images/aboutdebugging-firefox-logo.svg | 38 ++++++++++++++++++---- .../images/aboutdebugging-firefox-nightly.svg | 35 +++++++++++++++++--- .../images/aboutdebugging-firefox-release.svg | 35 +++++++++++++++++--- 5 files changed, 155 insertions(+), 23 deletions(-) diff --git a/devtools/client/themes/images/aboutdebugging-firefox-aurora.svg b/devtools/client/themes/images/aboutdebugging-firefox-aurora.svg index 7346d54b9447..9240dc6e84ca 100644 --- a/devtools/client/themes/images/aboutdebugging-firefox-aurora.svg +++ b/devtools/client/themes/images/aboutdebugging-firefox-aurora.svg @@ -1,4 +1,31 @@ - -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 955.45 986.16"><defs><linearGradient id="linear-gradient" x1="-14371.64" y1="9293.53" x2="-14108.4" y2="9293.53" gradientTransform="matrix(0.76, 0.03, 0.05, -1.12, 11228.23, 11186.79)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0083ff"/><stop offset="0.18" stop-color="#0096f6"/><stop offset="0.51" stop-color="#00b3e6"/><stop offset="0.79" stop-color="#00c6dd"/><stop offset="1" stop-color="#00ccda"/></linearGradient><linearGradient id="linear-gradient-2" x1="-541.3" y1="256.54" x2="-732.73" y2="882.77" gradientTransform="matrix(1, 0, 0, -1, 1081.94, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000f40" stop-opacity="0.6"/><stop offset="0.61" stop-color="#000f40" stop-opacity="0.18"/><stop offset="1" stop-color="#000f40" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-3" x1="540.64" y1="256.54" x2="349.2" y2="882.77" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" g radientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000f43" stop-opacity="0.4"/><stop offset="0.48" stop-color="#001962" stop-opacity="0.17"/><stop offset="1" stop-color="#002079" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-4" x1="-8570.46" y1="7439.08" x2="-8685.71" y2="7447.98" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10478.03, 10900.02)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#002275"/><stop offset="1" stop-color="#005fe7"/></linearGradient><linearGradient id="linear-gradient-5" x1="-8653.32" y1="7586.86" x2="-8545.37" y2="7698.98" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10478.03, 10900.02)" gradientUnits="userSpaceOnUse"><stop offset="0.05" stop-color="#005fe7"/><stop offset="0.19" stop-color="#005ce1"/><stop offset="0.38" stop-color="#0052cf"/><stop offset="0.6" stop-color="#0043b2"/><stop offset="0.84" stop-color="#002d8a"/><stop offset="0.95" stop-color="#002275"/></linearGradient><linearGradient id= "linear-gradient-6" x1="-8856.78" y1="7335.52" x2="-8625.9" y2="7334.98" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10478.03, 10900.02)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#002079"/><stop offset="0.99" stop-color="#000f40"/></linearGradient><radialGradient id="radial-gradient" cx="584.1" cy="600.57" fx="717.5140400954007" fy="478.32765335281425" r="751.57" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0.16" stop-color="#58c1ff"/><stop offset="0.24" stop-color="#4cb8ff"/><stop offset="0.39" stop-color="#2ea0ff"/><stop offset="0.54" stop-color="#0a84ff"/><stop offset="0.76" stop-color="#0060df"/><stop offset="0.8" stop-color="#0067de"/><stop offset="0.85" stop-color="#007bdd"/><stop offset="0.91" stop-color="#009cda"/><stop offset="0.98" stop-color="#00c8d7"/></radialGradient><linearGradient id="linear-gradient-7" x1="-7658.58" y1="9078.09" x2="-7729.61" y2="8279.7" gradientTransform="matrix(1.23, 0, 0, -1.22, 10201.91, 11050.28)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00feff"/><stop offset="0.3" stop-color="#04c9ff"/><stop offset="0.61" stop-color="#0897ff"/><stop offset="0.77" stop-color="#0a84ff"/><stop offset="0.79" stop-color="#0a84ff" stop-opacity="0.93"/><stop offset="0.84" stop-color="#0a84ff" stop-opacity="0.76"/><stop offset="0.9" stop-color="#0a84ff" stop-opacity="0.49"/><stop offset="0.98" stop-color="#0a84ff" stop-opacity="0.11"/><stop offset="1" stop-color="#0a84ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-8" x1="-9129.99" y1="7770.74" x2="-8993.52" y2="7770.74" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10478.03, 10900.02)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#003eaa"/><stop offset="0.3" stop-color="#0054c5" stop-opacity="0.68"/><stop offset="0.78" stop-color="#0076ef" stop-opacity="0.19"/><stop offset="1" stop-color="#0083ff" stop-opacity="0"/></linearGradient><linearGradient id="li near-gradient-9" x1="553.42" y1="650.09" x2="358.4" y2="653.09" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00feff" stop-opacity="0.25"/><stop offset="0.54" stop-color="#2ddfff" stop-opacity="0.12"/><stop offset="1" stop-color="#58c1ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-10" x1="208.63" y1="2142.48" x2="90.81" y2="2394.32" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, -255.6, 2416.49)" gradientUnits="userSpaceOnUse"><stop offset="0.19" stop-color="#002275" stop-opacity="0.7"/><stop offset="0.63" stop-color="#009dc2" stop-opacity="0.36"/><stop offset="0.94" stop-color="#00feff" stop-opacity="0.1"/></linearGradient><linearGradient id="linear-gradient-11" x1="-43.75" y1="388.32" x2="50.36" y2="281.43" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, 223.54, 856.07)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#002275" stop-opacity="0.8"/><stop offset="0.07" stop-co lor="#002479" stop-opacity="0.74"/><stop offset="0.95" stop-color="#003eaa" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-12" x1="136.86" y1="206.19" x2="136.9" y2="259.62" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, 223.54, 856.07)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#002275" stop-opacity="0.6"/><stop offset="0.24" stop-color="#002275" stop-opacity="0.34"/><stop offset="0.49" stop-color="#002275" stop-opacity="0.15"/><stop offset="0.72" stop-color="#002275" stop-opacity="0.04"/><stop offset="0.93" stop-color="#002275" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-13" x1="569.33" y1="1064.11" x2="877.68" y2="374.6" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00feff"/><stop offset="0.28" stop-color="#03dfff"/><stop offset="0.9" stop-color="#0992ff"/><stop offset="1" stop-color="#0a84ff"/></linearGradient><linearGradient id="linear-gradien t-14" x1="680.88" y1="556.54" x2="536.1" y2="167.79" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0060df"/><stop offset="0.09" stop-color="#0067e5" stop-opacity="0.81"/><stop offset="0.21" stop-color="#006eec" stop-opacity="0.59"/><stop offset="0.33" stop-color="#0075f2" stop-opacity="0.41"/><stop offset="0.46" stop-color="#007af7" stop-opacity="0.26"/><stop offset="0.58" stop-color="#007efa" stop-opacity="0.15"/><stop offset="0.71" stop-color="#0081fd" stop-opacity="0.06"/><stop offset="0.85" stop-color="#0082fe" stop-opacity="0.02"/><stop offset="1" stop-color="#0083ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-15" x1="640" y1="1020.28" x2="747.99" y2="109.82" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#75feff"/><stop offset="0.28" stop-color="#5adfff"/><stop offset="0.9" stop-color="#1692ff"/><stop offset="1" stop-colo r="#0a84ff"/></linearGradient><linearGradient id="linear-gradient-16" x1="735.59" y1="578.41" x2="653.1" y2="230.43" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9ee7ff"/><stop offset="0.14" stop-color="#8cdbff" stop-opacity="0.88"/><stop offset="0.46" stop-color="#5ebdff" stop-opacity="0.57"/><stop offset="0.92" stop-color="#168cff" stop-opacity="0.08"/><stop offset="1" stop-color="#0a84ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-17" x1="649" y1="1002.59" x2="724.57" y2="429.48" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00feff"/><stop offset="0.14" stop-color="#0bf7ff" stop-opacity="0.88"/><stop offset="0.46" stop-color="#26e4ff" stop-opacity="0.57"/><stop offset="0.92" stop-color="#51c6ff" stop-opacity="0.08"/><stop offset="1" stop-color="#58c1ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradien t-18" x1="662.8" y1="968.07" x2="1060.94" y2="345.6" gradientTransform="matrix(1, 0, 0, -1, 0, 986.01)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00feff"/><stop offset="0.14" stop-color="#01efff" stop-opacity="0.88"/><stop offset="0.46" stop-color="#04caff" stop-opacity="0.57"/><stop offset="0.92" stop-color="#098eff" stop-opacity="0.08"/><stop offset="1" stop-color="#0a84ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-19" x1="754.44" y1="521.58" x2="313.86" y2="178" href="#linear-gradient-16"/><linearGradient id="linear-gradient-20" x1="358.66" y1="754.08" x2="43.38" y2="513.58" href="#linear-gradient-18"/><linearGradient id="linear-gradient-21" x1="145.65" y1="859.21" x2="130.45" y2="726.91" href="#linear-gradient-18"/><linearGradient id="linear-gradient-22" x1="292.53" y1="562.84" x2="195.52" y2="368.82" href="#linear-gradient-18"/></defs><title>firefox-logo-developer-edition</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2 " data-name="Layer 1"><g id="Layer_2-2" data-name="Layer 2"><g id="Fox_Lines_-_Outlined" data-name="Fox Lines - Outlined"><polygon points="916.77 436.39 896.46 368.8 838.37 258.88 771.93 188.65 701.38 138.15 640.13 114.04 566.64 87.83 445.64 80.1 369.34 93.91 307.08 113.11 196.61 177.94 127.56 255.17 63.9 358.86 38.86 447.1 34.18 580.97 58.05 672.25 110.71 776.17 147.85 826.37 199.21 873.58 263.35 917.09 342.45 951.59 474.81 967.17 543.93 969.1 646.22 940.21 737.65 889.89 796.48 839.57 842.09 785 906.58 658.41 920.82 571.82 916.77 436.39" style="fill:#061a58"/><polygon points="447.85 140.94 393.67 194.85 482.06 230.78 447.85 140.94" style="fill:#133691"/><polygon points="482.06 230.78 447.85 140.94 547.82 149.01 482.06 230.78" style="fill:#1943ae"/><polygon points="482.06 230.78 653.2 225.58 547.82 149.01 482.06 230.78" style="fill:#2053cf"/><polygon points="653.2 225.58 547.82 149.01 640.49 148.44 653.2 225.58" style="fill:#2660eb"/><polygon points="653.2 225.58 750.65 219.2 640.49 148.44 653.2 225.58" style="fill:#306dff"/><polygon points="750.65 219.2 640.49 148.44 695.25 142.59 750.65 219.2" style="fill:#235adb"/><polygon points="750.65 219.2 695.25 142.59 771.93 188.65 750.65 219.2" style="fill:#2660eb"/><polygon points="824.01 266.11 750.65 219.2 771.93 188.65 824.01 266.11" style="fill:#2053cf"/><polygon points="750.65 219.2 738.38 271.68 805.48 298.57 750.65 219.2" style="fill:#1c4abd"/><polygon points="750.65 219.2 824.01 266.11 805.48 298.57 750.65 219.2" style="fill:#1a46b4"/><polygon points="653.2 225.58 750.65 219.2 738.38 271.68 653.2 225.58" style="fill:#2660eb"/><polygon points="653.2 225.58 738.38 271.68 675.3 344.13 653.2 225.58" style="fill:#235adb"/><polygon points="653.2 225.58 576.21 295.46 675.3 344.13 653.2 225.58" style="fill:#1f51ca"/><polygon points="482.06 230.78 653.2 225.58 576.21 295.46 482.06 230.78" style="fill:#1f50c9"/><polygon points="675.3 344.13 738.38 271.68 784.98 362.3 675.3 344.13" style="fill:#2053cf"/><polygon points ="738.38 271.68 784.98 362.3 805.48 298.57 738.38 271.68" style="fill:#1b48b9"/><polygon points="784.98 362.3 805.48 298.57 854.3 415.01 784.98 362.3" style="fill:#173fa5"/><polygon points="805.48 298.57 879.88 353.21 854.3 415.01 805.48 298.57" style="fill:#12348d"/><polygon points="805.48 298.57 879.88 353.21 824.01 266.11 805.48 298.57" style="fill:#143895"/><polygon points="824.01 266.11 838.37 258.88 879.88 353.21 824.01 266.11" style="fill:#0f2f82"/><polygon points="879.88 353.21 896.46 368.8 838.37 258.88 879.88 353.21" style="fill:#05154c"/><polygon points="824.01 266.11 838.37 258.88 771.93 188.65 824.01 266.11" style="fill:#163c9e"/><polygon points="913.04 489.2 896.46 368.8 916.77 436.39 912.77 489.2 913.04 489.2" style="fill:#051753"/><polygon points="879.88 353.21 913.04 489.2 896.46 368.8 879.88 353.21" style="fill:#061a57"/><polygon points="854.3 415.01 913.04 489.2 879.88 353.21 854.3 415.01" style="fill:#05154c"/><polygon points="912.77 489.2 916.77 436.39 920.82 57 1.82 913.04 489.2 912.77 489.2" style="fill:#081f63"/><polygon points="903.2 596.22 920.82 571.82 913.04 489.2 903.2 596.22" style="fill:#12348d"/><polygon points="906.58 658.41 892.49 665.22 920.82 571.82 906.58 658.41" style="fill:#123392"/><polygon points="892.49 665.22 920.82 571.82 903.2 596.22 892.49 665.22" style="fill:#0c2674"/><polygon points="903.2 596.22 913.04 489.2 882.86 524.9 903.2 596.22" style="fill:#081f63"/><polygon points="892.49 665.22 903.2 596.22 844.99 694.32 892.49 665.22" style="fill:#0f2f82"/><polygon points="854.3 415.01 913.04 489.2 882.86 524.9 854.3 415.01" style="fill:#061a57"/><polygon points="903.2 596.22 882.86 524.9 852.17 612.75 903.2 596.22" style="fill:#081e5f"/><polygon points="844.99 694.32 903.2 596.22 852.17 612.75 844.99 694.32" style="fill:#092167"/><polygon points="842.09 785 906.58 658.41 892.49 665.22 842.09 785" style="fill:#163aa2"/><polygon points="842.09 785 892.49 665.22 845.34 752.53 842.09 785" style="fill:#163aa2"/><polygon poi nts="845.34 752.53 892.49 665.22 844.99 694.32 845.34 752.53" style="fill:#0e2b7e"/><polygon points="796.48 839.57 845.34 752.53 842.09 785 796.48 839.57" style="fill:#123392"/><polyline points="734.31 868.24 796.48 839.57 737.65 889.89 734.31 868.24" style="fill:#1a45b2"/><polygon points="796.48 839.57 845.34 752.53 734.31 868.24 796.48 839.57" style="fill:#123392"/><polygon points="734.31 868.24 737.65 889.89 685.8 905.97 734.31 868.24" style="fill:#133493"/><polygon points="646.22 940.21 685.8 905.97 737.65 889.89 646.22 940.21" style="fill:#1a45b2"/><polygon points="646.22 940.21 685.8 905.97 557.16 954.07 646.22 940.21" style="fill:#1a45b2"/><polygon points="543.93 969.1 646.22 940.21 557.16 954.07 543.93 969.1" style="fill:#1a45b2"/><polygon points="474.81 967.17 543.93 969.1 557.16 954.07 474.81 967.17" style="fill:#1a45b2"/><polygon points="342.45 951.59 334.9 939.52 474.81 967.17 342.45 951.59" style="fill:#1f51ca"/><polygon points="342.45 951.59 334.9 939.52 263.35 917.09 342.45 951.59" style="fill:#173fad"/><polygon points="199.21 873.58 147.85 826.37 263.35 917.09 199.21 873.58" style="fill:#173fad"/><polygon points="147.85 826.37 110.71 776.17 135.38 784.31 147.85 826.37" style="fill:#1b47b5"/><polygon points="147.85 826.37 263.35 917.09 225.57 868.79 147.85 826.37" style="fill:#163aa3"/><polygon points="147.85 826.37 225.57 868.79 135.38 784.31 147.85 826.37" style="fill:#173fad"/><polygon points="225.57 868.79 334.9 939.52 263.35 917.09 225.57 868.79" style="fill:#133595"/><polygon points="225.57 868.79 334.9 939.52 336.71 897.93 225.57 868.79" style="fill:#163ba4"/><polygon points="394.33 924.94 334.9 939.52 336.71 897.93 394.33 924.94" style="fill:#163aa2"/><polygon points="135.38 784.31 110.71 776.17 94.21 702.09 135.38 784.31" style="fill:#2053cf"/><polygon points="110.71 776.17 58.05 672.25 94.21 702.09 110.71 776.17" style="fill:#306dff"/><polyline points="40.73 560.38 94.21 702.09 58.05 672.25" style="fill:#1f51ca"/><polygon points="58.05 672.25 34.18 580.97 40.73 560.38 58.05 672.25" style="fill:#2257d7"/><polygon points="40.73 560.38 34.18 580.97 38.86 447.1 40.73 560.38" style="fill:#11318d"/><polygon points="63.9 358.86 80.28 352.77 38.86 447.1 63.9 358.86" style="fill:#0c2674"/><polygon points="38.86 447.1 70.22 441.25 80.28 352.77 38.86 447.1" style="fill:#102f88"/><polygon points="40.73 560.38 38.86 447.1 70.22 441.25 40.73 560.38" style="fill:#133595"/><polygon points="70.22 441.25 68.11 537.91 40.73 560.38 70.22 441.25" style="fill:#12328e"/><polygon points="127.56 255.17 80.28 352.77 63.9 358.86 127.56 255.17" style="fill:#0b2572"/><polygon points="127.56 255.17 187.95 197.36 196.61 177.94 127.56 255.17" style="fill:#020b2e"/><polygon points="196.61 177.94 268.46 142.13 187.95 197.36 196.61 177.94" style="fill:#092064"/><polyline points="196.61 177.94 307.08 113.11 268.46 142.13 196.61 177.94" style="fill:#030f41"/><polygon points="268.46 142.13 369.34 93.91 307.08 113.11 268.46 142.13" style="fill:#081e5f "/><polygon points="369.34 93.91 329.9 136.51 268.46 142.13 369.34 93.91" style="fill:#081f61"/><polygon points="329.9 136.51 423.87 98.83 369.34 93.91 329.9 136.51" style="fill:#0d2a78"/><polygon points="445.64 80.1 369.34 93.91 423.87 98.83 445.64 80.1" style="fill:#11338b"/><polyline points="517.8 97.89 423.87 98.83 445.64 80.1" style="fill:#153a99"/><polygon points="445.64 80.1 566.64 87.83 517.8 97.89 445.64 80.1" style="fill:#0d2a78"/><polygon points="517.8 97.89 566.64 87.83 640.13 114.04 517.8 97.89" style="fill:#2053ce"/><polygon points="695.25 142.59 640.13 114.04 701.38 138.15 695.25 142.59" style="fill:#1e4dc3"/><polygon points="695.25 142.59 701.38 138.15 771.93 188.65 695.25 142.59" style="fill:#1e4fc7"/><polygon points="334.9 939.52 474.81 967.17 394.33 924.94 334.9 939.52" style="fill:#1a45b2"/><polygon points="474.81 967.17 394.33 924.94 473.09 910.23 474.81 967.17" style="fill:#163aa2"/><polygon points="557.16 954.07 474.81 967.17 473.09 910.23 557.16 954.07" style ="fill:#1a45b2"/><polygon points="557.16 954.07 473.09 910.23 588.95 879.02 557.16 954.07" style="fill:#1741aa"/><polyline points="685.8 905.97 557.16 954.07 588.95 879.02" style="fill:#1a45b2"/><polygon points="685.8 905.97 691.68 830.87 588.95 879.02 685.8 905.97" style="fill:#133493"/><polygon points="685.8 905.97 691.68 830.87 734.31 868.24 685.8 905.97" style="fill:#163aa2"/><polygon points="734.31 868.24 691.68 830.87 794.68 762.24 734.31 868.24" style="fill:#133493"/><polygon points="734.31 868.24 794.68 762.24 845.34 752.53 734.31 868.24" style="fill:#1a45b2"/><polygon points="845.34 752.53 844.99 694.32 794.68 762.24 845.34 752.53" style="fill:#092167"/><polyline points="640.13 114.04 640.49 148.44 695.25 142.59" style="fill:#2258d9"/><polygon points="640.49 148.44 640.13 114.04 517.8 97.89 640.49 148.44" style="fill:#2257d7"/><polygon points="517.8 97.89 547.82 149.01 640.49 148.44 517.8 97.89" style="fill:#2257d7"/><polygon points="517.8 97.89 547.82 149.01 447.85 140.94 517.8 97.89" style="fill:#1a46b3"/><polygon points="423.87 98.83 447.85 140.94 517.8 97.89 423.87 98.83" style="fill:#163c9f"/><polygon points="329.9 136.51 423.87 98.83 447.85 140.94 329.9 136.51" style="fill:#103186"/><polygon points="393.67 194.85 329.9 136.51 447.85 140.94 393.67 194.85" style="fill:#163c9e"/><polygon points="268.46 142.13 187.95 197.36 226.1 234.11 268.46 142.13" style="fill:#031043"/><polygon points="329.9 136.51 226.1 234.11 268.46 142.13 329.9 136.51" style="fill:#030f41"/><polygon points="226.1 234.11 292.33 245.16 329.9 136.51 226.1 234.11" style="fill:#05164e"/><polygon points="292.33 245.16 329.9 136.51 393.67 194.85 292.33 245.16" style="fill:#092064"/><polygon points="127.56 255.17 131.6 294.44 187.95 197.36 127.56 255.17" style="fill:#030f41"/><polygon points="80.28 352.77 127.56 255.17 131.6 294.44 80.28 352.77" style="fill:#091f64"/><polygon points="131.6 294.44 187.95 197.36 226.1 234.11 131.6 294.44" style="fill:#041345"/><polygon points="128.19 3 78.6 131.6 294.44 80.28 352.77 128.19 378.6" style="fill:#0a226b"/><polygon points="128.19 378.6 131.6 294.44 198.19 348.64 128.19 378.6" style="fill:#091f64"/><polygon points="198.19 348.64 226.1 234.11 131.6 294.44 198.19 348.64" style="fill:#061853"/><polygon points="198.19 348.64 226.1 234.11 292.33 245.16 198.19 348.64" style="fill:#030f42"/><polygon points="70.22 441.25 80.28 352.77 128.19 378.6 70.22 441.25" style="fill:#0b2572"/><polygon points="94.21 702.09 68.11 537.91 40.73 560.38 94.21 702.09" style="fill:#173da9"/><polygon points="135.38 784.31 94.21 702.09 138.33 708.3 135.38 784.31" style="fill:#1a45b2"/><polygon points="94.21 702.09 138.33 708.3 107.44 635.98 94.21 702.09" style="fill:#1741aa"/><polygon points="94.21 702.09 68.11 537.91 107.44 635.98 94.21 702.09" style="fill:#10308b"/><polygon points="135.38 784.31 181.75 793.26 138.33 708.3 135.38 784.31" style="fill:#123390"/><polygon points="135.38 784.31 225.57 868.79 181.75 793.26 135.38 784.31" style="fill:#13 3493"/><polygon points="225.57 868.79 258.2 837.33 181.75 793.26 225.57 868.79" style="fill:#1a45b2"/><polygon points="225.57 868.79 336.71 897.93 258.2 837.33 225.57 868.79" style="fill:#163aa2"/><polygon points="336.71 897.93 394.33 924.94 473.09 910.23 336.71 897.93" style="fill:#1a45b2"/><polygon points="336.71 897.93 374.38 818.85 473.09 910.23 336.71 897.93" style="fill:#123392"/><polygon points="68.11 537.91 132.48 537.82 70.22 441.25 68.11 537.91" style="fill:#102f87"/><polygon points="70.22 441.25 132.48 537.82 128.19 378.6 70.22 441.25" style="fill:#081f63"/><polygon points="68.11 537.91 107.44 635.98 132.48 537.82 68.11 537.91" style="fill:#163ba4"/><polygon points="107.44 635.98 132.48 537.82 163.61 615.38 107.44 635.98" style="fill:#11318c"/><polygon points="138.33 708.3 163.61 615.38 107.44 635.98 138.33 708.3" style="fill:#123390"/><polygon points="138.33 708.3 257.7 782.47 163.61 615.38 138.33 708.3" style="fill:#123392"/><polygon points="181.75 793.26 257.7 782.47 1 38.33 708.3 181.75 793.26" style="fill:#163aa2"/><polygon points="258.2 837.33 257.7 782.47 181.75 793.26 258.2 837.33" style="fill:#1741aa"/><polygon points="258.2 837.33 257.7 782.47 374.38 818.85 258.2 837.33" style="fill:#123392"/><polygon points="258.2 837.33 336.71 897.93 374.38 818.85 258.2 837.33" style="fill:#123392"/><polygon points="473.09 910.23 483 820.09 374.38 818.85 473.09 910.23" style="fill:#0e2b80"/><polygon points="473.09 910.23 483 820.09 588.95 879.02 473.09 910.23" style="fill:#143698"/><polygon points="588.95 879.02 584.83 777.69 483 820.09 588.95 879.02" style="fill:#0d2878"/><polygon points="588.95 879.02 584.83 777.69 691.68 830.87 588.95 879.02" style="fill:#123392"/><polygon points="584.83 777.69 650.94 717.65 691.68 830.87 584.83 777.69" style="fill:#081f63"/><polygon points="691.68 830.87 741.66 679.1 650.94 717.65 691.68 830.87" style="fill:#061a57"/><polygon points="794.68 762.24 691.68 830.87 741.66 679.1 794.68 762.24" style="fill:#0f2f82"/><polygo n points="794.68 762.24 844.99 694.32 741.66 679.1 794.68 762.24" style="fill:#092167"/><polygon points="844.99 694.32 741.66 679.1 852.17 612.75 844.99 694.32" style="fill:#05164f"/><polyline points="882.86 524.9 810.95 473.57 852.17 612.75 882.86 524.9" style="fill:#051753"/><polygon points="882.86 524.9 854.3 415.01 810.95 473.57 882.86 524.9" style="fill:#031043"/><polygon points="741.66 679.1 852.17 612.75 745.06 564.94 741.66 679.1" style="fill:#031043"/><polygon points="741.66 679.1 641.5 577.61 650.94 717.65 741.66 679.1" style="fill:#030f41"/><polygon points="584.83 777.69 507.93 709.41 650.94 717.65 584.83 777.69" style="fill:#092167"/><polygon points="584.83 777.69 483 820.09 507.93 709.41 584.83 777.69" style="fill:#0f2f82"/><polygon points="374.38 818.85 483 820.09 348.75 732.05 374.38 818.85" style="fill:#123390"/><polygon points="374.38 818.85 348.75 732.05 257.7 782.47 374.38 818.85" style="fill:#0f2d84"/><polygon points="257.7 782.47 274.73 694.32 348.75 732.05 257. 7 782.47" style="fill:#0e2b7e"/><polygon points="274.73 694.32 163.61 615.38 257.7 782.47 274.73 694.32" style="fill:#0f2e86"/><polygon points="483 820.09 507.93 709.41 348.75 732.05 483 820.09" style="fill:#081f63"/><polygon points="132.48 537.82 164.41 435.6 128.19 378.6 132.48 537.82" style="fill:#0a236c"/><polygon points="128.19 378.6 164.41 435.6 198.19 348.64 128.19 378.6" style="fill:#081f63"/><polygon points="198.19 348.64 338.33 307.68 292.33 245.16 198.19 348.64" style="fill:#05164e"/><polygon points="198.19 348.64 338.33 307.68 264.31 459.32 198.19 348.64" style="fill:#030f41"/><polygon points="741.66 679.1 641.5 577.61 745.06 564.94 741.66 679.1" style="fill:#05164f"/><polygon points="852.17 612.75 810.95 473.57 745.06 564.94 852.17 612.75" style="fill:#030f42"/><polygon points="650.94 717.65 536.4 606.6 641.5 577.61 650.94 717.65" style="fill:#030f41"/><polygon points="507.93 709.41 650.94 717.65 536.4 606.6 507.93 709.41" style="fill:#05164f"/><polygon points="507.93 7 09.41 429.6 645.45 536.4 606.6 507.93 709.41" style="fill:#031042"/><polygon points="810.95 473.57 854.3 415.01 784.98 362.3 810.95 473.57" style="fill:#0f2e82"/><polygon points="198.19 348.64 264.31 459.32 164.41 435.6 198.19 348.64" style="fill:#061853"/><polygon points="164.41 435.6 264.31 459.32 196.75 566.02 164.41 435.6" style="fill:#081f63"/><polygon points="338.33 307.68 393.67 194.85 292.33 245.16 338.33 307.68" style="fill:#081e5f"/><polyline points="196.75 566.02 164.41 435.6 132.48 537.82" style="fill:#091f64"/><polygon points="132.48 537.82 196.75 566.02 163.61 615.38 132.48 537.82" style="fill:#11318c"/><polygon points="196.75 566.02 274.73 694.32 163.61 615.38 196.75 566.02" style="fill:#0e2b7e"/><polygon points="274.73 694.32 285.15 539.09 196.75 566.02 274.73 694.32" style="fill:#092167"/><polygon points="274.73 694.32 429.6 645.45 285.15 539.09 274.73 694.32" style="fill:#061a57"/><polygon points="429.6 645.45 414.51 525.44 285.15 539.09 429.6 645.45" style="fill:# 05164f"/><polygon points="536.4 606.6 429.6 645.45 414.51 525.44 536.4 606.6" style="fill:#041245"/><polygon points="414.51 525.44 523.74 484.47 536.4 606.6 414.51 525.44" style="fill:#030f42"/><polygon points="348.75 732.05 507.93 709.41 429.6 645.45 348.75 732.05" style="fill:#092167"/><polygon points="348.75 732.05 274.73 694.32 429.6 645.45 348.75 732.05" style="fill:#0c2674"/><polygon points="338.33 307.68 433.19 317.74 393.67 194.85 338.33 307.68" style="fill:#0c2771"/><polygon points="482.06 230.78 393.67 194.85 433.19 317.74 482.06 230.78" style="fill:#153a99"/><polygon points="482.06 230.78 576.21 295.46 433.19 317.74 482.06 230.78" style="fill:#163da0"/><polygon points="433.19 317.74 573.48 392.34 523.74 484.47 433.19 317.74" style="fill:#11338b"/><polygon points="573.48 392.34 576.21 295.46 433.19 317.74 573.48 392.34" style="fill:#163ca0"/><polygon points="573.48 392.34 576.21 295.46 675.3 344.13 573.48 392.34" style="fill:#1a45b2"/><polygon points="433.19 317.74 523.74 484.47 364.92 404.7 433.19 317.74" style="fill:#0c266e"/><polygon points="414.51 525.44 523.74 484.47 364.92 404.7 414.51 525.44" style="fill:#071b5c"/><polygon points="523.74 484.47 663.82 458.82 573.48 392.34 523.74 484.47" style="fill:#0f2f82"/><polygon points="675.3 344.13 663.82 458.82 573.48 392.34 675.3 344.13" style="fill:#1741aa"/><polygon points="675.3 344.13 741.42 434.17 663.82 458.82 675.3 344.13" style="fill:#153a99"/><polygon points="784.98 362.3 675.3 344.13 741.42 434.17 784.98 362.3" style="fill:#1945b1"/><polygon points="741.42 434.17 810.95 473.57 784.98 362.3 741.42 434.17" style="fill:#12338c"/><polygon points="745.06 564.94 810.95 473.57 741.42 434.17 745.06 564.94" style="fill:#081e60"/><polygon points="745.06 564.94 741.42 434.17 663.82 458.82 745.06 564.94" style="fill:#081e5f"/><polyline points="663.82 458.82 641.5 577.61 745.06 564.94" style="fill:#061a57"/><polygon points="523.74 484.47 663.82 458.82 641.5 577.61 523.74 484.47" style="fill:#031042"/><pol ygon points="536.4 606.6 641.5 577.61 523.74 484.47 536.4 606.6" style="fill:#05164f"/><polygon points="338.33 307.68 364.92 404.7 433.19 317.74 338.33 307.68" style="fill:#05174f"/><polygon points="338.33 307.68 264.31 459.32 364.92 404.7 338.33 307.68" style="fill:#061853"/><polygon points="364.92 404.7 285.15 539.09 414.51 525.44 364.92 404.7" style="fill:#030f41"/><polygon points="285.15 539.09 364.92 404.7 264.31 459.32 285.15 539.09" style="fill:#041245"/><polygon points="196.75 566.02 264.31 459.32 285.15 539.09 196.75 566.02" style="fill:#061a58"/><path d="M922.81,571.94v-.19h0l-4-135.4v-.48h0l-20.3-67.57h0v-.11l-.06-.14V368L840.14,258v-.05l-.07-.11-.07-.1v-.06l-.06-.07v-.05L773.5,187.28h0l-.12-.1-.09-.08h0l-70.52-50.48h-.07l-.15-.08-.15-.08h0L640.91,112.2h-.12L567.31,85.94h-.54l-121-7.72h-.48L369,91.94h-.25l-62.19,19.17h0l-.14.06-.16.07h-.08l-110.58,65h0l-.09.06-.08.06-.08.06-.07.05-.08.08-.06.06h0l-69,77.21h0v.12l-.06.09h0L62.2,357.81v.06l-.06.11,0,.12-.05.14v.06L37,446.54 h0v.4h0l-4.86,134v.63h0L56,672.75h0v.07a1.08,1.08,0,0,0,.08.19h0v.1h0L108.77,777h0v0l.1.17h0L146,827.38h0v.06l.11.11.08.09,51.36,47.22.13.1.1.09,64.14,43.51h0l.15.09h.08l79.09,34.5h.08l.18.06h.31l132.37,15.58h.18l69.11,1.93h.07a1.27,1.27,0,0,0,.39,0h.14l102.29-28.89h.29l.12-.05h0l91.38-50.29h0l.15-.11h0l.12-.09h0L797.23,841l.06-.06.08-.07.07-.08h0l45.61-54.56h0a1.43,1.43,0,0,0,.16-.24l0-.09h0l64.49-126.59v-.09a.15.15,0,0,1,.07-.15v-.34l14.23-86.57h0V572A3.25,3.25,0,0,0,922.81,571.94ZM200.46,872l-13.3-12.23,29.92,23.5ZM394.6,922.85l-46.75-21.92,110.65,10Zm17-399.13-122.74,13,75.69-127.51ZM368.8,408.89l150,75.32L415.62,522.88Zm44,118.74L427,641.08,290.49,540.54Zm12.48,117.1L277,691.53l10-148.67ZM417,529.52l115,76.55L431.27,642.72Zm1.83-3.59L522,487.25l12,115.33ZM577.36,392.71,673,347.45,662.18,455.13Zm81.55,65-131.43,24,46.66-86.44ZM523.74,480.27,438.12,322.63l132.64,70.53Zm-4.8-.45L368,404l64.88-82.64ZM285.87,534l-19.23-73.62L359.5,410ZM273.16,687.88,199.8,567.18,283,541.85ZM423,649. 65l-74.63,79.94L280,694.76Zm110.5-39.84-26.62,96.12-73.23-59.8ZM526.22,489l110.94,87.75-99,27.31Zm2.23-3.34,132.87-24.34L640.15,574ZM666.11,456l10.66-106.48,61.38,83.59Zm73.38-19.11,3.4,121.94-75.75-99ZM575.57,389.14l2.55-90.51,92.58,45.46Zm-4-.08L439.43,318.79l134.71-21ZM365.8,400.34,341,310l88.35,9.37Zm-3.23,3.36-93.73,50.88,69-141.26Zm-79.84,134-81.4,24.8,62.21-98.26ZM268,687.08l-101.63-72.2,30.32-45.15Zm8.2,10.23,68.3,34.81-84,46.52Zm153.6-49.13,73.35,59.89-149,21.2Zm107.65-37.8,108.26,105-135.17-7.79Zm2.87-2.78,99.36-27.4,8.93,132.4ZM665,463.59l76.39,99.79L644,575.3Zm78.56-25.94L808,474.21,746.89,559Zm.68-4.21,40-65.91,23.82,102Zm-2.94-2.87L679.82,346.9l101.91,16.89ZM579.73,295l72.16-65.5L672.6,340.57ZM437,315.13l45.78-81.46L571,294.26ZM341.38,306l51.89-105.81,37.07,115.25ZM264.13,455.12l-62.9-105.28,133.31-39ZM197.57,561,167.14,438.31l94,22.31Zm-33.51,50.13-27.9-69.51,57.6,25.27Zm108.46,84.08-15.75,81.54-87-154.56Zm75,39.8,23.87,80.82L262.76,782ZM505.34,711.8l-23.66,105-127.4- 83.52Zm140.72,7.57L584.82,775l-71.25-63.26Zm-2.21-136.53,94.31,95.55L652.74,714.7Zm1.93-3.75L743,567.21l-3.2,107.15ZM810.19,478,849,609.16l-100.9-45Zm-22-110.79,63.33,48.15-39.6,53.5Zm-109-24.51L738,275.18l43.43,84.46Zm-2.65-3L655.93,229.33l79.29,42.91ZM576,292.92,488.2,232.6l159.61-4.86ZM433.69,312.77,396.88,198.32l82.32,33.47ZM338,303.84l-42.63-57.95,93.92-46.63Zm-3,2.72L204.46,344.73l87.72-96.42ZM260.16,456.28l-93.05-22.09,31.46-81ZM193.83,562.55,134.92,536.7,164.19,443ZM161,614.21l-50.67,18.58,22.59-88.55Zm91.14,162.44L140.65,707.38l23.61-86.78Zm113.5,41.56L260.18,835l-.46-49.79Zm-13.42-81.5,124,81.3-100.3-1.14Zm156.93-23.55,72,63.91L485.8,816.75Zm140.93,8,38,105.71L588.34,777.2Zm3.39-2.39,84.91-36.09L691.6,824.73ZM747,568l100.88,45L743.77,675.5Zm67.55-89.41,66,47.08L852.4,606.26Zm-.75-5.45,39.64-53.56,26.13,100.5ZM787.31,361.56l18.41-57.23L849.57,408.9Zm-2.77-4.47L742.6,275.52,803,299.73Zm-124.3-130,87.83-5.75L737,268.67Zm-173.91,1.53,61.84-76.9,99.11,72Zm-3.65-1.84-31.84-83.62 ,93,7.52Zm-4.13.39-81.34-33.06,49.86-49.61Zm-182.73,14L330.8,140l59.37,54.32ZM202,341.5l25.6-105.11,60.78,10.14Zm-38,89.7-32.84-51.68,63.46-27.15Zm-1.75,4.7-28.07,89.85-3.77-140ZM129.9,539.82,107,629.55,71.07,539.9Zm-59.74-3.91,1.92-88.09,56.73,88Zm90.5,82.68-22.75,83.63L110.1,637.13ZM252,781.27l-69.09,9.81L143.42,713.8Zm3.75,3.51.45,49.07-68.4-39.42ZM371,821.43l-35,73.41-72.88-56.25Zm4.08.74,92.41,85.55L339.75,896.19Zm4.53-1.26,101.22,1.15-9.23,84ZM583,780.64l3.86,94.9-99.23-55.19Zm4,.35L687.1,830.82l-96.26,45.12Zm155.27-97.26L792,761.66,695.39,826Zm3.46-2,95.69,14.1-46.59,62.9Zm1.78-3.78,102.35-61.44L843.18,692ZM882.67,531.51l18.07,63.4L855.38,609.6Zm-24-107.82,51.84,65.46-26.63,31.5ZM810.11,304.45l67.32,49.44L854.28,409.8Zm-69.4-34L751.57,224l48.49,70.19Zm-85.84-47-11.69-70.91,101.27,65Zm-4.44-2.37L553.92,151l84.87-.53ZM454.11,139.44l63-38.77,27,46Zm-60.5,52.65-58.34-53.37,107.91,4.05ZM291,242.91,230.41,232.8l95-89.27ZM197,345.1l-62-50.46,88-56.16Zm-2.63,3-64,27.4,3.12-77ZM130.29 ,530.73,72.74,441.46l53.58-57.91ZM105.36,636.17l-10.92,54.6L72.89,555.18Zm2.77,6.53,27,63.13-38.51-5.41Zm70,147.82-40.66-7.84L140,716Zm76.8,47.22L226,865.58l-38.78-66.85Zm3.45,2.23L327.7,893.5l-98.18-25.74ZM484.66,823.3l99,55.07L475.4,907.54Zm204.76,10.84L684,903.39l-89.31-24.85Zm99.35-65.56-55,96.54-38.82-34ZM843,700.33l.31,50.55-44,8.42Zm11-86.09,44.73-14.49-51,86Zm31-88.87,25.39-30-8.28,90ZM856.6,414.69l22.8-55.06,29.54,121.15ZM808.1,298l16-28,48.27,75.26Zm-2.78-3.19-47.38-68.58,63.39,40.53Zm-159-145,48-5.12,48.52,67.09ZM549,147l-26.42-45,108,44.49Zm-100.39-8.85-21.27-37.36,83.33-.83Zm-4.23.65-105-3.94L423,101.33ZM232.21,225.62,269.79,144l54.51-5Zm-6.75,5.1-34.36-33.1,72.51-49.74Zm-2.58,3.07-85.42,54.53,50.94-87.75ZM126.32,375.32,83.45,352.21,129.37,300ZM125,379.13,72.9,435.41l9-79.47ZM66.13,537l-22,18,23.71-95.77Zm.55,4.72L89.16,683l-46-122ZM136.26,710l-2.58,66.43-36-71.85Zm44.21,85L217,858l-75.2-70.41ZM334.64,899.4l-1.59,36.49-95.92-62.06Zm3.94,1.56,49.78,23.34L337,936.94Zm132. 59,11.61,1.55,51.18-72.35-38ZM585.51,882l-29.34,69.3-77.6-40.47Zm4.6-.6,89.24,24.83L560.82,950.57ZM693.36,835l37.81,33.14-43,33.46ZM796,764l43.59-8.35L744,855.23Zm51.33-19.32-.3-49.27L887.2,670.8Zm3.54-56.31,48.81-82.25-9,57.84Zm62.24-177.62,5.69,60.47-12.9,17.87Zm-29.64-151.5,11.15,10.49,11.15,81Zm-56.53-92.39,10.49-5.28,30.34,68.94ZM753.52,218.6l18.42-26.44,45.09,67Zm-2.86-2.89-48-66.4,66.47,39.92Zm-108.2-69.49-.3-28.87,46.26,24Zm-4-.78L532.74,101.88,638.15,115.8ZM429.33,96.77l16.83-14.48L502,96Zm-91.92,34.57L370.14,96l45.26,4.08ZM329,134.59l-49.56,4.53,81.37-38.89ZM192.66,191.7l5.48-12.3,45.48-22.67ZM133,288.11l-3.31-32.17,49.47-47.36Zm-3.44,5.66-41,46.64,37.8-78ZM68.4,439.55l-26.19,4.89L76.8,365.67Zm-.87,4.23L42.48,545l-1.59-96.25Zm22.15,252L59.91,671.19,45.65,579.07Zm41.75,85.14-19-6.28L99.69,717.51Zm81.29,78.59L149.53,825l-10.14-34.19Zm11.52,10.85,27.36,35L168,839.63ZM234.47,877l87,56.28-56.92-17.84Zm159.59,50.13,67.6,35.47L344.15,939.31Zm81.13-13.48L550.87,953l-74.13,11.79Zm2 00.87-1.84-30.72,26.58L576.21,949.1Zm56.78-39.84,2.56,16.58-39.7,12.3Zm103-106.65L795.05,838l-52,24Zm11.39-12.13,27.36-50.66L845.41,772ZM905.1,597l10.33-14.3-16.6,54.74ZM915,489h0v-.09h0l-.15-1.06,1-13.56,1,35.11Zm-2.75-20L902,394l12.8,42.58Zm-30.7-117-18.86-42.86,26.39,49.94Zm-56.86-88.51-37.66-56,48,50.78Zm-125.82-121,2.52-1.82,29,20.73Zm-3.8-2.19L675.5,130.11l21.76,8.56ZM529.81,97.46,566.5,89.9l55.21,19.69Zm-12-1.62-50-12.31,83.76,5.35Zm-94.64.92-39-3.51,54.52-9.87Zm-137.5,34.91L308,114.91l35.94-11.08Zm-18.3,8.75L248,150.06l29.73-17.45Zm-81.13,55.77-22.94,22,26.23-29.34ZM78.8,351.19,68.64,355l39.62-64.53Zm-13.29,9.2,11-4.09L48.72,419.66ZM38.14,524.81l.58,35.27-2,6.41Zm1.91,44.28,10,64.83L36.26,581ZM92.41,703.2l12.89,57.86L64.16,679.89Zm41.35,82.69,9,30.11-26.64-36ZM333.59,941.21l3.73,6-39.1-17.05Zm10,8.51L339,942.38l85.06,16.81ZM552,956.92l-9,10.15-46.69-1.3Zm6.2-1,55.66-8.67-63.93,18.06Zm128.61-48.19,32.64-10.12-57.56,31.68ZM739.08,886l-2.56-16.61,47.7-22ZM842.4,761.86l-2.23,22. 32L808.8,821.71ZM894,666.69l8.06-3.89-36.89,72.42Zm10.73-9.63-9,4.37,18.19-60Z" style="fill:#58c1ff;fill-opacity:0.30000001192092896"/><path d="M80,726.72c51.48,39.42,209.8,68.08,396.9,68.08s345.08-28.62,397-67.94" style="fill:none;stroke:#f9f9fa;stroke-linecap:round;stroke-miterlimit:10;stroke-width:6px"/><path d="M770.28,91.82c-23.95,27.88-35.1,90.64-10.82,154.26s61.5,49.8,84.7,114.67c30.62,85.6,16.37,200.59,16.37,200.59s36.82,106.6,62.47-6.64C979.79,342,770.28,144.2,770.28,91.82Z" style="fill:url(#linear-gradient)"/><path d="M810.67,803.89a245.54,245.54,0,0,1-30.12,18.18,702.48,702.48,0,0,0,38.3-63C828.31,748.6,837,738.42,844,727.42c3.44-5.41,7.31-12.08,11.42-19.82,24.92-44.9,52.4-117.56,53.18-192.2v-5.69A257.57,257.57,0,0,0,902.93,454c.2,1.43.38,2.86.56,4.29-.22-1.1-.41-2.21-.64-3.31.37,2,.66,4,1,6,5.09,43.22,1.47,85.37-16.68,116.45-.29.45-.58.88-.87,1.32,9.41-47.23,12.56-99.39,2.09-151.6,0,0-4.19-25.38-35.38-102.44C835,280.36,803.18,244,775,217.5c-24.69-30.55-47.11-51-59.47-64. 06-25.82-27.19-36.64-47.57-41.09-60.87-3.85-1.93-53.14-49.81-57.05-51.63-21.51,33.35-89.16,137.67-57,235.15,14.58,44.17,51.47,90,90.07,115.74,1.69,1.94,23,25,33.09,77.16,10.45,53.85,5,95.86-16.54,158C641.73,681.5,577,735.38,516.3,740.89c-129.67,11.78-177.15-65.11-177.15-65.11,46.34,18.52,97.57,14.65,128.72-4.56,31.4-19.43,50.39-33.83,65.81-28.15,15.2,5.65,27.3-10.76,16.44-27.77a78.52,78.52,0,0,0-79.4-34.57c-31.43,5.11-60.23,30-101.41,5.89a82.13,82.13,0,0,1-7.73-5.06c-2.71-1.79,8.83,2.72,6.13.69-8-4.35-22.2-13.84-25.88-17.22-.61-.56,6.22,2.18,5.61,1.62-38.51-31.71-33.7-53.13-32.49-66.57,1-10.75,8-24.52,19.75-30.11,5.69,3.11,9.24,5.48,9.24,5.48s-2.43-5-3.74-7.58c.46-.2.9-.15,1.36-.34,4.66,2.25,15,8.1,20.41,11.67,7.07,5,9.33,9.44,9.33,9.44s1.86-1,.48-5.37c-.5-1.78-2.65-7.45-9.65-13.17h.44a81.61,81.61,0,0,1,11.87,8.24c2-7.18,5.53-14.68,4.75-28.09-.48-9.43-.26-11.87-1.92-15.51-1.49-3.13.83-4.35,3.42-1.1a32.65,32.65,0,0,0-2.21-7.4V426c3.23-11.24,68.25-40.46,73-43.88a67.2,67.2,0,0,0,19.13- 20.8c3.62-5.76,6.34-13.85,7-26.11.36-8.84-3.76-14.73-69.51-21.62-18-1.77-28.53-14.8-34.53-26.82-1.09-2.59-2.21-4.94-3.33-7.28a57.31,57.31,0,0,1-2.56-8.43c10.75-30.87,28.81-57,55.37-76.7,1.45-1.32-5.78.34-4.34-1,1.69-1.54,12.71-6,14.79-7,2.54-1.2-10.88-6.9-22.73-5.51-12.07,1.36-14.63,2.8-21.07,5.53,2.67-2.66,11.17-6.15,9.18-6.13-13,2-29.18,9.56-43,18.12a10.66,10.66,0,0,1,.83-4.35c-6.44,2.73-22.26,13.79-26.87,23.14a44.19,44.19,0,0,0,.27-5.4,84.57,84.57,0,0,0-13.19,13.82l-.24.22c-37.36-15-70.23-16-98.05-9.28-6.09-6.11-9.06-1.64-22.91-32.07-.94-1.83.72,1.81,0,0-2.28-5.9,1.39,7.87,0,0-23.28,18.37-53.92,39.19-68.63,53.89-.18.59,17.16-4.9,0,0-6,1.72-5.6,5.28-6.51,37.5-.22,2.44,0,5.18-.22,7.38-11.75,15-19.75,27.64-22.78,34.21-15.19,26.18-31.93,67-48.15,131.55A334.2,334.2,0,0,1,75.2,398.62c-13.49,34.27-26.53,88.08-29.14,171a482.08,482.08,0,0,1,12.53-50.66A473,473,0,0,0,93.33,720c9.33,22.82,24.76,57.46,51,95.4,82.53,86.84,198.95,140.9,327.85,140.9C606.79,956.27,727.64,897.39,810.67,803.89Z" s tyle="fill:url(#linear-gradient-2)"/><path d="M810.67,803.89a245.54,245.54,0,0,1-30.12,18.18,702.48,702.48,0,0,0,38.3-63C828.31,748.6,837,738.42,844,727.42c3.44-5.41,7.31-12.08,11.42-19.82,24.92-44.9,52.4-117.56,53.18-192.2v-5.69A257.57,257.57,0,0,0,902.93,454c.2,1.43.38,2.86.56,4.29-.22-1.1-.41-2.21-.64-3.31.37,2,.66,4,1,6,5.09,43.22,1.47,85.37-16.68,116.45-.29.45-.58.88-.87,1.32,9.41-47.23,12.56-99.39,2.09-151.6,0,0-4.19-25.38-35.38-102.44C835,280.36,803.18,244,775,217.5c-24.69-30.55-47.11-51-59.47-64.06-25.82-27.19-36.64-47.57-41.09-60.87-3.85-1.93-53.14-49.81-57.05-51.63-21.51,33.35-89.16,137.67-57,235.15,14.58,44.17,51.47,90,90.07,115.74,1.69,1.94,23,25,33.09,77.16,10.45,53.85,5,95.86-16.54,158C641.73,681.5,577,735.38,516.3,740.89c-129.67,11.78-177.15-65.11-177.15-65.11,46.34,18.52,97.57,14.65,128.72-4.56,31.4-19.43,50.39-33.83,65.81-28.15,15.2,5.65,27.3-10.76,16.44-27.77a78.52,78.52,0,0,0-79.4-34.57c-31.43,5.11-60.23,30-101.41,5.89a82.13,82.13,0,0,1-7.73-5.06c-2.71-1.79,8.83,2 .72,6.13.69-8-4.35-22.2-13.84-25.88-17.22-.61-.56,6.22,2.18,5.61,1.62-38.51-31.71-33.7-53.13-32.49-66.57,1-10.75,8-24.52,19.75-30.11,5.69,3.11,9.24,5.48,9.24,5.48s-2.43-5-3.74-7.58c.46-.2.9-.15,1.36-.34,4.66,2.25,15,8.1,20.41,11.67,7.07,5,9.33,9.44,9.33,9.44s1.86-1,.48-5.37c-.5-1.78-2.65-7.45-9.65-13.17h.44a81.61,81.61,0,0,1,11.87,8.24c2-7.18,5.53-14.68,4.75-28.09-.48-9.43-.26-11.87-1.92-15.51-1.49-3.13.83-4.35,3.42-1.1a32.65,32.65,0,0,0-2.21-7.4V426c3.23-11.24,68.25-40.46,73-43.88a67.2,67.2,0,0,0,19.13-20.8c3.62-5.76,6.34-13.85,7-26.11.36-8.84-3.76-14.73-69.51-21.62-18-1.77-28.53-14.8-34.53-26.82-1.09-2.59-2.21-4.94-3.33-7.28a57.31,57.31,0,0,1-2.56-8.43c10.75-30.87,28.81-57,55.37-76.7,1.45-1.32-5.78.34-4.34-1,1.69-1.54,12.71-6,14.79-7,2.54-1.2-10.88-6.9-22.73-5.51-12.07,1.36-14.63,2.8-21.07,5.53,2.67-2.66,11.17-6.15,9.18-6.13-13,2-29.18,9.56-43,18.12a10.66,10.66,0,0,1,.83-4.35c-6.44,2.73-22.26,13.79-26.87,23.14a44.19,44.19,0,0,0,.27-5.4,84.57,84.57,0,0,0-13.19,13.82l-.24.22c-37.36- 15-70.23-16-98.05-9.28-6.09-6.11-9.06-1.64-22.91-32.07-.94-1.83.72,1.81,0,0-2.28-5.9,1.39,7.87,0,0-23.28,18.37-53.92,39.19-68.63,53.89-.18.59,17.16-4.9,0,0-6,1.72-5.6,5.28-6.51,37.5-.22,2.44,0,5.18-.22,7.38-11.75,15-19.75,27.64-22.78,34.21-15.19,26.18-31.93,67-48.15,131.55A334.2,334.2,0,0,1,75.2,398.62c-13.49,34.27-26.53,88.08-29.14,171a482.08,482.08,0,0,1,12.53-50.66A473,473,0,0,0,93.33,720c9.33,22.82,24.76,57.46,51,95.4,82.53,86.84,198.95,140.9,327.85,140.9C606.79,956.27,727.64,897.39,810.67,803.89Z" style="fill:url(#linear-gradient-3)"/><path d="M711.1,867C874,848.14,946.1,680.3,853.48,677,769.85,674.3,634,875.87,711.1,867Z" style="fill:url(#linear-gradient-4)"/><path d="M865.21,642.68C977.26,577.47,948,436.6,948,436.6s-43.25,50.24-72.62,130.32C846.4,646.22,797.84,682.07,865.21,642.68Z" style="fill:url(#linear-gradient-5)"/><path d="M509.47,950.32C665.7,1000.17,800,877.1,717.21,836,642,798.93,435.32,926.75,509.47,950.32Z" style="fill:url(#linear-gradient-6)"/><path d="M638.58,21. 68l.53-.57A1.8,1.8,0,0,0,638.58,21.68ZM876.85,702.49c3.8-5.36,8.94-22.53,13.48-30.21,27.58-44.52,27.78-80,27.78-80.84,16.66-83.22,15.15-117.2,4.9-180-8.25-50.6-44.32-123.09-75.57-158-32.2-36-9.51-24.25-40.69-50.52-27.33-30.29-53.82-60.29-68.25-72.36C634.22,43.35,636.57,24.84,638.58,21.68c-.34.37-.84.92-1.47,1.64-1.23-4.92-2.11-9.06-2.11-9.06s-57,57-69,152c-7.83,62,15.38,126.68,49,168a381.17,381.17,0,0,0,59,58h0c25.4,36.48,39.38,81.49,39.38,129.91,0,121.24-98.34,219.53-219.65,219.53a220.14,220.14,0,0,1-49.13-5.52c-57.24-10.91-90.29-39.78-106.77-59.38-9.45-11.23-13.46-19.42-13.46-19.42,51.28,18.37,108,14.53,142.47-4.52,34.75-19.26,55.77-33.55,72.84-27.92,16.82,5.61,30.21-10.67,18.2-27.54-11.77-16.85-42.4-41-87.88-34.29-34.79,5.07-66.66,29.76-112.24,5.84a92.59,92.59,0,0,1-8.55-5c-3-1.77,9.77,2.69,6.79.68-8.87-4.32-24.57-13.73-28.64-17.07-.68-.56,6.88,2.16,6.2,1.6-42.62-31.45-37.3-52.69-36-66,1.07-10.66,8.81-24.32,21.86-29.86,6.3,3.08,10.23,5.43,10.23,5.43s-2.69-4.92-4.14-7.51c.51-.19,1 -.15,1.5-.34,5.16,2.23,16.58,8,22.59,11.57,7.83,4.95,10.32,9.36,10.32,9.36s2.06-1,.54-5.33c-.56-1.77-2.93-7.39-10.68-13.07h.48a91.65,91.65,0,0,1,13.13,8.17c2.19-7.12,6.12-14.56,5.25-27.86-.53-9.35-.28-11.78-2.12-15.39-1.65-3.1.92-4.31,3.78-1.09a29.87,29.87,0,0,0-2.44-7.34v-.24c3.57-11.14,75.53-40.12,80.77-43.51a70.12,70.12,0,0,0,21.17-20.63c4-5.72,7-13.73,7.75-25.89.25-5.48-1.44-9.82-20.5-14-11.44-2.49-29.14-4.91-56.43-7.47-19.9-1.76-31.58-14.68-38.21-26.6-1.21-2.57-2.45-4.9-3.68-7.22A53.41,53.41,0,0,1,355.9,256a158.47,158.47,0,0,1,61.28-76.06c1.6-1.31-6.4.33-4.8-1,1.87-1.52,14.06-5.93,16.37-6.92,2.81-1.19-12-6.84-25.16-5.47-13.36,1.35-16.19,2.78-23.32,5.49,3-2.64,12.37-6.1,10.16-6.08-14.4,2-32.3,9.48-47.6,18a9.75,9.75,0,0,1,.92-4.31c-7.13,2.71-24.64,13.67-29.73,23a39.79,39.79,0,0,0,.29-5.35,89,89,0,0,0-14.6,13.7l-.27.22c-41.3-14.95-77.69-15.91-108.44-9.2-6.74-6.06-17.57-15.23-32.89-45.4-1-1.82-1.6,3.75-2.4,2-6-13.81-9.55-36.44-9-52,0,0-12.32,5.61-22.51,29.06-1.89,4.21-3.11,6.54-4.3 2,8.87-.56.68,1.27-7.7,1-7.24-1.77,3-6.36,7.19-8.37,12.62-1.38,4-3.32,6.27-4.56,11.29l-.29.46c-.1-1.48.37-6.08,0-5.14a237,237,0,0,0-12.31,29.84c-5.49,18-11.88,42.61-12.89,74.57-.24,2.42,0,5.14-.25,7.32C69.2,283,60.34,295.54,57,302.06,40.18,328,21.66,368.49,3.71,432.52a319.8,319.8,0,0,1,28.54-50C17.32,416.51,2.89,469.88,0,552.05a437.48,437.48,0,0,1,13.87-50.24c-2.58,54.8,3.81,122.74,38.45,199.39,20.57,45.09,67.92,136.65,183.62,208.1h0s39.36,29.3,107,51.26c5,1.81,10.06,3.6,15.23,5.33q-2.43-1-4.71-2a484.42,484.42,0,0,0,138.8,20.4c175.18.15,226.85-70.2,226.85-70.2l-.51.38q3.71-3.48,7.14-7.26c-27.63,26.12-90.74,27.84-114.29,26,40.22-11.81,66.69-21.81,118.17-41.52q9-3.36,18.48-7.64l2-.94c1.25-.58,2.49-1.13,3.75-1.74a348.86,348.86,0,0,0,70.26-44c51.7-41.3,63-81.56,68.83-108.1-.82,2.54-3.37,8.47-5.17,12.32-13.31,28.48-42.84,46-74.91,61A689.46,689.46,0,0,0,855.3,740C865.77,729.65,869,713.41,876.85,702.49Z" style="fill:url(#radial-gradient)"/><path d="M813.92,801.24c21.08-23.24,40-49.82,54.35 -80,36.9-77.58,94-206.58,49-341.31C881.77,273.48,833,215.25,771.11,158.38,670.56,66,642.48,24.78,642.48.26c0,0-116.09,129.41-65.74,264.38s153.46,130,221.68,270.87c80.27,165.74-64.95,346.61-185,397.24,7.35-1.63,267-60.38,280.61-208.88C893.68,726.6,887.83,767.67,813.92,801.24Z" style="fill:url(#linear-gradient-7)"/><path d="M477.59,319.63c.39-8.77-4.16-14.66-76.68-21.46-29.84-2.76-41.26-30.33-44.75-41.94-10.61,27.56-15,56.49-12.64,91.48,1.61,22.92,17,47.52,24.37,62,0,0,1.64-2.13,2.39-2.91,13.86-14.43,71.94-36.42,77.39-39.54C453.69,363.42,476.58,346.69,477.59,319.63Z" style="fill:url(#linear-gradient-8)"/><path d="M477.59,319.63c.39-8.77-4.16-14.66-76.68-21.46-29.84-2.76-41.26-30.33-44.75-41.94-10.61,27.56-15,56.49-12.64,91.48,1.61,22.92,17,47.52,24.37,62,0,0,1.64-2.13,2.39-2.91,13.86-14.43,71.94-36.42,77.39-39.54C453.69,363.42,476.58,346.69,477.59,319.63Z" style="fill:url(#linear-gradient-9)"/><path d="M158.31,156.73c-1-1.82-1.6,3.75-2.4,2-6-13.81-9.58-36.2-8.72-52,0,0-12.32,5.61-22.5 1,29.06-1.89,4.21-3.11,6.54-4.32,8.86-.56.68,1.27-7.7,1-7.24-1.77,3-6.36,7.19-8.35,12.38-1.65,4.24-3.35,6.52-4.61,11.77-.39,1.43.39-6.32,0-5.38C84.72,201.94,80.19,271.23,82.69,268.3,133.17,214.4,191,201.62,191,201.62c-6.15-4.53-19.53-17.63-32.7-44.89Z" style="fill:url(#linear-gradient-10)"/><path d="M349.84,720.36c-69.72-29.77-149-71.75-146-167.14C207.92,427.6,321,452.43,321,452.43c-4.27,1-15.68,9.16-19.72,17.82-4.27,10.83-12.07,35.28,11.55,60.9,37.09,40.19-76.2,95.36,98.66,199.57,4.41,2.4-41-1.43-61.64-10.36Z" style="fill:url(#linear-gradient-11)"/><path d="M325.07,657.76c49.44,17.21,107,14.19,141.52-4.86,23.09-12.85,52.7-33.43,70.92-28.35-15.78-6.24-27.73-9.15-42.1-9.86-2.45,0-5.38-.05-8-.32a138.21,138.21,0,0,0-15.76.86c-8.9.82-18.77,6.43-27.74,5.53-.48,0,8.7-3.77,8-3.61-4.75,1-9.92,1.21-15.37,1.88-3.47.39-6.45.82-9.89,1-103,8.73-190-55.81-190-55.81-7.41,25,33.17,74.3,88.52,93.57Z" style="fill:url(#linear-gradient-12)"/><path d="M813.74,801.9C917.9,699.63,970.6,575.32,948.32,435.9 c0,0,8.9,71.5-24.85,144.63,16.21-71.39,18.1-160.11-25-252C841,205.89,746.45,141.37,710.35,114.45,655.66,73.66,633,32.13,632.57,23.55c-16.34,33.48-65.77,148.2-5.31,247,56.64,92.56,145.86,120,208.33,205C950.67,631.92,813.74,801.9,813.74,801.9Z" style="fill:url(#linear-gradient-13)"/><path d="M798.81,535.81c-36.4-75.2-81.84-108-124.81-143.55,5,7,6.23,9.47,9,14,37.83,40.32,93.61,138.66,53.11,262.11C659.88,900.74,355,791.31,323,760.58c12.93,134.49,238,198.84,384.6,111.63C791,793.26,858.47,659,798.81,535.81Z" style="fill:url(#linear-gradient-14)"/><path d="M814.12,686.64l.94-4.85c.32-1.75.75-3.6,1-5.61.61-4,1.38-8.47,1.87-13.43a237.9,237.9,0,0,0,1.48-35A223.29,223.29,0,0,0,813.6,584a232.05,232.05,0,0,0-17.42-48.75,336.56,336.56,0,0,0-29.59-49.81c-5.8-8.24-12.31-16.18-19.09-24.06S733.27,446,725.58,438.59,709.75,424,701.44,417s-16.85-14-25.36-21-17-14.14-25.3-21.61-16.23-15.28-23.73-23.51a243.77,243.77,0,0,1-20.75-26l-2.3-3.42c-.79-1.13-1.57-2.27-2.28-3.45l-4.37-7c-1.44-2.34-2.72-4.77-4.08- 7.14l-2-3.57c-.66-1.2-1.24-2.43-1.86-3.64l-3.67-7.29c-1.14-2.46-2.22-4.94-3.34-7.4-2.31-4.88-4.12-9.94-6.13-14.88l-.74-1.86-.64-1.9-1.27-3.79c-.83-2.52-1.71-5-2.49-7.54l-2-7.63-1-3.8c-.36-1.26-.53-2.55-.8-3.82a212.28,212.28,0,0,1-3.8-59.83,261.53,261.53,0,0,1,10.19-53.46,310.75,310.75,0,0,1,17-44.06,373.62,373.62,0,0,1,18.17-33.81,366.73,366.73,0,0,1,24.69-36c2.56-3.27,5.11-6.43,7.66-9.35a1,1,0,0,1,1.31,0,1,1,0,0,1,.17,1.29c-2.42,2.81-5,6-7.55,9.3a376,376,0,0,0-43,70.76,309.24,309.24,0,0,0-16.54,43.94,256.66,256.66,0,0,0-9.66,53,213.15,213.15,0,0,0,4.27,58.87c.13.63.24,1.26.38,1.88l.49,1.86,1,3.73c.68,2.48,1.28,5,2,7.48l2.49,7.4,1.25,3.72c.41,1.24,1,2.45,1.42,3.67l2.94,7.35.74,1.84.82,1.81,1.64,3.63,1.64,3.64c.55,1.21,1.08,2.44,1.7,3.62l3.63,7.16a247.86,247.86,0,0,0,37.41,53.14c7.43,8.06,15.32,15.72,23.5,23.07s16.66,14.36,25.13,21.33,17,13.82,25.32,20.84,16.44,14.16,24.23,21.51,15.15,15,22.09,22.84a287.17,287.17,0,0,1,19.3,24.16,341.24,341.24,0,0,1,30,50.05l.79,1.55.72,1.58,1.44,3.1 4c.94,2.09,1.93,4.15,2.81,6.23l2.51,6.25L808.8,555c.39,1,.73,2.08,1.1,3.12l2.15,6.17c.37,1,.68,2,1,3.07l.91,3.07c.59,2,1.23,4,1.77,6.06l1.48,6A227.32,227.32,0,0,1,823.32,627,241.84,241.84,0,0,1,822,662.8c-1.06,10.17-2.69,18.44-3.92,24.66a282.32,282.32,0,0,1-9.88,35.23,298.31,298.31,0,0,1-12.74,30.91c-4.59,9.51-9.21,18.33-14,26.26l-1.73,3L778,785.72l-3.45,5.54c-2.34,3.55-4.57,7-6.77,10.15-4.42,6.36-8.57,12-12.3,16.73l-5.27,6.59-4.57,5.37-2,2.26-1.76,1.93q-1.64,1.8-2.79,3c-1.52,1.59-2.37,2.37-2.47,2.28s.57-1.07,1.94-2.88,3.49-4.39,6.08-7.84C749.93,822,757.43,812,766,799c2.08-3.28,4.3-6.7,6.51-10.34s4.5-7.43,6.7-11.46q6.82-12,13.38-26.17c1.06-2.37,2.2-4.74,3.23-7.2l3.12-7.46c2-5.08,4-10.27,5.8-15.67A292.34,292.34,0,0,0,814.12,686.64Z" style="fill:url(#linear-gradient-15)"/><path d="M739.36,650c.52-2.06,1.32-4.8,2-8.22s1.74-7.41,2.49-12c.4-2.29.87-4.71,1.29-7.26l1.11-8,.29-2.11.22-2.16.44-4.45c.14-1.51.32-3,.43-4.59l.28-4.75a262.14,262.14,0,0,0-.93-41.93l-.27-2.79-.37-2.79-.75-5.61c-.23 -1.88-.61-3.74-.92-5.63s-.61-3.77-1-5.65l-1.17-5.64c-.2-.94-.38-1.89-.6-2.82l-.68-2.81-1.37-5.61-1.55-5.56a272.56,272.56,0,0,0-15.87-42.08,267.22,267.22,0,0,0-19.66-34.4c-3.27-4.92-6.59-9.3-9.61-13.26s-6-7.34-8.54-10.2l-1.86-2.06-.45-.5a1.5,1.5,0,0,1-.3-.4l-.18-.29-.64-1.08L679,401.57c-1.32-2.18-2.34-3.71-2.92-4.59-.8-1.19-1.6-2.35-2.36-3.45a1,1,0,0,1,.3-1.27.94.94,0,0,1,1.3.14c.77,1.07,1.59,2.24,2.43,3.46.65,1,1.75,2.59,3.14,4.85l2.31,3.82.64,1a.24.24,0,0,0,.09.11l.22.24.46.5,1.92,2.1a222.87,222.87,0,0,1,18.55,23.67,269.68,269.68,0,0,1,20,34.53A274,274,0,0,1,741.32,509l1.6,5.59,1.42,5.64.71,2.82.62,2.84,1.22,5.67c.39,1.89.69,3.79,1,5.68s.72,3.77,1,5.66l.8,5.65.39,2.81.29,2.81a264.72,264.72,0,0,1,1.26,42.32,258,258,0,0,1-3.87,33.84C747,635,746,639,745.29,642.53s-1.51,6.33-2.06,8.47l-1.66,6.3-1.86,6-1.8,5.72c-.63,1.85-1.27,3.64-1.9,5.38-2.54,6.94-5.14,13-7.49,17.84-4.71,9.79-8.32,15.14-8.77,14.89s2.33-6.26,6.35-16.34c2-5,4.28-11.11,6.57-18,.57-1.72,1.15-3.49,1.71-5.31l1.66-5.6,1.74-5 .82Z" style="fill:url(#linear-gradient-16)"/><path d="M716.89,368.69c-2.35-1.89-5.54-4.37-9.35-7.54L701.31,356c-2.24-1.86-4.58-3.92-7.09-6.07a404.29,404.29,0,0,1-34.4-33.24,292.74,292.74,0,0,1-35.56-48c-1.31-2.31-2.66-4.62-4-7l-3.62-7.22-.91-1.81c-.29-.61-.55-1.24-.82-1.86l-1.63-3.74-1.63-3.75c-.51-1.26-1-2.55-1.45-3.83l-1.44-3.84c-.49-1.28-1-2.56-1.36-3.88L605,224l-2.1-8c-.37-1.32-.66-2.66-.94-4l-.85-4a223.53,223.53,0,0,1-4.1-32.31,249.74,249.74,0,0,1,.42-31.43A279.77,279.77,0,0,1,601.11,115c1.69-9.27,3.71-18,5.86-26.11A361.71,361.71,0,0,1,620.25,49c4.07-10.17,7.26-17,8.51-19.69.86-1.85,1.72-3.65,2.56-5.35a1,1,0,0,1,1.25-.35,1,1,0,0,1,.51,1.2c-.79,1.65-1.65,3.47-2.51,5.34C629.22,33,626,40,622,50.24a363.43,363.43,0,0,0-13,39.91A298,298,0,0,0,600,145a250.51,250.51,0,0,0-.18,31,222.27,222.27,0,0,0,4.27,31.68l.86,3.94.43,2,.52,1.95,2.11,7.79,2.48,7.67c.38,1.29.88,2.53,1.36,3.79l1.43,3.75c.49,1.25.93,2.51,1.45,3.74l1.62,3.66,1.61,3.65c.27.6.52,1.22.82,1.81l.9,1.77,3.58,7,3.91,6.79a290.3 1,290.31,0,0,0,35.21,47,402,402,0,0,0,34.17,32.77c2.51,2.13,4.85,4.18,7.09,6l6.26,5.13c3.82,3.17,7.07,5.68,9.47,7.62l26.81,21.21c8.08,6.44,15.15,12.25,20.91,17.2l7.67,6.72c2.2,2,4,3.78,5.55,5.22,3,2.89,4.51,4.56,4.33,4.76s-2.1-1.14-5.47-3.73L765,405.83l-21.46-16.5C735.35,383.09,726.32,376.21,716.89,368.69Z" style="fill:url(#linear-gradient-17)"/><path d="M925.73,401.72c-.5-1.87-1-4.07-1.73-6.54s-1.49-5.25-2.42-8.28l-1.51-4.73c-.52-1.65-1.07-3.36-1.71-5.1l-4-11.24-2.17-6.14-2.5-6.4-2.62-6.71c-.92-2.28-1.75-4.64-2.8-7L898,325c-2.29-5-4.76-10.1-7.25-15.38l-.94-2-1-2-2.06-4-4.19-8.06c-.69-1.37-1.45-2.71-2.22-4.05l-2.34-4-4.68-8.24-5.08-8.21-2.57-4.15c-.43-.69-.85-1.4-1.3-2.08l-1.38-2c-3.7-5.45-7.31-11.08-11.36-16.47-2-2.72-4-5.49-6-8.21l-6.3-8.15c-1.06-1.35-2.1-2.72-3.19-4.05l-3.32-4-6.69-8-7-7.79c-1.17-1.29-2.3-2.62-3.5-3.88l-3.59-3.8c-2.4-2.53-4.77-5.09-7.2-7.59l-7.37-7.42c-2.43-2.49-4.95-4.89-7.45-7.3s-5-4.83-7.5-7.19l-15.09-14c-10-9.2-19.77-18.32-29.12-27.29-18.7-17.93-35.79-35.19-5 0-51s-25.56-30.19-32.86-42a104.24,104.24,0,0,1-8-15.28,54.94,54.94,0,0,1-3-9.2,36.36,36.36,0,0,1-1-7.28,1,1,0,0,0-1-.84.91.91,0,0,0-1,.85V1a37.31,37.31,0,0,0,1,7.67,57.38,57.38,0,0,0,3.22,9.94,107.1,107.1,0,0,0,8.33,15.83,230.52,230.52,0,0,0,14,19.82c5.57,7.13,12,14.72,19.12,22.68,14.24,15.91,31.27,33.23,49.86,51.19,9.29,9,19,18.12,28.92,27.33l14.93,14,7.39,7.17c2.47,2.39,4.94,4.79,7.34,7.27l7.26,7.38,7.09,7.55,3.54,3.78c1.16,1.27,2.29,2.58,3.44,3.86l6.83,7.73,6.57,7.89,3.27,3.93c1.07,1.33,2.09,2.68,3.14,4l6.21,8c2,2.7,3.94,5.44,5.9,8.14,4,5.34,7.52,10.92,11.16,16.31,1.85,2.67,3.46,5.48,5.15,8.2l5,8.13,4.6,8.16c1.49,2.71,3.07,5.33,4.45,8l4.11,8,2,3.92c.68,1.3,1.34,2.59,1.93,3.9a545.2,545.2,0,0,1,23.28,55.87L914.51,378l.9,2.58.79,2.5,1.5,4.72c.93,3,1.68,5.8,2.41,8.28s1.23,4.7,1.74,6.6l.73,2.83.65,2.83,1.29,5.58c.73,3.71,1.57,7.32,2.16,10.9l1,5.29.8,5.19c.57,3.41.93,6.76,1.38,10,1.6,13,2.24,24.61,2.54,34.24.52,19.29-.2,30.75.45,30.8h0c.25,0,.71-2.93,1.26-8.34s1-13.29,1.09-23.12A307.49 ,307.49,0,0,0,925.73,401.72Z" style="fill:url(#linear-gradient-18)"/><path d="M577.29,723c1.42-.52,3-1.31,4.85-2.12l6.14-2.78,7.21-3.68,2-1,2-1.14,4.19-2.4c2.91-1.58,5.82-3.54,8.93-5.5s6.22-4.24,9.51-6.53c1.66-1.13,3.26-2.4,4.9-3.69l5-3.91,5-4.28c1.68-1.45,3.42-2.9,5-4.51l5-4.78c1.69-1.63,3.29-3.39,5-5.11l2.51-2.62c.84-.88,1.61-1.83,2.43-2.74l4.88-5.61a242.24,242.24,0,0,0,18-25.16,239.39,239.39,0,0,0,14.82-28.69,234.94,234.94,0,0,0,10.5-31.1,232.14,232.14,0,0,0,5.68-32.06c.41-5.35.94-10.64,1-15.9.23-5.25.11-10.45,0-15.57a236.67,236.67,0,0,0-2.93-29.45c-.69-4.68-1.68-9.19-2.58-13.59l-1.55-6.44c-.48-2.12-1.14-4.16-1.69-6.19l-.85-3c-.29-1-.62-2-.93-2.93l-1.83-5.67-2-5.37-1-2.59-1-2.49-2-4.8c-.67-1.54-1.37-3-2-4.46s-1.27-2.85-1.93-4.17l-1.93-3.83a211.15,211.15,0,0,0-10.73-18.7l-3.29-5a1,1,0,0,1,.15-1.11l.43-.16h-.49l.45-.16a.93.93,0,0,1,1.06.28l3.36,5a212.54,212.54,0,0,1,11.2,19.34,218.69,218.69,0,0,1,15.71,39.84c1.24,4.07,2.22,8.36,3.31,12.75l1.4,6.74c.25,1.14.46,2.29.65,3.45l.59,3.51a 248.2,248.2,0,0,1,3.05,29.66l.18,7.79v3.94l-.09,4c0,5.3-.55,10.65-.91,16a219.8,219.8,0,0,1-49,118.39l-4.91,5.71c-.82.93-1.6,1.89-2.44,2.79l-2.53,2.66c-1.69,1.75-3.31,3.53-5,5.21l-5,4.93c-.85.79-1.65,1.62-2.51,2.37l-2.57,2.24-5,4.37-5.07,4c-1.67,1.3-3.27,2.63-5,3.78l-4.88,3.48c-.8.56-1.58,1.14-2.37,1.68L615,707.49c-3.17,2-6.11,4-9.08,5.66l-4.27,2.46-2,1.17c-.67.37-1.36.71-2,1.05l-7.39,3.79c-2.3,1.09-4.43,2-6.32,2.89s-3.55,1.67-5,2.21a205.44,205.44,0,0,1-33.27,10.63c-2.58.56-5.07,1.13-7.5,1.63L531,740.15l-3.35.54-3.24.36-6.06.64c-1.92.24-3.76.29-5.49.38l-4.87.22c-3,.18-5.62,0-7.73,0-4.22-.13-6.5-.34-6.5-.62s2.36-.57,6.64-.92c2.14-.18,4.76-.3,7.8-.7l4.87-.53,2.66-.28c.91-.1,1.84-.27,2.8-.41,3.81-.62,8-1.07,12.49-2l6.94-1.36,7.31-1.78A231.31,231.31,0,0,0,577.29,723Z" style="fill:url(#linear-gradient-19)"/><path d="M351.94,263c1-2.74,2.18-6,3.6-9.69s3.21-7.86,5.47-12.36a162.23,162.23,0,0,1,19.1-30.7A152.53,152.53,0,0,1,415,177.78c1.84-1.25,3.77-2.43,5.74-3.6l1.49-.86.54-.31.19-.1.32-.17h .09c.12,0,0,0-.06-.07h-.1l-.42-.09q-3.41-.72-6.93-1.23a126.12,126.12,0,0,0-29.7-.78,112.84,112.84,0,0,0-26.45,5.73,102,102,0,0,0-13.72,6c-4.56,2.42-9.26,5.06-14,7.77s-9.53,5.59-14.28,8.68c-1.2.76-2.38,1.55-3.56,2.35s-2.36,1.61-3.52,2.45a76.69,76.69,0,0,0-6.73,5.32c-.5.48-1,1-1.48,1.46l-.35.37-.39.47c-.09.15-.25.22-.3.42h-.17l-.09,0-.19.1-.69.37a3,3,0,0,1-.64.26c-.27.07-.56.33-.86.12l-1.51-.56-2.09-.74c-2.8-1-5.65-1.88-8.52-2.77Q278,205.69,269,203.64l-.79-.18-.85-.2a190.45,190.45,0,0,0-29.58-4.16,132,132,0,0,0-30.22,2.23c-5,.87-10,2-15,3.22s-9.91,2.68-14.8,4.23A239.93,239.93,0,0,0,149.18,220,209.57,209.57,0,0,0,99,252.6a177.19,177.19,0,0,0-19.89,20.65c-1.53,1.77-2.89,3.67-4.3,5.51s-2.71,3.75-4,5.63L66.89,290c-1.28,1.87-2.6,3.69-3.75,5.61l-7,11.19L49.8,317.89c-1.07,1.8-2,3.64-3,5.46L44,328.78c-.92,1.79-1.88,3.53-2.74,5.3l-2.54,5.26c-3.43,6.89-6.32,13.63-9.14,20-2.65,6.39-5.18,12.39-7.29,18.05s-4,10.9-5.76,15.66-3.11,9.09-4.27,12.91l-1.66,5.29-1.32,4.46c-.81,2.68-1.38,4.79-1.79,6.25-1, 3.42-1.84,6.8-2.62,10a1,1,0,0,1-1.15.61A.92.92,0,0,1,3,431.48v0c.76-3.15,1.62-6.58,2.6-10.08.43-1.6,1-3.84,1.88-6.64l1.36-4.63,1.69-5.44c.59-2,1.27-4,2-6.22s1.48-4.52,2.33-6.95c1.73-4.84,3.57-10.18,5.8-15.87S25.3,363.85,28,357.41l4.35-9.84c.73-1.69,1.52-3.38,2.35-5.08l2.48-5.17L39.67,332l2.77-5.32,2.82-5.43c.48-.91.94-1.84,1.45-2.75l1.55-2.73c2.09-3.65,4.15-7.4,6.37-11.14l7-11.26c.58-1,1.22-1.89,1.86-2.82l1.92-2.81,3.89-5.67,2-2.86,2.11-2.8,2.13-2.81c.72-.93,1.49-1.83,2.24-2.75A181,181,0,0,1,97.91,250a204.59,204.59,0,0,1,23.81-18,230.67,230.67,0,0,1,26.75-14.8,240,240,0,0,1,58.82-18.93c5.09-.9,10.2-1.62,15.34-2.05,1.28-.11,2.57-.21,3.86-.27s2.58-.12,3.87-.14c2.58,0,5.14.08,7.7.13a194.48,194.48,0,0,1,30,4.12l.86.2.81.18q9.07,2,17.83,4.67c2.91.89,5.79,1.8,8.64,2.78l2.13.75.62.22c.11,0,.13.06.18,0l.1-.14.28-.34.41-.44c.54-.61,1.11-1.11,1.67-1.66a78.53,78.53,0,0,1,7-5.58c1.19-.86,2.38-1.71,3.59-2.51s2.4-1.63,3.61-2.4c4.81-3.15,9.64-6,14.39-8.81s9.43-5.39,14.09-7.89a104.82,104.82,0,0,1,1 4.19-6.25,116.45,116.45,0,0,1,27.36-6,129.84,129.84,0,0,1,30.39.7q3.62.51,7.13,1.23c.35.07,1.77.37,2.79.62s2.17.53,3.13.83l2.93.87,1.45.44.3.1.16,0H434l-.85.38-3.37,1.53-.84.38c-.28.13-.57.26-.77.37l-1.33.7-1.33.69-.66.35-.32.17-.18.1-1.43.83c-1,.54-1.88,1.13-2.81,1.7s-1.84,1.16-2.73,1.76a148.58,148.58,0,0,0-33.92,31.52,159.38,159.38,0,0,0-18.71,30c-2.22,4.44-3.86,8.6-5.41,12.24s-2.62,6.94-3.6,9.7a232.16,232.16,0,0,0-8.08,30A198.75,198.75,0,0,0,344,322.27a127.54,127.54,0,0,0,.92,25.09l.47,2.85c.15.94.3,1.87.54,2.79.44,1.83.8,3.64,1.32,5.37s.92,3.45,1.46,5.1,1,3.27,1.55,4.83A274.52,274.52,0,0,0,362,397.06c3.09,6.56,4.88,10.07,4.63,10.22s-2.53-3.27-6.14-9.81a212.22,212.22,0,0,1-13.21-29c-1.15-3.19-2.27-6.57-3.3-10.15-.52-1.79-1-3.65-1.44-5.52s-.73-3.87-1.11-5.87a131.29,131.29,0,0,1-1.09-25.76,189.56,189.56,0,0,1,3.59-28.37A227.44,227.44,0,0,1,351.94,263Z" style="fill:url(#linear-gradient-20)"/><g style="opacity:0.25"><path d="M915.07,657.63l2.85-6.3,4-9.2,4.75-11.72,2.52-6.71c.86-2.32 ,1.8-4.7,2.62-7.19,1.7-5,3.56-10.18,5.18-15.68.82-2.75,1.77-5.52,2.53-8.38l2.36-8.69c.85-2.92,1.46-5.92,2.17-8.93l1-4.53c.36-1.51.71-3,1-4.57l1.74-9.24.43-2.32.34-2.33.69-4.66c1-6.19,1.55-12.42,2.24-18.53.44-6.13,1-12.15,1.12-18,.46-11.7.34-22.7-.22-32.32a283.63,283.63,0,0,0-4.08-36.28c-.21-1.15-.43-2.28-.65-3.34a1,1,0,0,1,.77-1,.92.92,0,0,1,1.14.63h0c.23,1,.48,2.2.7,3.38a287,287,0,0,1,4.51,36.94c.13,2.42.32,4.92.4,7.5l.24,8c0,5.44.12,11.14-.13,17-.09,5.88-.58,11.93-1,18.08-.64,6.13-1.12,12.39-2.08,18.62l-.64,4.68-.32,2.34-.42,2.33-1.66,9.3c-.25,1.55-.6,3.08-.94,4.6l-1,4.56c-.69,3-1.28,6.05-2.1,9l-2.29,8.75c-.36,1.45-.79,2.86-1.21,4.26l-1.25,4.18-1.23,4.1-.61,2-.66,2-2.57,7.7a445.76,445.76,0,0,1-16.62,41.7c-11.91,26.19-23.65,43.64-24.6,43S903.6,682.92,915.07,657.63Z" style="fill:#fff"/></g><g style="opacity:0.25"><path d="M779.41,865.32c5-3,16.85-10,31.16-20.3l5.49-4,5.63-4.28,2.9-2.2,2.88-2.32,5.87-4.75,5.84-5c2-1.69,4-3.39,5.82-5.18s3.73-3.64,5.59-5.48,3.59-3.81,5.27-5.82a140,140, 0,0,0,9.53-12.29,147.13,147.13,0,0,0,8-12.74,169.73,169.73,0,0,0,11.32-24.49A158.72,158.72,0,0,0,892.63,727c.15-1,.3-1.91.41-2.81a1,1,0,0,1,1.07-.74.92.92,0,0,1,.87,1v0c-.1.9-.23,1.88-.38,2.88a161.08,161.08,0,0,1-7.79,30.28,171.81,171.81,0,0,1-11.21,24.91,151.5,151.5,0,0,1-8,13,143.71,143.71,0,0,1-9.54,12.57c-1.68,2.06-3.51,4-5.29,6a78.84,78.84,0,0,1-5.63,5.64c-1.95,1.79-3.87,3.58-5.82,5.3l-5.81,5.12L829.67,835l-2.86,2.37-2.89,2.24L818.3,844c-1.85,1.4-3.7,2.72-5.48,4-14.29,10.46-26.22,17.71-31.39,20.8-20.72,12.39-37.24,18.66-37.67,17.61-.2-.47,3.73-2.72,10.19-6.37S769.43,871.27,779.41,865.32Z" style="fill:#fff"/></g><g style="opacity:0.25"><path d="M518.09,981.82l6.73-.27,9.74-.6c7.4-.51,16.5-1.28,26.66-2.52,1.27-.15,2.56-.27,3.86-.46l3.94-.57,8.15-1.18c2.77-.39,5.56-1,8.4-1.46s5.73-1,8.63-1.6l8.75-1.93,4.43-1c1.47-.35,2.93-.77,4.41-1.16l8.85-2.37c.74-.2,1.48-.38,2.21-.61l2.18-.7,4.36-1.41c2.9-1,5.82-1.82,8.68-2.85l8.49-3.14,4.19-1.56,4.1-1.67,8-3.29a270.77,270.77,0,0,0,28.13-14,118 .17,118.17,0,0,0,19.1-13.55,49.59,49.59,0,0,0,8-8.69c.3-.46.61-.92.89-1.37a10.55,10.55,0,0,0,.72-1.36,1.05,1.05,0,0,1,1.22-.39c.55.15.71.64.56,1.2a8.18,8.18,0,0,1-.78,1.53,11.59,11.59,0,0,1-1,1.51,52.49,52.49,0,0,1-8.44,9.36,124.32,124.32,0,0,1-19.42,14,279.54,279.54,0,0,1-28.23,14.4l-8,3.37-4.09,1.72-4.19,1.6-8.45,3.2c-2.86,1-5.79,2-8.7,2.94l-4.38,1.46-2.19.73-2.22.63-8.87,2.47c-1.48.4-2.94.84-4.42,1.2l-4.43,1-8.77,2c-2.9.63-5.8,1.13-8.65,1.68s-5.65,1.13-8.42,1.55L569.66,981c-2.67.42-5.28.83-7.83,1.11-10.2,1.33-19.35,2.18-26.82,2.76l-9.87.67-6.89.3c-28,1.17-48.35-1.16-48.24-2.29S491.06,983,518.09,981.82Z" style="fill:#fff"/></g><path d="M155.86,160.77l-1.92-3.17c-.67-1.32-1.53-2.79-2.33-4.54A76.5,76.5,0,0,1,147,139.64,117.38,117.38,0,0,1,144,120q-.21-2.84-.31-5.89v-2.17h0l-.09.09-.09.1-.45.5c-1.5,1.68-3,3.43-4.56,5.24-4.08,4.77-8.43,10.15-12.83,16s-8.84,12.16-13,18.82c-2.14,3.3-4.08,6.77-6.06,10.21l-2.78,5.28c-.48.87-.9,1.77-1.31,2.67l-1.25,2.7a150.27,150.27,0,0,0-8,21.95c-2,7.28-3 .66,14.35-4.93,20.92s-2.16,12.65-2.85,18c-1.33,10.61-1.78,18.1-1.91,20.49l-.16,3.35a1,1,0,0,1-1,.83.93.93,0,0,1-1-.85v0c0-1.06.07-2.21.12-3.39.12-2.63.5-10.29,1.76-21,.64-5.37,1.53-11.49,2.71-18.13s2.79-13.77,4.77-21.13a149.36,149.36,0,0,1,7.78-22.29l1.24-2.75.62-1.38.69-1.35,2.76-5.38c2-3.5,3.9-7,6-10.38,4.15-6.77,8.54-13.19,12.93-19.11s8.7-11.4,12.77-16.27c1.54-1.83,3.05-3.6,4.55-5.3l.68-.77,1.06-1.17,2.11-2.32,2.07-2.23,1-1.11.25-.26.12-.12v1c-.06,2.15-.18,4.38-.16,6.33V114q.1,2.94.33,5.7a113.79,113.79,0,0,0,3,18.89A72.43,72.43,0,0,0,155,151.33c.34.85.79,1.57,1.15,2.28l1.05,2,1.9,3.13c3.67,5.91,7.49,11.2,11,15.9s6.66,8.8,9.31,12.2c5.3,6.8,8.45,10.86,8,11.24s-4.4-3.19-10.36-9.65c-3-3.23-6.43-7.2-10.1-11.82A169.38,169.38,0,0,1,155.86,160.77Z" style="fill:url(#linear-gradient-21)"/><path d="M205.1,584.1c-.35-1.58-.67-3.73-1.13-6.35-.25-1.31-.43-2.74-.61-4.3l-.6-5a142.7,142.7,0,0,1,.09-25.65A151.74,151.74,0,0,1,209,511.5a99.91,99.91,0,0,1,6.59-16,81.94,81.94,0,0,1,22.32-26.87l3.43-2. 59c1.14-.85,2.35-1.59,3.51-2.38l1.75-1.16c.59-.37,1.2-.71,1.79-1.07l3.56-2.09a81.56,81.56,0,0,1,28.77-8.82,122.24,122.24,0,0,1,22.47-.45c5.84.42,9.8,1.07,11.38,1.32,1.08.18,2.13.37,3.13.58a1,1,0,0,1-.39,1.92c-.94-.18-2-.35-3.06-.52-1.69-.25-5.7-.85-11.5-1.19a119.36,119.36,0,0,0-22.12.74A78.89,78.89,0,0,0,253,461.85c-2.26,1.39-4.63,2.69-6.85,4.28-1.11.78-2.29,1.49-3.37,2.35L239.51,471a78.82,78.82,0,0,0-21.08,26,97.19,97.19,0,0,0-6.17,15.5A148.72,148.72,0,0,0,206.55,543a139.8,139.8,0,0,0,.09,24.89l.61,4.86c.19,1.52.36,2.93.61,4.21.47,2.57.79,4.7,1.14,6.28,1.31,6.35,2.86,12.2,4.4,17.41s3.11,9.75,4.52,13.49c2.73,7.52,4.67,11.87,4.17,12.15s-3.37-3.86-6.85-11.32a132.29,132.29,0,0,1-5.42-13.49c-.86-2.62-1.78-5.38-2.53-8.31S205.8,587.26,205.1,584.1Z" style="fill:url(#linear-gradient-22)"/></g></g></g></g></svg> +<?xml version="1.0" encoding="UTF-8"?> +<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1"> + <stop stop-color="#420C5D" offset="0%"></stop> + <stop stop-color="#951AD1" offset="100%"></stop> + </linearGradient> + <path d="M25,29 C152.577777,29 256,131.974508 256,259 C256,386.025492 152.577777,489 25,489 L25,29 Z" id="path-2"></path> + <filter x="-18.2%" y="-7.4%" width="129.4%" height="114.8%" filterUnits="objectBoundingBox" id="filter-3"> + <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset> + <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur> + <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> + </filter> + </defs> + <g id="Assets" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="icon_512x512"> + <g id="Group"> + <g id="tb_icon/Stable"> + <g id="Stable"> + <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="256" cy="256" r="246"></circle> + <path d="M256.525143,465.439707 L256.525143,434.406609 C354.826191,434.122748 434.420802,354.364917 434.420802,255.992903 C434.420802,157.627987 354.826191,77.8701558 256.525143,77.5862948 L256.525143,46.5531962 C371.964296,46.8441537 465.446804,140.489882 465.446804,255.992903 C465.446804,371.503022 371.964296,465.155846 256.525143,465.439707 Z M256.525143,356.820314 C311.970283,356.529356 356.8487,311.516106 356.8487,255.992903 C356.8487,200.476798 311.970283,155.463547 256.525143,155.17259 L256.525143,124.146588 C329.115485,124.430449 387.881799,183.338693 387.881799,255.992903 C387.881799,328.654211 329.115485,387.562455 256.525143,387.846316 L256.525143,356.820314 Z M256.525143,201.718689 C286.266674,202.00255 310.3026,226.180407 310.3026,255.992903 C310.3026,285.812497 286.266674,309.990353 256.525143,310.274214 L256.525143,201.718689 Z M0,255.992903 C0,397.384044 114.60886,512 256,512 C397.384044,512 512,397.384044 512,255.992903 C512,114.60886 397.384 044,0 256,0 C114.60886,0 0,114.60886 0,255.992903 Z" id="center" fill="url(#linearGradient-1)"></path> + <g id="half" transform="translate(140.500000, 259.000000) scale(-1, 1) translate(-140.500000, -259.000000) "> + <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use> + <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use> + </g> + </g> + </g> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/devtools/client/themes/images/aboutdebugging-firefox-beta.svg b/devtools/client/themes/images/aboutdebugging-firefox-beta.svg index 6cdc237fa99e..9240dc6e84ca 100644 --- a/devtools/client/themes/images/aboutdebugging-firefox-beta.svg +++ b/devtools/client/themes/images/aboutdebugging-firefox-beta.svg @@ -1,4 +1,31 @@ - -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 961 984"><defs><radialGradient id="radial-gradient" cx="-14492.05" cy="9293.61" fx="-14520.816138719447" r="450.88" gradientTransform="matrix(0.76, 0.03, 0.05, -1.12, 11486.51, 11147.86)" gradientUnits="userSpaceOnUse"><stop offset="0.05" stop-color="#ffea00"/><stop offset="0.12" stop-color="#ffde00"/><stop offset="0.25" stop-color="#ffbf00"/><stop offset="0.43" stop-color="#ff8e00"/><stop offset="0.77" stop-color="#ff272d"/><stop offset="0.87" stop-color="#e0255a"/><stop offset="0.95" stop-color="#cc2477"/><stop offset="1" stop-color="#c42482"/></radialGradient><radialGradient id="radial-gradient-2" cx="-7586.92" cy="8863.48" r="791.23" gradientTransform="matrix(1.23, 0, 0, -1.23, 9957.22, 11055.45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00ccda"/><stop offset="0.22" stop-color="#0083ff"/><stop offset="0.26" stop-color="#007af9"/><stop offset="0.33" stop-color="#0060e8"/><stop offset="0.33" stop-color="#005f e7"/><stop offset="0.44" stop-color="#2639ad"/><stop offset="0.52" stop-color="#401e84"/><stop offset="0.57" stop-color="#4a1475"/></radialGradient><linearGradient id="linear-gradient" x1="540.64" y1="254.8" x2="349.2" y2="881.03" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000f43" stop-opacity="0.4"/><stop offset="0.48" stop-color="#001962" stop-opacity="0.17"/><stop offset="1" stop-color="#002079" stop-opacity="0"/></linearGradient><radialGradient id="radial-gradient-3" cx="-8337.18" cy="7467.65" r="266.89" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10240.12, 10764.8)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffea00"/><stop offset="0.5" stop-color="#ff272d"/><stop offset="1" stop-color="#c42482"/></radialGradient><radialGradient id="radial-gradient-4" cx="-8361.33" cy="7723.56" r="445.68" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10240.12, 10764.8)" gradientUnits="userSpaceOnUse"> <stop offset="0" stop-color="#ffe900"/><stop offset="0.16" stop-color="#ffaf0e"/><stop offset="0.32" stop-color="#ff7a1b"/><stop offset="0.47" stop-color="#ff4e26"/><stop offset="0.62" stop-color="#ff2c2e"/><stop offset="0.76" stop-color="#ff1434"/><stop offset="0.89" stop-color="#ff0538"/><stop offset="1" stop-color="#ff0039"/></radialGradient><radialGradient id="radial-gradient-5" cx="-8298.29" cy="7310.42" r="408.96" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10240.12, 10764.8)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff272d"/><stop offset="0.5" stop-color="#c42482"/><stop offset="0.99" stop-color="#620700"/></radialGradient><radialGradient id="radial-gradient-6" cx="715.19" cy="589.96" fx="743.1665035759797" fy="576.1323859732546" r="782.18" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0.16" stop-color="#ffea00"/><stop offset="0.23" stop-color="#ffde00"/><stop offset="0.37" stop-color="#ffbf00"/><stop o ffset="0.54" stop-color="#ff8e00"/><stop offset="0.76" stop-color="#ff272d"/><stop offset="0.8" stop-color="#f92433"/><stop offset="0.84" stop-color="#e91c45"/><stop offset="0.89" stop-color="#cf0e62"/><stop offset="0.94" stop-color="#b5007f"/></radialGradient><radialGradient id="radial-gradient-7" cx="656.34" cy="982.71" r="923.62" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0.28" stop-color="#ffea00"/><stop offset="0.4" stop-color="#fd0"/><stop offset="0.63" stop-color="#ffba00"/><stop offset="0.86" stop-color="#ff9100"/><stop offset="0.93" stop-color="#ff6711"/><stop offset="0.99" stop-color="#ff4a1d"/></radialGradient><linearGradient id="linear-gradient-2" x1="-9022.89" y1="7636.68" x2="-8738.53" y2="7709.17" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10240.12, 10764.8)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c42482" stop-opacity="0.5"/><stop offset="0.47" stop-color="#ff272d" stop-opacity="0.5"/><sto p offset="0.49" stop-color="#ff2c2c" stop-opacity="0.51"/><stop offset="0.68" stop-color="#ff7a1a" stop-opacity="0.72"/><stop offset="0.83" stop-color="#ffb20d" stop-opacity="0.87"/><stop offset="0.94" stop-color="#ffd605" stop-opacity="0.96"/><stop offset="1" stop-color="#ffe302"/></linearGradient><linearGradient id="linear-gradient-3" x1="188.87" y1="2080.93" x2="134.3" y2="2220.78" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, -250.06, 2305.85)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#891551" stop-opacity="0.6"/><stop offset="1" stop-color="#c42482" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-4" x1="-38.43" y1="277.74" x2="55.68" y2="170.86" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, 229.07, 745.44)" gradientUnits="userSpaceOnUse"><stop offset="0.01" stop-color="#891551" stop-opacity="0.5"/><stop offset="0.48" stop-color="#ff272d" stop-opacity="0.5"/><stop offset="1" stop-color="#ff272d" stop-opacity="0"/></linearGradient>< linearGradient id="linear-gradient-5" x1="142.43" y1="93.37" x2="142.5" y2="168.15" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, 229.07, 745.44)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c42482"/><stop offset="0.08" stop-color="#c42482" stop-opacity="0.81"/><stop offset="0.21" stop-color="#c42482" stop-opacity="0.57"/><stop offset="0.33" stop-color="#c42482" stop-opacity="0.36"/><stop offset="0.45" stop-color="#c42482" stop-opacity="0.2"/><stop offset="0.56" stop-color="#c42482" stop-opacity="0.09"/><stop offset="0.67" stop-color="#c42482" stop-opacity="0.02"/><stop offset="0.77" stop-color="#c42482" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-6" x1="620.52" y1="947.88" x2="926.18" y2="264.39" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff14f"/><stop offset="0.27" stop-color="#ffee4c"/><stop offset="0.45" stop-color="#ffe643"/><stop offset="0.61" stop-color="#ffd834"/ ><stop offset="0.76" stop-color="#ffc41e"/><stop offset="0.89" stop-color="#ffab02"/><stop offset="0.9" stop-color="#ffa900"/><stop offset="0.95" stop-color="#ffa000"/><stop offset="1" stop-color="#ff9100"/></linearGradient><linearGradient id="linear-gradient-7" x1="680.88" y1="554.79" x2="536.1" y2="166.04" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff8e00"/><stop offset="0.04" stop-color="#ff8e00" stop-opacity="0.86"/><stop offset="0.08" stop-color="#ff8e00" stop-opacity="0.73"/><stop offset="0.13" stop-color="#ff8e00" stop-opacity="0.63"/><stop offset="0.18" stop-color="#ff8e00" stop-opacity="0.56"/><stop offset="0.23" stop-color="#ff8e00" stop-opacity="0.51"/><stop offset="0.28" stop-color="#ff8e00" stop-opacity="0.5"/><stop offset="0.39" stop-color="#ff8e00" stop-opacity="0.48"/><stop offset="0.52" stop-color="#ff8e00" stop-opacity="0.42"/><stop offset="0.68" stop-color="#ff8e00" stop-opacity="0.31"/><stop offset ="0.84" stop-color="#ff8e00" stop-opacity="0.17"/><stop offset="1" stop-color="#ff8e00" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-8" x1="348" y1="163" x2="949" y2="163" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#04fcee"/><stop offset="1" stop-color="#23e832"/></linearGradient></defs><title>firefox-logo-beta</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Layer_2-2" data-name="Layer 2"><g id="BETA"><path d="M770.28,91.56c-23.94,27.88-35.09,90.64-10.81,154.25s61.49,49.8,84.7,114.68c30.62,85.6,16.37,200.59,16.37,200.59s36.81,106.6,62.47-6.64C979.79,341.74,770.28,143.94,770.28,91.56Z" style="fill:url(#radial-gradient)"/><path id="_Path_" data-name=" Path " d="M478.07,974.64c245.24,0,443.9-199.74,443.9-446s-198.66-446-443.66-446S34.65,282.32,34.65,528.61C34.18,775.14,233.07,974.64,478.07,974.64Z" style="fill:url(#radial-gradient-2)"/><path d="M810.67,803. 64a245.54,245.54,0,0,1-30.12,18.18,707.66,707.66,0,0,0,38.3-63c9.46-10.47,18.12-20.65,25.19-31.65,3.43-5.41,7.31-12.08,11.41-19.82,24.92-44.9,52.41-117.57,53.18-192.21v-5.65a257.26,257.26,0,0,0-5.72-55.75c.2,1.43.38,2.86.56,4.29-.22-1.1-.41-2.21-.64-3.31.36,2,.66,4,1,6,5.1,43.22,1.47,85.37-16.68,116.45-.29.45-.58.88-.87,1.32,9.41-47.23,12.56-99.38,2.09-151.6,0,0-4.19-25.38-35.38-102.44-18-44.35-49.83-80.72-78-107.21-24.69-30.55-47.11-51-59.48-64.06-25.82-27.19-36.64-47.57-41.08-60.87-3.86-1.93-53.14-49.8-57-51.63-21.51,33.35-89.16,137.68-57,235.15,14.58,44.17,51.46,90,90.06,115.74,1.7,1.93,23,25,33.09,77.15,10.45,53.85,5,95.86-16.54,158C641.75,681.23,577,735.11,516.31,740.62c-129.67,11.78-177.14-65.11-177.14-65.11C385.5,694,436.73,690.16,467.89,671c31.4-19.43,50.39-33.83,65.81-28.15C548.86,648.43,561,632,550.1,615a78.5,78.5,0,0,0-79.4-34.57c-31.43,5.11-60.22,30-101.41,5.89a82.13,82.13,0,0,1-7.73-5.06c-2.71-1.78,8.83,2.72,6.13.69-8-4.36-22.2-13.84-25.88-17.22-.61-.56,6.22,2.18,5.61,1 .62-38.51-31.71-33.7-53.14-32.49-66.57,1-10.75,8-24.52,19.75-30.11,5.69,3.11,9.24,5.48,9.24,5.48s-2.43-5-3.74-7.58c.46-.19.9-.15,1.36-.34,4.66,2.25,15,8.1,20.4,11.67,7.08,5,9.33,9.43,9.33,9.43s1.86-1,.49-5.37c-.51-1.78-2.65-7.45-9.66-13.18h.44A82.16,82.16,0,0,1,374.41,478c2-7.18,5.53-14.67,4.74-28.09-.47-9.43-.25-11.87-1.92-15.51-1.48-3.13.84-4.35,3.42-1.1a32.35,32.35,0,0,0-2.21-7.4v-.25c3.22-11.23,68.24-40.46,73-43.87A67.59,67.59,0,0,0,470.57,361c3.62-5.76,6.34-13.84,7-26.11.35-8.84-3.76-14.73-69.51-21.62-18-1.77-28.53-14.8-34.52-26.82-1.1-2.59-2.21-4.94-3.33-7.28a57.68,57.68,0,0,1-2.56-8.43c10.75-30.88,28.81-57,55.37-76.7,1.45-1.32-5.78.34-4.34-1,1.69-1.54,12.71-6,14.79-7,2.54-1.19-10.88-6.9-22.73-5.51-12.07,1.36-14.63,2.8-21.07,5.53,2.67-2.66,11.17-6.15,9.18-6.13-13,2-29.18,9.56-43,18.13a10.84,10.84,0,0,1,.84-4.35c-6.44,2.73-22.26,13.79-26.87,23.14a44.29,44.29,0,0,0,.27-5.4,84.17,84.17,0,0,0-13.19,13.82l-.25.22c-37.35-15-70.23-16-98-9.27-6.08-6.12-9.06-1.65-22.91-32.07-.94-1.84.7 3,1.81,0,0-2.27-5.9,1.39,7.87,0,0-23.28,18.37-53.92,39.19-68.62,53.89-.18.58,17.15-4.9,0,0-6,1.71-5.6,5.28-6.51,37.5-.22,2.44,0,5.18-.23,7.38-11.75,15-19.75,27.64-22.77,34.21-15.2,26.18-31.93,67-48.15,131.55A333,333,0,0,1,75.2,398.36c-13.49,34.27-26.53,88.08-29.14,170.95a484.57,484.57,0,0,1,12.53-50.66A473.24,473.24,0,0,0,93.33,719.71c9.33,22.82,24.76,57.46,51,95.4C226.9,902,343.31,956,472.21,956,606.79,956,727.64,897.13,810.67,803.64Z" style="fill:url(#linear-gradient)"/><path d="M711.1,866.71c162.87-18.86,235-186.7,142.38-190C769.85,674,634,875.61,711.1,866.71Z" style="fill:url(#radial-gradient-3)"/><path d="M865.21,642.42c112-65.21,82.84-206.08,82.84-206.08s-43.25,50.24-72.63,130.32C846.4,646,797.84,681.81,865.21,642.42Z" style="fill:url(#radial-gradient-4)"/><path d="M509.47,950.06C665.7,999.91,800,876.84,717.21,835.74,642,798.68,435.32,926.49,509.47,950.06Z" style="fill:url(#radial-gradient-5)"/><path d="M876.85,702.23c3.8-5.36,8.94-22.53,13.48-30.21,27.58-44.52,27.78-80,27.78- 80.83C934.76,508,933.25,474,923,411.14c-8.25-50.6-44.32-123.09-75.57-158-32.2-36-9.52-24.25-40.69-50.52-27.33-30.29-53.83-60.29-68.26-72.36C634.22,43.09,636.57,24.58,638.58,21.42c-.34.37-.84.92-1.47,1.64C635.87,18.14,635,14,635,14s-57,57-69,152c-7.83,62,15.38,126.68,49,168a381.62,381.62,0,0,0,59,58h0c25.4,36.48,39.38,81.49,39.38,129.91,0,121.25-98.34,219.53-219.65,219.53a220.81,220.81,0,0,1-49.14-5.51C387.36,725,354.3,696.12,337.82,676.51c-9.45-11.23-13.46-19.42-13.46-19.42,51.28,18.37,108,14.53,142.46-4.52,34.75-19.26,55.78-33.54,72.84-27.91,16.82,5.6,30.21-10.67,18.2-27.54-11.77-16.84-42.4-41-87.88-34.29-34.79,5.07-66.66,29.76-112.24,5.85a97.34,97.34,0,0,1-8.55-5c-3-1.77,9.76,2.69,6.78.68-8.87-4.32-24.57-13.73-28.64-17.07-.68-.56,6.88,2.16,6.21,1.6-42.63-31.45-37.3-52.69-36-66,1.07-10.66,8.81-24.32,21.86-29.86,6.3,3.08,10.22,5.44,10.22,5.44s-2.69-4.92-4.14-7.52c.51-.19,1-.14,1.5-.34,5.17,2.24,16.58,8,22.59,11.57,7.83,4.95,10.32,9.36,10.32,9.36s2.06-1,.54-5.33c-.56-1.77-2.93-7.39-1 0.68-13.06l.48.05a89.38,89.38,0,0,1,13.13,8.17c2.19-7.12,6.12-14.56,5.26-27.86-.53-9.35-.29-11.78-2.13-15.39-1.64-3.1.93-4.31,3.79-1.08a30.4,30.4,0,0,0-2.45-7.35v-.24c3.57-11.14,75.53-40.12,80.77-43.51a70.24,70.24,0,0,0,21.17-20.63c4-5.72,7-13.73,7.75-25.9.25-5.48-1.44-9.81-20.49-14-11.44-2.49-29.14-4.91-56.44-7.48-19.9-1.75-31.57-14.67-38.21-26.6-1.21-2.56-2.44-4.89-3.68-7.22a53.41,53.41,0,0,1-2.83-8.36c11.9-30.62,31.89-56.5,61.28-76.06,1.6-1.31-6.4.33-4.8-1,1.87-1.53,14.06-5.93,16.37-6.92,2.81-1.19-12.05-6.84-25.16-5.47-13.36,1.35-16.2,2.78-23.33,5.49,3-2.64,12.37-6.1,10.16-6.08-14.4,2-32.29,9.48-47.59,18a9.59,9.59,0,0,1,.92-4.31c-7.13,2.71-24.64,13.68-29.73,22.95a38.21,38.21,0,0,0,.29-5.35,89,89,0,0,0-14.6,13.7l-.27.22C258.14,196,221.75,195,191,201.72c-6.73-6.06-17.56-15.22-32.89-45.4-1-1.81-1.6,3.76-2.4,2-6-13.81-9.55-36.44-9-52,0,0-12.32,5.61-22.52,29.06-1.89,4.21-3.1,6.54-4.32,8.86-.55.68,1.27-7.7,1-7.24-1.77,3-6.36,7.19-8.37,12.62-1.39,4-3.33,6.27-4.57,11.28l-.29.46c-.09-1.47 .37-6.08,0-5.13A236.91,236.91,0,0,0,95.34,186c-5.49,18-11.88,42.61-12.89,74.57-.25,2.42,0,5.13-.25,7.31-13,14.84-21.86,27.4-25.2,33.92-16.81,26-35.33,66.44-53.28,130.46a319.29,319.29,0,0,1,28.53-50C17.32,416.25,2.89,469.62,0,551.8a436.92,436.92,0,0,1,13.87-50.24C11.29,556.36,17.68,624.3,52.32,701c20.57,45,67.92,136.6,183.62,208h0s39.36,29.3,107,51.26c5,1.81,10.06,3.6,15.23,5.33-1.62-.65-3.19-1.34-4.71-2A485.2,485.2,0,0,0,492.27,984c175.18.15,226.85-70.2,226.85-70.2l-.52.38q3.72-3.49,7.15-7.25C698.11,933,635,934.76,611.45,932.87c40.22-11.81,66.69-21.8,118.17-41.52q9-3.35,18.48-7.64c.68-.3,1.37-.62,2-.94,1.25-.58,2.49-1.13,3.75-1.74a348.86,348.86,0,0,0,70.26-44c51.71-41.29,63-81.55,68.83-108.09-.82,2.54-3.37,8.47-5.17,12.31-13.31,28.49-42.84,46-74.91,61a689.15,689.15,0,0,0,42.39-62.44C865.77,729.39,869,713.15,876.85,702.23Z" style="fill:url(#radial-gradient-6)"/><path d="M813.92,801c21.08-23.24,40-49.82,54.35-80,36.9-77.58,94-206.58,49-341.3C881.77,273.22,833,215,771.11,158.12,670.56, 65.76,642.48,24.52,642.48,0c0,0-116.09,129.41-65.74,264.38s153.46,130,221.68,270.88c80.27,165.74-64.95,346.61-185,397.23,7.35-1.63,267-60.38,280.61-208.88C893.68,726.34,887.83,767.41,813.92,801Z" style="fill:url(#radial-gradient-7)"/><path d="M477.59,319.37c.4-8.77-4.15-14.66-76.68-21.46-29.84-2.76-41.26-30.33-44.75-41.94-10.61,27.56-15,56.49-12.63,91.48,1.61,22.92,17,47.52,24.37,62,0,0,1.63-2.13,2.39-2.91,13.86-14.43,71.93-36.42,77.39-39.54C453.69,363.16,476.58,346.44,477.59,319.37Z" style="fill:url(#linear-gradient-2)"/><path d="M158.31,156.47c-1-1.82-1.6,3.76-2.4,2-5.95-13.81-9.57-36.2-8.72-52,0,0-12.31,5.61-22.51,29.06-1.89,4.21-3.11,6.54-4.32,8.86-.56.68,1.27-7.7,1-7.24-1.77,3-6.35,7.19-8.34,12.38-1.65,4.24-3.35,6.51-4.62,11.77-.38,1.43.4-6.32.06-5.38C84.72,201.68,80.19,271,82.69,268,133.17,214.14,191,201.36,191,201.36c-6.15-4.53-19.52-17.62-32.7-44.89Z" style="fill:url(#linear-gradient-3)"/><path d="M349.84,720.1c-69.72-29.77-149-71.75-146-167.13C207.92,427.35,321,452.18,321,4 52.18c-4.27,1-15.68,9.16-19.72,17.82-4.27,10.82-12.07,35.27,11.55,60.89,37.09,40.2-76.2,95.36,98.66,199.57,4.41,2.4-41-1.43-61.64-10.36Z" style="fill:url(#linear-gradient-4)"/><path d="M325.07,657.5c49.45,17.21,107,14.19,141.53-4.85,23.08-12.86,52.7-33.44,70.92-28.36-15.78-6.23-27.73-9.15-42.1-9.86a69.59,69.59,0,0,1-8.05-.32,136,136,0,0,0-15.76.86c-8.89.82-18.76,6.44-27.73,5.54-.49,0,8.7-3.78,7.95-3.61-4.75,1-9.91,1.21-15.37,1.88-3.47.39-6.45.82-9.89,1-103,8.74-190-55.81-190-55.81-7.41,25,33.17,74.3,88.52,93.57Z" style="fill:url(#linear-gradient-5)"/><path d="M813.74,801.65c104.16-102.27,156.86-226.59,134.58-366,0,0,8.91,71.5-24.85,144.63,16.22-71.4,18.1-160.12-25-252C841,205.64,746.45,141.11,710.35,114.19,655.66,73.4,633,31.87,632.57,23.3c-16.34,33.47-65.76,148.2-5.31,247,56.64,92.57,145.87,120,208.33,205C950.67,631.67,813.74,801.65,813.74,801.65Z" style="fill:url(#linear-gradient-6)"/><path d="M798.81,535.55C762.41,460.35,717,427.55,674,392c5,7,6.23,9.47,9,14,37.83,40.32,93.61,138 .66,53.11,262.11C659.88,900.48,355,791.06,323,760.32,335.93,894.81,561,959.16,707.6,872,791,793,858.47,658.79,798.81,535.55Z" style="fill:url(#linear-gradient-7)"/><image width="625" height="290" transform="translate(336 680)" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAnEAAAEiCAYAAACWf4T8AAAACXBIWXMAAAsSAAALEgHS3X78AAAgAElEQVR4Xu3dT3Zcx9Gv6zdy76oCQIKSZcmts9xw83bvBDwJj9KT+CZwuqfphte5HUuWRYIE6s/eGbeRuQsFEKRIiZRV0vusVaoCQAAltH4rIiMyMhNJkiSdl/HH/sHvWUTEj/0bSZKknyJ/ZiUtfub3n70PCGo/9nVJkqSP9WQA+5hg97sLcU+Etkcf/+2J0PatQU6SJH0i3zwKX38//fj4+scC3W8+xL0ntAX8rb9cQtpNf9725z8b3iRJ0mfwzx7ALvrzdd6Hu78nPcy9L8j9JkPco+D2KLR9Gw/D2p8D7gJ2/XP7gD9Ge+6+PvTXf0SSJOnj/fv+5XerHr7WCf/O9vxlbcHuIlug+58lyL0zzP1mQtzTwe1v8bDKtoS2H8oxrH2zD+a7Ql4HOfXHs/bMHOTcv38OeI4kSdJPc9dCVwwJQxK3SdlUyl3l+8sKNxWuK3xb4ZvaKnOtKvebDHFvh7cluJ2GtruAmwJ/DL5+U5gvC3VbqJtC7gu5Li2wrQp5KFCDzdies/afvz79PZIkSR9pn0RJKEnsk+1YiXmmzDNxOTPMMz8wwW5ulbl/VfhLfVeQO8sVI++vuv0j4E8FdqV97a7w1WVhngbqXNjmQE6FOg9cHgp1GMgcyFrIw0DOBYbCYQpWQyFKQA3YQ44GOU mS9PFiauGNSOKQHFYzY87EMFGGiV0eqMPEi9vCWCe+/9cEfwK+XYJbRkScBrmzqsQ9Ed6inXP7R2lVt29Kq7hdF766K8yrgToOLahtBzYxUstAMpL9eYyBjIGcB+ivqYWhFKiFHALy5AFnmn0lSdIvburP0QNcrVAqc84EE1H2zHVPDHuG3LE/7BnWe1avD3xfDvBqbq3V/6k8qsadRYh7f8v0ZYH/FfD9wNfXhWk1MA8DlZGaIxtGsr/OXDEeP14BI0P/OBlbgIuBgYGsA0Qh6eGt9PewBDlJkqQPFQlZiahAC3C17olhR80dJe6YpzsGthxyyzjteLXZAxPczL2tWk9D3K++pHQS4OLplulfCl+9HJhfDGxjpM4jm2lFvRipdcVhXjOOK4IV5JrMFTmsgBVDrsiyap9jpDBCD3At0BVK9rZsDSj9fUiSJH2oSKitEldrC3AZB2AH9Y6IWyJHhlKYK6xXlcO68uVc+eGmwrYuPygijpOqv9oQ9zC8EfDXR+HtbuAPzwbmm4H9MDKvV2zqqgW3cc24XxPDmmADdQ2xZmBDljXUNUNZkazJuqKUFuLIFckADAQDUEh6iCsn7VSDnCRJ+iC5bAkBKhETyUTkDuIO4hbmNXMpDAHDWJljpubEPExwXeBPvYj18JaHX2WIe7v69o8Clw/D25Qj+xypmxXruiJyzaGuGcuGYEOOG5guGGNDzQuSDRkbMjdErFuAY02wImnVuKUS1/4uhdMQV5Ywef82kSRJer9egcse4piI3JNlR+Qt5A0RA1SoQyVzIuueDXum/YGv5sL3uwL7yiO/qhD3dOv0/5Q2sDAPfPXlwFRH9tOKOq9YT2vquCaGDREbgguoF8AFDBdkuSRpHxcuyNgQuQE2PcCtgRVZV0Rp5+JYWqkMRC1EBESQp4MNy3uUJEl6r7awNyIJZioTwQ7qFthADBAQZYbcE2ULsabWkToM1HW5v6Tgb3F6RdevJsQ9XX37U4G Lga8PA4dpZF9XzBcr1vtNC2+rHtzyEvKCMS6p5ZKSl2T253JJ5GULcFxwDHB1DbEiY0UwQo7QhxtKDmS0StyxnUvc5zaHGyRJ0oeIFuLIJGMGDhA7yFtgbBkvZjJ3kHcwbyDWbeByGKi70m6S+v/eyh6/ihDXA1x//LVX314McDfw5fXIjpH5sGa9XhO5IVYXJ+HtkixXUK/Icgl5BXlFiUsyLol6CVwQeQGx6WFudfwDBW1KFQbIZc3IEwHutPIWGOQkSdL7xXHHG9CnUvMAbIkYafMJE8Su5ZVoR77mbEWli0NhuooHV4HSclNm5n81xL377NvFwFd1ZNqNHDZr1lNrmR7qBUNewnjZQ9sV1GcttJUran1GxBUZlxBXZF4ScUFyQbCBkxYqp+HtJMBFPwsX2duojwOc4U2SJH2I5FiJSyrBDLEnGdrauJggt1B7kSlXZIwMMRDTQK6jXfsJ7QYqoFeS4L9YiXsY4P5aHpx9+/J6xX5eMa/WrPcbDnHBMLT2KPEM5mftOZ9RyjNqPIP6jBJXZF4RpVXoop+HWwIcnFbfhtZGpUCfRL2vvhXyWB3kieBmkJMkSR8g+5LfqMBE5kCLQDPJrlXfWBN9Z23QLh3IMdr1n3PwdQ2+u+TxhOp/JcS93T79trVPvz6MHKal+rYh9heUzQU5XwEtqMFzMp5TeE7N58AzCj3IZavCRS7Vtws4mUKFfv5tqb4dg1uBOGmfZrCEzCTekdkMcpIk6X1a4IpeiYNyDHDEnui5pDISjJQYqFmgtI7g8f72p/2iIe5H26e7qxXzdsPqsOFQLhiGKw6HZ5R4BvmcgWvq8BzymqQHOZ63c3BxBdHOvx2rb9mGF54693YMbz2wHdumxzbq8W0jSZL0UyUJzP2j2qpxvaCUMUCedANLyybUgHW0PbVvnvyxv1iIe7t9+o+A6+Fh+3TesFpdMNVLhuEKeM44PKfmdQtuwzUlr6lcEzwnaZU4uKL0s2/0 FSL0/W/Rp06PwS0Ksex/exDYeohb3uZpC7UgSZL08SosAw6tIleIRwOUpfRVZtGLSRmtnbr4I3B46yf/IiHu7QDX26cw8MXt6r59Gn0tyNDapuQ11BdQXpBcE7k8X5PxjKC1UCkX1HrRdsVFW9wbrIh4OLCwBLfjebflfWXcB7UlvJ0W4H7998tKkqRfo6DliKXrt4S10w7gEjo+bnjys4e4d55/o4y82K04jBvW84ZDuWTgiimeE73yRrwg4wuCF2R5QeYLgucQz4Gr9ohWfYvYHCtv8aB1WiDLw+C2hLbTwHYMah/1B5QkSXqP7Jlj+XgJcpwEuJMgBy2e/XgB6bOGuPsAt9y+cDnAxQB15PpqxbTdsMoLJq4o4xXkNWNeU3v1Db7ojxctyHENtKnUiGX/24bs595aeBuPwe3YV46yvKOTP9zxbT5+35IkSZ/BSeb4uKrbUz5biHs6wP1rgD+suJ5WTPNFO/82X1HyGTFdw3AN9QtKfEHlC5IvCL4AemWOXoGLS2C5B3UZXOgDCzm037uceTutuhncJEnSb8NnCXEPz8CdBLg//GHFYbdmigtWXFDKM3Lo7dPyAuoXZHwB8QWFL6nxguRF+3o8I7gCWoCDNRFr2pUVvW16MnHK6XvI/ixJkvTb8MlD3KMhhrcD3BwXjKtLyuEZU72m9Opba5t+2R+tCkdeHwNcckUcL7Ffbl3oZ99Kb5+ehrc8eR+SJEm/LZ88xHVxP4V60VqoxwA3XFH2z5jGa6K+gPwCypckXxJLiIsXkC8ofQr1ePvCMcCNRAxk9rUhS4A7HVYwvEmSpN+uTxri7s/Bna4RqWM7A7dU4PbPmMdrgi+I0kNb/gHoQS77GTh6gOMSot28cH/n6dDWhSw7Vpbfa9tUkiT9PnyyEPdwkOEfcVwjcn3Vhxi4aC3UJcAdw9sfjiGO+KJV4XhO9gnUdn3WGrK3T+NR9S0cWJAkSb87nyTEPTwH94/SbmJg4MWur xFZtSGGqbYWapQe4PIrSmlBrtL2wbX9cFf3K0RY2qfjffv0tPq2/F5JkqTfj08S4rplkKHA3G9iGPseuPmKHJ63IYZcBhj+0AJcfsX9PrjlGq1LyA0s06eM5DJ9msWzb5Ik6ffuZ4e4t8/BXbS7UA+bNet50xb55rM2ZVrbEEOrwvVWag9wsSzy7TvgTgPcMbx59k2SJAl+5s3ujxb6tkGGr8aRaV6x3m2Y6iWlXFHymogXRJyuEfmSyrLUtwc4rqBfYh/LGbhlgGG5baH96ifejiRJ0u/GT67EvX0O7pvC14eR3dWKeW6X2Q+0q7Q47oJra0SyDzEEbYjhPsBtINdEGcm6BLgwwEmSJD30k0Nc9/Ac3GEamZdBhrxkiueMvY2aJ1W4yD6Fmo9aqLkmYkXW+4vr76dPDW+SJEndT2qnvt1G/dfAl/sV02bNatgw10vmaOfgan0B/Sqt4wqR6Pegxv09qMcKXD4KcO1XvvvdSJIk/f58dIi7b6P+rbdRH52Dm7lgGK4I7u9ErdH3wvEF5AvgmsyTKVTWBL2FaoCTJEn6MR8d4rpoF9v/qcBmYCoj82rN9CjARbwg+vRpu8y+34XKs+MeuGUKNcMKnCRJ0gf6qBD3dBuVkXmzZr3fMG4umOdnLcQt96LmF+0MXL4g8v4qrWS5SutkjchxiS8Y4CRJkt7pgwcb3jGNOrBjZD2tOcQFOV9R4hm1t1Hb9Glrn0ZeQ7/Mnri/ieHtNSL9d0iSJOldPjjEdU9Mox7WxLBhGC6BZ5DPIa9JrsklyPUAl1wRSwUuV+0qrQdTqL3SJ0mSpPf5oHbqw2GGm4AfCl8NA3NdsV6tmbmg5iV17jczlHYejnxB5jXJc1gCXGyAtsg3c3gU4CRJkvQBPqYSdzLMcDcw1ZH5YkXkhiEvW6uU59ThOaVX4uLBIt9LMjZEroEVRL/MPvtZuOV3SJIk6cf8aCXuySrcH8aBeVqx3m8YuKCMl5T5GRFtKr Vy3Rf5PodllQhLgBuBHuCIk7dggJMkSfpAPxriuni4UiRH6ryijmsqF9R6RY1nvfL2nOA52c/AHZf50ipwsawSeXAfqgFOkiTpI3xEiDupwtU+kTrEhpKXRLki4hm1B7gW5J4R/UL7zCXEnZyDS8/BSZIk/UTvDXEne+GAlwWuC/Ob4WEVLi/J+VkPbS3IJc/IvGq74HJDRBtkeNBGdR+cJEnST/WBlbh/FPhfwVcvB2qMrOvqYRWu9HZqPCPyqj3KBcGGjBWwgnzURgUMcJIkST/JO0Pcw4GGbcD3A/NqYL5YUYc1NTZULsh6RcQVUZ9ReUZGC3BZL4ANwQo4uVLLNqokSdLP9WMrRvpAwzeFrw+FbYxs6opDXRNcMMYlWS6p9RklriDbIENyQcSGZEUwnqwT6dOo3sogSZL0c/xIO3VZK3JTmFZtoKHWFWNpq0VquSSzVeIyr8ge4DI3ED3AMbZWqrcySJIkfSpPhrj7gYZlrch1YR4GNvmwlRp5SeQVySWUS4KL/tiQ2YcZYjkDZ3CTJEn6RH6kErdcsXVXWhXuYmSc15TYUIYLkksiLom4gmxVuLYTbnV/Fi6LVThJkqRP6z0hbhlo2AfzaqAuC36HNTm11SKRlySXZF5Cr8KR616FG04mUg1ukiRJn9Bbgw0PW6l/DrgrVAY2jBzmNcGGMTbt7Fu5JOolERfABbBuZ+FyvA9wx2lUq3CSJEmfyI+0U++Cry4LdRhIRsZxxVDakt/sZ+Lor2FD9qu1WCZSs++F+8B1dJIkSfog71ox0qdSKczTQOZAXY/tnFusSTYULsjYENkGGWDdz8G1ABcUctk151k4SZKkT+kdJbK/0c7D/TGom8ImRjJXZF1T6obCpgU4LiCWe1GXKlzbCZdvXa8lSZKkT+RBiHvrPNzXbwp5N1DLwMhIyRUZazI3RN1A3ZC9CpenO+GWxb4s5+EkSZL0Cb2jnXoTsCvMzwo5FbK2gJbDCuqaiDX LGbjWQj1ZKXLaSs3oXVSDnCRJ0if0VIjrgWsf1KFQ54GyGfrakBVDWZGsW4Cra4jTNuqjVurxii1JkiR9Qk+ciXt0Hu5yVY6t0iFXZK7JXBPZ1okk430rlT6NaitVkiTpczqGuPvzcAB/Dr7ZB7kv7TxcDAyMZFmRuSJyBbnqF9yviF6BOwa4B8MMBjlJkqRP7Il26rctzM13hXxeyFzapG1CtZQW3rKeXHB/0kqNiNZBPZ6HkyRJ0if2jsGGXZDXAVOQtbTFvb1tmj3MRRkhe4BbJlKjkMvNDJ6HkyRJ+lyeOBN308pnOQW5KmRpE6cZA4URctWeT1eKxOkdqSdtWUmSJH0Oj0Lc3+4nU3MK8lDIuZCxBLUW5jIGqANJf81JgFuGGbylQZIk6XN5ohLXJ1PzWUANGArUwkALbu0xtspctp1w7x5qkCRJ0mfwjmu3eiVuMxayBkMpZG1Vtzi2TgcyWniLXnWLB3elSpIk6TMpcFwv0v25v55bJW7VK3HEw0dkgTytvhncJEmSfiGnlbiHISznIGs745ZDkASlB7fM0oJbf2T/3uNkqiRJkj6nR+3Ub1sA+/pwEsR6kHvrwaPHaQv1HV1aSZIkfRLvSVtzwPrkjFvpYa0EZXlt5U2SJOm/4R0h7o/A8/Yyx5MqW+FRNU6SJEn/Be+4seEp79v7ZqCTJEn6JX3g4bUHWe8ksD0IbwY5SZKkX8gHhri3nFTlDHKSJEm/tJ8a4iRJkvRfZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMk STpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEk6Q4Y4SZKkM2SIkyRJOkOGOEmSpDNkiJMkSTpDhjhJkqQzZIiTJEn6ZeT9y1he58PPfzhDnCRJ0i/nqSD36PMTH8IQJ0mS9IuKd1TeIt/9tbcZ4iRJkv5rluAWCfX+czH1MPca+PeT32mIkyRJ+ uXl8VFrQu0f15Nq3D5heGdlzhAnSZL0WdX7ly2gPXrEE49yH96+W/XX3zwIdCOSJEn63JIgSWjPeR/iolSgUqlEJjG3EBelfc/jn9NZiZMkSfrlJORScatkVMhHj1I5zLVV45Z26j+P4S1bADTESZIkfV79jNtSfctIoBJZgRmykjkTORNlZq6VKMluqsSYsH7yXJztVEmSpM9uqb7RWqdJJaMFN8oEzMDMzAylwlRhSOJNwl3CxVtBzhAnSZL0efTgljwaaKgtvMUMpQc57h/BDEMlVrWdiVsn7IG/PwhytlMlSZI+r5MAlxWWAMcETFQmiAOVqQW6nIk6E4feTgW4thInSZL0y6m05b0kSYXo5+BoIS7rRJQDwXR8MMztGyOJm4RLz8RJkiT9sk6HGh4HOCaCA9QDlUMLczm1Sl3OxFwZLmsLcc/fCnK2UyVJkj69k9D11lDDTHJoAS4OZByIOBD1wMzElDOlzsS68u06T9aL5LJeBKzESZIkfSaRbwU4lpYpE+SBLHuC9pg5QLav3x0q61rvJ1P//tZPN8RJkiR9FsfzcG2lyH0r9QDsydgTuQf21OztVA5knSmbmTJWmPtk6ls3NxjiJEmSPrEeuHolrt3K0CZSlzZqcugBbkeyJ2IP84EorUoX+8pwqPBlr8a9zTNxkiRJn9yyF25ppfaVIq2VuifYQdmRZUfEjsg9NQ5MTO083OXMd89qOw/3TfLoPBxYiZMkSfoM+hVbD1uprY0Ke8gdGVsid1R2RNkR7IEDu5xY7d57Hg4McZIkSZ9S3t/S8KCVOvVW6p5kR9ACXPbnYA99X1y9mBnWM4yV+0XBb7GdKkmS9EnV/p8lwDFBD3D0AAdbMu4IthS2zHXPNLUQV+aZ7+/qu5b8LgxxkiRJn0avwi2PrH2Yoa0Taa3ULckW4o6od1S21NxRhh1l2LNjokwz3Lz3PBzYTpUkSfrU7gMczET0lSJsWxs17oi8o8YdJe5g3B LTnlwfKDkxHOZ26T35+NL7U4Y4SZKkn2+pvmW/Xqu1Uo83Myxt1Lgj8xbyjog76ryFYUcOe1bbibKZ+P6ywuU7V4ssbKdKkiR9Oj3IZb+dIQ4kbYAh2UK9I7gj45aMOwpbSu4o855dHBjm3kr9V31fKxWsxEmSJP1cj6twM2S/4D4PROwgt736dkvNW6LcEvWOiS1Zd6zKgTJPjIcZrvtU6rtbqWAlTpIk6efoQav213k/kRocyGxt1Fyqb3lLKW/I2s/Ejds20FAODDnx3U2Fb49VuHf/WitxkiRJP9PxdoYKdZlIPRDsiLIl65bglog31PIGlkpcbiF35LxnmHor9asZbo5VuHe1UsFKnCRJ0k/VA1YmbZBhmUg9ENnPwtVtP/92S+YbSr4h6y1Zb6lxx5w79qVNpX7/xQz/N+Ev9X2/dGElTpIk6eOdBLjlflRaGzX7Obg2jXoLvCF4TeVNez28IfIO2JLTnrI5MDzrAw1f1H7N1jsHGhaGOEmSpJ/kpI0azGT2y+1jR1vqex/gktcUXlOztVOz3JG5Yxr3jEz8Z5rhy2WtyHvD28J2qiRJ0sc5mUbtbdTM0wvud20SlVsi35C8hiXI5RtKuW2rRaY9ZTgwxgS7+XStyPt++cIQJ0mS9OEeTaOetlGjBzjuIN4AryFuKNyQcUPma+rwhjrdMbNlv94xjIf7Ktz1Bw00LAxxkiRJH6YHq+iTqMd1Iq0CF9kCXHJLslTgWoArc6vEZb5hjjuG3DFsD4zlJ1XhwDNxkiRJH+Fkqe/9ObhDWxUSfZVIr8Alr8j6isge5Mob4I5gy/6wZ1UOfD+fnIX78CocGOIkSZI+xBPn4JgglnNwLcCRbyBuIF8RvGptVG4gX0O+oc53rHJHrvasDhPs+1Tq//6oKhzYTpUkSfoxJ+tEqP0xARPZAxxxB/mGjBvIFuLIV5T6ihI31HzDMNwy5Jb9uGdg4rvt3G5n+EtdfseHVuHASpwkSdL 7nAS44z64qT/2bRccd0S+ocYNxCuSlwQvgZdkvAJeMwxvmHZbpvWO1d2eHzYT/GmGu9rbqD+6F+4xK3GSJElPOw1wrYUa/V5UslXgMu+AVoELbij5CnhJ8pLMpZ36mnm+ZWTLcNgz1p88zHDKECdJkvS2JwJcmdo5OPYQbRI14g3QKnAtvP1AyZdQHwa4gS37zY5xOPD9NMGrubVRP26Y4ZTtVEmSpIeeCHAxk3WCuF/mC7cQr9sZOF5BthYq+ZJSXjHFDWO+Icodh8OOVd3zw9Xh57ZRF4Y4SZKkpoep4xqRvK/AnQa44zLftkaEeEnwA/AD8JIcXgI3DLxmjjum3DJe7Fhtf9Y06mO2UyVJkt4KcP0mhuBxgGv3oSavW4DLl8AP5BLi4iXMbS/cPN8yHu4Y5h2r1we+q9PPmUZ9zEqcJEn6vXsqwLUp1Ix+Bm6pwPGG4OY4fVqPFbgfyHwJy264estY7tivdqzmfg5uO8M3P7uNujDESZKk36uT8FYB6v11WssakexDDNlaqMnrY4Aj/gP8pz3nDzC8JPOGOr9hzFv2sWM1PToH9z+VTxDgwBAnSZJ+n95x/o25T6AuU6htD1xro/YBhh7gau0Brlfhst4wltfEcMvhsGWcd7zcHD7lObhTnomTJEm/JydBKh+ef4OJzHaNVrIFbslcVoi09SHkf6j5PTW/h/ge4j8kP5DlFSM31PqGA1uGix2vyqHtg7uZP9U5uFNW4iRJ0u/FE9W3Y/t0pt2D2kLc8SaGZQ9ctiBHLAMMvQLHDyQvGaYb5vUbpsOWkS03rw9Q+j64b/JTnYM7ZYiTJEm/dY/Pvt0PL7T2ab+FgT3kjuUu1FjuQo1XwCvidAo1ewu1vGKYbqjjG6bDHUNuuRkPcDrI8OnOwZ0yxEmSpN+qk/AGT1bfMifgQMaeyB0ZW4Jb6HehBjeQbYEv/NCCXL5sQwz1hnFeKnAtwK02e/jPW4MMT7+9n8cQJ0mSfmue CG+chLdaIU6qb7QAB3fHALdU4CJf9erbMpHa14hkG2KotbVQlwD3n2OAm+F/jufvPnUVDgxxkiTpt+EkJD1omy7hLWnDC3MPcAcyD0TsWHbAJbcEryFuiLwheUnlZbsLNftNDH2Rb53ftCnU0s/AjYeTCtx8erH95whwYIiTJEnn61E4WgYWkhbc+tqQ4/LebKtDkgNxDHBblh1w8AbiBnI5A/eyBbl8RSmvgBty7It8s68Rudi1IYZpehjgPv0gw2OfIMRFnvwNP9sblSRJv3tP5Iyl6na8baE/xxoH65gAAAhSSURBVEnbNPv6ECaCA8GOjB3BtlXf4hZ4Df0qraCFuHaZ/Suy3DBFuwu1Tv0mhtgxzjtebfsU6nY5A7dU4D5rgIMPDnETEMsHef9Yes3HP1xXl3//Wd+8JEn6PVlyRz15fVzU256DSkZtwS1a+zQ5ENGqb5k7omyhbiHaPahkq8AFN2Rt12aVfEXGKyg3wGvGfMMcd6xqv0pr2rdFvru5rxF5MMTwuQMcfHCIWyxVtzgJcieBLkhyCXeJu4QlSdJPU09eHwNb/8+jAHcMblSSel95y6mFN3p4ix0ltuRJgAtek/GaQjvr1s7C3cDQwhu8ps63RLljyi0Z7S7UH676TQz73j79ZQMcvDPE/Rt41l7GlGTpf7DaAlvNJE4uiU0qEf0Px9y/MSzESZKkn+ZxR2+puNGLRsePT4JbLIMLbW1I9NsX2uDCFnJLXSZQ+xBDuwv1NTVuKPPrNpWar5nqG4bhDXW+ZWTL4bBjvNixuuuX2f9pbldp/aUu59/au/xlAhy8txJ31/84S4DLevxjHZfj9T9WHJfktdJbq8gt/ddjH1aSJOkJTwef6J/PkwAH2UJbnAwsHCdO+843DgR7iHZ9Vrt9YRlguG23MOQbKm8oPchRXzPzmlLa11bjLdNuy4ot+82OVd2z2k58d3r+7X/nch/qLxneFu9vp0YPcFErlEqtMxETw UTlJOXGnsyBCGiJuEAGBjhJkvRhHoWgyCXCnRSRlqLS0vmrtODWz731vW9xUn2L5faFetcGGPKWWt5QaNOoNd9Q8g059LNx3FHnO2LaMq135GH/sH36bf1vnH97yqMQ903Ca/hulVzTqnBxSHJsf6xYJjtyT7CDPpqbLAFu7mGu9HaqIU6SJH2gOA1DrW1KJnnSCTzueuvXZcVSVGJpne5JlsnTLRF3ZN4ScUfN215pu6XWW2JorxluYbqjxh3BllXu2I97Vnd7xjo9bJ/+P/+19uljpyEugYB/JnwDDEnsksNqJnJmiImMA5E7suzaVEfeEjH2v/kMsScYaG3VaIU4g5wkSXqfeByEetv00bm3OD331sPbcutC9tUh5O7YPo24I/IO8o6MW6LcUusdUW5bWzXvyHIHbMmxh7fDnlztWTHxw2Zq06e/jvbpYyO0dxIRJ2FrncRNst1Uxmwpt9Zemow7Im+BDTC2c4Yx9dS7AgZaerMSJ0mSPkDyVhXu/lGJrO0c/vHc2/3ON3K593QPpd99mjuyt1Br3BFxd2ypZtwRub0Pb7kjp31rne4OrMqB1WHiu+38a6y+nXriTNxFwr+Tcl2JeSaGiSg9wNV2IJC8gRj6/8sEuYXYEIxk9BDnmThJkvRBkuORuEdrzJIW4CJnKH11SO0BLg5k6QGOXSso5a61UXNLjS0l7qjzlsKWiS1l2ELu7sPbuKdsDqzGA+Nm4vu5rw35obbq21/y1xjg4K0Q9/eE/xdYJ+WuUoaZMkxMdU/Erh0InNdEDL3YNrdzcXVDsKYyQhZKWQKcIU6SJP2Yk2AUSa2tjRqlVeHICmUicqYyEeUA9WQKlT3ZL7GvPcgFrSLHuIWhtVmz7sjck/OeqRwomwMjE2NM/Gc3t9bpl/XXXH079UQl7jrhsvL9XeV6mNnlgTH2lLwjcmQuBSpEmdvivHpJ9ipcMAKFPLZRDXGSJOlD5PE5Tlqp7Tzc/TBDW947Uf swQ7Cn5oHoLdUoO4I9U91Thh0x7clhT9Y9q3JgFweG6cAqJ4ZnM/+ZHoW3uzw9+wa/zgAHT4a4bxL+T8JFZbieqcPEkDumaWAohSGgDhVyT9u3siFyRTJSllaqk6mSJOljRfabGlqAqie7aZcQV7OtOotyIOqBmUOrzM0H5uiVuXIg64FkT64PrLYTuzhQ5on1NDHMM99/0c+7nYa3X2/r9CnHENeHGwCinYu7rvzAxIvbwn4srKIwVxjG2q6xKFuYN0SsyRgJBmoWKMUAJ0mSfoJsCy76DVGRCVmJMjMvlbg+cBk5MTNB9kvtSxt2oO+LW40TOyZKTpTNxHqeGQ8z391U+GqGfyR88WR4g19/gAOI0/fYJ1QD/lrg2wIvBr6qKw7PV8z7NevVmjk25LxmKGuyrklGhhigFnIJcEuI+8irWSVJ0u/U1J8jj4+YE0pl7pcORM6QMzG0MDctga6251JndjkRFzNlninTzHCY+f6yV9uua1vWe5H9uixYqn7dOYS3xVMhDqDAXwMuB/jXwFfjyFRG5qsVNUc2dUVlJPs06moayLGHtxrttSRJ0keKqQeTfmvUYa7tBqm5EkNtgW1sz6XO3B0qZTMT+0pczpRdOw72/V0PbutsLdN/1Xbu/5ul6gZnGt4WD0plJ/visi38/UeFP8H3PyRsKl/OlXmYmPYH6jCQw8DFoZDrHt5qwNoAJ0mSfppcA/vsQ5TJakx2U22XEKwqcai9SleJdWVdK2WsDIfKd0Nvj44VLhO+7VW2822Zvk889f7v26p/C/g2Wmv1mwI3Ba4LX90V6mWh7gp5FTAHOffwdmmIkyRJP9FrYGjhJIZs4W1M4k1/HtuFBMNl5dt1wr/zvtr2z+zn+nu4+e1U3Z7yvhAHx11vfw24CdgG/DnghwL7gD9Gewa+PpyEtz++9TMlSZJ+3L/b03erk4ByGtYANtkqbUtog5NWKdwHtt9ccDv1ZIg7fvFBmPtbf/1tD3T QQh20YCdJkvSp/bMHldOwBi2wwbtCG/w2g9up94Y4eBDk4MHy3r89Cm7fGuQkSdIn8s0TAeXvjz/3uwptj/1oiDv1KNA9+NI7Pi9JkvRTvTek/N5C22MfFeKe8p5gJ0mS9LP83oPa+/zsECdJkqRf3v8PG+6Zu/RALfQAAAAASUVORK5CYII=" style="opacity:0.5;isolation:isolate"/><path d="M881,954H348V756a68,68,0,0,1,68-68H949V886A68,68,0,0,1,881,954Z" style="fill:url(#linear-gradient-8)"/><path d="M531.35,855.62c0,33.13-26.38,43.38-63,43.38H423V748.36h39.46c38.8,0,62.35,10.9,62.35,38.37,0,18.75-13.52,29.43-27.91,32.48C514.12,822.48,531.35,830.55,531.35,855.62Zm-79.57-86.11v40.76h17.65c15.7,0,25.95-7,25.95-21.14,0-15.26-10.47-19.62-30.09-19.62Zm49.48,85c0-18.1-12.86-24.2-29.65-24.2H451.78V877.4h16.78c19,0,32.7-3.91,32.7-22.87Z" style="fill:#002d3e"/><path d="M643.37,769.72H587.78V811.8h48.39v21.36H587.78v44.26h59.51V899H559V748.36h87.42Z" style="fill:#002d3e"/><path d="M771.78,771.25H732.54V899h-29V771.25H663V748.36H774.83Z" style="fill:#002d3e"/><path d="M854.16,864.12H804.24L794.87,899H765l46.87-150.64H847.4L894.06,899H863.54Zm-5.66-21.8- 19.41-71.94-19.18,71.94Z" style="fill:#002d3e"/></g></g></g></g></svg> +<?xml version="1.0" encoding="UTF-8"?> +<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1"> + <stop stop-color="#420C5D" offset="0%"></stop> + <stop stop-color="#951AD1" offset="100%"></stop> + </linearGradient> + <path d="M25,29 C152.577777,29 256,131.974508 256,259 C256,386.025492 152.577777,489 25,489 L25,29 Z" id="path-2"></path> + <filter x="-18.2%" y="-7.4%" width="129.4%" height="114.8%" filterUnits="objectBoundingBox" id="filter-3"> + <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset> + <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur> + <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> + </filter> + </defs> + <g id="Assets" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="icon_512x512"> + <g id="Group"> + <g id="tb_icon/Stable"> + <g id="Stable"> + <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="256" cy="256" r="246"></circle> + <path d="M256.525143,465.439707 L256.525143,434.406609 C354.826191,434.122748 434.420802,354.364917 434.420802,255.992903 C434.420802,157.627987 354.826191,77.8701558 256.525143,77.5862948 L256.525143,46.5531962 C371.964296,46.8441537 465.446804,140.489882 465.446804,255.992903 C465.446804,371.503022 371.964296,465.155846 256.525143,465.439707 Z M256.525143,356.820314 C311.970283,356.529356 356.8487,311.516106 356.8487,255.992903 C356.8487,200.476798 311.970283,155.463547 256.525143,155.17259 L256.525143,124.146588 C329.115485,124.430449 387.881799,183.338693 387.881799,255.992903 C387.881799,328.654211 329.115485,387.562455 256.525143,387.846316 L256.525143,356.820314 Z M256.525143,201.718689 C286.266674,202.00255 310.3026,226.180407 310.3026,255.992903 C310.3026,285.812497 286.266674,309.990353 256.525143,310.274214 L256.525143,201.718689 Z M0,255.992903 C0,397.384044 114.60886,512 256,512 C397.384044,512 512,397.384044 512,255.992903 C512,114.60886 397.384 044,0 256,0 C114.60886,0 0,114.60886 0,255.992903 Z" id="center" fill="url(#linearGradient-1)"></path> + <g id="half" transform="translate(140.500000, 259.000000) scale(-1, 1) translate(-140.500000, -259.000000) "> + <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use> + <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use> + </g> + </g> + </g> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/devtools/client/themes/images/aboutdebugging-firefox-logo.svg b/devtools/client/themes/images/aboutdebugging-firefox-logo.svg index 7e9522a3be6d..9240dc6e84ca 100644 --- a/devtools/client/themes/images/aboutdebugging-firefox-logo.svg +++ b/devtools/client/themes/images/aboutdebugging-firefox-logo.svg @@ -1,7 +1,31 @@ - -<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"> - <path fill="context-fill" - d="M31.359,14.615h0c-.044-.289-.088-.459-.088-.459s-.113.131-.3.378A10.77,10.77,0,0,0,30.6,12.5a13.846,13.846,0,0,0-.937-2.411,10.048,10.048,0,0,0-.856-1.468q-.176-.263-.359-.51c-.57-.931-1.224-1.5-1.981-2.576a7.806,7.806,0,0,1-.991-2.685A10.844,10.844,0,0,0,25,4.607c-.777-.784-1.453-1.341-1.861-1.721C21.126,1.006,21.36.031,21.36.031h0S17.6,4.228,19.229,8.6a8.4,8.4,0,0,0,2.8,3.733c1.576,1.3,3.273,2.323,4.168,4.937a8.377,8.377,0,0,0-3.144-3.317,7.573,7.573,0,0,1,.6,3,7.124,7.124,0,0,1-8.711,6.94,6.561,6.561,0,0,1-1.765-.6,7.183,7.183,0,0,1-2.115-1.955l-.01-.017.126.046a6.5,6.5,0,0,0,.9.241,5.628,5.628,0,0,0,3.583-.423c1.126-.625,1.808-1.088,2.361-.905l.01,0c.54.172.966-.352.58-.9a2.94,2.94,0,0,0-2.848-1.112c-1.127.164-2.16.965-3.637.189a3.129,3.129,0,0,1-.277-.163c-.1-.057.317.087.22.022a7.33,7.33,0,0,1-.928-.554c-.022-.018.223.07.2.052a3.581,3.581,0,0,1-.968-.979,1.741,1.741,0,0,1-.066-1.554,1.371,1.371,0,0,1,.6-.564c.191.094.309.165.309.165s-.087-.16-.134-.244c.017-.006.032 ,0,.049-.011.167.072.537.26.732.375a1.016,1.016,0,0,1,.335.3s.067-.033.017-.173a.9.9,0,0,0-.346-.424l.016,0a2.94,2.94,0,0,1,.426.265,2.079,2.079,0,0,0,.17-.9,1.178,1.178,0,0,0-.069-.5c-.053-.1.03-.14.123-.035a.976.976,0,0,0-.079-.238v-.008h0s.053-.069.077-.094a1.43,1.43,0,0,1,.216-.176,9.973,9.973,0,0,1,1.465-.747c.414-.181.757-.319.827-.359a2.3,2.3,0,0,0,.293-.225,1.968,1.968,0,0,0,.66-1.14,1.6,1.6,0,0,0,.017-.178v-.05l0-.03v0l0-.012v0l0-.013h0c-.06-.225-.448-.394-2.476-.584a1.773,1.773,0,0,1-1.45-1.36l0,.009c-.029.074-.055.149-.081.225.026-.075.052-.15.081-.225l0-.016a5.138,5.138,0,0,1,1.986-2.466c.052-.042-.208.011-.156-.032a5.156,5.156,0,0,1,.53-.224c.091-.038-.39-.222-.815-.177a2.2,2.2,0,0,0-.756.178c.1-.086.4-.2.329-.2a4.865,4.865,0,0,0-1.542.583.314.314,0,0,1,.03-.14,2.4,2.4,0,0,0-.964.744,1.275,1.275,0,0,0,.01-.174,2.876,2.876,0,0,0-.473.444l-.009.007a6.285,6.285,0,0,0-3.517-.3l-.01-.009.012,0a2.943,2.943,0,0,1-.625-.7L6.1,5.852,6.081,5.83c-.077-.114-.156-.243-.237-.387-.058 -.1-.117-.217-.176-.338,0-.008-.009-.011-.013-.012-.024,0-.041.111-.061.082l0-.006a4.308,4.308,0,0,1-.283-1.687l-.016.008a1.884,1.884,0,0,0-.714.934c-.061.137-.1.212-.14.287,0,.006,0-.01,0-.035.009-.069.039-.211.032-.2s-.012.019-.019.029a1.733,1.733,0,0,0-.251.372,2.355,2.355,0,0,0-.15.382c-.006.021,0-.018,0-.064s.009-.128,0-.111l-.022.043a9.5,9.5,0,0,0-.8,3.035A3.022,3.022,0,0,0,3.2,8.7v.016a6.628,6.628,0,0,0-.817,1.1,15.606,15.606,0,0,0-1.727,4.23,10.351,10.351,0,0,1,.925-1.621,15,15,0,0,0-1.045,5.5,14.233,14.233,0,0,1,.45-1.629A13.807,13.807,0,0,0,2.234,22.76a15.037,15.037,0,0,0,5.951,6.748h0a13.016,13.016,0,0,0,3.468,1.662c.162.059.326.117.494.173-.053-.021-.1-.044-.153-.067a15.7,15.7,0,0,0,4.5.662c5.394,0,7.175-2.054,7.339-2.259h0a2.73,2.73,0,0,0,.637-.856h0q.156-.064.315-.137l.067-.03.121-.057a11.312,11.312,0,0,0,2.277-1.426,5.5,5.5,0,0,0,2.123-3.1h0a1.938,1.938,0,0,0,.029-1.428q.083-.131.171-.28a12.706,12.706,0,0,0,1.907-6.181v-.006c0-.059,0-.118,0-.177A7.731,7.731,0,0,0,31.3 59,14.615Z"/> -</svg> +<?xml version="1.0" encoding="UTF-8"?> +<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1"> + <stop stop-color="#420C5D" offset="0%"></stop> + <stop stop-color="#951AD1" offset="100%"></stop> + </linearGradient> + <path d="M25,29 C152.577777,29 256,131.974508 256,259 C256,386.025492 152.577777,489 25,489 L25,29 Z" id="path-2"></path> + <filter x="-18.2%" y="-7.4%" width="129.4%" height="114.8%" filterUnits="objectBoundingBox" id="filter-3"> + <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset> + <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur> + <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> + </filter> + </defs> + <g id="Assets" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="icon_512x512"> + <g id="Group"> + <g id="tb_icon/Stable"> + <g id="Stable"> + <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="256" cy="256" r="246"></circle> + <path d="M256.525143,465.439707 L256.525143,434.406609 C354.826191,434.122748 434.420802,354.364917 434.420802,255.992903 C434.420802,157.627987 354.826191,77.8701558 256.525143,77.5862948 L256.525143,46.5531962 C371.964296,46.8441537 465.446804,140.489882 465.446804,255.992903 C465.446804,371.503022 371.964296,465.155846 256.525143,465.439707 Z M256.525143,356.820314 C311.970283,356.529356 356.8487,311.516106 356.8487,255.992903 C356.8487,200.476798 311.970283,155.463547 256.525143,155.17259 L256.525143,124.146588 C329.115485,124.430449 387.881799,183.338693 387.881799,255.992903 C387.881799,328.654211 329.115485,387.562455 256.525143,387.846316 L256.525143,356.820314 Z M256.525143,201.718689 C286.266674,202.00255 310.3026,226.180407 310.3026,255.992903 C310.3026,285.812497 286.266674,309.990353 256.525143,310.274214 L256.525143,201.718689 Z M0,255.992903 C0,397.384044 114.60886,512 256,512 C397.384044,512 512,397.384044 512,255.992903 C512,114.60886 397.384 044,0 256,0 C114.60886,0 0,114.60886 0,255.992903 Z" id="center" fill="url(#linearGradient-1)"></path> + <g id="half" transform="translate(140.500000, 259.000000) scale(-1, 1) translate(-140.500000, -259.000000) "> + <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use> + <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use> + </g> + </g> + </g> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/devtools/client/themes/images/aboutdebugging-firefox-nightly.svg b/devtools/client/themes/images/aboutdebugging-firefox-nightly.svg index bfed2982bc9c..9240dc6e84ca 100644 --- a/devtools/client/themes/images/aboutdebugging-firefox-nightly.svg +++ b/devtools/client/themes/images/aboutdebugging-firefox-nightly.svg @@ -1,4 +1,31 @@ - -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 953.37 984"><defs><linearGradient id="linear-gradient" x1="-14706.28" y1="9250.14" x2="-14443.04" y2="9250.14" gradientTransform="matrix(0.76, 0.03, 0.05, -1.12, 11485.47, 11148)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0083ff"/><stop offset="0.1" stop-color="#0092f8"/><stop offset="0.31" stop-color="#00abeb"/><stop offset="0.52" stop-color="#00bee1"/><stop offset="0.75" stop-color="#00c8dc"/><stop offset="1" stop-color="#00ccda"/></linearGradient><radialGradient id="radial-gradient" cx="-7588.66" cy="8866.53" r="791.23" gradientTransform="matrix(1.23, 0, 0, -1.22, 9958.21, 11048.11)" gradientUnits="userSpaceOnUse"><stop offset="0.02" stop-color="#005fe7"/><stop offset="0.18" stop-color="#0042b4"/><stop offset="0.32" stop-color="#002989"/><stop offset="0.4" stop-color="#002079"/><stop offset="0.47" stop-color="#131d78"/><stop offset="0.66" stop-color="#3b1676"/><stop offset="0.75" stop-color="#4a1475"/></radia lGradient><linearGradient id="linear-gradient-2" x1="539.64" y1="254.8" x2="348.2" y2="881.03" gradientTransform="matrix(1, 0, 0, -1, 1, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000f43" stop-opacity="0.4"/><stop offset="0.48" stop-color="#001962" stop-opacity="0.17"/><stop offset="1" stop-color="#002079" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-3" x1="540.64" y1="254.8" x2="349.2" y2="881.03" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" href="#linear-gradient-2"/><linearGradient id="linear-gradient-4" x1="-8367.12" y1="7348.87" x2="-8482.36" y2="7357.76" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10241.06, 10765.32)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#812cc9"/><stop offset="1" stop-color="#005fe7"/></linearGradient><linearGradient id="linear-gradient-5" x1="-8449.89" y1="7496.97" x2="-8341.94" y2="7609.09" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10241.06, 10765.32)" gradientUnits= "userSpaceOnUse"><stop offset="0.05" stop-color="#005fe7"/><stop offset="0.18" stop-color="#065de6"/><stop offset="0.35" stop-color="#1856e1"/><stop offset="0.56" stop-color="#354adb"/><stop offset="0.78" stop-color="#5d3ad1"/><stop offset="0.95" stop-color="#812cc9"/></linearGradient><linearGradient id="linear-gradient-6" x1="-8653.41" y1="7245.3" x2="-8422.52" y2="7244.76" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10241.06, 10765.32)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#002079"/><stop offset="0.99" stop-color="#a238ff"/></linearGradient><radialGradient id="radial-gradient-2" cx="644.11" cy="599.83" fx="785.0454815336918" fy="470.6889181532662" r="793.95" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0.2" stop-color="#00fdff"/><stop offset="0.26" stop-color="#0af1ff"/><stop offset="0.37" stop-color="#23d2ff"/><stop offset="0.52" stop-color="#4da0ff"/><stop offset="0.69" stop-color="#855bff"/><stop offs et="0.77" stop-color="#a238ff"/><stop offset="0.81" stop-color="#a738fd"/><stop offset="0.86" stop-color="#b539f9"/><stop offset="0.9" stop-color="#cd39f1"/><stop offset="0.96" stop-color="#ee3ae6"/><stop offset="0.98" stop-color="#ff3be0"/></radialGradient><linearGradient id="linear-gradient-7" x1="-7458.97" y1="9093.17" x2="-7531.06" y2="8282.84" gradientTransform="matrix(1.23, 0, 0, -1.22, 9958.21, 11048.11)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00ec00"/><stop offset="0.1" stop-color="#00e244"/><stop offset="0.22" stop-color="#00d694"/><stop offset="0.31" stop-color="#00cfc7"/><stop offset="0.35" stop-color="#00ccda"/><stop offset="0.42" stop-color="#0bc2dd" stop-opacity="0.92"/><stop offset="0.57" stop-color="#29a7e4" stop-opacity="0.72"/><stop offset="0.77" stop-color="#597df0" stop-opacity="0.4"/><stop offset="1" stop-color="#9448ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-8" x1="-8926.61" y1="7680.53" x2="-8790.14" y2="76 80.53" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10241.06, 10765.32)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#005fe7"/><stop offset="0.46" stop-color="#0071f3" stop-opacity="0.51"/><stop offset="0.83" stop-color="#007efc" stop-opacity="0.14"/><stop offset="1" stop-color="#0083ff" stop-opacity="0"/></linearGradient><radialGradient id="radial-gradient-3" cx="-8914.62" cy="7721.05" r="165.97" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10241.06, 10765.32)" gradientUnits="userSpaceOnUse"><stop offset="0.63" stop-color="#ffe302" stop-opacity="0"/><stop offset="0.67" stop-color="#ffe302" stop-opacity="0.05"/><stop offset="0.75" stop-color="#ffe302" stop-opacity="0.19"/><stop offset="0.86" stop-color="#ffe302" stop-opacity="0.4"/><stop offset="0.99" stop-color="#ffe302" stop-opacity="0.7"/></radialGradient><linearGradient id="linear-gradient-9" x1="214.02" y1="2032.47" x2="96.19" y2="2284.31" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, -250.1, 2306 .29)" gradientUnits="userSpaceOnUse"><stop offset="0.19" stop-color="#4a1475" stop-opacity="0.5"/><stop offset="0.62" stop-color="#2277ac" stop-opacity="0.23"/><stop offset="0.94" stop-color="#00ccda" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-10" x1="-38.44" y1="278.18" x2="55.67" y2="171.29" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, 229.04, 745.87)" gradientUnits="userSpaceOnUse"><stop offset="0.01" stop-color="#002079" stop-opacity="0.5"/><stop offset="1" stop-color="#0083ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-11" x1="142.45" y1="96.25" x2="142.5" y2="149.68" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, 229.04, 745.87)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4a1475" stop-opacity="0.9"/><stop offset="0.18" stop-color="#6720a2" stop-opacity="0.6"/><stop offset="0.38" stop-color="#812acb" stop-opacity="0.34"/><stop offset="0.57" stop-color="#9332e8" stop-opacity="0.15"/><stop offset="0.7 6" stop-color="#9e36f9" stop-opacity="0.04"/><stop offset="0.93" stop-color="#a238ff" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-12" x1="620.52" y1="947.88" x2="926.18" y2="264.39" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00ec00" stop-opacity="0"/><stop offset="0.28" stop-color="#00dc6d" stop-opacity="0.5"/><stop offset="0.5" stop-color="#00d1bb" stop-opacity="0.86"/><stop offset="0.6" stop-color="#00ccda"/><stop offset="0.68" stop-color="#04c9db"/><stop offset="0.75" stop-color="#0fc1df"/><stop offset="0.83" stop-color="#23b2e6"/><stop offset="0.9" stop-color="#3e9ef0"/><stop offset="0.98" stop-color="#6184fc"/><stop offset="0.99" stop-color="#6680fe"/></linearGradient><linearGradient id="linear-gradient-13" x1="680.88" y1="554.79" x2="536.1" y2="166.04" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0083ff"/><stop offset="0.0 4" stop-color="#0083ff" stop-opacity="0.92"/><stop offset="0.14" stop-color="#0083ff" stop-opacity="0.71"/><stop offset="0.26" stop-color="#0083ff" stop-opacity="0.52"/><stop offset="0.37" stop-color="#0083ff" stop-opacity="0.36"/><stop offset="0.49" stop-color="#0083ff" stop-opacity="0.23"/><stop offset="0.61" stop-color="#0083ff" stop-opacity="0.13"/><stop offset="0.73" stop-color="#0083ff" stop-opacity="0.06"/><stop offset="0.86" stop-color="#0083ff" stop-opacity="0.01"/><stop offset="1" stop-color="#0083ff" stop-opacity="0"/></linearGradient></defs><title>firefox-logo-nightly</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Layer_2-2" data-name="Layer 2"><g id="Firefox"><path d="M770.28,91.56c-23.95,27.88-35.1,90.64-10.82,154.26s61.5,49.8,84.7,114.67c30.62,85.6,16.37,200.59,16.37,200.59s36.81,106.61,62.47-6.63C979.79,341.74,770.28,143.94,770.28,91.56Z" style="fill:url(#linear-gradient)"/><path id="_Path_" data-name=" Path " d="M476.92,972.8 3c245.24,0,443.9-199.74,443.9-446s-198.66-446-443.66-446S33.5,280.51,33.5,526.8C33,773.33,231.92,972.83,476.92,972.83Z" style="fill:url(#radial-gradient)"/><path d="M810.67,803.64a246.8,246.8,0,0,1-30.12,18.18,705.31,705.31,0,0,0,38.3-63c9.46-10.47,18.13-20.65,25.19-31.65,3.44-5.41,7.31-12.08,11.42-19.82,24.92-44.9,52.4-117.56,53.18-192.2v-5.66a257.25,257.25,0,0,0-5.71-55.75c.2,1.43.38,2.86.56,4.29-.22-1.1-.41-2.21-.64-3.31.37,2,.66,4,1,6,5.09,43.22,1.47,85.37-16.68,116.45-.29.45-.58.88-.87,1.32,9.41-47.23,12.56-99.39,2.09-151.6,0,0-4.19-25.38-35.38-102.44-18-44.35-49.83-80.72-78-107.21-24.69-30.55-47.11-51-59.47-64.06C689.72,126,678.9,105.61,674.45,92.31c-3.85-1.93-53.14-49.81-57.05-51.63-21.51,33.35-89.16,137.67-57,235.15,14.58,44.17,51.47,90,90.07,115.74,1.69,1.94,23,25,33.09,77.16,10.45,53.85,5,95.86-16.54,158C641.73,681.24,577,735.12,516.3,740.63c-129.67,11.78-177.15-65.11-177.15-65.11C385.49,694,436.72,690.17,467.87,671c31.4-19.43,50.39-33.83,65.81-28.15C548.86,648.43,561,632, 550.1,615a78.5,78.5,0,0,0-79.4-34.57c-31.43,5.11-60.23,30-101.41,5.89a86.29,86.29,0,0,1-7.73-5.06c-2.71-1.79,8.83,2.72,6.13.69-8-4.35-22.2-13.84-25.88-17.22-.61-.56,6.22,2.18,5.61,1.62-38.51-31.71-33.7-53.13-32.49-66.57,1-10.75,8-24.52,19.75-30.11,5.69,3.11,9.24,5.48,9.24,5.48s-2.43-5-3.74-7.58c.46-.2.9-.15,1.36-.34,4.66,2.25,15,8.1,20.41,11.67,7.07,5,9.33,9.44,9.33,9.44s1.86-1,.48-5.37c-.5-1.78-2.65-7.45-9.65-13.17h.44A81.61,81.61,0,0,1,374.42,478c2-7.18,5.53-14.68,4.75-28.09-.48-9.43-.26-11.87-1.92-15.51-1.49-3.13.83-4.35,3.42-1.1a32.5,32.5,0,0,0-2.21-7.4v-.24c3.23-11.24,68.25-40.46,73-43.88A67.2,67.2,0,0,0,470.59,361c3.62-5.76,6.34-13.85,7-26.11.36-8.84-3.76-14.73-69.51-21.62-18-1.77-28.53-14.8-34.53-26.82-1.09-2.59-2.21-4.94-3.33-7.28a57.68,57.68,0,0,1-2.56-8.43c10.75-30.87,28.81-57,55.37-76.7,1.45-1.32-5.78.34-4.34-1,1.69-1.54,12.71-6,14.79-7,2.54-1.2-10.88-6.9-22.73-5.51-12.07,1.36-14.63,2.8-21.07,5.53,2.67-2.66,11.17-6.15,9.18-6.13-13,2-29.18,9.56-43,18.12a10.66,10.66,0,0,1,. 83-4.35c-6.44,2.73-22.26,13.79-26.87,23.14a44.29,44.29,0,0,0,.27-5.4,84.17,84.17,0,0,0-13.19,13.82l-.24.22c-37.36-15-70.23-16-98.05-9.28-6.09-6.11-9.06-1.64-22.91-32.07-.94-1.83.72,1.81,0,0-2.28-5.9,1.39,7.87,0,0-23.28,18.37-53.92,39.19-68.63,53.89-.18.59,17.16-4.9,0,0-6,1.72-5.6,5.28-6.51,37.5-.22,2.44,0,5.18-.22,7.38-11.75,15-19.75,27.64-22.78,34.21-15.19,26.18-31.93,67-48.15,131.55A334.82,334.82,0,0,1,75.2,398.36C61.71,432.63,48.67,486.44,46.07,569.3A482.08,482.08,0,0,1,58.6,518.64,473,473,0,0,0,93.33,719.71c9.33,22.82,24.76,57.46,51,95.4C226.9,902,343.31,956,472.21,956,606.79,956,727.64,897.13,810.67,803.64Z" style="fill:url(#linear-gradient-2)"/><path d="M810.67,803.64a246.8,246.8,0,0,1-30.12,18.18,705.31,705.31,0,0,0,38.3-63c9.46-10.47,18.13-20.65,25.19-31.65,3.44-5.41,7.31-12.08,11.42-19.82,24.92-44.9,52.4-117.56,53.18-192.2v-5.66a257.25,257.25,0,0,0-5.71-55.75c.2,1.43.38,2.86.56,4.29-.22-1.1-.41-2.21-.64-3.31.37,2,.66,4,1,6,5.09,43.22,1.47,85.37-16.68,116.45-.29.45-.58.88-.8 7,1.32,9.41-47.23,12.56-99.39,2.09-151.6,0,0-4.19-25.38-35.38-102.44-18-44.35-49.83-80.72-78-107.21-24.69-30.55-47.11-51-59.47-64.06C689.72,126,678.9,105.61,674.45,92.31c-3.85-1.93-53.14-49.81-57.05-51.63-21.51,33.35-89.16,137.67-57,235.15,14.58,44.17,51.47,90,90.07,115.74,1.69,1.94,23,25,33.09,77.16,10.45,53.85,5,95.86-16.54,158C641.73,681.24,577,735.12,516.3,740.63c-129.67,11.78-177.15-65.11-177.15-65.11C385.49,694,436.72,690.17,467.87,671c31.4-19.43,50.39-33.83,65.81-28.15C548.86,648.43,561,632,550.1,615a78.5,78.5,0,0,0-79.4-34.57c-31.43,5.11-60.23,30-101.41,5.89a86.29,86.29,0,0,1-7.73-5.06c-2.71-1.79,8.83,2.72,6.13.69-8-4.35-22.2-13.84-25.88-17.22-.61-.56,6.22,2.18,5.61,1.62-38.51-31.71-33.7-53.13-32.49-66.57,1-10.75,8-24.52,19.75-30.11,5.69,3.11,9.24,5.48,9.24,5.48s-2.43-5-3.74-7.58c.46-.2.9-.15,1.36-.34,4.66,2.25,15,8.1,20.41,11.67,7.07,5,9.33,9.44,9.33,9.44s1.86-1,.48-5.37c-.5-1.78-2.65-7.45-9.65-13.17h.44A81.61,81.61,0,0,1,374.42,478c2-7.18,5.53-14.68,4.75-28.09-.48-9.43-.26 -11.87-1.92-15.51-1.49-3.13.83-4.35,3.42-1.1a32.5,32.5,0,0,0-2.21-7.4v-.24c3.23-11.24,68.25-40.46,73-43.88A67.2,67.2,0,0,0,470.59,361c3.62-5.76,6.34-13.85,7-26.11.36-8.84-3.76-14.73-69.51-21.62-18-1.77-28.53-14.8-34.53-26.82-1.09-2.59-2.21-4.94-3.33-7.28a57.68,57.68,0,0,1-2.56-8.43c10.75-30.87,28.81-57,55.37-76.7,1.45-1.32-5.78.34-4.34-1,1.69-1.54,12.71-6,14.79-7,2.54-1.2-10.88-6.9-22.73-5.51-12.07,1.36-14.63,2.8-21.07,5.53,2.67-2.66,11.17-6.15,9.18-6.13-13,2-29.18,9.56-43,18.12a10.66,10.66,0,0,1,.83-4.35c-6.44,2.73-22.26,13.79-26.87,23.14a44.29,44.29,0,0,0,.27-5.4,84.17,84.17,0,0,0-13.19,13.82l-.24.22c-37.36-15-70.23-16-98.05-9.28-6.09-6.11-9.06-1.64-22.91-32.07-.94-1.83.72,1.81,0,0-2.28-5.9,1.39,7.87,0,0-23.28,18.37-53.92,39.19-68.63,53.89-.18.59,17.16-4.9,0,0-6,1.72-5.6,5.28-6.51,37.5-.22,2.44,0,5.18-.22,7.38-11.75,15-19.75,27.64-22.78,34.21-15.19,26.18-31.93,67-48.15,131.55A334.82,334.82,0,0,1,75.2,398.36C61.71,432.63,48.67,486.44,46.07,569.3A482.08,482.08,0,0,1,58.6,518.64,473, 473,0,0,0,93.33,719.71c9.33,22.82,24.76,57.46,51,95.4C226.9,902,343.31,956,472.21,956,606.79,956,727.64,897.13,810.67,803.64Z" style="fill:url(#linear-gradient-3)"/><path d="M711.1,866.71c162.87-18.86,235-186.7,142.38-190C769.85,674,634,875.61,711.1,866.71Z" style="fill:url(#linear-gradient-4)"/><path d="M865.21,642.42C977.26,577.21,948,436.34,948,436.34s-43.25,50.24-72.62,130.32C846.4,646,797.84,681.81,865.21,642.42Z" style="fill:url(#linear-gradient-5)"/><path d="M509.47,950.06C665.7,999.91,800,876.84,717.21,835.74,642,798.68,435.32,926.49,509.47,950.06Z" style="fill:url(#linear-gradient-6)"/><path d="M638.58,21.42l.53-.57A1.7,1.7,0,0,0,638.58,21.42ZM876.85,702.23c3.8-5.36,8.94-22.53,13.48-30.21,27.58-44.52,27.78-80,27.78-80.84,16.66-83.22,15.15-117.2,4.9-180-8.25-50.6-44.32-123.09-75.57-158-32.2-36-9.51-24.25-40.69-50.52-27.33-30.29-53.82-60.29-68.25-72.36C634.22,43.09,636.57,24.58,638.58,21.42c-.34.37-.84.92-1.47,1.64C635.87,18.14,635,14,635,14s-57,57-69,152c-7.83,62,15.38,126.6 8,49,168a381.62,381.62,0,0,0,59,58h0c25.4,36.48,39.38,81.49,39.38,129.91,0,121.24-98.34,219.53-219.65,219.53a220.14,220.14,0,0,1-49.13-5.52c-57.24-10.92-90.3-39.8-106.78-59.41-9.45-11.23-13.46-19.42-13.46-19.42,51.28,18.37,108,14.53,142.47-4.52,34.75-19.26,55.77-33.55,72.84-27.92,16.82,5.61,30.21-10.67,18.2-27.54-11.77-16.85-42.4-41-87.88-34.29-34.79,5.07-66.66,29.76-112.24,5.84a97.34,97.34,0,0,1-8.55-5c-3-1.77,9.77,2.69,6.79.68-8.87-4.32-24.57-13.73-28.64-17.07-.68-.56,6.88,2.16,6.2,1.6-42.62-31.45-37.3-52.69-36-66,1.07-10.66,8.81-24.32,21.86-29.86,6.3,3.08,10.23,5.43,10.23,5.43s-2.69-4.92-4.14-7.51c.51-.19,1-.15,1.5-.34,5.16,2.23,16.58,8,22.59,11.57,7.83,4.95,10.32,9.36,10.32,9.36s2.06-1,.54-5.33c-.56-1.77-2.93-7.39-10.68-13.07h.48a91.65,91.65,0,0,1,13.13,8.17c2.19-7.12,6.12-14.56,5.25-27.86-.53-9.35-.28-11.78-2.12-15.39-1.65-3.1.92-4.31,3.78-1.09a29.73,29.73,0,0,0-2.44-7.34v-.24c3.57-11.14,75.53-40.12,80.77-43.51a70.24,70.24,0,0,0,21.17-20.63c4-5.72,7-13.73,7.75-25.89.25-5.48-1.4 4-9.82-20.5-14-11.44-2.49-29.14-4.91-56.43-7.47-19.9-1.76-31.58-14.68-38.21-26.6-1.21-2.57-2.45-4.9-3.68-7.22a53.41,53.41,0,0,1-2.83-8.36,158.47,158.47,0,0,1,61.28-76.06c1.6-1.31-6.4.33-4.8-1,1.87-1.52,14.06-5.93,16.37-6.92,2.81-1.19-12-6.84-25.16-5.47-13.36,1.35-16.19,2.78-23.32,5.49,3-2.64,12.37-6.1,10.16-6.08-14.4,2-32.3,9.48-47.6,18a9.72,9.72,0,0,1,.92-4.31c-7.13,2.71-24.64,13.67-29.73,23a39.79,39.79,0,0,0,.29-5.35,88.55,88.55,0,0,0-14.6,13.7l-.27.22C258.14,196,221.75,195,191,201.72c-6.74-6.06-17.57-15.23-32.89-45.4-1-1.82-1.6,3.75-2.4,2-6-13.81-9.55-36.44-9-52,0,0-12.32,5.61-22.51,29.06-1.89,4.21-3.11,6.54-4.32,8.87-.56.68,1.27-7.7,1-7.24-1.77,3-6.36,7.19-8.37,12.62-1.38,4-3.32,6.27-4.56,11.29l-.29.46c-.1-1.48.37-6.08,0-5.14A235.4,235.4,0,0,0,95.34,186c-5.49,18-11.88,42.61-12.89,74.57-.24,2.42,0,5.14-.25,7.32-13,14.83-21.86,27.39-25.2,33.91-16.81,26-35.33,66.44-53.29,130.46a319.35,319.35,0,0,1,28.54-50C17.32,416.25,2.89,469.62,0,551.8a436.92,436.92,0,0,1,13.87-50.24C11.29,556.3 6,17.68,624.3,52.32,701c20.57,45,67.92,136.6,183.62,208h0s39.36,29.3,107,51.26c5,1.81,10.06,3.6,15.23,5.33q-2.43-1-4.71-2A484.9,484.9,0,0,0,492.27,984c175.18.15,226.85-70.2,226.85-70.2l-.51.38q3.71-3.49,7.14-7.26c-27.64,26.08-90.75,27.84-114.3,26,40.22-11.81,66.69-21.81,118.17-41.52q9-3.36,18.48-7.64l2-.94c1.25-.58,2.49-1.13,3.75-1.74a349.3,349.3,0,0,0,70.26-44c51.7-41.3,63-81.56,68.83-108.1-.82,2.54-3.37,8.47-5.17,12.32-13.31,28.48-42.84,46-74.91,61a689.05,689.05,0,0,0,42.38-62.44C865.77,729.39,869,713.15,876.85,702.23Z" style="fill:url(#radial-gradient-2)"/><path d="M813.92,801c21.08-23.24,40-49.82,54.35-80,36.9-77.58,94-206.58,49-341.31C881.77,273.22,833,215,771.11,158.12,670.56,65.76,642.48,24.52,642.48,0c0,0-116.09,129.41-65.74,264.38s153.46,130,221.68,270.87c80.27,165.74-64.95,346.61-185,397.24,7.35-1.63,267-60.38,280.61-208.88C893.68,726.34,887.83,767.41,813.92,801Z" style="fill:url(#linear-gradient-7)"/><path d="M477.59,319.37c.39-8.77-4.16-14.66-76.68-21.46-29.84-2.76-41.26 -30.33-44.75-41.94-10.61,27.56-15,56.49-12.64,91.48,1.61,22.92,17,47.52,24.37,62,0,0,1.64-2.13,2.39-2.91,13.86-14.43,71.94-36.42,77.39-39.54C453.69,363.16,476.58,346.44,477.59,319.37Z" style="fill:url(#linear-gradient-8)"/><path d="M477.59,319.37c.39-8.77-4.16-14.66-76.68-21.46-29.84-2.76-41.26-30.33-44.75-41.94-10.61,27.56-15,56.49-12.64,91.48,1.61,22.92,17,47.52,24.37,62,0,0,1.64-2.13,2.39-2.91,13.86-14.43,71.94-36.42,77.39-39.54C453.69,363.16,476.58,346.44,477.59,319.37Z" style="opacity:0.5;isolation:isolate;fill:url(#radial-gradient-3)"/><path d="M158.31,156.47c-1-1.82-1.6,3.75-2.4,2-6-13.81-9.58-36.2-8.72-52,0,0-12.32,5.61-22.51,29.06-1.89,4.21-3.11,6.54-4.32,8.86-.56.68,1.27-7.7,1-7.24-1.77,3-6.36,7.19-8.35,12.38-1.65,4.24-3.35,6.52-4.61,11.77-.39,1.43.39-6.32,0-5.38C84.72,201.68,80.19,271,82.69,268,133.17,214.14,191,201.36,191,201.36c-6.15-4.53-19.53-17.63-32.7-44.89Z" style="fill:url(#linear-gradient-9)"/><path d="M349.84,720.1c-69.72-29.77-149-71.75-146-167.14C207.92,427.35 ,321,452.18,321,452.18c-4.27,1-15.68,9.16-19.72,17.82-4.27,10.83-12.07,35.28,11.55,60.9,37.09,40.19-76.2,95.36,98.66,199.57,4.41,2.4-41-1.43-61.64-10.36Z" style="fill:url(#linear-gradient-10)"/><path d="M325.07,657.5c49.44,17.21,107,14.19,141.52-4.86,23.09-12.85,52.7-33.43,70.92-28.35-15.78-6.24-27.73-9.15-42.1-9.86-2.45,0-5.38,0-8-.32a136,136,0,0,0-15.76.86c-8.9.82-18.77,6.43-27.74,5.53-.48,0,8.7-3.77,8-3.61-4.75,1-9.92,1.21-15.37,1.88-3.47.39-6.45.82-9.89,1-103,8.73-190-55.81-190-55.81-7.41,25,33.17,74.3,88.52,93.57Z" style="opacity:0.5;isolation:isolate;fill:url(#linear-gradient-11)"/><path d="M813.74,801.65c104.16-102.27,156.86-226.58,134.58-366,0,0,8.9,71.5-24.85,144.63,16.21-71.39,18.1-160.11-25-252C841,205.64,746.45,141.11,710.35,114.19,655.66,73.4,633,31.87,632.57,23.3c-16.34,33.48-65.77,148.2-5.31,247,56.64,92.56,145.86,120,208.33,205C950.67,631.67,813.74,801.65,813.74,801.65Z" style="fill:url(#linear-gradient-12)"/><path d="M798.81,535.55C762.41,460.35,717,427.55,674,392c5 ,7,6.23,9.47,9,14,37.83,40.32,93.61,138.66,53.11,262.11C659.88,900.48,355,791.06,323,760.32,335.93,894.81,561,959.16,707.6,872,791,793,858.47,658.79,798.81,535.55Z" style="fill:url(#linear-gradient-13)"/></g></g></g></g></svg> +<?xml version="1.0" encoding="UTF-8"?> +<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1"> + <stop stop-color="#420C5D" offset="0%"></stop> + <stop stop-color="#951AD1" offset="100%"></stop> + </linearGradient> + <path d="M25,29 C152.577777,29 256,131.974508 256,259 C256,386.025492 152.577777,489 25,489 L25,29 Z" id="path-2"></path> + <filter x="-18.2%" y="-7.4%" width="129.4%" height="114.8%" filterUnits="objectBoundingBox" id="filter-3"> + <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset> + <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur> + <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> + </filter> + </defs> + <g id="Assets" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="icon_512x512"> + <g id="Group"> + <g id="tb_icon/Stable"> + <g id="Stable"> + <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="256" cy="256" r="246"></circle> + <path d="M256.525143,465.439707 L256.525143,434.406609 C354.826191,434.122748 434.420802,354.364917 434.420802,255.992903 C434.420802,157.627987 354.826191,77.8701558 256.525143,77.5862948 L256.525143,46.5531962 C371.964296,46.8441537 465.446804,140.489882 465.446804,255.992903 C465.446804,371.503022 371.964296,465.155846 256.525143,465.439707 Z M256.525143,356.820314 C311.970283,356.529356 356.8487,311.516106 356.8487,255.992903 C356.8487,200.476798 311.970283,155.463547 256.525143,155.17259 L256.525143,124.146588 C329.115485,124.430449 387.881799,183.338693 387.881799,255.992903 C387.881799,328.654211 329.115485,387.562455 256.525143,387.846316 L256.525143,356.820314 Z M256.525143,201.718689 C286.266674,202.00255 310.3026,226.180407 310.3026,255.992903 C310.3026,285.812497 286.266674,309.990353 256.525143,310.274214 L256.525143,201.718689 Z M0,255.992903 C0,397.384044 114.60886,512 256,512 C397.384044,512 512,397.384044 512,255.992903 C512,114.60886 397.384 044,0 256,0 C114.60886,0 0,114.60886 0,255.992903 Z" id="center" fill="url(#linearGradient-1)"></path> + <g id="half" transform="translate(140.500000, 259.000000) scale(-1, 1) translate(-140.500000, -259.000000) "> + <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use> + <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use> + </g> + </g> + </g> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/devtools/client/themes/images/aboutdebugging-firefox-release.svg b/devtools/client/themes/images/aboutdebugging-firefox-release.svg index 46f2a424213b..9240dc6e84ca 100644 --- a/devtools/client/themes/images/aboutdebugging-firefox-release.svg +++ b/devtools/client/themes/images/aboutdebugging-firefox-release.svg @@ -1,4 +1,31 @@ - -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 953.37 984"><defs><radialGradient id="radial-gradient" cx="-14491.11" cy="9293.72" fx="-14519.875714136173" r="450.88" gradientTransform="matrix(0.76, 0.03, 0.05, -1.12, 11485.79, 11147.95)" gradientUnits="userSpaceOnUse"><stop offset="0.1" stop-color="#ffea00"/><stop offset="0.17" stop-color="#ffde00"/><stop offset="0.28" stop-color="#ffbf00"/><stop offset="0.43" stop-color="#ff8e00"/><stop offset="0.77" stop-color="#ff272d"/><stop offset="0.87" stop-color="#e0255a"/><stop offset="0.95" stop-color="#cc2477"/><stop offset="1" stop-color="#c42482"/></radialGradient><radialGradient id="radial-gradient-2" cx="-7587.48" cy="8863.48" r="791.23" gradientTransform="matrix(1.23, 0, 0, -1.23, 9957.91, 11055.45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00ccda"/><stop offset="0.22" stop-color="#0083ff"/><stop offset="0.26" stop-color="#007af9"/><stop offset="0.33" stop-color="#0060e8"/><stop offset="0.33" stop-color="#00 5fe7"/><stop offset="0.44" stop-color="#2639ad"/><stop offset="0.52" stop-color="#401e84"/><stop offset="0.57" stop-color="#4a1475"/></radialGradient><linearGradient id="linear-gradient" x1="540.64" y1="254.8" x2="349.2" y2="881.03" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000f43" stop-opacity="0.4"/><stop offset="0.48" stop-color="#001962" stop-opacity="0.17"/><stop offset="1" stop-color="#002079" stop-opacity="0"/></linearGradient><radialGradient id="radial-gradient-3" cx="-8337.74" cy="7467.89" r="266.89" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10240.78, 10765.16)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffea00"/><stop offset="0.5" stop-color="#ff272d"/><stop offset="1" stop-color="#c42482"/></radialGradient><radialGradient id="radial-gradient-4" cx="-8361.89" cy="7723.8" r="445.68" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10240.78, 10765.16)" gradientUnits="userSpaceOnUs e"><stop offset="0" stop-color="#ffe900"/><stop offset="0.16" stop-color="#ffaf0e"/><stop offset="0.32" stop-color="#ff7a1b"/><stop offset="0.47" stop-color="#ff4e26"/><stop offset="0.62" stop-color="#ff2c2e"/><stop offset="0.76" stop-color="#ff1434"/><stop offset="0.89" stop-color="#ff0538"/><stop offset="1" stop-color="#ff0039"/></radialGradient><radialGradient id="radial-gradient-5" cx="-8298.85" cy="7310.66" r="408.96" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10240.78, 10765.16)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff272d"/><stop offset="0.5" stop-color="#c42482"/><stop offset="0.99" stop-color="#620700"/></radialGradient><radialGradient id="radial-gradient-6" cx="715.19" cy="589.96" fx="743.1665035759834" fy="576.1323859732546" r="782.18" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0.16" stop-color="#ffea00"/><stop offset="0.23" stop-color="#ffde00"/><stop offset="0.37" stop-color="#ffbf00"/><st op offset="0.54" stop-color="#ff8e00"/><stop offset="0.76" stop-color="#ff272d"/><stop offset="0.8" stop-color="#f92433"/><stop offset="0.84" stop-color="#e91c45"/><stop offset="0.89" stop-color="#cf0e62"/><stop offset="0.94" stop-color="#b5007f"/></radialGradient><radialGradient id="radial-gradient-7" cx="670.34" cy="952.71" r="891.45" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0.28" stop-color="#ffea00"/><stop offset="0.4" stop-color="#fd0"/><stop offset="0.63" stop-color="#ffba00"/><stop offset="0.86" stop-color="#ff9100"/><stop offset="0.93" stop-color="#ff6711"/><stop offset="0.99" stop-color="#ff4a1d"/></radialGradient><linearGradient id="linear-gradient-2" x1="-9023.45" y1="7636.92" x2="-8716.42" y2="7715.18" gradientTransform="matrix(1.22, 0.12, 0.12, -1.22, 10240.78, 10765.16)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c42482" stop-opacity="0.5"/><stop offset="0.47" stop-color="#ff272d" stop-opacity="0.5"/ ><stop offset="0.49" stop-color="#ff2c2c" stop-opacity="0.51"/><stop offset="0.68" stop-color="#ff7a1a" stop-opacity="0.72"/><stop offset="0.83" stop-color="#ffb20d" stop-opacity="0.87"/><stop offset="0.94" stop-color="#ffd605" stop-opacity="0.96"/><stop offset="1" stop-color="#ffe302"/></linearGradient><linearGradient id="linear-gradient-3" x1="188.87" y1="2081.23" x2="134.3" y2="2221.08" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, -250.09, 2306.15)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#891551" stop-opacity="0.6"/><stop offset="1" stop-color="#c42482" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-4" x1="-38.43" y1="278.04" x2="55.68" y2="171.16" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, 229.04, 745.74)" gradientUnits="userSpaceOnUse"><stop offset="0.01" stop-color="#891551" stop-opacity="0.5"/><stop offset="0.48" stop-color="#ff272d" stop-opacity="0.5"/><stop offset="1" stop-color="#ff272d" stop-opacity="0"/></linearGradi ent><linearGradient id="linear-gradient-5" x1="142.46" y1="93.68" x2="142.53" y2="168.46" gradientTransform="matrix(0.99, 0.1, 0.1, -0.99, 229.04, 745.74)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c42482"/><stop offset="0.08" stop-color="#c42482" stop-opacity="0.81"/><stop offset="0.21" stop-color="#c42482" stop-opacity="0.57"/><stop offset="0.33" stop-color="#c42482" stop-opacity="0.36"/><stop offset="0.45" stop-color="#c42482" stop-opacity="0.2"/><stop offset="0.56" stop-color="#c42482" stop-opacity="0.09"/><stop offset="0.67" stop-color="#c42482" stop-opacity="0.02"/><stop offset="0.77" stop-color="#c42482" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-6" x1="620.52" y1="947.88" x2="926.18" y2="264.39" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff14f"/><stop offset="0.27" stop-color="#ffee4c"/><stop offset="0.45" stop-color="#ffe643"/><stop offset="0.61" stop-color="#ff d834"/><stop offset="0.76" stop-color="#ffc41e"/><stop offset="0.89" stop-color="#ffab02"/><stop offset="0.9" stop-color="#ffa900"/><stop offset="0.95" stop-color="#ffa000"/><stop offset="1" stop-color="#ff9100"/></linearGradient><linearGradient id="linear-gradient-7" x1="680.88" y1="554.79" x2="536.1" y2="166.04" gradientTransform="matrix(1, 0, 0, -1, 0, 984)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff8e00"/><stop offset="0.04" stop-color="#ff8e00" stop-opacity="0.86"/><stop offset="0.08" stop-color="#ff8e00" stop-opacity="0.73"/><stop offset="0.13" stop-color="#ff8e00" stop-opacity="0.63"/><stop offset="0.18" stop-color="#ff8e00" stop-opacity="0.56"/><stop offset="0.23" stop-color="#ff8e00" stop-opacity="0.51"/><stop offset="0.28" stop-color="#ff8e00" stop-opacity="0.5"/><stop offset="0.39" stop-color="#ff8e00" stop-opacity="0.48"/><stop offset="0.52" stop-color="#ff8e00" stop-opacity="0.42"/><stop offset="0.68" stop-color="#ff8e00" stop-opacity="0.31"/><stop offset="0.84" stop-color="#ff8e00" stop-opacity="0.17"/><stop offset="1" stop-color="#ff8e00" stop-opacity="0"/></linearGradient></defs><title>firefox-logo</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Layer_2-2" data-name="Layer 2"><g id="Firefox_-_Large" data-name="Firefox - Large"><path d="M770.28,91.56c-23.95,27.88-35.1,90.64-10.82,154.26s61.5,49.8,84.7,114.67c30.62,85.6,16.37,200.59,16.37,200.59s36.81,106.61,62.47-6.63C979.79,341.74,770.28,143.94,770.28,91.56Z" style="fill:url(#radial-gradient)"/><path id="_Path_" data-name=" Path " d="M478.07,974.64c245.24,0,443.9-199.74,443.9-446s-198.66-446-443.66-446S34.65,282.32,34.65,528.61C34.18,775.14,233.07,974.64,478.07,974.64Z" style="fill:url(#radial-gradient-2)"/><path d="M810.67,803.64a246.8,246.8,0,0,1-30.12,18.18,705.31,705.31,0,0,0,38.3-63c9.46-10.47,18.13-20.65,25.19-31.65,3.44-5.41,7.31-12.08,11.42-19.82,24.92-44.9,52.4-117.56,53.18-192.2v-5.66a257.25,257.25,0,0,0-5.71-55.75c.2,1.43.3 8,2.86.56,4.29-.22-1.1-.41-2.21-.64-3.31.37,2,.66,4,1,6,5.09,43.22,1.47,85.37-16.68,116.45-.29.45-.58.88-.87,1.32,9.41-47.23,12.56-99.39,2.09-151.6,0,0-4.19-25.38-35.38-102.44-18-44.35-49.83-80.72-78-107.21-24.69-30.55-47.11-51-59.47-64.06C689.72,126,678.9,105.61,674.45,92.31c-3.85-1.93-53.14-49.81-57.05-51.63-21.51,33.35-89.16,137.67-57,235.15,14.58,44.17,51.47,90,90.07,115.74,1.69,1.94,23,25,33.09,77.16,10.45,53.85,5,95.86-16.54,158C641.73,681.24,577,735.12,516.3,740.63c-129.67,11.78-177.15-65.11-177.15-65.11C385.49,694,436.72,690.17,467.87,671c31.4-19.43,50.39-33.83,65.81-28.15C548.86,648.43,561,632,550.1,615a78.5,78.5,0,0,0-79.4-34.57c-31.43,5.11-60.23,30-101.41,5.89a86.29,86.29,0,0,1-7.73-5.06c-2.71-1.79,8.83,2.72,6.13.69-8-4.35-22.2-13.84-25.88-17.22-.61-.56,6.22,2.18,5.61,1.62-38.51-31.71-33.7-53.13-32.49-66.57,1-10.75,8-24.52,19.75-30.11,5.69,3.11,9.24,5.48,9.24,5.48s-2.43-5-3.74-7.58c.46-.2.9-.15,1.36-.34,4.66,2.25,15,8.1,20.41,11.67,7.07,5,9.33,9.44,9.33,9.44s1.86-1,.48-5. 37c-.5-1.78-2.65-7.45-9.65-13.17h.44A81.61,81.61,0,0,1,374.42,478c2-7.18,5.53-14.68,4.75-28.09-.48-9.43-.26-11.87-1.92-15.51-1.49-3.13.83-4.35,3.42-1.1a32.5,32.5,0,0,0-2.21-7.4v-.24c3.23-11.24,68.25-40.46,73-43.88A67.2,67.2,0,0,0,470.59,361c3.62-5.76,6.34-13.85,7-26.11.36-8.84-3.76-14.73-69.51-21.62-18-1.77-28.53-14.8-34.53-26.82-1.09-2.59-2.21-4.94-3.33-7.28a57.68,57.68,0,0,1-2.56-8.43c10.75-30.87,28.81-57,55.37-76.7,1.45-1.32-5.78.34-4.34-1,1.69-1.54,12.71-6,14.79-7,2.54-1.2-10.88-6.9-22.73-5.51-12.07,1.36-14.63,2.8-21.07,5.53,2.67-2.66,11.17-6.15,9.18-6.13-13,2-29.18,9.56-43,18.12a10.66,10.66,0,0,1,.83-4.35c-6.44,2.73-22.26,13.79-26.87,23.14a44.29,44.29,0,0,0,.27-5.4,84.17,84.17,0,0,0-13.19,13.82l-.24.22c-37.36-15-70.23-16-98.05-9.28-6.09-6.11-9.06-1.64-22.91-32.07-.94-1.83.72,1.81,0,0-2.28-5.9,1.39,7.87,0,0-23.28,18.37-53.92,39.19-68.63,53.89-.18.59,17.16-4.9,0,0-6,1.72-5.6,5.28-6.51,37.5-.22,2.44,0,5.18-.22,7.38-11.75,15-19.75,27.64-22.78,34.21-15.19,26.18-31.93,67-48.15,131.55 A334.82,334.82,0,0,1,75.2,398.36C61.71,432.63,48.67,486.44,46.07,569.3A482.08,482.08,0,0,1,58.6,518.64,473,473,0,0,0,93.33,719.71c9.33,22.82,24.76,57.46,51,95.4C226.9,902,343.31,956,472.21,956,606.79,956,727.64,897.13,810.67,803.64Z" style="fill:url(#linear-gradient)"/><path d="M711.1,866.71c162.87-18.86,235-186.7,142.38-190C769.85,674,634,875.61,711.1,866.71Z" style="fill:url(#radial-gradient-3)"/><path d="M865.21,642.42C977.26,577.21,948,436.34,948,436.34s-43.25,50.24-72.62,130.32C846.4,646,797.84,681.81,865.21,642.42Z" style="fill:url(#radial-gradient-4)"/><path d="M509.47,950.06C665.7,999.91,800,876.84,717.21,835.74,642,798.68,435.32,926.49,509.47,950.06Z" style="fill:url(#radial-gradient-5)"/><path d="M876.85,702.23c3.8-5.36,8.94-22.53,13.48-30.21,27.58-44.52,27.78-80,27.78-80.84,16.66-83.22,15.15-117.2,4.9-180-8.25-50.6-44.32-123.09-75.57-158-32.2-36-9.51-24.25-40.69-50.52-27.33-30.29-53.82-60.29-68.25-72.36C634.22,43.09,636.57,24.58,638.58,21.42c-.34.37-.84.92-1.47,1.64C635.8 7,18.14,635,14,635,14s-57,57-69,152c-7.83,62,15.38,126.68,49,168a381.62,381.62,0,0,0,59,58h0c25.4,36.48,39.38,81.49,39.38,129.91,0,121.24-98.34,219.53-219.65,219.53a220.14,220.14,0,0,1-49.13-5.52c-57.24-10.92-90.3-39.8-106.78-59.41-9.45-11.23-13.46-19.42-13.46-19.42,51.28,18.37,108,14.53,142.47-4.52,34.75-19.26,55.77-33.55,72.84-27.92,16.82,5.61,30.21-10.67,18.2-27.54-11.77-16.85-42.4-41-87.88-34.29-34.79,5.07-66.66,29.76-112.24,5.84a97.34,97.34,0,0,1-8.55-5c-3-1.77,9.77,2.69,6.79.68-8.87-4.32-24.57-13.73-28.64-17.07-.68-.56,6.88,2.16,6.2,1.6-42.62-31.45-37.3-52.69-36-66,1.07-10.66,8.81-24.32,21.86-29.86,6.3,3.08,10.23,5.43,10.23,5.43s-2.69-4.92-4.14-7.51c.51-.19,1-.15,1.5-.34,5.16,2.23,16.58,8,22.59,11.57,7.83,4.95,10.32,9.36,10.32,9.36s2.06-1,.54-5.33c-.56-1.77-2.93-7.39-10.68-13.07h.48a91.65,91.65,0,0,1,13.13,8.17c2.19-7.12,6.12-14.56,5.25-27.86-.53-9.35-.28-11.78-2.12-15.39-1.65-3.1.92-4.31,3.78-1.09a29.73,29.73,0,0,0-2.44-7.34v-.24c3.57-11.14,75.53-40.12,80.77-43.51a70.24,70.24 ,0,0,0,21.17-20.63c4-5.72,7-13.73,7.75-25.89.25-5.48-1.44-9.82-20.5-14-11.44-2.49-29.14-4.91-56.43-7.47-19.9-1.76-31.58-14.68-38.21-26.6-1.21-2.57-2.45-4.9-3.68-7.22a53.41,53.41,0,0,1-2.83-8.36,158.47,158.47,0,0,1,61.28-76.06c1.6-1.31-6.4.33-4.8-1,1.87-1.52,14.06-5.93,16.37-6.92,2.81-1.19-12-6.84-25.16-5.47-13.36,1.35-16.19,2.78-23.32,5.49,3-2.64,12.37-6.1,10.16-6.08-14.4,2-32.3,9.48-47.6,18a9.72,9.72,0,0,1,.92-4.31c-7.13,2.71-24.64,13.67-29.73,23a39.79,39.79,0,0,0,.29-5.35,88.55,88.55,0,0,0-14.6,13.7l-.27.22C258.14,196,221.75,195,191,201.72c-6.74-6.06-17.57-15.23-32.89-45.4-1-1.82-1.6,3.75-2.4,2-6-13.81-9.55-36.44-9-52,0,0-12.32,5.61-22.51,29.06-1.89,4.21-3.11,6.54-4.32,8.87-.56.68,1.27-7.7,1-7.24-1.77,3-6.36,7.19-8.37,12.62-1.38,4-3.32,6.27-4.56,11.29l-.29.46c-.1-1.48.37-6.08,0-5.14A235.4,235.4,0,0,0,95.34,186c-5.49,18-11.88,42.61-12.89,74.57-.24,2.42,0,5.14-.25,7.32-13,14.83-21.86,27.39-25.2,33.91-16.81,26-35.33,66.44-53.29,130.46a319.35,319.35,0,0,1,28.54-50C17.32,416.25,2.89,46 9.62,0,551.8a436.92,436.92,0,0,1,13.87-50.24C11.29,556.36,17.68,624.3,52.32,701c20.57,45,67.92,136.6,183.62,208h0s39.36,29.3,107,51.26c5,1.81,10.06,3.6,15.23,5.33q-2.43-1-4.71-2A484.9,484.9,0,0,0,492.27,984c175.18.15,226.85-70.2,226.85-70.2l-.51.38q3.71-3.49,7.14-7.26c-27.64,26.08-90.75,27.84-114.3,26,40.22-11.81,66.69-21.81,118.17-41.52q9-3.36,18.48-7.64l2-.94c1.25-.58,2.49-1.13,3.75-1.74a349.3,349.3,0,0,0,70.26-44c51.7-41.3,63-81.56,68.83-108.1-.82,2.54-3.37,8.47-5.17,12.32-13.31,28.48-42.84,46-74.91,61a689.05,689.05,0,0,0,42.38-62.44C865.77,729.39,869,713.15,876.85,702.23Z" style="fill:url(#radial-gradient-6)"/><path d="M813.92,801c21.08-23.24,40-49.82,54.35-80,36.9-77.58,94-206.58,49-341.31C881.77,273.22,833,215,771.11,158.12,670.56,65.76,642.48,24.52,642.48,0c0,0-116.09,129.41-65.74,264.38s153.46,130,221.68,270.87c80.27,165.74-64.95,346.61-185,397.24,7.35-1.63,267-60.38,280.61-208.88C893.68,726.34,887.83,767.41,813.92,801Z" style="fill:url(#radial-gradient-7)"/><path d="M477.59 ,319.37c.39-8.77-4.16-14.66-76.68-21.46-29.84-2.76-41.26-30.33-44.75-41.94-10.61,27.56-15,56.49-12.64,91.48,1.61,22.92,17,47.52,24.37,62,0,0,1.64-2.13,2.39-2.91,13.86-14.43,71.94-36.42,77.39-39.54C453.69,363.16,476.58,346.44,477.59,319.37Z" style="fill:url(#linear-gradient-2)"/><path d="M158.31,156.47c-1-1.82-1.6,3.75-2.4,2-6-13.81-9.58-36.2-8.72-52,0,0-12.32,5.61-22.51,29.06-1.89,4.21-3.11,6.54-4.32,8.86-.56.68,1.27-7.7,1-7.24-1.77,3-6.36,7.19-8.35,12.38-1.65,4.24-3.35,6.52-4.61,11.77-.39,1.43.39-6.32,0-5.38C84.72,201.68,80.19,271,82.69,268,133.17,214.14,191,201.36,191,201.36c-6.15-4.53-19.53-17.63-32.7-44.89Z" style="fill:url(#linear-gradient-3)"/><path d="M349.84,720.1c-69.72-29.77-149-71.75-146-167.14C207.92,427.35,321,452.18,321,452.18c-4.27,1-15.68,9.16-19.72,17.82-4.27,10.83-12.07,35.28,11.55,60.9,37.09,40.19-76.2,95.36,98.66,199.57,4.41,2.4-41-1.43-61.64-10.36Z" style="fill:url(#linear-gradient-4)"/><path d="M325.07,657.5c49.44,17.21,107,14.19,141.52-4.86,23.09-12.85,52.7-33 .43,70.92-28.35-15.78-6.24-27.73-9.15-42.1-9.86-2.45,0-5.38,0-8-.32a136,136,0,0,0-15.76.86c-8.9.82-18.77,6.43-27.74,5.53-.48,0,8.7-3.77,8-3.61-4.75,1-9.92,1.21-15.37,1.88-3.47.39-6.45.82-9.89,1-103,8.73-190-55.81-190-55.81-7.41,25,33.17,74.3,88.52,93.57Z" style="fill:url(#linear-gradient-5)"/><path d="M813.74,801.65c104.16-102.27,156.86-226.58,134.58-366,0,0,8.9,71.5-24.85,144.63,16.21-71.39,18.1-160.11-25-252C841,205.64,746.45,141.11,710.35,114.19,655.66,73.4,633,31.87,632.57,23.3c-16.34,33.48-65.77,148.2-5.31,247,56.64,92.56,145.86,120,208.33,205C950.67,631.67,813.74,801.65,813.74,801.65Z" style="fill:url(#linear-gradient-6)"/><path d="M798.81,535.55C762.41,460.35,717,427.55,674,392c5,7,6.23,9.47,9,14,37.83,40.32,93.61,138.66,53.11,262.11C659.88,900.48,355,791.06,323,760.32,335.93,894.81,561,959.16,707.6,872,791,793,858.47,658.79,798.81,535.55Z" style="fill:url(#linear-gradient-7)"/></g></g></g></g></svg> +<?xml version="1.0" encoding="UTF-8"?> +<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1"> + <stop stop-color="#420C5D" offset="0%"></stop> + <stop stop-color="#951AD1" offset="100%"></stop> + </linearGradient> + <path d="M25,29 C152.577777,29 256,131.974508 256,259 C256,386.025492 152.577777,489 25,489 L25,29 Z" id="path-2"></path> + <filter x="-18.2%" y="-7.4%" width="129.4%" height="114.8%" filterUnits="objectBoundingBox" id="filter-3"> + <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset> + <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur> + <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> + </filter> + </defs> + <g id="Assets" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="icon_512x512"> + <g id="Group"> + <g id="tb_icon/Stable"> + <g id="Stable"> + <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="256" cy="256" r="246"></circle> + <path d="M256.525143,465.439707 L256.525143,434.406609 C354.826191,434.122748 434.420802,354.364917 434.420802,255.992903 C434.420802,157.627987 354.826191,77.8701558 256.525143,77.5862948 L256.525143,46.5531962 C371.964296,46.8441537 465.446804,140.489882 465.446804,255.992903 C465.446804,371.503022 371.964296,465.155846 256.525143,465.439707 Z M256.525143,356.820314 C311.970283,356.529356 356.8487,311.516106 356.8487,255.992903 C356.8487,200.476798 311.970283,155.463547 256.525143,155.17259 L256.525143,124.146588 C329.115485,124.430449 387.881799,183.338693 387.881799,255.992903 C387.881799,328.654211 329.115485,387.562455 256.525143,387.846316 L256.525143,356.820314 Z M256.525143,201.718689 C286.266674,202.00255 310.3026,226.180407 310.3026,255.992903 C310.3026,285.812497 286.266674,309.990353 256.525143,310.274214 L256.525143,201.718689 Z M0,255.992903 C0,397.384044 114.60886,512 256,512 C397.384044,512 512,397.384044 512,255.992903 C512,114.60886 397.384 044,0 256,0 C114.60886,0 0,114.60886 0,255.992903 Z" id="center" fill="url(#linearGradient-1)"></path> + <g id="half" transform="translate(140.500000, 259.000000) scale(-1, 1) translate(-140.500000, -259.000000) "> + <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use> + <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use> + </g> + </g> + </g> + </g> + </g> + </g> +</svg> \ No newline at end of file

1 0

[torbutton/master] Bug 31725: Pick up mk in Torbutton properly
by gk＠torproject.org 18 Sep '19

18 Sep '19

commit 7e6b62a61a0d26b79dd14f14e4d8d36bff7bf1c8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 13 11:45:57 2019 +0000 Bug 31725: Pick up mk in Torbutton properly --- jar.mn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jar.mn b/jar.mn index 565ad996..6697b543 100644 --- a/jar.mn +++ b/jar.mn @@ -60,6 +60,8 @@ torbutton.jar: locale/ka/ (chrome/locale/ka/*) % locale torbutton ko %locale/ko/ locale/ko/ (chrome/locale/ko/*) +% locale torbutton mk %locale/mk/ + locale/mk/ (chrome/locale/mk/*) % locale torbutton nb-NO %locale/nb-NO/ locale/nb-NO/ (chrome/locale/nb-NO/*) % locale torbutton nl %locale/nl/

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_31448_v5'
by gk＠torproject.org 18 Sep '19

18 Sep '19

commit 3b899b766fd13986fc3545a4294fd391b6ea139d Merge: a7a90d3 8cc9eaf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 18 12:34:10 2019 +0000 Merge remote-tracking branch 'boklm/bug_31448_v5' projects/firefox/build | 4 ++-- projects/firefox/mozconfig-linux-i686 | 8 +++----- projects/tor-browser/build | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-)

1 0

[tor-browser-build/master] Bug 31448: Disable firefox debug-symbols for linux-i686
by gk＠torproject.org 18 Sep '19

18 Sep '19

commit 8cc9eaf22abf0c9d98b88bb60aaa1476e4a6555c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 12 11:06:39 2019 +0200 Bug 31448: Disable firefox debug-symbols for linux-i686 This allows us to switch back to ld.gold as the linker, and fix #31618. ld.gold fails when we build with debug symbols for linux-i686: 30:31.20 toolkit/library/symverscript.stub 30:31.26 toolkit/library/libxul.so 30:39.58 /var/tmp/dist/binutils/bin/ld.gold.real: internal error in relocate_section, at i386.cc:3684 --- projects/firefox/build | 4 ++-- projects/firefox/mozconfig-linux-i686 | 8 +++----- projects/tor-browser/build | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 13e70f5..ac63c84 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -199,7 +199,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir -[% IF c("var/linux") %] +[% IF c("var/linux-x86_64") %] mkdir -p $distdir/Debug/Browser/gtk2 # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) @@ -240,7 +240,7 @@ END; tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', }) %] -[% IF c("var/linux") %] +[% IF c("var/linux-x86_64") %] [% c('tar', { tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index c8f19a4..0a05864 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -18,9 +18,6 @@ export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --target=i686-linux-gnu -# XXX: gold and lld break when linking libxul, resort to bfd -ac_add_options --enable-linker=bfd - ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding @@ -32,8 +29,6 @@ ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar -ac_add_options --disable-strip -ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter @@ -42,3 +37,6 @@ ac_add_options --disable-webrtc ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection #ac_add_options --disable-ctypes + +# Bug 31448: ld.gold fails if we don't disable debug-symbols +ac_add_options --disable-debug-symbols diff --git a/projects/tor-browser/build b/projects/tor-browser/build index aeb77de..ed69f19 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -274,8 +274,10 @@ rm -rf $distdir/${PKG_DIR} SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ -[% IF c("var/linux") -%] +[% IF c("var/linux-x86_64") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz +[% END -%] +[% IF c("var/linux") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%]

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 21431: Clean-up system extensions shipped in Firefox 52
by gk＠torproject.org 18 Sep '19

18 Sep '19

commit 63655f7a4c9575c5ab7828f49a9814c3ff157bda Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 18 12:19:39 2019 +0200 fixup! Bug 21431: Clean-up system extensions shipped in Firefox 52 --- browser/components/BrowserGlue.jsm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index a99a29a014ad..d22f9512184d 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1844,6 +1844,9 @@ BrowserGlue.prototype = { const ID = "screenshots(a)mozilla.org"; const _checkScreenshotsPref = async () => { let addon = await AddonManager.getAddonByID(ID); + if (!addon) { + return; + } let disabled = Services.prefs.getBoolPref(PREF, false); if (disabled) { await addon.disable({ allowSystemAddons: true }); @@ -1860,6 +1863,9 @@ BrowserGlue.prototype = { const ID = "webcompat-reporter(a)mozilla.org"; Services.prefs.addObserver(PREF, async () => { let addon = await AddonManager.getAddonByID(ID); + if (!addon) { + return; + } let enabled = Services.prefs.getBoolPref(PREF, false); if (enabled && !addon.isActive) { await addon.enable({ allowSystemAddons: true });

1 0

[tor-launcher/master] Bug 31303: Do not launch tor in browser toolbox
by gk＠torproject.org 18 Sep '19

18 Sep '19

commit 810ba7e93981511765ec1be667689ae2992e8c49 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 18 10:19:00 2019 +0200 Bug 31303: Do not launch tor in browser toolbox --- src/modules/tl-util.jsm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index bac5eae..14ac76f 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -333,10 +333,13 @@ let TorLauncherUtil = // Public const kPrefStartTor = "extensions.torlauncher.start_tor"; try { + const kBrowserToolboxPort = "MOZ_BROWSER_TOOLBOX_PORT"; const kEnvSkipLaunch = "TOR_SKIP_LAUNCH"; var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); + if (env.exists(kBrowserToolboxPort)) + return false; if (env.exists(kEnvSkipLaunch)) return ("1" != env.get(kEnvSkipLaunch)); } catch(e) {}

1 0

[tor-browser-build/master] Bug 31538: Make Windows builds reproducible again
by boklm＠torproject.org 18 Sep '19

18 Sep '19

commit a7a90d35e55bb8f9886fd9d827b01eba2060c74b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 13 06:51:04 2019 +0000 Bug 31538: Make Windows builds reproducible again Updating CMake to the latest stable version as done in the previous commit solves the reproducibility issue only partly. We need to patch the code that merges libc++abi.a into libc++.a to get the order in the merged archive deterministic. The code doing the merging is: `files = glob.glob(os.path.join(temp_directory_root, '*.o*'))` Regarding `glob` there is following in the Python docs: "The glob module finds all the pathnames matching a specified pattern according to the rules used by the Unix shell, although results are returned in *arbitrary* order." (emphasis mine) (https://docs.python.org/2/library/glob.html) --- projects/mingw-w64-clang/build | 1 + projects/mingw-w64-clang/config | 1 + projects/mingw-w64-clang/sort.patch | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 86c3c6e..fa059da 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -173,6 +173,7 @@ make -j[% c("buildconf/num_procs") %] VERBOSE=1 # libcxx cd $builddir/libcxx +patch -p1 < $rootdir/sort.patch mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 3d209ea..32d18a8 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -36,3 +36,4 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch + - filename: sort.patch diff --git a/projects/mingw-w64-clang/sort.patch b/projects/mingw-w64-clang/sort.patch new file mode 100644 index 0000000..e9143b0 --- /dev/null +++ b/projects/mingw-w64-clang/sort.patch @@ -0,0 +1,22 @@ +From 9eeb3b9ea13b25591c9081a5f05a1904d367d523 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 11 Sep 2019 13:25:54 +0000 +Subject: [PATCH] sorted + + +diff --git a/utils/merge_archives.py b/utils/merge_archives.py +index 58d92f0e2..597ca2471 100755 +--- a/utils/merge_archives.py ++++ b/utils/merge_archives.py +@@ -124,7 +124,7 @@ def main(): + execute_command_verbose([ar_exe, 'x', arc], cwd=temp_directory_root, + verbose=args.verbose) + +- files = glob.glob(os.path.join(temp_directory_root, '*.o*')) ++ files = sorted(glob.glob(os.path.join(temp_directory_root, '*.o*'))) + if not files: + print_and_exit('Failed to glob for %s' % temp_directory_root) + cmd = [ar_exe, 'qcs', args.output] + files +-- +2.23.0 +

1 0

[tor-browser-build/master] Bug 31538: Bump CMake version
by boklm＠torproject.org 18 Sep '19

18 Sep '19

commit cd111df46540c3727697bac62898a4c141752080 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 13 06:50:07 2019 +0000 Bug 31538: Bump CMake version The old CMake version built libraries like libc++.a and libc++abi.a in a non-reproducible way. Using the latest CMake version solves that. We need to use our own GCC for Linux as the shippped one is too old. --- projects/cmake/build | 6 +++++- projects/cmake/config | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/projects/cmake/build b/projects/cmake/build index a5eca23..e8613a2 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -1,7 +1,11 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/build +[% IF c("var/linux") %] + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +[% END -%] +mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./bootstrap --prefix=$distdir diff --git a/projects/cmake/config b/projects/cmake/config index 492b99c..fd8d186 100644 --- a/projects/cmake/config +++ b/projects/cmake/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.4.3 +version: 3.15.3 git_url: https://cmake.org/cmake.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 @@ -11,3 +11,6 @@ var: input_files: - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]'

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26345: Hide tracking protection UI
by gk＠torproject.org 17 Sep '19

17 Sep '19

commit ea79fd5825ed9ea4e148baa473da3b97356bb38f Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 17 11:24:46 2019 +0200 fixup! Bug 26345: Hide tracking protection UI --- browser/components/customizableui/content/panelUI.inc.xul | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index b2c70b9f041d..2b56e7301153 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -257,7 +257,7 @@ </hbox> </toolbaritem> <toolbarseparator class="sync-ui-item"/> - <toolbaritem> + <toolbaritem hidden="true"> <toolbarbutton id="appMenu-tp-button" class="subviewbutton subviewbutton-iconic" oncommand="ContentBlocking.openPreferences('appMenu-trackingprotection');"> @@ -266,7 +266,7 @@ <label id="appMenu-tp-category"/> </toolbarbutton> </toolbaritem> - <toolbarseparator id="appMenu-tp-separator"/> + <toolbarseparator hidden="true" id="appMenu-tp-separator"/> <toolbarbutton id="appMenu-new-window-button" class="subviewbutton subviewbutton-iconic" label="&newNavigatorCmd.label;"

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 24653: merge securityLevel.properties into torbutton.dtd
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit 7baed647f56e5d3e7c92eaffadb1c18c07aabe7f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 16 13:01:32 2019 +0200 fixup! Bug 24653: merge securityLevel.properties into torbutton.dtd --- browser/components/securitylevel/content/securityLevel.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 9dc23d97855d..9965046a7d15 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -9,7 +9,11 @@ XPCOMUtils.defineLazyModuleGetters(this, { }); XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); -XPCOMUtils.defineLazyGetter(this, "domParser", () => new DOMParser()); +XPCOMUtils.defineLazyGetter(this, "domParser", () => { + const parser = new DOMParser(); + parser.forceEnableDTD(); + return parser; +}); /* Security Level Strings

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 467035 - Add new internal DTD content types r=ckerschb
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit 93c30885b92760fcdf6bd06b235ddd3c87b09b97 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Jul 3 17:28:25 2019 +0000 Bug 467035 - Add new internal DTD content types r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D35232 --HG-- extra : moz-landing-system : lando --- dom/base/nsContentPolicyUtils.h | 2 ++ dom/base/nsContentUtils.h | 4 ++++ dom/base/nsIContentPolicy.idl | 12 ++++++++++++ dom/cache/DBSchema.cpp | 4 +++- dom/fetch/InternalRequest.cpp | 2 ++ dom/security/nsCSPUtils.cpp | 2 ++ extensions/permissions/nsContentBlocker.cpp | 2 ++ 7 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dom/base/nsContentPolicyUtils.h b/dom/base/nsContentPolicyUtils.h index 9af71cb85b3f..50767baa3637 100644 --- a/dom/base/nsContentPolicyUtils.h +++ b/dom/base/nsContentPolicyUtils.h @@ -137,6 +137,8 @@ inline const char* NS_CP_ContentTypeName(uint32_t contentType) { CASE_RETURN(TYPE_SPECULATIVE); CASE_RETURN(TYPE_INTERNAL_MODULE); CASE_RETURN(TYPE_INTERNAL_MODULE_PRELOAD); + CASE_RETURN(TYPE_INTERNAL_DTD); + CASE_RETURN(TYPE_INTERNAL_FORCE_ALLOWED_DTD); default: return "<Unknown Type>"; } diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 9c409099c9af..b80c6c91093b 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -3467,6 +3467,10 @@ nsContentUtils::InternalContentPolicyTypeToExternal(nsContentPolicyType aType) { case nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD: return nsIContentPolicy::TYPE_STYLESHEET; + case nsIContentPolicy::TYPE_INTERNAL_DTD: + case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD: + return nsIContentPolicy::TYPE_DTD; + default: return aType; } diff --git a/dom/base/nsIContentPolicy.idl b/dom/base/nsIContentPolicy.idl index 5acbf9b8d9d2..13137cee7bc6 100644 --- a/dom/base/nsIContentPolicy.idl +++ b/dom/base/nsIContentPolicy.idl @@ -364,6 +364,18 @@ interface nsIContentPolicy : nsISupports */ const nsContentPolicyType TYPE_INTERNAL_MODULE_PRELOAD = 46; + /** + * Indicates a DTD loaded by an XML document the URI of which could + * not be mapped to a known local DTD. + */ + const nsContentPolicyType TYPE_INTERNAL_DTD = 47; + + /** + * Indicates a TYPE_INTERNAL_DTD which will not be blocked no matter + * what principal is being loaded from. + */ + const nsContentPolicyType TYPE_INTERNAL_FORCE_ALLOWED_DTD = 48; + /* When adding new content types, please update nsContentBlocker, * NS_CP_ContentTypeName, nsCSPContext, CSP_ContentTypeToDirective, * DoContentSecurityChecks, all nsIContentPolicy implementations, the diff --git a/dom/cache/DBSchema.cpp b/dom/cache/DBSchema.cpp index 540c12424925..670acb28b555 100644 --- a/dom/cache/DBSchema.cpp +++ b/dom/cache/DBSchema.cpp @@ -333,7 +333,9 @@ static_assert(nsIContentPolicy::TYPE_INVALID == 0 && nsIContentPolicy::TYPE_SAVEAS_DOWNLOAD == 43 && nsIContentPolicy::TYPE_SPECULATIVE == 44 && nsIContentPolicy::TYPE_INTERNAL_MODULE == 45 && - nsIContentPolicy::TYPE_INTERNAL_MODULE_PRELOAD == 46, + nsIContentPolicy::TYPE_INTERNAL_MODULE_PRELOAD == 46 && + nsIContentPolicy::TYPE_INTERNAL_DTD == 47 && + nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD == 48, "nsContentPolicyType values are as expected"); namespace { diff --git a/dom/fetch/InternalRequest.cpp b/dom/fetch/InternalRequest.cpp index dada8d6df418..6456fe55c9aa 100644 --- a/dom/fetch/InternalRequest.cpp +++ b/dom/fetch/InternalRequest.cpp @@ -254,6 +254,8 @@ RequestDestination InternalRequest::MapContentPolicyTypeToRequestDestination( destination = RequestDestination::_empty; break; case nsIContentPolicy::TYPE_DTD: + case nsIContentPolicy::TYPE_INTERNAL_DTD: + case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD: destination = RequestDestination::_empty; break; case nsIContentPolicy::TYPE_FONT: diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp index dc6b0f9b2025..cf30ba9e36f3 100644 --- a/dom/security/nsCSPUtils.cpp +++ b/dom/security/nsCSPUtils.cpp @@ -235,6 +235,8 @@ CSPDirective CSP_ContentTypeToDirective(nsContentPolicyType aType) { case nsIContentPolicy::TYPE_DTD: case nsIContentPolicy::TYPE_OTHER: case nsIContentPolicy::TYPE_SPECULATIVE: + case nsIContentPolicy::TYPE_INTERNAL_DTD: + case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD: return nsIContentSecurityPolicy::DEFAULT_SRC_DIRECTIVE; // csp shold not block top level loads, e.g. in case diff --git a/extensions/permissions/nsContentBlocker.cpp b/extensions/permissions/nsContentBlocker.cpp index bd98eb5aa5a7..3c4246b2ecc2 100644 --- a/extensions/permissions/nsContentBlocker.cpp +++ b/extensions/permissions/nsContentBlocker.cpp @@ -71,6 +71,8 @@ static const nsLiteralCString kTypeString[] = { NS_LITERAL_CSTRING("speculative"), NS_LITERAL_CSTRING(""), // TYPE_INTERNAL_MODULE NS_LITERAL_CSTRING(""), // TYPE_INTERNAL_MODULE_PRELOAD + NS_LITERAL_CSTRING(""), // TYPE_INTERNAL_DTD + NS_LITERAL_CSTRING(""), // TYPE_INTERNAL_FORCE_ALLOWED_DTD }; #define NUMBER_OF_TYPES MOZ_ARRAY_LENGTH(kTypeString)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 467035 - Avoid leaking browser language via DTD r=Gijs, bzbarsky
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit 2fe57c62af9706be45fc2085796a9398c3b10763 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 8 10:47:05 2019 +0000 Bug 467035 - Avoid leaking browser language via DTD r=Gijs,bzbarsky Differential Revision: https://phabricator.services.mozilla.com/D34187 --HG-- extra : moz-landing-system : lando --- .../browser_misused_characters_in_strings.js | 1 + .../test/mochitest/formautofill/mochitest.ini | 1 + dom/base/DOMParser.cpp | 11 +++++- dom/base/DOMParser.h | 8 +++- dom/base/Document.cpp | 39 ++----------------- dom/base/Document.h | 10 +++++ dom/base/nsContentUtils.cpp | 28 ++++++++++++++ dom/base/nsContentUtils.h | 7 ++++ dom/security/nsContentSecurityManager.cpp | 16 +++++++- dom/tests/mochitest/bugs/mochitest.ini | 1 + dom/tests/mochitest/bugs/test_bug467035.html | 45 ++++++++++++++++++++++ dom/webidl/DOMParser.webidl | 5 +++ parser/htmlparser/nsExpatDriver.cpp | 6 ++- testing/marionette/l10n.js | 6 ++- .../firefox/firefox_puppeteer/api/l10n.py | 1 + toolkit/content/widgets/datetimebox.js | 1 + toolkit/content/widgets/pluginProblem.js | 1 + toolkit/content/widgets/videocontrols.js | 4 ++ 18 files changed, 150 insertions(+), 41 deletions(-) diff --git a/browser/base/content/test/static/browser_misused_characters_in_strings.js b/browser/base/content/test/static/browser_misused_characters_in_strings.js index eb17e92c7b59..4b1d9a75d3bb 100644 --- a/browser/base/content/test/static/browser_misused_characters_in_strings.js +++ b/browser/base/content/test/static/browser_misused_characters_in_strings.js @@ -272,6 +272,7 @@ add_task(async function checkAllTheFluents() { {} ); let domParser = new DOMParser(); + domParser.forceEnableDTD(); for (let uri of uris) { let rawContents = await fetchFile(uri.spec); let resource = FluentResource.fromString(rawContents); diff --git a/browser/components/payments/test/mochitest/formautofill/mochitest.ini b/browser/components/payments/test/mochitest/formautofill/mochitest.ini index c58cdb9eefb3..9740f9e3e88f 100644 --- a/browser/components/payments/test/mochitest/formautofill/mochitest.ini +++ b/browser/components/payments/test/mochitest/formautofill/mochitest.ini @@ -6,4 +6,5 @@ support-files = ../../../../../../browser/extensions/formautofill/content/editCreditCard.xhtml ../../../../../../browser/extensions/formautofill/content/editAddress.xhtml +skip-if = true # Bug 1446164 [test_editCreditCard.html] diff --git a/dom/base/DOMParser.cpp b/dom/base/DOMParser.cpp index 6f0d30fd75a7..3f12ef8d7c69 100644 --- a/dom/base/DOMParser.cpp +++ b/dom/base/DOMParser.cpp @@ -33,7 +33,8 @@ DOMParser::DOMParser(nsIGlobalObject* aOwner, nsIPrincipal* aDocPrincipal, mPrincipal(aDocPrincipal), mDocumentURI(aDocumentURI), mBaseURI(aBaseURI), - mForceEnableXULXBL(false) { + mForceEnableXULXBL(false), + mForceEnableDTD(false) { MOZ_ASSERT(aDocPrincipal); MOZ_ASSERT(aDocumentURI); } @@ -69,6 +70,10 @@ already_AddRefed<Document> DOMParser::ParseFromString(const nsAString& aStr, document->ForceEnableXULXBL(); } + if (mForceEnableDTD) { + document->ForceSkipDTDSecurityChecks(); + } + nsresult rv = nsContentUtils::ParseDocumentHTML(aStr, document, false); if (NS_WARN_IF(NS_FAILED(rv))) { aRv.Throw(rv); @@ -183,6 +188,10 @@ already_AddRefed<Document> DOMParser::ParseFromStream(nsIInputStream* aStream, document->ForceEnableXULXBL(); } + if (mForceEnableDTD) { + document->ForceSkipDTDSecurityChecks(); + } + // Have to pass false for reset here, else the reset will remove // our event listener. Should that listener addition move to later // than this call? diff --git a/dom/base/DOMParser.h b/dom/base/DOMParser.h index 0a2db0ef4e2b..9a6545ad7f33 100644 --- a/dom/base/DOMParser.h +++ b/dom/base/DOMParser.h @@ -53,7 +53,12 @@ class DOMParser final : public nsISupports, public nsWrapperCache { SupportedType aType, ErrorResult& aRv); - void ForceEnableXULXBL() { mForceEnableXULXBL = true; } + void ForceEnableXULXBL() { + mForceEnableXULXBL = true; + ForceEnableDTD(); + } + + void ForceEnableDTD() { mForceEnableDTD = true; } nsIGlobalObject* GetParentObject() const { return mOwner; } @@ -78,6 +83,7 @@ class DOMParser final : public nsISupports, public nsWrapperCache { nsCOMPtr<nsIURI> mBaseURI; bool mForceEnableXULXBL; + bool mForceEnableDTD; }; } // namespace dom diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index a0823a6e457f..eebeada1c63c 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -1263,6 +1263,7 @@ Document::Document(const char* aContentType) mType(eUnknown), mDefaultElementType(0), mAllowXULXBL(eTriUnset), + mSkipDTDSecurityChecks(false), mBidiOptions(IBMBIDI_DEFAULT_BIDI_OPTIONS), mSandboxFlags(0), mPartID(0), @@ -1987,38 +1988,6 @@ void Document::Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup) { mChannel = aChannel; } -/** - * Determine whether the principal is allowed access to the localization system. - * We don't want the web to ever see this but all our UI including in content - * pages should pass this test. - */ -bool PrincipalAllowsL10n(nsIPrincipal* principal) { - // The system principal is always allowed. - if (nsContentUtils::IsSystemPrincipal(principal)) { - return true; - } - - nsCOMPtr<nsIURI> uri; - nsresult rv = principal->GetURI(getter_AddRefs(uri)); - NS_ENSURE_SUCCESS(rv, false); - - bool hasFlags; - - // Allow access to uris that cannot be loaded by web content. - rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_DANGEROUS_TO_LOAD, - &hasFlags); - NS_ENSURE_SUCCESS(rv, false); - if (hasFlags) { - return true; - } - - // UI resources also get access. - rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_IS_UI_RESOURCE, - &hasFlags); - NS_ENSURE_SUCCESS(rv, false); - return hasFlags; -} - void Document::DisconnectNodeTree() { // Delete references to sub-documents and kill the subdocument map, // if any. This is not strictly needed, but makes the node tree @@ -3256,11 +3225,11 @@ DocumentL10n* Document::GetL10n() { return mDocumentL10n; } bool Document::DocumentSupportsL10n(JSContext* aCx, JSObject* aObject) { nsCOMPtr<nsIPrincipal> callerPrincipal = nsContentUtils::SubjectPrincipal(aCx); - return PrincipalAllowsL10n(callerPrincipal); + return nsContentUtils::PrincipalAllowsL10n(callerPrincipal); } void Document::LocalizationLinkAdded(Element* aLinkElement) { - if (!PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { return; } @@ -3291,7 +3260,7 @@ void Document::LocalizationLinkAdded(Element* aLinkElement) { } void Document::LocalizationLinkRemoved(Element* aLinkElement) { - if (!PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { return; } diff --git a/dom/base/Document.h b/dom/base/Document.h index 82b7d66753ef..e65bb95d94c9 100644 --- a/dom/base/Document.h +++ b/dom/base/Document.h @@ -2764,8 +2764,16 @@ class Document : public nsINode, : mAllowXULXBL == eTriFalse ? false : InternalAllowXULXBL(); } + /** + * Returns true if this document is allowed to load DTDs from UI resources + * no matter what. + */ + bool SkipDTDSecurityChecks() { return mSkipDTDSecurityChecks; } + void ForceEnableXULXBL() { mAllowXULXBL = eTriTrue; } + void ForceSkipDTDSecurityChecks() { mSkipDTDSecurityChecks = true; } + /** * Returns the template content owner document that owns the content of * HTMLTemplateElement. @@ -4401,6 +4409,8 @@ class Document : public nsINode, Tri mAllowXULXBL; + bool mSkipDTDSecurityChecks; + // The document's script global object, the object from which the // document can get its script context and scope. This is the // *inner* window object. diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 2b416828e8c1..66134cdb691f 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -1676,6 +1676,34 @@ bool nsContentUtils::OfflineAppAllowed(nsIPrincipal* aPrincipal) { return NS_SUCCEEDED(rv) && allowed; } +/* static */ +bool nsContentUtils::PrincipalAllowsL10n(nsIPrincipal* aPrincipal) { + // The system principal is always allowed. + if (IsSystemPrincipal(aPrincipal)) { + return true; + } + + nsCOMPtr<nsIURI> uri; + nsresult rv = aPrincipal->GetURI(getter_AddRefs(uri)); + NS_ENSURE_SUCCESS(rv, false); + + bool hasFlags; + + // Allow access to uris that cannot be loaded by web content. + rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_DANGEROUS_TO_LOAD, + &hasFlags); + NS_ENSURE_SUCCESS(rv, false); + if (hasFlags) { + return true; + } + + // UI resources also get access. + rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_IS_UI_RESOURCE, + &hasFlags); + NS_ENSURE_SUCCESS(rv, false); + return hasFlags; +} + bool nsContentUtils::MaybeAllowOfflineAppByDefault(nsIPrincipal* aPrincipal) { if (!Preferences::GetRootBranch()) return false; diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index b80c6c91093b..46818cc43a1b 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1984,6 +1984,13 @@ class nsContentUtils { static bool OfflineAppAllowed(nsIPrincipal* aPrincipal); /** + * Determine whether the principal is allowed access to the localization + * system. We don't want the web to ever see this but all our UI including in + * content pages should pass this test. + */ + static bool PrincipalAllowsL10n(nsIPrincipal* aPrincipal); + + /** * If offline-apps.allow_by_default is true, we set offline-app permission * for the principal and return true. Otherwise false. */ diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index d7724ff496ff..e7a0a9d1a72b 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -329,8 +329,20 @@ static bool IsImageLoadInEditorAppType(nsILoadInfo* aLoadInfo) { } static nsresult DoCheckLoadURIChecks(nsIURI* aURI, nsILoadInfo* aLoadInfo) { - // Bug 1228117: determine the correct security policy for DTD loads - if (aLoadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_DTD) { + // In practice, these DTDs are just used for localization, so applying the + // same principal check as Fluent. + if (aLoadInfo->InternalContentPolicyType() == + nsIContentPolicy::TYPE_INTERNAL_DTD) { + return nsContentUtils::PrincipalAllowsL10n(aLoadInfo->TriggeringPrincipal()) + ? NS_OK + : NS_ERROR_DOM_BAD_URI; + } + + // This is used in order to allow a privileged DOMParser to parse documents + // that need to access localization DTDs. We just allow through + // TYPE_INTERNAL_FORCE_ALLOWED_DTD no matter what the triggering principal is. + if (aLoadInfo->InternalContentPolicyType() == + nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD) { return NS_OK; } diff --git a/dom/tests/mochitest/bugs/mochitest.ini b/dom/tests/mochitest/bugs/mochitest.ini index 571ca80e6339..26ce4e2b8c47 100644 --- a/dom/tests/mochitest/bugs/mochitest.ini +++ b/dom/tests/mochitest/bugs/mochitest.ini @@ -152,5 +152,6 @@ skip-if = toolkit == 'android' [test_bug1171215.html] support-files = window_bug1171215.html [test_bug1530292.html] +[test_bug467035.html] [test_no_find_showDialog.html] skip-if = toolkit == 'android' # Bug 1358633 - window.find doesn't work for Android diff --git a/dom/tests/mochitest/bugs/test_bug467035.html b/dom/tests/mochitest/bugs/test_bug467035.html new file mode 100644 index 000000000000..ffcfe03e7c61 --- /dev/null +++ b/dom/tests/mochitest/bugs/test_bug467035.html @@ -0,0 +1,45 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="utf-8"> + <title>Test for Bug 467035</title> + <script src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> + <script type="application/javascript"> + + /** Test for Bug 467035 **/ + SimpleTest.waitForExplicitFinish(); + addLoadEvent(() => { + const s = `<!DOCTYPE html SYSTEM \"chrome://branding/locale/brand.dtd\"> + <html xmlns=\"http://www.w3.org/1999/xhtml\"> + <head> + <meta charset=\"utf-8\"/> + <title>&brandShortName;</title> + </head> + </html>`; + + const parser = new DOMParser(); + let doc = parser.parseFromString(s, 'application/xhtml+xml'); + is(doc.getElementsByTagName('parsererror').length, 1, 'parseFromString cannot access locale DTD'); + + SpecialPowers.wrap(parser).forceEnableDTD(); + doc = parser.parseFromString(s, 'application/xhtml+xml'); + const isTitleLocalized = doc.getElementsByTagName('parsererror').length === 0 && + typeof doc.title === 'string' && + !!doc.title; + ok(isTitleLocalized, 'parseFromString can access locale DTD with forceEnableDTD'); + + SimpleTest.finish(); + }); + </script> +</head> +<body> +<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=467035">Mozilla Bug 467035</a> +<p id="display"></p> +<pre id="test"> +</pre> +</body> +</html> diff --git a/dom/webidl/DOMParser.webidl b/dom/webidl/DOMParser.webidl index 8afff03da225..6497374aff16 100644 --- a/dom/webidl/DOMParser.webidl +++ b/dom/webidl/DOMParser.webidl @@ -36,5 +36,10 @@ interface DOMParser { // principal it's using for the document. [ChromeOnly] void forceEnableXULXBL(); + + // Can be used to allow a DOMParser to load DTDs from URLs that + // normally would not be allowed based on the document principal. + [Func="IsChromeOrXBLOrUAWidget"] + void forceEnableDTD(); }; diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp index dd09ba67d67e..9f2321cd2831 100644 --- a/parser/htmlparser/nsExpatDriver.cpp +++ b/parser/htmlparser/nsExpatDriver.cpp @@ -633,12 +633,16 @@ nsresult nsExpatDriver::OpenInputStreamFromExternalDTD(const char16_t* aFPIStr, mSink == nsCOMPtr<nsIExpatSink>(do_QueryInterface(mOriginalSink)), "In nsExpatDriver::OpenInputStreamFromExternalDTD: " "mOriginalSink not the same object as mSink?"); + nsContentPolicyType policyType = nsIContentPolicy::TYPE_INTERNAL_DTD; nsCOMPtr<nsIPrincipal> loadingPrincipal; if (mOriginalSink) { nsCOMPtr<Document> doc; doc = do_QueryInterface(mOriginalSink->GetTarget()); if (doc) { loadingPrincipal = doc->NodePrincipal(); + if (doc->SkipDTDSecurityChecks()) { + policyType = nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD; + } } } if (!loadingPrincipal) { @@ -648,7 +652,7 @@ nsresult nsExpatDriver::OpenInputStreamFromExternalDTD(const char16_t* aFPIStr, rv = NS_NewChannel(getter_AddRefs(channel), uri, loadingPrincipal, nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | nsILoadInfo::SEC_ALLOW_CHROME, - nsIContentPolicy::TYPE_DTD); + policyType); } NS_ENSURE_SUCCESS(rv, rv); diff --git a/testing/marionette/l10n.js b/testing/marionette/l10n.js index ebbe071f483b..b4c6a98b9c14 100644 --- a/testing/marionette/l10n.js +++ b/testing/marionette/l10n.js @@ -21,7 +21,11 @@ const { XPCOMUtils } = ChromeUtils.import( ); XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); -XPCOMUtils.defineLazyGetter(this, "domParser", () => new DOMParser()); +XPCOMUtils.defineLazyGetter(this, "domParser", () => { + const parser = new DOMParser(); + parser.forceEnableDTD(); + return parser; +}); const { NoSuchElementError } = ChromeUtils.import( "chrome://marionette/content/error.js" diff --git a/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py b/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py index 159f8dc29e46..9a61bf89439d 100644 --- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py +++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py @@ -75,6 +75,7 @@ class L10n(BaseLib): value = self.marionette.execute_script(""" Cu.importGlobalProperties(["DOMParser"]); var parser = new DOMParser(); + parser.forceEnableDTD(); var doc = parser.parseFromString(arguments[0], "text/xml"); var node = doc.querySelector("elem[id='entity']"); diff --git a/toolkit/content/widgets/datetimebox.js b/toolkit/content/widgets/datetimebox.js index 1865007a23ad..5153c3cfaf53 100644 --- a/toolkit/content/widgets/datetimebox.js +++ b/toolkit/content/widgets/datetimebox.js @@ -143,6 +143,7 @@ this.DateTimeInputBaseImplWidget = class { * Remove it when migrate to Fluent (bug 1504363). */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % datetimeboxDTD SYSTEM "chrome://global/locale/datetimebox.dtd"> diff --git a/toolkit/content/widgets/pluginProblem.js b/toolkit/content/widgets/pluginProblem.js index e2cd6a0b6138..aee9942daa5a 100644 --- a/toolkit/content/widgets/pluginProblem.js +++ b/toolkit/content/widgets/pluginProblem.js @@ -17,6 +17,7 @@ this.PluginProblemWidget = class { onsetup() { const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( ` <!DOCTYPE bindings [ diff --git a/toolkit/content/widgets/videocontrols.js b/toolkit/content/widgets/videocontrols.js index 991c01534229..a32d3e2261ae 100644 --- a/toolkit/content/widgets/videocontrols.js +++ b/toolkit/content/widgets/videocontrols.js @@ -2472,6 +2472,7 @@ this.VideoControlsImplWidget = class { * Remove it when migrate to Fluent. */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % videocontrolsDTD SYSTEM "chrome://global/locale/videocontrols.dtd"> @@ -2719,6 +2720,7 @@ this.NoControlsMobileImplWidget = class { * Remove it when migrate to Fluent. */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % videocontrolsDTD SYSTEM "chrome://global/locale/videocontrols.dtd"> @@ -2769,6 +2771,7 @@ this.NoControlsPictureInPictureImplWidget = class { * Remove it when migrate to Fluent. */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % videocontrolsDTD SYSTEM "chrome://global/locale/videocontrols.dtd"> @@ -2875,6 +2878,7 @@ this.NoControlsDesktopImplWidget = class { * Remove it when migrate to Fluent. */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % videocontrolsDTD SYSTEM "chrome://global/locale/videocontrols.dtd">

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 26345: Hide tracking protection UI
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit cbf4dfb66958590b64cf5b2fc63ff0ed9e2d7d0e Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 10 16:29:31 2019 +0200 Bug 26345: Hide tracking protection UI --- browser/components/controlcenter/content/identityPanel.inc.xul | 3 ++- browser/themes/shared/identity-block/identity-block.inc.css | 4 ++++ browser/themes/shared/incontentprefs/privacy.css | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/browser/components/controlcenter/content/identityPanel.inc.xul b/browser/components/controlcenter/content/identityPanel.inc.xul index 73cb3968c7fb..88d5074589e3 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xul +++ b/browser/components/controlcenter/content/identityPanel.inc.xul @@ -73,7 +73,8 @@  <hbox id="tracking-protection-container" class="identity-popup-section" - when-connection="not-secure secure secure-ev secure-cert-user-overridden extension"> + when-connection="not-secure secure secure-ev secure-cert-user-overridden extension" + hidden="true"> <vbox id="identity-popup-content-blocking-content" flex="1"> <hbox align="start"> <label id="content-blocking-label" diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css index d8233077be69..e1911fd47305 100644 --- a/browser/themes/shared/identity-block/identity-block.inc.css +++ b/browser/themes/shared/identity-block/identity-block.inc.css @@ -173,6 +173,10 @@ toolbar[brighttext] #urlbar[pageproxystate="valid"] > #identity-box.chromeUI > # /* TRACKING PROTECTION ICON */ #tracking-protection-icon-box { + display: none; +} + +#tracking-protection-icon-box { visibility: collapse; overflow: hidden; width: 20px; diff --git a/browser/themes/shared/incontentprefs/privacy.css b/browser/themes/shared/incontentprefs/privacy.css index 5cb165d7d48d..ce9614bcd677 100644 --- a/browser/themes/shared/incontentprefs/privacy.css +++ b/browser/themes/shared/incontentprefs/privacy.css @@ -88,6 +88,10 @@ /* Content Blocking */ +#trackingGroup { + display: none; +} + /* Override styling that sets descriptions as grey */ #trackingGroup description.indent, #trackingGroup .indent > description {

1 0

[tor-browser-build/master] Bug 31732: Windows nightly builds are busted
by boklm＠torproject.org 13 Sep '19

13 Sep '19

commit 554d1014079a9d83586759ee92280c8b094e682a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 13 10:46:21 2019 +0000 Bug 31732: Windows nightly builds are busted It seems we were a bit too optimistic to pick up FORTIFY_SOURCE support in mingw-w64 as this breaks our builds. Let's be more conservative and use what Mozilla is using in their mingw-w64/clang builds. --- projects/mingw-w64-clang/config | 2 +- projects/mingw-w64/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index a6b6cde..3d209ea 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 330025c54b85512d54b6960fad07498365c8fee3 +git_hash: 0a1d495478d8ed1a94fc77b9dbb428b7e0372588 version: '[% c("abbrev") %]' llvm_version: 8.0.0 gpg_keyring: clang.gpg diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 38fbb4e..b088c8e 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 330025c54b85512d54b6960fad07498365c8fee3 +git_hash: 0a1d495478d8ed1a94fc77b9dbb428b7e0372588 version: '[% c("abbrev") %]' var: container:

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Update Torbutton to pick up latest changes
by gk＠torproject.org 13 Sep '19

13 Sep '19

commit c175609e241f3e67251f68a9cd9f1e50c072466f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 13 09:10:53 2019 +0000 Update Torbutton to pick up latest changes --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index d796dd27d128..903d676ccf33 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit d796dd27d12850bd176a85e160002755bfccfab2 +Subproject commit 903d676ccf33e36938438a595b71e781ef13bbe1

1 0

[torbutton/master] Bug 24653: merge securityLevel.properties into torbutton.dtd
by gk＠torproject.org 13 Sep '19

13 Sep '19

commit 903d676ccf33e36938438a595b71e781ef13bbe1 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 10 20:04:15 2019 +0200 Bug 24653: merge securityLevel.properties into torbutton.dtd --- chrome/locale/ar/securityLevel.properties | 22 ---------------------- chrome/locale/ar/torbutton.dtd | 10 +++++++++- chrome/locale/az/securityLevel.properties | 1 - chrome/locale/az/torbutton.dtd | 1 + chrome/locale/bg/securityLevel.properties | 1 - chrome/locale/bg/torbutton.dtd | 1 + chrome/locale/bms/securityLevel.properties | 1 - chrome/locale/bms/torbutton.dtd | 1 + chrome/locale/bn-BD/securityLevel.properties | 22 ---------------------- chrome/locale/bn-BD/torbutton.dtd | 14 +++++++++++--- chrome/locale/bs/securityLevel.properties | 1 - chrome/locale/bs/torbutton.dtd | 1 + chrome/locale/ca/securityLevel.properties | 22 ---------------------- chrome/locale/ca/torbutton.dtd | 12 ++++++++++-- chrome/locale/cs/securityLevel.properties | 22 ---------------------- chrome/locale/cs/torbutton.dtd | 8 ++++++++ chrome/locale/da/securityLevel.properties | 22 ---------------------- chrome/locale/da/torbutton.dtd | 8 ++++++++ chrome/locale/de/securityLevel.properties | 22 ---------------------- chrome/locale/de/torbutton.dtd | 11 +++++++++-- chrome/locale/el/securityLevel.properties | 22 ---------------------- chrome/locale/el/torbutton.dtd | 10 +++++++++- chrome/locale/en-US/securityLevel.properties | 22 ---------------------- chrome/locale/en-US/torbutton.dtd | 8 ++++++++ chrome/locale/eo/securityLevel.properties | 1 - chrome/locale/eo/torbutton.dtd | 1 + chrome/locale/es-AR/securityLevel.properties | 22 ---------------------- chrome/locale/es-AR/torbutton.dtd | 16 ++++++++++++---- chrome/locale/es-ES/securityLevel.properties | 22 ---------------------- chrome/locale/es-ES/torbutton.dtd | 8 ++++++++ chrome/locale/eu/securityLevel.properties | 22 ---------------------- chrome/locale/eu/torbutton.dtd | 8 ++++++++ chrome/locale/fa/securityLevel.properties | 22 ---------------------- chrome/locale/fa/torbutton.dtd | 12 ++++++++++-- chrome/locale/fi/securityLevel.properties | 1 - chrome/locale/fi/torbutton.dtd | 1 + chrome/locale/fr/securityLevel.properties | 22 ---------------------- chrome/locale/fr/torbutton.dtd | 8 ++++++++ chrome/locale/ga-IE/securityLevel.properties | 22 ---------------------- chrome/locale/ga-IE/torbutton.dtd | 8 ++++++++ chrome/locale/gl/securityLevel.properties | 1 - chrome/locale/gl/torbutton.dtd | 1 + chrome/locale/gu/securityLevel.properties | 1 - chrome/locale/gu/torbutton.dtd | 1 + chrome/locale/he/securityLevel.properties | 22 ---------------------- chrome/locale/he/torbutton.dtd | 18 +++++++++++++----- chrome/locale/hu/securityLevel.properties | 22 ---------------------- chrome/locale/hu/torbutton.dtd | 8 ++++++++ chrome/locale/id/securityLevel.properties | 22 ---------------------- chrome/locale/id/torbutton.dtd | 14 +++++++++++--- chrome/locale/is/securityLevel.properties | 22 ---------------------- chrome/locale/is/torbutton.dtd | 8 ++++++++ chrome/locale/it/securityLevel.properties | 22 ---------------------- chrome/locale/it/torbutton.dtd | 8 ++++++++ chrome/locale/ja/securityLevel.properties | 22 ---------------------- chrome/locale/ja/torbutton.dtd | 8 ++++++++ chrome/locale/ka/securityLevel.properties | 22 ---------------------- chrome/locale/ka/torbutton.dtd | 8 ++++++++ chrome/locale/ko/securityLevel.properties | 22 ---------------------- chrome/locale/ko/torbutton.dtd | 22 +++++++++++++++------- chrome/locale/lt/securityLevel.properties | 1 - chrome/locale/lt/torbutton.dtd | 1 + chrome/locale/lv/securityLevel.properties | 1 - chrome/locale/lv/torbutton.dtd | 1 + chrome/locale/mk/securityLevel.properties | 22 ---------------------- chrome/locale/mk/torbutton.dtd | 12 ++++++++++-- chrome/locale/my/securityLevel.properties | 1 - chrome/locale/my/torbutton.dtd | 1 + chrome/locale/nb-NO/securityLevel.properties | 22 ---------------------- chrome/locale/nb-NO/torbutton.dtd | 8 ++++++++ chrome/locale/nl/securityLevel.properties | 22 ---------------------- chrome/locale/nl/torbutton.dtd | 18 +++++++++++++----- chrome/locale/pl/securityLevel.properties | 22 ---------------------- chrome/locale/pl/torbutton.dtd | 8 ++++++++ chrome/locale/pt-BR/securityLevel.properties | 22 ---------------------- chrome/locale/pt-BR/torbutton.dtd | 10 +++++++++- chrome/locale/pt/securityLevel.properties | 1 - chrome/locale/ro/securityLevel.properties | 22 ---------------------- chrome/locale/ro/torbutton.dtd | 8 ++++++++ chrome/locale/ru/securityLevel.properties | 22 ---------------------- chrome/locale/ru/torbutton.dtd | 10 +++++++++- chrome/locale/sk/securityLevel.properties | 1 - chrome/locale/sk/torbutton.dtd | 1 + chrome/locale/sl/securityLevel.properties | 1 - chrome/locale/sl/torbutton.dtd | 1 + chrome/locale/sr/securityLevel.properties | 1 - chrome/locale/sr/torbutton.dtd | 1 + chrome/locale/sv-SE/securityLevel.properties | 22 ---------------------- chrome/locale/sv-SE/torbutton.dtd | 8 ++++++++ chrome/locale/tr/securityLevel.properties | 22 ---------------------- chrome/locale/tr/torbutton.dtd | 8 ++++++++ chrome/locale/uk/securityLevel.properties | 1 - chrome/locale/uk/torbutton.dtd | 1 + chrome/locale/vi/securityLevel.properties | 22 ---------------------- chrome/locale/vi/torbutton.dtd | 8 ++++++++ chrome/locale/zh-CN/securityLevel.properties | 22 ---------------------- chrome/locale/zh-CN/torbutton.dtd | 8 ++++++++ chrome/locale/zh-TW/securityLevel.properties | 22 ---------------------- chrome/locale/zh-TW/torbutton.dtd | 14 +++++++++++--- 99 files changed, 328 insertions(+), 806 deletions(-) diff --git a/chrome/locale/ar/securityLevel.properties b/chrome/locale/ar/securityLevel.properties deleted file mode 100644 index b02c6cc4..00000000 --- a/chrome/locale/ar/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = مستوى الأمان -securityLevel.customWarning = مخصص -securityLevel.overview = تعطيل مميزات ويب معينة فد يتم استخدامها لمهاجمة أمنك و مجهولية هويتك. -securityLevel.standard.level = عادي -securityLevel.standard.tooltip = مستوى الأمان: قياسي -securityLevel.standard.summary = كل خصائص متصفح تور ومواقع الوب مفعلة -securityLevel.safer.level = آمِن -securityLevel.safer.tooltip = مستوى الأمان: آمن -securityLevel.safer.summary = يعطل مميزات مواقع الوب التي عادة ما تكون خطيرة. يتسبب في تعطل خصائص بعض المواقع. -securityLevel.safer.description1 = تعطل جافا سكربت على المواقع التي لا تستخدم HTTPS -securityLevel.safer.description2 = تعطّل بعض الخطوط والرموز الرياضية. -securityLevel.safer.description3 = الصوت والفيديو (HTML5 media), و WebGL هي انقر للتشغيل -securityLevel.safest.level = الأكثر أمنا -securityLevel.safest.tooltip = مستوى الأمان: الأكثر أمانا -securityLevel.safest.summary = اسمح فقط بالخصائص المطلوبة للمواقع غير الديناميكية والخدمات الأساسية. تؤثر هذه التغييرات على الصور والوسائط والنصوص البرمجية. -securityLevel.safest.description1 = تعطل جافا سكربت مبدئيا على جميع المواقع. -securityLevel.safest.description2 = تعطّل بعض الخطوط والأيقونات والرموز الرياضية والصور. -securityLevel.safest.description3 = الصوت والفيديو يحتاج للنقر لتشغيله. -securityLevel.custom.summary = تفضيلاتك الخاصة للمتصفح تسببت في إعدادات أمان غير معتادة. لأمان وخصوصية أفضل ننصح باستخدام أحد مستويات الأمان المبدئية. -securityLevel.learnMore = تعرف على المزيد -securityLevel.restoreDefaults = استعد الإعادات المبدئية -securityLevel.advancedSecuritySettings = إعدادات الأمن المتقدمة ... diff --git a/chrome/locale/ar/torbutton.dtd b/chrome/locale/ar/torbutton.dtd index 1c114b6d..015fddfa 100644 --- a/chrome/locale/ar/torbutton.dtd +++ b/chrome/locale/ar/torbutton.dtd @@ -31,11 +31,19 @@ <!ENTITY torbutton.prefs.sec_safest_label "الأكثر أمنا"> <!ENTITY torbutton.prefs.sec_safest_description "اسمح فقط بالخصائص المطلوبة للمواقع غير الديناميكية والخدمات الأساسية. تؤثر هذه التغييرات على الصور والوسائط والنصوص البرمجية."> <!ENTITY torbutton.prefs.sec_safest_list_label "في الإعداد الأكثر أمنا:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "تعرّف على المزيد"> +<!ENTITY torbutton.prefs.sec_learn_more_label "تعرف على المزيد"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "تعطل جافا سكربت على المواقع التي لا تستخدم HTTPS"> <!ENTITY torbutton.prefs.sec_js_disabled "تعطل جافا سكربت مبدئيا على جميع المواقع."> <!ENTITY torbutton.prefs.sec_limit_typography "تعطّل بعض الخطوط والرموز الرياضية."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "تعطّل بعض الخطوط والأيقونات والرموز الرياضية والصور."> <!ENTITY torbutton.prefs.sec_click_to_play_media "الصوت والفيديو (HTML5 media), و WebGL هي انقر للتشغيل"> +<!ENTITY torbutton.prefs.sec_custom_warning "مخصص"> +<!ENTITY torbutton.prefs.sec_overview "تعطيل مميزات ويب معينة فد يتم استخدامها لمهاجمة أمنك و مجهولية هويتك."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "مستوى الأمان: قياسي"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "مستوى الأمان: آمن"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "مستوى الأمان: الأكثر أمانا"> +<!ENTITY torbutton.prefs.sec_custom_summary "تفضيلاتك الخاصة للمتصفح تسببت في إعدادات أمان غير معتادة. لأمان وخصوصية أفضل ننصح باستخدام أحد مستويات الأمان المبدئية."> +<!ENTITY torbutton.prefs.sec_restore_defaults "استعد الإعادات المبدئية"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "إعدادات الأمن المتقدمة ..."> <!ENTITY torbutton.circuit_display.title "دائرة تور"> <!ENTITY torbutton.circuit_display.new_circuit "دائرة تور جديدة لهذا الموقع"> diff --git a/chrome/locale/az/securityLevel.properties b/chrome/locale/az/securityLevel.properties deleted file mode 100644 index 16b086a7..00000000 --- a/chrome/locale/az/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Varsayılanları yenidən yüklə diff --git a/chrome/locale/az/torbutton.dtd b/chrome/locale/az/torbutton.dtd index 589c6fe2..f8c14f23 100644 --- a/chrome/locale/az/torbutton.dtd +++ b/chrome/locale/az/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Varsayılanları yenidən yüklə"> diff --git a/chrome/locale/bg/securityLevel.properties b/chrome/locale/bg/securityLevel.properties deleted file mode 100644 index 6d147b67..00000000 --- a/chrome/locale/bg/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Възстанови стандартните diff --git a/chrome/locale/bg/torbutton.dtd b/chrome/locale/bg/torbutton.dtd index 52adc2ec..cba7a127 100644 --- a/chrome/locale/bg/torbutton.dtd +++ b/chrome/locale/bg/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Възстанови стандартните"> diff --git a/chrome/locale/bms/securityLevel.properties b/chrome/locale/bms/securityLevel.properties deleted file mode 100644 index 8cbfd400..00000000 --- a/chrome/locale/bms/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = မူလအေျခအေနသို႕ ျပန္လည္ ထည့္သြင္းရန္ diff --git a/chrome/locale/bms/torbutton.dtd b/chrome/locale/bms/torbutton.dtd index 773b9efa..0cc769b2 100644 --- a/chrome/locale/bms/torbutton.dtd +++ b/chrome/locale/bms/torbutton.dtd @@ -12,3 +12,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "မူလအေျခအေနသို႕ ျပန္လည္ ထည့္သြင္းရန္"> diff --git a/chrome/locale/bn-BD/securityLevel.properties b/chrome/locale/bn-BD/securityLevel.properties deleted file mode 100644 index c596f9ba..00000000 --- a/chrome/locale/bn-BD/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = নিরাপত্তার মাত্রা -securityLevel.customWarning = পছন্দসই -securityLevel.overview = আপনার নিরাপত্তা এবং গোপনীয়তা আক্রমণ করতে ব্যবহার করা যেতে পারে এমন কিছু ওয়েব বৈশিষ্ট্য অক্ষম করুন। -securityLevel.standard.level = মান -securityLevel.standard.tooltip = নিরাপত্তা স্তর: স্ট্যান্ডার্ড -securityLevel.standard.summary = সমস্ত টর ব্রাউজার এবং ওয়েবসাইট বৈশিষ্ট্য সক্ষম করা হয়। -securityLevel.safer.level = নিরাপদ -securityLevel.safer.tooltip = নিরাপত্তা স্তর: নিরাপদ -securityLevel.safer.summary = ওয়েবসাইটের বৈশিষ্ট্যগুলি প্রায়ই বিপজ্জনক করে, যা কিছু সাইটগুলি কার্যকারিতা হারাতে বাধা দেয়। -securityLevel.safer.description1 = Non-HTTPS সাইটগুলিতে জাভাস্ক্রিপ্ট অক্ষম করা আছে। -securityLevel.safer.description2 = কিছু ফন্ট এবং গণিত চিহ্ন অক্ষম আছে। -securityLevel.safer.description3 = অডিও ও ভিডিও (এইচটিএমএল5 মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন -securityLevel.safest.level = সবচে’ নিরাপদ -securityLevel.safest.tooltip = নিরাপত্তা স্তর: সবচে’ নিরাপদ -securityLevel.safest.summary = শুধুমাত্র স্থায়ী সাইট এবং মৌলিক পরিষেবাগুলির জন্য প্রয়োজনীয় ওয়েবসাইট বৈশিষ্ট্যগুলি মঞ্জুরি দেয় এই পরিবর্তনগুলি ইমেজ, মিডিয়া এবং স্ক্রিপ্টগুলি প্রভাবিত করে। -securityLevel.safest.description1 = স্বয়ংক্রিয়ভাবে সকল সাইটে জাভাস্ক্রিপ্ট নিষ্ক্রিয়কৃত। -securityLevel.safest.description2 = কিছু ফন্ট, আইকন, গণিত প্রতীক এবং ছবি অক্ষম রয়েছে। -securityLevel.safest.description3 = অডিও এবং ভিডিও (HTML5 মিডিয়া) ক্লিক-টু-খেলা। -securityLevel.custom.summary = আপনার কাস্টম ব্রাউজারের পছন্দগুলির কারণে অস্বাভাবিক নিরাপত্তা সেটিংস দেখা দিয়েছে নিরাপত্তা এবং গোপনীয়তার কারণে, আমরা আপনাকে ডিফল্ট নিরাপত্তা স্তরগুলির একটি চয়ন করার সুপারিশ করি। -securityLevel.learnMore = আরও জানুন -securityLevel.restoreDefaults = স্বয়ংক্রিয় সেটিংসগুলি পুনঃস্থাপন করুন -securityLevel.advancedSecuritySettings = উন্নত নিরাপত্তা সেটিংস ... diff --git a/chrome/locale/bn-BD/torbutton.dtd b/chrome/locale/bn-BD/torbutton.dtd index 670f72f0..118a4866 100644 --- a/chrome/locale/bn-BD/torbutton.dtd +++ b/chrome/locale/bn-BD/torbutton.dtd @@ -28,14 +28,22 @@ <!ENTITY torbutton.prefs.sec_safer_label "নিরাপদ"> <!ENTITY torbutton.prefs.sec_safer_description "ওয়েবসাইটের বৈশিষ্ট্যগুলি প্রায়ই বিপজ্জনক করে, যা কিছু সাইটগুলি কার্যকারিতা হারাতে বাধা দেয়।"> <!ENTITY torbutton.prefs.sec_safer_list_label "নিরাপদ সেটিংসে:"> -<!ENTITY torbutton.prefs.sec_safest_label "নিরাপদ"> +<!ENTITY torbutton.prefs.sec_safest_label "সবচে’ নিরাপদ"> <!ENTITY torbutton.prefs.sec_safest_description "শুধুমাত্র স্থায়ী সাইট এবং মৌলিক পরিষেবাগুলির জন্য প্রয়োজনীয় ওয়েবসাইট বৈশিষ্ট্যগুলি মঞ্জুরি দেয় এই পরিবর্তনগুলি ইমেজ, মিডিয়া এবং স্ক্রিপ্টগুলি প্রভাবিত করে।"> <!ENTITY torbutton.prefs.sec_safest_list_label "নিরাপদ সেটিং এ:"> <!ENTITY torbutton.prefs.sec_learn_more_label "আরও জানুন"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Non-HTTPS সাইটগুলিতে জাভাস্ক্রিপ্ট অক্ষম করা আছে।"> -<!ENTITY torbutton.prefs.sec_js_disabled "জাভাস্ক্রিপ্ট সব সাইটে ডিফল্ট দ্বারা নিষ্ক্রিয় করা হয়।"> +<!ENTITY torbutton.prefs.sec_js_disabled "স্বয়ংক্রিয়ভাবে সকল সাইটে জাভাস্ক্রিপ্ট নিষ্ক্রিয়কৃত।"> <!ENTITY torbutton.prefs.sec_limit_typography "কিছু ফন্ট এবং গণিত চিহ্ন অক্ষম আছে।"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "কিছু ফন্ট, আইকন, গণিত প্রতীক এবং ছবি অক্ষম রয়েছে।"> -<!ENTITY torbutton.prefs.sec_click_to_play_media "অডিও ও ভিডিও (এইচটিএমএল৫ মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন"> +<!ENTITY torbutton.prefs.sec_click_to_play_media "অডিও ও ভিডিও (এইচটিএমএল5 মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন"> +<!ENTITY torbutton.prefs.sec_custom_warning "পছন্দসই"> +<!ENTITY torbutton.prefs.sec_overview "আপনার নিরাপত্তা এবং গোপনীয়তা আক্রমণ করতে ব্যবহার করা যেতে পারে এমন কিছু ওয়েব বৈশিষ্ট্য অক্ষম করুন।"> +<!ENTITY torbutton.prefs.sec_standard_tooltip "নিরাপত্তা স্তর: স্ট্যান্ডার্ড"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "নিরাপত্তা স্তর: নিরাপদ"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "নিরাপত্তা স্তর: সবচে’ নিরাপদ"> +<!ENTITY torbutton.prefs.sec_custom_summary "আপনার কাস্টম ব্রাউজারের পছন্দগুলির কারণে অস্বাভাবিক নিরাপত্তা সেটিংস দেখা দিয়েছে নিরাপত্তা এবং গোপনীয়তার কারণে, আমরা আপনাকে ডিফল্ট নিরাপত্তা স্তরগুলির একটি চয়ন করার সুপারিশ করি।"> +<!ENTITY torbutton.prefs.sec_restore_defaults "স্বয়ংক্রিয় সেটিংসগুলি পুনঃস্থাপন করুন"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "উন্নত নিরাপত্তা সেটিংস ..."> <!ENTITY torbutton.circuit_display.title "টর সার্কিট"> <!ENTITY torbutton.circuit_display.new_circuit "এই সাইটের জন্য নতুন সার্কিট"> diff --git a/chrome/locale/bs/securityLevel.properties b/chrome/locale/bs/securityLevel.properties deleted file mode 100644 index a713fa96..00000000 --- a/chrome/locale/bs/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Vrati početno diff --git a/chrome/locale/bs/torbutton.dtd b/chrome/locale/bs/torbutton.dtd index 207f4312..163046ee 100644 --- a/chrome/locale/bs/torbutton.dtd +++ b/chrome/locale/bs/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Vrati početno"> diff --git a/chrome/locale/ca/securityLevel.properties b/chrome/locale/ca/securityLevel.properties deleted file mode 100644 index 79fb018f..00000000 --- a/chrome/locale/ca/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Nivell de seguretat -securityLevel.customWarning = Personalitza -securityLevel.overview = Deshabiliteu certes funcions web que es puguin fer servir per atacar la vostra seguretat i el vostre anonimat. -securityLevel.standard.level = Estàndard -securityLevel.standard.tooltip = Nivell de seguretat: estàndard -securityLevel.standard.summary = Totes les característiques del buscador Tor i de la pàgina web estan actives. -securityLevel.safer.level = Més segur -securityLevel.safer.tooltip = Nivell de seguretat: més segur -securityLevel.safer.summary = Desactivar les funcions del lloc web que sovint són perilloses, pot fent que alguns llocs perden funcionalitat. -securityLevel.safer.description1 = El JavaScript està desactivat per defecte en tots els llocs no-HTTPS -securityLevel.safer.description2 = Algunes fonts i símbols matemàtics estan desactivats. -securityLevel.safer.description3 = L'àudio, el vídeo (mitjans de comunicació HTML5) i WebGL són click-to-play. -securityLevel.safest.level = més segur -securityLevel.safest.tooltip = Nivell de seguretat: el més segur -securityLevel.safest.summary = Només es permeten funcions del lloc web requerides per a llocs estàtics i serveis bàsics. Aquests canvis afecten imatges, mitjans de comunicació i scripts. -securityLevel.safest.description1 = El JavaScript està desactivat per defecte a tots els llocs. -securityLevel.safest.description2 = Algunes fonts, icones, símbols matemàtics, i imatges estan desactivats. -securityLevel.safest.description3 = L'àudio i el vídeo (mitjans de comunicació HTML5) són click-to-play. -securityLevel.custom.summary = El navegador personalitzat ha obtingut uns paràmetres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecció d'un nivell de seguretat per defecte. -securityLevel.learnMore = Aprèn més -securityLevel.restoreDefaults = Torna a les opcions per defecte -securityLevel.advancedSecuritySettings = Configuració de seguretat avançada... diff --git a/chrome/locale/ca/torbutton.dtd b/chrome/locale/ca/torbutton.dtd index 86b81ab8..e7434a76 100644 --- a/chrome/locale/ca/torbutton.dtd +++ b/chrome/locale/ca/torbutton.dtd @@ -25,17 +25,25 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "El control lliscant de seguretat permet deshabilitar característiques del navegador que poden permetre vulnerabilitats en atemptats de furoners."> <!ENTITY torbutton.prefs.sec_standard_label "Estàndard"> <!ENTITY torbutton.prefs.sec_standard_description "Totes les característiques del buscador Tor i de la pàgina web estan actives."> -<!ENTITY torbutton.prefs.sec_safer_label "Més segur."> +<!ENTITY torbutton.prefs.sec_safer_label "Més segur"> <!ENTITY torbutton.prefs.sec_safer_description "Desactivar les funcions del lloc web que sovint són perilloses, pot fent que alguns llocs perden funcionalitat."> <!ENTITY torbutton.prefs.sec_safer_list_label "A la configuració més segura:"> <!ENTITY torbutton.prefs.sec_safest_label "més segur"> <!ENTITY torbutton.prefs.sec_safest_description "Només es permeten funcions del lloc web requerides per a llocs estàtics i serveis bàsics. Aquests canvis afecten imatges, mitjans de comunicació i scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "A la configuració més segura:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Apreneu-ne més"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Aprèn més"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "El JavaScript està desactivat per defecte en tots els llocs no-HTTPS"> <!ENTITY torbutton.prefs.sec_js_disabled "El JavaScript està desactivat per defecte a tots els llocs."> <!ENTITY torbutton.prefs.sec_limit_typography "Algunes fonts i símbols matemàtics estan desactivats. "> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunes fonts, icones, símbols matemàtics, i imatges estan desactivats. "> <!ENTITY torbutton.prefs.sec_click_to_play_media "L'àudio, el vídeo (mitjans de comunicació HTML5) i WebGL són click-to-play. "> +<!ENTITY torbutton.prefs.sec_custom_warning "Personalitza"> +<!ENTITY torbutton.prefs.sec_overview "Deshabiliteu certes funcions web que es puguin fer servir per atacar la vostra seguretat i el vostre anonimat."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Nivell de seguretat: estàndard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Nivell de seguretat: més segur"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Nivell de seguretat: el més segur"> +<!ENTITY torbutton.prefs.sec_custom_summary "El navegador personalitzat ha obtingut uns paràmetres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecció d'un nivell de seguretat per defecte."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Torna a les opcions per defecte"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Configuració de seguretat avançada..."> <!ENTITY torbutton.circuit_display.title "Circuit de Tor"> <!ENTITY torbutton.circuit_display.new_circuit " Circuit de Tor per a aquest lloc "> diff --git a/chrome/locale/cs/securityLevel.properties b/chrome/locale/cs/securityLevel.properties deleted file mode 100644 index 5a0214b5..00000000 --- a/chrome/locale/cs/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Úroveň zabezpečení -securityLevel.customWarning = Vlastní -securityLevel.overview = Vypnout některé webové funkce, které mohou být zneužity k ohrožení vaší bezpečnosti a anonymity. -securityLevel.standard.level = Standardní -securityLevel.standard.tooltip = Úroveň zabezpečení: běžná -securityLevel.standard.summary = Všechny funkce prohlížeče Tor jsou zapnuté. -securityLevel.safer.level = Bezpečnější -securityLevel.safer.tooltip = Úroveň zabezpečení: bezpečnější -securityLevel.safer.summary = Některé méně bezpečné funkce jsou vypnuty, ale některé stránky nemusí fungovat. -securityLevel.safer.description1 = JavaScript je na stránkách bez HTTPS vypnut. -securityLevel.safer.description2 = Některá písma a matematické symboly jsou zablokovány. -securityLevel.safer.description3 = Audio, video (HTML5 média) a WebGL se přehrávají po kliknutí. -securityLevel.safest.level = Nejbezpečnější -securityLevel.safest.tooltip = Úroveň zabezpečení: nejbezpečnější -securityLevel.safest.summary = Povolí jen funkce pro zobrazení statických webových stránek a fungování základních služeb. Ovlivněno bude zobrazení obrázků, médií a fungování skriptů. -securityLevel.safest.description1 = JavaScript je ve výchozím nastavení vypnut na všech stránkách. -securityLevel.safest.description2 = Některá písma, matematické symboly a obrázky jsou zablokovány. -securityLevel.safest.description3 = Audio a video (HTML5 média) se přehrávají po kliknutí. -securityLevel.custom.summary = Vaše nastavení prohlížeče neodpovídá standardnímu nastavení zabezpečení. Z důvodu ochrany soukromí a zvýšení bezpečnosti vám doporučujeme vybrat si jednu z výchozích bezpečnostních úrovní. -securityLevel.learnMore = Zjistit více -securityLevel.restoreDefaults = Obnovit výchozí -securityLevel.advancedSecuritySettings = Rozšířená bezpečnostní nastavení… diff --git a/chrome/locale/cs/torbutton.dtd b/chrome/locale/cs/torbutton.dtd index 75855010..6713384a 100644 --- a/chrome/locale/cs/torbutton.dtd +++ b/chrome/locale/cs/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Některá písma a matematické symboly jsou zablokovány."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Některá písma, matematické symboly a obrázky jsou zablokovány."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio, video (HTML5 média) a WebGL se přehrávají po kliknutí."> +<!ENTITY torbutton.prefs.sec_custom_warning "Vlastní"> +<!ENTITY torbutton.prefs.sec_overview "Vypnout některé webové funkce, které mohou být zneužity k ohrožení vaší bezpečnosti a anonymity."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Úroveň zabezpečení: běžná"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Úroveň zabezpečení: bezpečnější"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Úroveň zabezpečení: nejbezpečnější"> +<!ENTITY torbutton.prefs.sec_custom_summary "Vaše nastavení prohlížeče neodpovídá standardnímu nastavení zabezpečení. Z důvodu ochrany soukromí a zvýšení bezpečnosti vám doporučujeme vybrat si jednu z výchozích bezpečnostních úrovní."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Obnovit výchozí"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Rozšířená bezpečnostní nastavení…"> <!ENTITY torbutton.circuit_display.title "Tor okruh"> <!ENTITY torbutton.circuit_display.new_circuit "Nový okruh Toru pro tuto stránku"> diff --git a/chrome/locale/da/securityLevel.properties b/chrome/locale/da/securityLevel.properties deleted file mode 100644 index 5058084b..00000000 --- a/chrome/locale/da/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Sikkerhedsniveau -securityLevel.customWarning = Brugerdefineret -securityLevel.overview = Deaktivér bestemte webfunktionaliteter som kan bruges til angribe din sikkerhed og anonymitet. -securityLevel.standard.level = Standard -securityLevel.standard.tooltip = Sikkerhedsniveau : Standard -securityLevel.standard.summary = Alle Tor Browser- og webstedsfunktionaliteter er aktiveret. -securityLevel.safer.level = Mere sikker -securityLevel.safer.tooltip = Sikkerhedsniveau : Mere sikker -securityLevel.safer.summary = Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister deres funktionalitet. -securityLevel.safer.description1 = JavaScript er deaktiveret på ikke-HTTPS steder. -securityLevel.safer.description2 = Nogle skrifttyper og matematiksymboler er deaktiverede. -securityLevel.safer.description3 = Lyd og video (HTML5-medier) og WebGL er klik-for-at-afspille. -securityLevel.safest.level = Mest sikker -securityLevel.safest.tooltip = Sikkerhedsniveau : Mest sikker -securityLevel.safest.summary = Tillader kun webstedsfunktionaliteter som kræves til statiske steder og grundlæggende tjenester. Ændringerne påvirker billeder, medier og scripts. -securityLevel.safest.description1 = JavaScript er som standard deaktiveret på alle steder. -securityLevel.safest.description2 = Nogle skrifttyper, ikoner, matematiksymboler og billeder er deaktiveret. -securityLevel.safest.description3 = Lyd og video (HTML5-medier) er klik-for-at-afspille. -securityLevel.custom.summary = Dine tilpassede browserpræferencer har resulterede i usædvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsårsagen, anbefaler vi at du vælger en af standardsikkerhedsniveauerne. -securityLevel.learnMore = Lær mere -securityLevel.restoreDefaults = Gendan Standarder -securityLevel.advancedSecuritySettings = Avancerede sikkerhedsindstillinger… diff --git a/chrome/locale/da/torbutton.dtd b/chrome/locale/da/torbutton.dtd index b6d6c3ac..b6c24b0e 100644 --- a/chrome/locale/da/torbutton.dtd +++ b/chrome/locale/da/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Nogle skrifttyper og matematiksymboler er deaktiverede."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Nogle skrifttyper, ikoner, matematiksymboler og billeder er deaktiveret."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Lyd og video (HTML5-medier) og WebGL er klik-for-at-afspille."> +<!ENTITY torbutton.prefs.sec_custom_warning "Brugerdefineret"> +<!ENTITY torbutton.prefs.sec_overview "Deaktivér bestemte webfunktionaliteter som kan bruges til angribe din sikkerhed og anonymitet."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Sikkerhedsniveau : Standard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Sikkerhedsniveau : Mere sikker"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Sikkerhedsniveau : Mest sikker"> +<!ENTITY torbutton.prefs.sec_custom_summary "Dine tilpassede browserpræferencer har resulterede i usædvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsårsagen, anbefaler vi at du vælger en af standardsikkerhedsniveauerne."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Gendan Standarder"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Avancerede sikkerhedsindstillinger…"> <!ENTITY torbutton.circuit_display.title "Tor-kredsløb"> <!ENTITY torbutton.circuit_display.new_circuit "Nyt kredsløb til dette sted"> diff --git a/chrome/locale/de/securityLevel.properties b/chrome/locale/de/securityLevel.properties deleted file mode 100644 index 0358c462..00000000 --- a/chrome/locale/de/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Sicherheitsstufe -securityLevel.customWarning = Benutzerdefiniert -securityLevel.overview = Deaktiviere bestimmte Webfunktionen, welche verwendet werden können, um deine Sicherheit und Anonymität anzugreifen. -securityLevel.standard.level = Standard -securityLevel.standard.tooltip = Sicherheitsstufe: Standard -securityLevel.standard.summary = Alle Tor Browser und Webseiten Funktionen sind aktiviert. -securityLevel.safer.level = Sicherer -securityLevel.safer.tooltip = Sicherheitsstufe: Sicherer -securityLevel.safer.summary = Deaktiviert Webseiten-Funktionen, die oft gefährlich sind. Sorgt dafür, dass manche Seiten nicht mehr so gut funktionieren -securityLevel.safer.description1 = JavaScript ist auf Nicht-HTTTPS-Sites deaktiviert. -securityLevel.safer.description2 = Einige Schriftarten und mathematische Symbole sind deaktiviert. -securityLevel.safer.description3 = Ton und Bild (HTML5-Medien) und WebGL sind Click-to-Play. -securityLevel.safest.level = Am sichersten -securityLevel.safest.tooltip = Sicherheitsstufe: Am sichersten -securityLevel.safest.summary = Erlaubt nur Webseiten-Funktionen, die für statische Seiten und Basisdienste benötigt werden. Diese Änderungen betreffen Bilder, Medien und Skripte. -securityLevel.safest.description1 = JavaScript ist standardmäßig auf allen Seiten deaktiviert. -securityLevel.safest.description2 = Einige Schriftarten, Symbole, mathematische Symbole und Bilder sind deaktiviert. -securityLevel.safest.description3 = Audio und Video (HTML5-Medien) müssen zur Wiedergabe angeklickt werden. -securityLevel.custom.summary = Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewöhnlichen Sicherheitseinstellungen geführt. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir dir eine der vorgegebenen Sicherheitsstufen auszuwählen. -securityLevel.learnMore = Erfahre mehr -securityLevel.restoreDefaults = Standardeinstellungen wiederherstellen -securityLevel.advancedSecuritySettings = Erweiterte Sicherheitseinstellungen … diff --git a/chrome/locale/de/torbutton.dtd b/chrome/locale/de/torbutton.dtd index 7bcdd386..f146fac3 100644 --- a/chrome/locale/de/torbutton.dtd +++ b/chrome/locale/de/torbutton.dtd @@ -23,8 +23,7 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schützen"> <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler kannst du bestimmte Browserfunktionen, die deinen Browser für mögliche Attacken anfälliger machen, deaktivieren."> -<!ENTITY torbutton.prefs.sec_standard_label "Standard -"> +<!ENTITY torbutton.prefs.sec_standard_label "Standard"> <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser und Webseiten Funktionen sind aktiviert."> <!ENTITY torbutton.prefs.sec_safer_label "Sicherer"> <!ENTITY torbutton.prefs.sec_safer_description "Deaktiviert Webseiten-Funktionen, die oft gefährlich sind. Sorgt dafür, dass manche Seiten nicht mehr so gut funktionieren"> @@ -38,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Einige Schriftarten und mathematische Symbole sind deaktiviert."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Einige Schriftarten, Symbole, mathematische Symbole und Bilder sind deaktiviert."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Ton und Bild (HTML5-Medien) und WebGL sind Click-to-Play."> +<!ENTITY torbutton.prefs.sec_custom_warning "Benutzerdefiniert"> +<!ENTITY torbutton.prefs.sec_overview "Deaktiviere bestimmte Webfunktionen, welche verwendet werden können, um deine Sicherheit und Anonymität anzugreifen."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Sicherheitsstufe: Standard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Sicherheitsstufe: Sicherer"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Sicherheitsstufe: Am sichersten"> +<!ENTITY torbutton.prefs.sec_custom_summary "Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewöhnlichen Sicherheitseinstellungen geführt. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir dir eine der vorgegebenen Sicherheitsstufen auszuwählen."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Standardeinstellungen wiederherstellen"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Erweiterte Sicherheitseinstellungen …"> <!ENTITY torbutton.circuit_display.title "Tor Kanal"> <!ENTITY torbutton.circuit_display.new_circuit "Neuen Kanal für diese Seite"> diff --git a/chrome/locale/el/securityLevel.properties b/chrome/locale/el/securityLevel.properties deleted file mode 100644 index 78dee581..00000000 --- a/chrome/locale/el/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Επίπεδο ασφάλειας -securityLevel.customWarning = Προσαρμογή -securityLevel.overview = Απενεργοποιήστε ορισμένα χαρακτηριστικά του διαδικτύου που μπορεί να χρησιμοποιηθούν για επιθέσεις εναντίον της ασφάλειας και της ανωνυμίας σας. -securityLevel.standard.level = Βασικό -securityLevel.standard.tooltip = Επίπεδο ασφαλείας: Βασικό -securityLevel.standard.summary = Όλες οι παροχές του περιηγητή Tor και της ιστοσελίδας είναι ενεργοποιημένες. -securityLevel.safer.level = Ασφαλέστερο -securityLevel.safer.tooltip = Επίπεδο ασφαλείας: Ασφαλέστερο -securityLevel.safer.summary = Απενεργοποιεί παροχές ιστοσελίδων που είναι επικίνδυνες και οδηγούν κάποιες ιστοσελίδες στο να χάνουν λειτουργικότητα. -securityLevel.safer.description1 = Η JavaScript είναι απενεργοποιημένη σε ιστότοπους που δεν είναι HTTPS. -securityLevel.safer.description2 = Μερικές γραμματοσειρές και μαθηματικά σύμβολα είναι απενεργοποιημένα. -securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. -securityLevel.safest.level = Ασφαλέστατο -securityLevel.safest.tooltip = Επίπεδο ασφαλείας: Ασφαλέστατο -securityLevel.safest.summary = Επιτρέπει μόνο τις παροχές ιστοσελίδας που απαιτούνται για βασικές ιστοσελίδες και υπηρεσίες. Αυτό επηρεάζει εικόνες, μέσα και scripts. -securityLevel.safest.description1 = Η JavaScript είναι απενεργοποιημένη σε όλους τους ιστότοπους ως προεπιλογή. -securityLevel.safest.description2 = Ορισμένες γραμματοσειρές, εικονίδια, μαθηματικά σύμβολα και εικόνες είναι απενεργοποιημένα. -securityLevel.safest.description3 = Οι ήχοι και τα βίντεο (μέσα HTML5) παίζουν, αφού γίνει κλικ για αναπαραγωγή. -securityLevel.custom.summary = Οι προσαρμοσμένες προτιμήσεις του browser σας έχουν οδηγήσει σε ασυνήθιστες ρυθμίσεις ασφάλειας. Για λόγους ασφαλείας και ιδιωτικότητας, προτείνουμε να επιλέξετε ένα από τα προεπιλεγμένα επίπεδα ασφάλειας. -securityLevel.learnMore = Μάθε περισσότερα -securityLevel.restoreDefaults = Επαναφορά προεπιλογών -securityLevel.advancedSecuritySettings = Ρυθμίσεις ασφαλείας για προχωρημένους... diff --git a/chrome/locale/el/torbutton.dtd b/chrome/locale/el/torbutton.dtd index 83f40ded..d2e51f99 100644 --- a/chrome/locale/el/torbutton.dtd +++ b/chrome/locale/el/torbutton.dtd @@ -31,11 +31,19 @@ <!ENTITY torbutton.prefs.sec_safest_label "Ασφαλέστατο"> <!ENTITY torbutton.prefs.sec_safest_description "Επιτρέπει μόνο τις παροχές ιστοσελίδας που απαιτούνται για βασικές ιστοσελίδες και υπηρεσίες. Αυτό επηρεάζει εικόνες, μέσα και scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Στην πιο ασφαλή ρύθμιση:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Μάθετε περισσότερα"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Μάθε περισσότερα"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Η JavaScript είναι απενεργοποιημένη σε ιστότοπους που δεν είναι HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "Η JavaScript είναι απενεργοποιημένη σε όλους τους ιστότοπους ως προεπιλογή."> <!ENTITY torbutton.prefs.sec_limit_typography "Μερικές γραμματοσειρές και μαθηματικά σύμβολα είναι απενεργοποιημένα."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Ορισμένες γραμματοσειρές, εικονίδια, μαθηματικά σύμβολα και εικόνες είναι απενεργοποιημένα."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> +<!ENTITY torbutton.prefs.sec_custom_warning "Προσαρμογή "> +<!ENTITY torbutton.prefs.sec_overview "Απενεργοποιήστε ορισμένα χαρακτηριστικά του διαδικτύου που μπορεί να χρησιμοποιηθούν για επιθέσεις εναντίον της ασφάλειας και της ανωνυμίας σας."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Επίπεδο ασφαλείας: Βασικό"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Επίπεδο ασφαλείας: Ασφαλέστερο"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Επίπεδο ασφαλείας: Ασφαλέστατο"> +<!ENTITY torbutton.prefs.sec_custom_summary "Οι προσαρμοσμένες προτιμήσεις του browser σας έχουν οδηγήσει σε ασυνήθιστες ρυθμίσεις ασφάλειας. Για λόγους ασφαλείας και ιδιωτικότητας, προτείνουμε να επιλέξετε ένα από τα προεπιλεγμένα επίπεδα ασφάλειας."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Επαναφορά προεπιλογών"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Ρυθμίσεις ασφαλείας για προχωρημένους..."> <!ENTITY torbutton.circuit_display.title "Κύκλωμα Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Νέο κύκλωμα για αυτή την ιστοσελίδα"> diff --git a/chrome/locale/en-US/securityLevel.properties b/chrome/locale/en-US/securityLevel.properties deleted file mode 100644 index 1b941b5c..00000000 --- a/chrome/locale/en-US/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Security Level -securityLevel.customWarning = Custom -securityLevel.overview = Disable certain web features that can be used to attack your security and anonymity. -securityLevel.standard.level = Standard -securityLevel.standard.tooltip = Security Level : Standard -securityLevel.standard.summary = All Tor Browser and website features are enabled. -securityLevel.safer.level = Safer -securityLevel.safer.tooltip = Security Level : Safer -securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality. -securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites. -securityLevel.safer.description2 = Some fonts and math symbols are disabled. -securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. -securityLevel.safest.level = Safest -securityLevel.safest.tooltip = Security Level : Safest -securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. -securityLevel.safest.description1 = JavaScript is disabled by default on all sites. -securityLevel.safest.description2 = Some fonts, icons, math symbols, and images are disabled. -securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-play. -securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. -securityLevel.learnMore = Learn more -securityLevel.restoreDefaults = Restore Defaults -securityLevel.advancedSecuritySettings = Advanced Security Settings… diff --git a/chrome/locale/en-US/torbutton.dtd b/chrome/locale/en-US/torbutton.dtd index 2e106f60..d14bd1da 100644 --- a/chrome/locale/en-US/torbutton.dtd +++ b/chrome/locale/en-US/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> +<!ENTITY torbutton.prefs.sec_custom_warning "Custom"> +<!ENTITY torbutton.prefs.sec_overview "Disable certain web features that can be used to attack your security and anonymity."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Security Level : Standard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Security Level : Safer"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Security Level : Safest"> +<!ENTITY torbutton.prefs.sec_custom_summary "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Restore Defaults"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> <!ENTITY torbutton.circuit_display.title "Tor Circuit"> <!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/chrome/locale/eo/securityLevel.properties b/chrome/locale/eo/securityLevel.properties deleted file mode 100644 index aa80f5cb..00000000 --- a/chrome/locale/eo/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Restaŭri defaŭltojn diff --git a/chrome/locale/eo/torbutton.dtd b/chrome/locale/eo/torbutton.dtd index a4c2f3ab..646768b9 100644 --- a/chrome/locale/eo/torbutton.dtd +++ b/chrome/locale/eo/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Restaŭri defaŭltojn"> diff --git a/chrome/locale/es-AR/securityLevel.properties b/chrome/locale/es-AR/securityLevel.properties deleted file mode 100644 index 0c8564d2..00000000 --- a/chrome/locale/es-AR/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Nivel de Seguridad -securityLevel.customWarning = Personalizado -securityLevel.overview = Deshabilita ciertas funciones web que pueden usarse para atacar su seguridad y anonimato. -securityLevel.standard.level = Estándar -securityLevel.standard.tooltip = Nivel de Seguridad: Estándar -securityLevel.standard.summary = Todas las características del Navegador Tor y el sitio web están habilitadas. -securityLevel.safer.level = Más seguro -securityLevel.safer.tooltip = Nivel de Seguridad: Más Seguro -securityLevel.safer.summary = Deshabilita características del sitio web que son a menudo peligrosas, causando que algunos sitios pierdan funcionalidad. -securityLevel.safer.description1 = JavaScript está deshabilitado en sitios no-HTTPS. -securityLevel.safer.description2 = Algunos tipos de letra y símbolos matemáticos están deshabilitados. -securityLevel.safer.description3 = Audio y video (medios HTML5) son cliquear-para-reproducir. -securityLevel.safest.level = El más seguro -securityLevel.safest.tooltip = Nivel de Seguridad: El más Seguro -securityLevel.safest.summary = Sólo permite características del sitio web requeridas por sitios estáticos y servicios básicos. Estos cambios afectan imágenes, medios y código ejecutable. -securityLevel.safest.description1 = JavaScript está deshabilitado por defecto en todos los sitios. -securityLevel.safest.description2 = Algunos tipos de letra, iconos, símbolos matemáticos e imágenes están deshabilitados. -securityLevel.safest.description3 = Audio y video (medios HTML5) son cliquear-para-reproducir. -securityLevel.custom.summary = Tus preferencias personalizadas del navegador han resultado en ajustes de seguridad inusuales. Por razones de seguridad y privacidad, recomendamos que elijas uno de los niveles de seguridad por defecto. -securityLevel.learnMore = Aprendé más -securityLevel.restoreDefaults = Restablecer valores por defecto -securityLevel.advancedSecuritySettings = Configuración de Seguridad Avanzada diff --git a/chrome/locale/es-AR/torbutton.dtd b/chrome/locale/es-AR/torbutton.dtd index 3d2315af..b45d0e84 100644 --- a/chrome/locale/es-AR/torbutton.dtd +++ b/chrome/locale/es-AR/torbutton.dtd @@ -21,21 +21,29 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas salvo las protegidas "> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies"> -<!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad"> +<!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad"> <!ENTITY torbutton.prefs.sec_caption_tooltip "La regla deslizante de Seguridad te deja deshabilitar ciertas características del navegador que pueden hacerlo más vulnerable a intentos de apropiación."> <!ENTITY torbutton.prefs.sec_standard_label "Estándar"> -<!ENTITY torbutton.prefs.sec_standard_description "Todas las características del navegador Tor y el sitio web están habilitadas."> +<!ENTITY torbutton.prefs.sec_standard_description "Todas las características del Navegador Tor y el sitio web están habilitadas."> <!ENTITY torbutton.prefs.sec_safer_label "Más seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Deshabilita características del sitio web que son a menudo peligrosas, causando que algunos sitios pierdan funcionalidad."> <!ENTITY torbutton.prefs.sec_safer_list_label "En el ajuste "Más seguro":"> -<!ENTITY torbutton.prefs.sec_safest_label "En extremo seguro"> +<!ENTITY torbutton.prefs.sec_safest_label "El más seguro"> <!ENTITY torbutton.prefs.sec_safest_description "Sólo permite características del sitio web requeridas por sitios estáticos y servicios básicos. Estos cambios afectan imágenes, medios y código ejecutable."> <!ENTITY torbutton.prefs.sec_safest_list_label "En el ajuste "En extremo seguro":"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Más informacion"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Aprendé más"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está deshabilitado en sitios no-HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está deshabilitado por defecto en todos los sitios."> <!ENTITY torbutton.prefs.sec_limit_typography "Algunos tipos de letra y símbolos matemáticos están deshabilitados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunos tipos de letra, iconos, símbolos matemáticos e imágenes están deshabilitados."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y video (medios HTML5) son cliquear-para-reproducir."> +<!ENTITY torbutton.prefs.sec_custom_warning "Personalizado"> +<!ENTITY torbutton.prefs.sec_overview "Deshabilita ciertas funciones web que pueden usarse para atacar su seguridad y anonimato."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Nivel de Seguridad: Estándar"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Nivel de Seguridad: Más Seguro"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Nivel de Seguridad: El más Seguro"> +<!ENTITY torbutton.prefs.sec_custom_summary "Tus preferencias personalizadas del navegador han resultado en ajustes de seguridad inusuales. Por razones de seguridad y privacidad, recomendamos que elijas uno de los niveles de seguridad por defecto."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Restablecer valores por defecto"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Configuración de Seguridad Avanzada"> <!ENTITY torbutton.circuit_display.title "Circuito Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Nuevo circuito para este sitio"> diff --git a/chrome/locale/es-ES/securityLevel.properties b/chrome/locale/es-ES/securityLevel.properties deleted file mode 100644 index a9af1de6..00000000 --- a/chrome/locale/es-ES/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Nivel de seguridad -securityLevel.customWarning = Personalizado -securityLevel.overview = Deshabilita ciertas funciones web que se pueden usar para atacar tu seguridad y anonimato. -securityLevel.standard.level = Estándar -securityLevel.standard.tooltip = Nivel de seguridad: Estándar -securityLevel.standard.summary = Están habilitadas todas las características de Tor Browser y sitio web. -securityLevel.safer.level = Más seguro -securityLevel.safer.tooltip = Nivel de seguridad: Más seguro -securityLevel.safer.summary = Deshabilita características del sitio web que a menudo son peligrosas, lo que causa que algunos sitios pierdan funcionalidad. -securityLevel.safer.description1 = JavaScript está deshabilitado en sitios no-HTTPS. -securityLevel.safer.description2 = Algunas fuentes y símbolos matemáticos están deshabilitados. -securityLevel.safer.description3 = Audio y vídeo (HTML5 media), y WebGL son click-to-play. -securityLevel.safest.level = El más seguro de todos -securityLevel.safest.tooltip = Nivel de seguridad: El más seguro de todos -securityLevel.safest.summary = Sólo permite las características de sitio web requeridas para sitios estáticos y servicios básicos. Estos cambios afectan a imágenes, medios, y scripts. -securityLevel.safest.description1 = JavaScript está deshabilitado por defecto en todos los sitios. -securityLevel.safest.description2 = Algunas fuentes, iconos, símbolos matemáticos, e imágenes están deshabilitados. -securityLevel.safest.description3 = Audio y vídeo (media HTML5) son de tipo pulsar-para-reproducir. -securityLevel.custom.summary = Tus preferencias personalizadas para el navegador han resultado en una configuración de seguridad inusual. Por motivos de seguridad y privacidad, te recomendamos uno de los de los niveles de seguridad predeterminados. -securityLevel.learnMore = Conocer más -securityLevel.restoreDefaults = Restaurar valores predeterminados -securityLevel.advancedSecuritySettings = Configuración de seguridad avanzada ... diff --git a/chrome/locale/es-ES/torbutton.dtd b/chrome/locale/es-ES/torbutton.dtd index 816b2b7c..a644831a 100644 --- a/chrome/locale/es-ES/torbutton.dtd +++ b/chrome/locale/es-ES/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Algunas fuentes y símbolos matemáticos están deshabilitados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunas fuentes, iconos, símbolos matemáticos, e imágenes están deshabilitados."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y vídeo (HTML5 media), y WebGL son click-to-play."> +<!ENTITY torbutton.prefs.sec_custom_warning "Personalizado"> +<!ENTITY torbutton.prefs.sec_overview "Deshabilita ciertas funciones web que se pueden usar para atacar tu seguridad y anonimato."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Nivel de seguridad: Estándar"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Nivel de seguridad: Más seguro"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Nivel de seguridad: El más seguro de todos"> +<!ENTITY torbutton.prefs.sec_custom_summary "Tus preferencias personalizadas para el navegador han resultado en una configuración de seguridad inusual. Por motivos de seguridad y privacidad, te recomendamos uno de los de los niveles de seguridad predeterminados."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Restaurar valores predeterminados"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Configuración de seguridad avanzada ..."> <!ENTITY torbutton.circuit_display.title "Circuito Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Nuevo Circuito para este Sitio"> diff --git a/chrome/locale/eu/securityLevel.properties b/chrome/locale/eu/securityLevel.properties deleted file mode 100644 index 08ea80dc..00000000 --- a/chrome/locale/eu/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Segurtasun maila -securityLevel.customWarning = Pertsonalizatua -securityLevel.overview = Disable certain web features that can be used to attack your security and anonymity. -securityLevel.standard.level = Estandarra -securityLevel.standard.tooltip = Security Level : Standard -securityLevel.standard.summary = Tor Nabigatzailearen eta web-orriaren ezaugarri guztiak gaituta daude. -securityLevel.safer.level = Seguruagoa -securityLevel.safer.tooltip = Security Level : Safer -securityLevel.safer.summary = Askotan arriskutsuak diren webguneen ezaugarriak ezgaitzen ditu, gune batzuen funtzionalitatea galduz. -securityLevel.safer.description1 = JavaScript ezgaituta dago HTTPS ez diren web-orrietan. -securityLevel.safer.description2 = Letra-mota eta ikur matematiko batzuk ezgaituta daude. -securityLevel.safer.description3 = Audioa eta bideoa (HTML5 media), eta WebGL erreproduzitzeko klikatu behar da. -securityLevel.safest.level = Seguruena -securityLevel.safest.tooltip = Security Level : Safest -securityLevel.safest.summary = Gune estatikoek eta zerbitzuek behar dituzten ezaugarriak onartzen ditu soilik. Aldaketak hauek irudiei, mediari, eta scritpei eragiten diete. -securityLevel.safest.description1 = JavaScripta ezgaituta dago gune guztietan. -securityLevel.safest.description2 = Letra-mota, ikono, ikur matematiko batzuk eta irudiak ezgaituta daude. -securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-play. -securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. -securityLevel.learnMore = Gehiago jakin -securityLevel.restoreDefaults = Lehenetsiak berrezarri -securityLevel.advancedSecuritySettings = Advanced Security Settings… diff --git a/chrome/locale/eu/torbutton.dtd b/chrome/locale/eu/torbutton.dtd index 66632851..9a1adb7b 100644 --- a/chrome/locale/eu/torbutton.dtd +++ b/chrome/locale/eu/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Letra-mota eta ikur matematiko batzuk ezgaituta daude."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Letra-mota, ikono, ikur matematiko batzuk eta irudiak ezgaituta daude."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audioa eta bideoa (HTML5 media), eta WebGL erreproduzitzeko klikatu behar da."> +<!ENTITY torbutton.prefs.sec_custom_warning "Pertsonalizatua"> +<!ENTITY torbutton.prefs.sec_overview "Disable certain web features that can be used to attack your security and anonymity."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Security Level : Standard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Security Level : Safer"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Security Level : Safest"> +<!ENTITY torbutton.prefs.sec_custom_summary "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Lehenetsiak berrezarri"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> <!ENTITY torbutton.circuit_display.title "Tor Zirkuitoa"> <!ENTITY torbutton.circuit_display.new_circuit "Zirkuito berria Gune honetarako"> diff --git a/chrome/locale/fa/securityLevel.properties b/chrome/locale/fa/securityLevel.properties deleted file mode 100644 index 888cf7d0..00000000 --- a/chrome/locale/fa/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = سطح امنیت -securityLevel.customWarning = تنظیم خاص -securityLevel.overview = بعضی خصیصه‌های وب را که می‌تواند جهت تعرض به امنیت و گمنامی شما مورد استفاده قرار گیرد غیر فعال نمایید. -securityLevel.standard.level = استاندارد -securityLevel.standard.tooltip = سطح امنیت: استاندارد -securityLevel.standard.summary = همه مرورگر تور و ویژگی‌های وبسایت به کار انداخته شده‌اند. -securityLevel.safer.level = ایمن تر -securityLevel.safer.tooltip = سطح امنیت: ایمن‌تر -securityLevel.safer.summary = از کار انداختن ویژگی‌های وبسایت که اغلب خطرناک هستند و باعث از دست رفتن برخی سایت‌ها می‌شوند. -securityLevel.safer.description1 = جاوا اسکریپت روی سایت‌های غیر HTTPS کار نمی‌کند. -securityLevel.safer.description2 = برخی از فونت ها و نمادهای ریاضی غیرفعال هستند -securityLevel.safer.description3 = صدا و تصویر (رسانه HTML5) و WebGL قابل باز شدن با کلیک هستند. -securityLevel.safest.level = ایمن ترین -securityLevel.safest.tooltip = سطح امنیت: ایمن‌ترین -securityLevel.safest.summary = تنها اجازه می‌دهد که ویژگی‌های وبسایت برای سایت‌های ایستا و خدمات پایه مورد نیاز باشد. این تغییرات بر تصاویر، رسانه‌ها و متن تاثیر می‌گذارند. -securityLevel.safest.description1 = جاوا اسکریپت به طور پیش فرض در تمامی سایت ها غیر فعال است. -securityLevel.safest.description2 = برخی از فونت ها، شمایل‌ها، علایم ریاضی و تصاویر از کار افتاده هستند. -securityLevel.safest.description3 = صدا و ویدیو ( HTML5 رسانه ) برای بازی کلیک می‌کنند. -securityLevel.custom.summary = تنظیمات سفارشی شما در مرورگر منجر به تغییرات غیر معمول در تنظیمات امنیتی شده است.برای امن نگه داشتن حریم خصوصی خود ما پیشنهاد میکنیم یکی از تنظیمات پیشفرض امنیتی را انتخاب کنید. -securityLevel.learnMore = اطلاعات بیشتر -securityLevel.restoreDefaults = بازگردانی تنظیمات اولیه -securityLevel.advancedSecuritySettings = تنظیمات پیشرفته امنیت ... diff --git a/chrome/locale/fa/torbutton.dtd b/chrome/locale/fa/torbutton.dtd index 6f6b2582..5883e8ef 100644 --- a/chrome/locale/fa/torbutton.dtd +++ b/chrome/locale/fa/torbutton.dtd @@ -25,10 +25,10 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "نوار لغزنده امنیتی به شما اجازه می‌دهد که مشخصه‌های خاص مرورگر را غیرفعال کنید که ممکن است مرورگر شما را در برابر تلاش‌های هک آسیب‌پذیر سازد."> <!ENTITY torbutton.prefs.sec_standard_label "استاندارد"> <!ENTITY torbutton.prefs.sec_standard_description "همه مرورگر تور و ویژگی‌های وبسایت به کار انداخته شده‌اند."> -<!ENTITY torbutton.prefs.sec_safer_label "ایمن تر "> +<!ENTITY torbutton.prefs.sec_safer_label "ایمن تر"> <!ENTITY torbutton.prefs.sec_safer_description "از کار انداختن ویژگی‌های وبسایت که اغلب خطرناک هستند و باعث از دست رفتن برخی سایت‌ها می‌شوند."> <!ENTITY torbutton.prefs.sec_safer_list_label "تنظیم مکانی امن‌تر:"> -<!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین "> +<!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین"> <!ENTITY torbutton.prefs.sec_safest_description "تنها اجازه می‌دهد که ویژگی‌های وبسایت برای سایت‌های ایستا و خدمات پایه مورد نیاز باشد. این تغییرات بر تصاویر، رسانه‌ها و متن تاثیر می‌گذارند."> <!ENTITY torbutton.prefs.sec_safest_list_label "تنظیم امن‌ترین مکان"> <!ENTITY torbutton.prefs.sec_learn_more_label "اطلاعات بیشتر"> @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "برخی از فونت ها و نمادهای ریاضی غیرفعال هستند"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "برخی از فونت ها، شمایل‌ها، علایم ریاضی و تصاویر از کار افتاده هستند."> <!ENTITY torbutton.prefs.sec_click_to_play_media "صدا و تصویر (رسانه HTML5) و WebGL قابل باز شدن با کلیک هستند."> +<!ENTITY torbutton.prefs.sec_custom_warning "تنظیم خاص"> +<!ENTITY torbutton.prefs.sec_overview "بعضی خصیصه‌های وب را که می‌تواند جهت تعرض به امنیت و گمنامی شما مورد استفاده قرار گیرد غیر فعال نمایید."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "سطح امنیت: استاندارد"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "سطح امنیت: ایمن‌تر"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "سطح امنیت: ایمن‌ترین"> +<!ENTITY torbutton.prefs.sec_custom_summary "تنظیمات سفارشی شما در مرورگر منجر به تغییرات غیر معمول در تنظیمات امنیتی شده است.برای امن نگه داشتن حریم خصوصی خود ما پیشنهاد میکنیم یکی از تنظیمات پیشفرض امنیتی را انتخاب کنید. "> +<!ENTITY torbutton.prefs.sec_restore_defaults "بازگردانی تنظیمات اولیه"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "تنظیمات پیشرفته امنیت ..."> <!ENTITY torbutton.circuit_display.title "مدار تور"> <!ENTITY torbutton.circuit_display.new_circuit "مدار جدید برای این سایت"> diff --git a/chrome/locale/fi/securityLevel.properties b/chrome/locale/fi/securityLevel.properties deleted file mode 100644 index f270671f..00000000 --- a/chrome/locale/fi/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Palauta Oletukset diff --git a/chrome/locale/fi/torbutton.dtd b/chrome/locale/fi/torbutton.dtd index d2088a6a..3be4a7ef 100644 --- a/chrome/locale/fi/torbutton.dtd +++ b/chrome/locale/fi/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Poista kaikki paitsi suojatut"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evästeet"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Älä suojaa uusia evästeitä"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Palauta Oletukset"> diff --git a/chrome/locale/fr/securityLevel.properties b/chrome/locale/fr/securityLevel.properties deleted file mode 100644 index c548747a..00000000 --- a/chrome/locale/fr/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Niveau de sécurité -securityLevel.customWarning = Personnalisé -securityLevel.overview = Désactive certaines fonctions Web qui peuvent être utilisées pour attaquer votre sécurité et votre anonymat. -securityLevel.standard.level = Normal -securityLevel.standard.tooltip = Niveau de sécurité : normal -securityLevel.standard.summary = Toutes les fonctions du Navigateur Tor et des sites Web sont activées. -securityLevel.safer.level = Plus sûr -securityLevel.safer.tooltip = Niveau de sécurité : plus sûr -securityLevel.safer.summary = Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web. -securityLevel.safer.description1 = JavaScript est désactivé pour les sites non HTTPS. -securityLevel.safer.description2 = Certaines polices et certains symboles mathématiques sont désactivés. -securityLevel.safer.description3 = Le son et la vidéo (médias HTML5) ainsi que WebGL sont « cliquer pour lire ». -securityLevel.safest.level = Le plus sûr -securityLevel.safest.tooltip = Niveau de sécurité : le plus sûr -securityLevel.safest.summary = Ne permet que les fonctions de sites Web exigées pour les sites statiques et les services de base. Ces changements affectent les images, les médias et les scripts. -securityLevel.safest.description1 = JavaScript est désactivé par défaut pour tous les sites. -securityLevel.safest.description2 = Certaines polices, icônes, images et certains symboles mathématiques sont désactivés. -securityLevel.safest.description3 = Le son et la vidéo (médias HTML5) sont « cliquer pour lire ». -securityLevel.custom.summary = Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des données personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut. -securityLevel.learnMore = En apprendre davantage -securityLevel.restoreDefaults = Rétablir les paramètres par défaut -securityLevel.advancedSecuritySettings = Paramètres de sécurité avancés… diff --git a/chrome/locale/fr/torbutton.dtd b/chrome/locale/fr/torbutton.dtd index e54ce1c1..ed86525a 100644 --- a/chrome/locale/fr/torbutton.dtd +++ b/chrome/locale/fr/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Certaines polices et certains symboles mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Certaines polices, icônes, images et certains symboles mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Le son et la vidéo (médias HTML5) ainsi que WebGL sont « cliquer pour lire »."> +<!ENTITY torbutton.prefs.sec_custom_warning "Personnalisé"> +<!ENTITY torbutton.prefs.sec_overview "Désactive certaines fonctions Web qui peuvent être utilisées pour attaquer votre sécurité et votre anonymat."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Niveau de sécurité : normal"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Niveau de sécurité : plus sûr"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Niveau de sécurité : le plus sûr"> +<!ENTITY torbutton.prefs.sec_custom_summary "Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des données personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Rétablir les paramètres par défaut"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Paramètres de sécurité avancés…"> <!ENTITY torbutton.circuit_display.title "Circuit Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Nouveau circuit pour ce site"> diff --git a/chrome/locale/ga-IE/securityLevel.properties b/chrome/locale/ga-IE/securityLevel.properties deleted file mode 100644 index 8423dd67..00000000 --- a/chrome/locale/ga-IE/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Leibhéal Slándála -securityLevel.customWarning = Saincheaptha -securityLevel.overview = Díchumasaigh gnéithe áirithe a d'fhéadfaí a úsáid chun ionsaí a dhéanamh ort nó d'aitheantas a nochtadh. -securityLevel.standard.level = Gnáthshlándáil -securityLevel.standard.tooltip = Leibhéal Slándála: Gnáthleibhéal -securityLevel.standard.summary = Gach gné de bhrabhsálaí Tor agus gach gné de shuímh Ghréasáin ar siúl. -securityLevel.safer.level = Níos Sábháilte -securityLevel.safer.tooltip = Leibhéal Slándála: Níos Sábháilte -securityLevel.safer.summary = Díchumasaítear gnéithe de shuímh atá contúirteach go minic; dá bharr seo, ní fheidhmeoidh gach suíomh mar is ceart. -securityLevel.safer.description1 = Tá JavaScript díchumasaithe ar shuímh nach mbaineann úsáid as HTTPS. -securityLevel.safer.description2 = Tá roinnt clófhoirne agus siombailí matamaiticiúla díchumasaithe. -securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. -securityLevel.safest.level = Is Sábháilte -securityLevel.safest.tooltip = Leibhéal Slándála: Is Sábháilte -securityLevel.safest.summary = Ní cheadaítear ach na gnéithe atá de dhíth ar shuímh statacha agus ar bhunseirbhísí. Téann na hathruithe seo i bhfeidhm ar íomhánna, ar mheáin, agus ar scripteanna. -securityLevel.safest.description1 = Tá JavaScript díchumasaithe ar gach suíomh de réir réamhshocraithe. -securityLevel.safest.description2 = Tá roinnt clófhoirne, deilbhíní, siombailí matamaiticiúla, agus íomhánna díchumasaithe. -securityLevel.safest.description3 = Caithfidh tú fuaimeanna agus físeáin (meáin HTML5) a chliceáil lena seinm. -securityLevel.custom.summary = Tá socruithe slándála an bhrabhsálaí as an ngnáth faoi láthair, mar thoradh ar do chuid sainroghanna. Ar chúiseanna slándála agus príobháideachais, molaimid duit ceann de na leibhéil slándála réamhshocraithe a roghnú. -securityLevel.learnMore = Tuilleadh eolais -securityLevel.restoreDefaults = Fill ar na Réamhshocruithe -securityLevel.advancedSecuritySettings = Ardsocruithe Slándála... diff --git a/chrome/locale/ga-IE/torbutton.dtd b/chrome/locale/ga-IE/torbutton.dtd index 68191bc3..dbaee6a0 100644 --- a/chrome/locale/ga-IE/torbutton.dtd +++ b/chrome/locale/ga-IE/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Tá roinnt clófhoirne agus siombailí matamaiticiúla díchumasaithe."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Tá roinnt clófhoirne, deilbhíní, siombailí matamaiticiúla, agus íomhánna díchumasaithe."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> +<!ENTITY torbutton.prefs.sec_custom_warning "Saincheaptha"> +<!ENTITY torbutton.prefs.sec_overview "Díchumasaigh gnéithe áirithe a d'fhéadfaí a úsáid chun ionsaí a dhéanamh ort nó d'aitheantas a nochtadh."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Leibhéal Slándála: Gnáthleibhéal"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Leibhéal Slándála: Níos Sábháilte"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Leibhéal Slándála: Is Sábháilte"> +<!ENTITY torbutton.prefs.sec_custom_summary "Tá socruithe slándála an bhrabhsálaí as an ngnáth faoi láthair, mar thoradh ar do chuid sainroghanna. Ar chúiseanna slándála agus príobháideachais, molaimid duit ceann de na leibhéil slándála réamhshocraithe a roghnú."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Fill ar na Réamhshocruithe"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Ardsocruithe Slándála..."> <!ENTITY torbutton.circuit_display.title "Ciorcad Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Ciorcad Nua don Suíomh seo"> diff --git a/chrome/locale/gl/securityLevel.properties b/chrome/locale/gl/securityLevel.properties deleted file mode 100644 index fd621499..00000000 --- a/chrome/locale/gl/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Restabelecer valores predeterminados diff --git a/chrome/locale/gl/torbutton.dtd b/chrome/locale/gl/torbutton.dtd index c6ae5f79..f64c9e42 100644 --- a/chrome/locale/gl/torbutton.dtd +++ b/chrome/locale/gl/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Restabelecer valores predeterminados"> diff --git a/chrome/locale/gu/securityLevel.properties b/chrome/locale/gu/securityLevel.properties deleted file mode 100644 index e6eabc59..00000000 --- a/chrome/locale/gu/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = મૂળભૂત પાછું લાવો diff --git a/chrome/locale/gu/torbutton.dtd b/chrome/locale/gu/torbutton.dtd index 0a9faa2d..8eca1722 100644 --- a/chrome/locale/gu/torbutton.dtd +++ b/chrome/locale/gu/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "મૂળભૂત પાછું લાવો"> diff --git a/chrome/locale/he/securityLevel.properties b/chrome/locale/he/securityLevel.properties deleted file mode 100644 index f10d98e3..00000000 --- a/chrome/locale/he/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = רמת אבטחה -securityLevel.customWarning = מותאמת אישית -securityLevel.overview = השבת מאפייני אתר מסוימים אשר יכולים לשמש כדי לתקוף את אבטחתך ואלמוניותך. -securityLevel.standard.level = תקנית -securityLevel.standard.tooltip = רמת אבטחה: תקנית -securityLevel.standard.summary = כל המאפיינים של דפדפן Tor ומאפייני אתר מאופשרים. -securityLevel.safer.level = בטוחה יותר -securityLevel.safer.tooltip = רמת אבטחה: בטוחה יותר -securityLevel.safer.summary = משבית מאפייני אתר שמסוכנים לעיתים קרובות, מה שגורם למספר אתרים לאבד תפקודיות. -securityLevel.safer.description1 = JavaScript מושבת בכל האתרים שאינם HTTPS. -securityLevel.safer.description2 = מספר גופנים וסמלים מתמטיים מושבתים. -securityLevel.safer.description3 = שמע, וידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן. -securityLevel.safest.level = הכי בטוחה -securityLevel.safest.tooltip = רמת אבטחה: הכי בטוחה -securityLevel.safest.summary = מתיר רק למאפייני אתר הדרושים עבור אתרים נייחים ושירותים יסודיים. שינויים אלו משפיעים על תמונות, מדיה ותסריטים. -securityLevel.safest.description1 = JavaScript מושבת כברירת מחדל בכל האתרים. -securityLevel.safest.description2 = מספר גופנים, צלמיות, סמלים מתמטיים ותמונות מושבתים. -securityLevel.safest.description3 = שמע ווידיאו (מדית HTML5) הם לחץ־כדי־לנגן. -securityLevel.custom.summary = העדפות הדפדפן המותאמות שלך נבעו מהגדרות אבטחה בלתי שגרתיות. מטעמי אבטחה ופרטיות, אנו ממליצים לך לבחור באחת מרמות האבטחה של ברירת המחדל. -securityLevel.learnMore = למד עוד -securityLevel.restoreDefaults = שחזר ברירות מחדל -securityLevel.advancedSecuritySettings = הגדרות אבטחה מתקדמות... diff --git a/chrome/locale/he/torbutton.dtd b/chrome/locale/he/torbutton.dtd index 1e2bffbd..77527559 100644 --- a/chrome/locale/he/torbutton.dtd +++ b/chrome/locale/he/torbutton.dtd @@ -23,12 +23,12 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "אל תגן על עוגיות חדשות"> <!ENTITY torbutton.prefs.sec_caption "רמת אבטחה"> <!ENTITY torbutton.prefs.sec_caption_tooltip "מחוון האבטחה נותן לך להשבית תכונות דפדפן מסוימות אשר עלולות לעשות את הדפדפן שלך יותר פגיע לנסיונות פיצוח."> -<!ENTITY torbutton.prefs.sec_standard_label "תקני"> -<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מושבתים."> -<!ENTITY torbutton.prefs.sec_safer_label "בטוח יותר"> +<!ENTITY torbutton.prefs.sec_standard_label "תקנית"> +<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מאופשרים."> +<!ENTITY torbutton.prefs.sec_safer_label "בטוחה יותר"> <!ENTITY torbutton.prefs.sec_safer_description "משבית מאפייני אתר שמסוכנים לעיתים קרובות, מה שגורם למספר אתרים לאבד תפקודיות."> <!ENTITY torbutton.prefs.sec_safer_list_label "בהגדרה הבטוחה יותר:"> -<!ENTITY torbutton.prefs.sec_safest_label "הכי בטוח"> +<!ENTITY torbutton.prefs.sec_safest_label "הכי בטוחה"> <!ENTITY torbutton.prefs.sec_safest_description "מתיר רק למאפייני אתר הדרושים עבור אתרים נייחים ושירותים יסודיים. שינויים אלו משפיעים על תמונות, מדיה ותסריטים."> <!ENTITY torbutton.prefs.sec_safest_list_label "בהגדרה הבטוחה ביותר:"> <!ENTITY torbutton.prefs.sec_learn_more_label "למד עוד"> @@ -36,6 +36,14 @@ <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript מושבת כברירת מחדל בכל האתרים."> <!ENTITY torbutton.prefs.sec_limit_typography "מספר גופנים וסמלים מתמטיים מושבתים."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "מספר גופנים, צלמיות, סמלים מתמטיים ותמונות מושבתים."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "שמע ווידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "שמע, וידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן."> +<!ENTITY torbutton.prefs.sec_custom_warning "מותאמת אישית"> +<!ENTITY torbutton.prefs.sec_overview "השבת מאפייני אתר מסוימים אשר יכולים לשמש כדי לתקוף את אבטחתך ואלמוניותך."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "רמת אבטחה: תקנית"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "רמת אבטחה: בטוחה יותר"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "רמת אבטחה: הכי בטוחה"> +<!ENTITY torbutton.prefs.sec_custom_summary "העדפות הדפדפן המותאמות שלך נבעו מהגדרות אבטחה בלתי שגרתיות. מטעמי אבטחה ופרטיות, אנו ממליצים לך לבחור באחת מרמות האבטחה של ברירת המחדל."> +<!ENTITY torbutton.prefs.sec_restore_defaults "שחזר ברירות מחדל"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "הגדרות אבטחה מתקדמות..."> <!ENTITY torbutton.circuit_display.title "מעגל Tor"> <!ENTITY torbutton.circuit_display.new_circuit "מעגל חדש עבור אתר זה"> diff --git a/chrome/locale/hu/securityLevel.properties b/chrome/locale/hu/securityLevel.properties deleted file mode 100644 index ecb5ab1c..00000000 --- a/chrome/locale/hu/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Biztonsági szint -securityLevel.customWarning = Egyéni -securityLevel.overview = Néhány web szolgáltatás kikapcsolása, amit támadhatja biztonságát és anonimitását. -securityLevel.standard.level = Normál -securityLevel.standard.tooltip = Biztonsági szint: Normál -securityLevel.standard.summary = Minden Tor Browser és weboldal szolgáltatás engedélyezve. -securityLevel.safer.level = Biztonságosabb -securityLevel.safer.tooltip = Biztonsági szint: Biztonságosabb -securityLevel.safer.summary = Azon weboldal szolgáltatások tiltása, amelyek többnyire veszélyesek, ami néhány oldal működésének problémáit okozhatja. -securityLevel.safer.description1 = A JavaScript tiltott a nem-HTTPS oldalkon. -securityLevel.safer.description2 = Néhány betűtípus és matematikai szimbólum tiltásra került. -securityLevel.safer.description3 = Az audió és videó (HTML5 média) és a WebGL kattintásra indul. -securityLevel.safest.level = Legbiztonságosabb -securityLevel.safest.tooltip = Biztonsági szint: Legbiztonságosabb -securityLevel.safest.summary = Csak azon weboldal szolgáltatások engedélyezése, amelyek a statikus, vagy alap szolgáltatásokhoz szükségesek. Ezek a beállítások érintik a képeket, médiákat és scripteket. -securityLevel.safest.description1 = A JavaScript alapértelmezetten tiltott minden oldalon. -securityLevel.safest.description2 = Néhány betűtípus, ikon és matematikai szimbólum és a képek tiltásra kerültek. -securityLevel.safest.description3 = Audió és videó (HTML5 média) kattintásra indul. -securityLevel.custom.summary = Az Ön által eszközölt egyéni böngészői beállítások eredményeképp biztonsági kockázatok merülhetnek fel. Biztonsági és adatvédelmi szempontokból kérjük válasszon az alapértelmezett biztonsági szintek közül. -securityLevel.learnMore = További információ -securityLevel.restoreDefaults = Alapértelmezések visszaállítása -securityLevel.advancedSecuritySettings = Speciális biztonsági beállítások... diff --git a/chrome/locale/hu/torbutton.dtd b/chrome/locale/hu/torbutton.dtd index 0c0b05b5..c25c63bf 100644 --- a/chrome/locale/hu/torbutton.dtd +++ b/chrome/locale/hu/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Néhány betűtípus és matematikai szimbólum tiltásra került."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Néhány betűtípus, ikon és matematikai szimbólum és a képek tiltásra kerültek."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Az audió és videó (HTML5 média) és a WebGL kattintásra indul."> +<!ENTITY torbutton.prefs.sec_custom_warning "Egyéni"> +<!ENTITY torbutton.prefs.sec_overview "Néhány web szolgáltatás kikapcsolása, amit támadhatja biztonságát és anonimitását."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Biztonsági szint: Normál"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Biztonsági szint: Biztonságosabb"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Biztonsági szint: Legbiztonságosabb"> +<!ENTITY torbutton.prefs.sec_custom_summary "Az Ön által eszközölt egyéni böngészői beállítások eredményeképp biztonsági kockázatok merülhetnek fel. Biztonsági és adatvédelmi szempontokból kérjük válasszon az alapértelmezett biztonsági szintek közül."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Alapértelmezések visszaállítása"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Speciális biztonsági beállítások..."> <!ENTITY torbutton.circuit_display.title "Tor áramkör"> <!ENTITY torbutton.circuit_display.new_circuit "Új Tor áramkör ehhez az oldalhoz"> diff --git a/chrome/locale/id/securityLevel.properties b/chrome/locale/id/securityLevel.properties deleted file mode 100644 index 0b618b65..00000000 --- a/chrome/locale/id/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Tingkat Keamanan -securityLevel.customWarning = Kustom -securityLevel.overview = Menonaktifkan fitur web tertentu yang dapat digunakan untuk menyerang keamanan dan anonimitas Anda. -securityLevel.standard.level = Standar -securityLevel.standard.tooltip = Tingkat Keamanan: Standar -securityLevel.standard.summary = Semua fitur dari Tor Browser dan situs web diaktifkan. -securityLevel.safer.level = Lebih aman -securityLevel.safer.tooltip = Tingkat Keamanan: Lebih aman -securityLevel.safer.summary = Menonaktifkan fitur-fitur situs web yang sering berbahaya, ini akan membuat beberapa situs kehilangan fungsionalitas. -securityLevel.safer.description1 = JavaScript dinonaktifkan di semua situs non-HTTPS. -securityLevel.safer.description2 = Beberapa font dan simbol matematika dinonaktifkan. -securityLevel.safer.description3 = Audio dan video (media HTML5), dan WebGL dijalankan saat diklik. -securityLevel.safest.level = Paling aman -securityLevel.safest.tooltip = Tingkat Keamanan: Paling aman -securityLevel.safest.summary = Hanya mengizinkan fitur-fitur situs web yang diperlukan untuk menjalankan situs web statis dan layanan dasar. Perubahan ini mempengaruhi gambar, media, dan skrip. -securityLevel.safest.description1 = JavaScript dinonaktifkan secara bawaan di semua situs. -securityLevel.safest.description2 = Beberapa font, icon, simbol matematika, dan gambar dinonaktifkan. -securityLevel.safest.description3 = Audio dan video (media HTML5) dijalankan saat diklik. -securityLevel.custom.summary = Preferensi peramban khusus Anda telah membuat pengaturan keamanan yang tidak biasa. Untuk alasan keamanan dan privasi, kami menyarankan Anda untuk memilih satu dari tingkat keamanan bawaan. -securityLevel.learnMore = Pelajari Selengkapnya -securityLevel.restoreDefaults = Kembalikan ke Standar -securityLevel.advancedSecuritySettings = Pengaturan Keamanan Lanjutan... diff --git a/chrome/locale/id/torbutton.dtd b/chrome/locale/id/torbutton.dtd index 989a9972..414a7554 100644 --- a/chrome/locale/id/torbutton.dtd +++ b/chrome/locale/id/torbutton.dtd @@ -29,13 +29,21 @@ <!ENTITY torbutton.prefs.sec_safer_description "Menonaktifkan fitur-fitur situs web yang sering berbahaya, ini akan membuat beberapa situs kehilangan fungsionalitas."> <!ENTITY torbutton.prefs.sec_safer_list_label "Di pengaturan yang lebih aman:"> <!ENTITY torbutton.prefs.sec_safest_label "Paling aman"> -<!ENTITY torbutton.prefs.sec_safest_description "Hanya menjalankan fitur-fitur situs yang diperlukan untuk menjalankan situs web statis dan servis dasar. Perubahan ini mempengaruhi gambar, media, dan skrip."> +<!ENTITY torbutton.prefs.sec_safest_description "Hanya mengizinkan fitur-fitur situs web yang diperlukan untuk menjalankan situs web statis dan layanan dasar. Perubahan ini mempengaruhi gambar, media, dan skrip."> <!ENTITY torbutton.prefs.sec_safest_list_label "Di pengaturan yang paling aman:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Pelajari lebih lanjut"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Pelajari Selengkapnya"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript dinonaktifkan di semua situs non-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript dinonaktifkan secara default di semua situs."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript dinonaktifkan secara bawaan di semua situs."> <!ENTITY torbutton.prefs.sec_limit_typography "Beberapa font dan simbol matematika dinonaktifkan."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Beberapa font, icon, simbol matematika, dan gambar dinonaktifkan."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio dan video (media HTML5), dan WebGL dijalankan saat diklik."> +<!ENTITY torbutton.prefs.sec_custom_warning "Kustom "> +<!ENTITY torbutton.prefs.sec_overview "Menonaktifkan fitur web tertentu yang dapat digunakan untuk menyerang keamanan dan anonimitas Anda."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Tingkat Keamanan: Standar"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Tingkat Keamanan: Lebih aman"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Tingkat Keamanan: Paling aman"> +<!ENTITY torbutton.prefs.sec_custom_summary "Preferensi peramban khusus Anda telah membuat pengaturan keamanan yang tidak biasa. Untuk alasan keamanan dan privasi, kami menyarankan Anda untuk memilih satu dari tingkat keamanan bawaan."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Kembalikan ke Standar"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Pengaturan Keamanan Lanjutan..."> <!ENTITY torbutton.circuit_display.title "Sirkuit Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Sirkuit Baru untuk Situs Ini"> diff --git a/chrome/locale/is/securityLevel.properties b/chrome/locale/is/securityLevel.properties deleted file mode 100644 index b079f648..00000000 --- a/chrome/locale/is/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Öryggisstig -securityLevel.customWarning = Sérsniðið -securityLevel.overview = Gera ýmsa eiginleika vefsíðna óvirka, sem hægt væri að nota til árása á öryggi þitt og gagnaleynd. -securityLevel.standard.level = Staðlað -securityLevel.standard.tooltip = Öryggisstig: Staðlað -securityLevel.standard.summary = Allir eiginleikar Tor-vafrans og vefsvæðisins eru virkjaðir. -securityLevel.safer.level = Öruggara -securityLevel.safer.tooltip = Öryggisstig: Öruggara -securityLevel.safer.summary = Gerir óvirka ýmsa eiginleika vefsvæða sem oft eru hættulegir, en veldur því að sum vefsvæði hætta að virka eins og þau eiga að gera. -securityLevel.safer.description1 = JavaScript er óvirkt á öllum ekki-HTTPS vefjum. -securityLevel.safer.description2 = Sumt letur og stærðfræðitákn eru óvirk. -securityLevel.safer.description3 = Hljóð og myndskeið (HTML5-gagnamiðla) ásamt WebGL þarf að smella á til að spila. -securityLevel.safest.level = Öruggast -securityLevel.safest.tooltip = Öryggisstig: Öruggast -securityLevel.safest.summary = Leyfir aðeins þá eiginleika vefsvæða sem krafist er fyrir beinan lestur (static sites) og grunnþjónustur. Þessar breytingar hafa áhrif á myndir, margmiðlunargögn og skriftur. -securityLevel.safest.description1 = JavaScript er sjálfgefið óvirkt á öllum vefsvæðum. -securityLevel.safest.description2 = Sumt letur, táknmyndir, myndir og stærðfræðitákn eru óvirk. -securityLevel.safest.description3 = Hljóð og myndskeið (HTML5-gagnamiðla) þarf að smella á til að spila. -securityLevel.custom.summary = Sérsniðnar kjörstillingar vafrans þíns valda mjög óvenjulegum öryggisstillingum. Til að uppfylla sem best öryggi og gagnaleynd, mælum við með því að þú veljir eitt af sjálfgefnum öryggisstigum. -securityLevel.learnMore = Fræðast frekar -securityLevel.restoreDefaults = Frumstilla á sjálfgefið -securityLevel.advancedSecuritySettings = Ítarlegar öryggisstillingar… diff --git a/chrome/locale/is/torbutton.dtd b/chrome/locale/is/torbutton.dtd index c791d6a0..e1bdf583 100644 --- a/chrome/locale/is/torbutton.dtd +++ b/chrome/locale/is/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Sumt letur og stærðfræðitákn eru óvirk."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sumt letur, táknmyndir, myndir og stærðfræðitákn eru óvirk."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Hljóð og myndskeið (HTML5-gagnamiðla) ásamt WebGL þarf að smella á til að spila."> +<!ENTITY torbutton.prefs.sec_custom_warning "Sérsniðið"> +<!ENTITY torbutton.prefs.sec_overview "Gera ýmsa eiginleika vefsíðna óvirka, sem hægt væri að nota til árása á öryggi þitt og gagnaleynd."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Öryggisstig: Staðlað"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Öryggisstig: Öruggara"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Öryggisstig: Öruggast"> +<!ENTITY torbutton.prefs.sec_custom_summary "Sérsniðnar kjörstillingar vafrans þíns valda mjög óvenjulegum öryggisstillingum. Til að uppfylla sem best öryggi og gagnaleynd, mælum við með því að þú veljir eitt af sjálfgefnum öryggisstigum."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Frumstilla á sjálfgefið"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Ítarlegar öryggisstillingar…"> <!ENTITY torbutton.circuit_display.title "Tor-rás"> <!ENTITY torbutton.circuit_display.new_circuit "Ný rás fyrir þetta vefsvæði"> diff --git a/chrome/locale/it/securityLevel.properties b/chrome/locale/it/securityLevel.properties deleted file mode 100644 index d4015a02..00000000 --- a/chrome/locale/it/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Livello di Sicurezza -securityLevel.customWarning = Personalizzata -securityLevel.overview = Disabilita alcune funzionalità web che possono essere utilizzate per attaccare la tua sicurezza e anonimato. -securityLevel.standard.level = Standard -securityLevel.standard.tooltip = Livello di sicurezza: Standard -securityLevel.standard.summary = Tutte le funzionalità di Tor Browser e dei siti sono attive. -securityLevel.safer.level = Sicuro -securityLevel.safer.tooltip = Livello di sicurezza: Più sicuro -securityLevel.safer.summary = Disattiva le caratteristiche dei siti spesso pericolose, causando la perdita di funzionalità di alcuni siti. -securityLevel.safer.description1 = JavaScript è disattivato nei siti non-HTTPS. -securityLevel.safer.description2 = Alcuni caratteri e simboli matematici sono disattivati. -securityLevel.safer.description3 = Audio, video (media HTML5) e WebGL sono click-to-play. -securityLevel.safest.level = Molto sicuro -securityLevel.safest.tooltip = Livello di sicurezza: Il più sicuro -securityLevel.safest.summary = Permette solo le funzionalità necessarie per siti statici e servizi di base. Queste modifiche influiscono su immagini, media e script. -securityLevel.safest.description1 = JavaScript è disattivato in tutti i siti in modo predefinito. -securityLevel.safest.description2 = Alcuni caratteri, icone, simboli matematici e immagini sono disattivati. -securityLevel.safest.description3 = Audio e video (media HTML5) sono click-to-play. -securityLevel.custom.summary = Le tue impostazioni personalizzate del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti. -securityLevel.learnMore = Per saperne di più -securityLevel.restoreDefaults = Ripristina impostazioni iniziali -securityLevel.advancedSecuritySettings = Impostazioni di sicurezza avanzate... diff --git a/chrome/locale/it/torbutton.dtd b/chrome/locale/it/torbutton.dtd index cfd8af97..706fa599 100644 --- a/chrome/locale/it/torbutton.dtd +++ b/chrome/locale/it/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Alcuni caratteri e simboli matematici sono disattivati."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Alcuni caratteri, icone, simboli matematici e immagini sono disattivati."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio, video (media HTML5) e WebGL sono click-to-play."> +<!ENTITY torbutton.prefs.sec_custom_warning "Personalizzata"> +<!ENTITY torbutton.prefs.sec_overview "Disabilita alcune funzionalità web che possono essere utilizzate per attaccare la tua sicurezza e anonimato."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Livello di sicurezza: Standard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Livello di sicurezza: Più sicuro"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Livello di sicurezza: Il più sicuro"> +<!ENTITY torbutton.prefs.sec_custom_summary "Le tue impostazioni personalizzate del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Ripristina impostazioni iniziali"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Impostazioni di sicurezza avanzate..."> <!ENTITY torbutton.circuit_display.title "Circuito Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Nuovo circuito per questo sito"> diff --git a/chrome/locale/ja/securityLevel.properties b/chrome/locale/ja/securityLevel.properties deleted file mode 100644 index 292dbea8..00000000 --- a/chrome/locale/ja/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = セキュリティレベル -securityLevel.customWarning = カスタム -securityLevel.overview = セキュリティと匿名性を攻撃するために利用されるあるウェブ機能を無効にする。 -securityLevel.standard.level = 標準 -securityLevel.standard.tooltip = セキュリティレベル：標準 -securityLevel.standard.summary = Tor Browser とウェブサイトのすべての機能が有効化されます。 -securityLevel.safer.level = より安全 -securityLevel.safer.tooltip = セキュリティレベル：やや安全 -securityLevel.safer.summary = ウェブサイトのしばしば危険である機能を無効化します。サイトによっては正常に動作しなくなります。 -securityLevel.safer.description1 = HTTPS非対応のサイトで JavaScript が無効化されます。 -securityLevel.safer.description2 = いくつかのフォントと数学記号が無効化されます。 -securityLevel.safer.description3 = オーディオ、ビデオ(HTML5メディア)、WebGLはクリックすると再生されます。 -securityLevel.safest.level = 最も安全 -securityLevel.safest.tooltip = セキュリティレベル：最も安全 -securityLevel.safest.summary = 静的なサイトと基本的なサービスに必要な機能だけを許可します。この変更は画像、メディア、スクリプトに影響します。 -securityLevel.safest.description1 = すべてのサイトで JavaScript が無効化されます。 -securityLevel.safest.description2 = いくつかのアイコン、数学記号および画像が無効化されます。 -securityLevel.safest.description3 = オーディオとビデオ(HTML5メディア)はクリックすると再生されます。 -securityLevel.custom.summary = あなたのブラウザーにおけるカスタム設定はセキュリティ結果に影響を及ぼしません。セキュリティとプライバシーに関してはデフォルトのセキュリティレベルのひとつを選択することをおすすめいたします。 -securityLevel.learnMore = さらに知る -securityLevel.restoreDefaults = デフォルトにもどす -securityLevel.advancedSecuritySettings = 詳細セキュリティ設定... diff --git a/chrome/locale/ja/torbutton.dtd b/chrome/locale/ja/torbutton.dtd index 0c1d43ab..321a052b 100644 --- a/chrome/locale/ja/torbutton.dtd +++ b/chrome/locale/ja/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "いくつかのフォントと数学記号が無効化されます。"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "いくつかのアイコン、数学記号および画像が無効化されます。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "オーディオ、ビデオ(HTML5メディア)、WebGLはクリックすると再生されます。"> +<!ENTITY torbutton.prefs.sec_custom_warning "カスタム"> +<!ENTITY torbutton.prefs.sec_overview "セキュリティと匿名性を攻撃するために利用されるあるウェブ機能を無効にする。"> +<!ENTITY torbutton.prefs.sec_standard_tooltip "セキュリティレベル：標準"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "セキュリティレベル：やや安全"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "セキュリティレベル：最も安全"> +<!ENTITY torbutton.prefs.sec_custom_summary "あなたのブラウザーにおけるカスタム設定はセキュリティ結果に影響を及ぼしません。セキュリティとプライバシーに関してはデフォルトのセキュリティレベルのひとつを選択することをおすすめいたします。"> +<!ENTITY torbutton.prefs.sec_restore_defaults "デフォルトにもどす"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "詳細セキュリティ設定..."> <!ENTITY torbutton.circuit_display.title "Tor サーキット"> <!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使用する"> diff --git a/chrome/locale/ka/securityLevel.properties b/chrome/locale/ka/securityLevel.properties deleted file mode 100644 index b009b829..00000000 --- a/chrome/locale/ka/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = უსაფრთხოების დონე -securityLevel.customWarning = მითითებული -securityLevel.overview = გაითიშება შესაძლებლობების ნაწილი, რომლებიც უსაფრთხოებაზე შეტევებისა და პირადი მონაცემების ხელყოფისთვის შეიძლება გამოიყენონ. -securityLevel.standard.level = ჩვეულებრივი -securityLevel.standard.tooltip = უსაფრთხოების დონე : ჩვეულებრივი -securityLevel.standard.summary = Tor-ბრაუზერისა და ვებსაიტის ყველა შესაძლებლობა ჩართულია. -securityLevel.safer.level = მეტად დაცული -securityLevel.safer.tooltip = უსაფრთხოების დონე : მეტად დაცული -securityLevel.safer.summary = გაითიშება ვებსაიტის საფრთხისშემცველი შესაძლებლობები, სავარაუდოდ საიტების ნაწილი ვერ იმუშავებს გამართულად. -securityLevel.safer.description1 = JavaScript გათიშულია HTTPS-ს არმქონე ყველა საიტზე. -securityLevel.safer.description2 = შრიფტებისა და მათემატიკური სიმბოლოების ნაწილი გათიშულია. -securityLevel.safer.description3 = ხმოვანი და ვიდეოფაილები (HTML5), აგრეთვე WebGL ეშვება მხოლოდ დაწკაპებით. -securityLevel.safest.level = სრულიად დაცული -securityLevel.safest.tooltip = უსაფრთხოების დონე : სრულიად დაცული -securityLevel.safest.summary = დაშვებულია მხოლოდ ის შესაძლებლობები, რომლებსაც საჭიროებს უცვლელი შიგთავსის მქონე საიტები და ძირითადი მომსახურებები. ცვლილებები შეეხება სურათებს, ფაილებსა და სკრიპტებს. -securityLevel.safest.description1 = JavaScript გათიშულია ყველა საიტზე ნაგულისხმევად. -securityLevel.safest.description2 = შრიფტების, ხატულების, მათემატიკური სიმბოლოებისა და სურათების ნაწილი გათიშულია. -securityLevel.safest.description3 = ხმოვანი და ვიდეოფაილები (HTML5) ეშვება მხოლოდ დაწკაპებით. -securityLevel.custom.summary = თქვენ მიერ მითითებული პარამეტრები ბრაუზერში, არაა მისაღები უსაფრთხოებისთვის. პირადი მონაცემების სათანადოდ დაცვის უზრუნველსაყოფად, გირჩევთ შეარჩიოთ უსაფრთხოების ნაგულისხმევი დონეებიდან რომელიმე. -securityLevel.learnMore = იხილეთ ვრცლად -securityLevel.restoreDefaults = ნაგულისხმევის აღდგენა -securityLevel.advancedSecuritySettings = უსაფრთხოების დამატებითი პარამ. diff --git a/chrome/locale/ka/torbutton.dtd b/chrome/locale/ka/torbutton.dtd index bdf517ef..3997c67f 100644 --- a/chrome/locale/ka/torbutton.dtd +++ b/chrome/locale/ka/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "შრიფტებისა და მათემატიკური სიმბოლოების ნაწილი გათიშულია."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "შრიფტების, ხატულების, მათემატიკური სიმბოლოებისა და სურათების ნაწილი გათიშულია."> <!ENTITY torbutton.prefs.sec_click_to_play_media "ხმოვანი და ვიდეოფაილები (HTML5), აგრეთვე WebGL ეშვება მხოლოდ დაწკაპებით."> +<!ENTITY torbutton.prefs.sec_custom_warning "მითითებული"> +<!ENTITY torbutton.prefs.sec_overview "გაითიშება შესაძლებლობების ნაწილი, რომლებიც უსაფრთხოებაზე შეტევებისა და პირადი მონაცემების ხელყოფისთვის შეიძლება გამოიყენონ."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "უსაფრთხოების დონე : ჩვეულებრივი"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "უსაფრთხოების დონე : მეტად დაცული"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "უსაფრთხოების დონე : სრულიად დაცული"> +<!ENTITY torbutton.prefs.sec_custom_summary "თქვენ მიერ მითითებული პარამეტრები ბრაუზერში, არაა მისაღები უსაფრთხოებისთვის. პირადი მონაცემების სათანადოდ დაცვის უზრუნველსაყოფად, გირჩევთ შეარჩიოთ უსაფრთხოების ნაგულისხმევი დონეებიდან რომელიმე."> +<!ENTITY torbutton.prefs.sec_restore_defaults "ნაგულისხმევის აღდგენა"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "უსაფრთხოების დამატებითი პარამ."> <!ENTITY torbutton.circuit_display.title "Tor-წრედი"> <!ENTITY torbutton.circuit_display.new_circuit "ახალი წრედი ამ საიტისთვის"> diff --git a/chrome/locale/ko/securityLevel.properties b/chrome/locale/ko/securityLevel.properties deleted file mode 100644 index 7e0f26c0..00000000 --- a/chrome/locale/ko/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = 보안 등급 -securityLevel.customWarning = 사용자 맞춤 -securityLevel.overview = 보안과 익명성을 공격하는 데 사용될 수 있는 특정한 웹의 기능을 해제합니다. -securityLevel.standard.level = 표준 -securityLevel.standard.tooltip = 보안 수준:표준 -securityLevel.standard.summary = 모든 Tor 브라우저와 웹사이트의 기능들이 활성화됩니다. -securityLevel.safer.level = 더 안전합니다 -securityLevel.safer.tooltip = 보안등급: 더욱 안전 -securityLevel.safer.summary = 이 설정을 하여 흔히 위험한 웹사이트의 기능이 비활성화하면, 일부 사이트의 기능들을 사용할 수 없습니다. -securityLevel.safer.description1 = HTTPS을 적용되지 않은 사이트에서는 JavaScript가 비활성화됩니다. -securityLevel.safer.description2 = 일부 글꼴과 수학기호가 비활성화됩니다. -securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. -securityLevel.safest.level = 제일 안전합니다 -securityLevel.safest.tooltip = 보안등급: 매우 안전 -securityLevel.safest.summary = 정적 사이트와 기본 서비스에 필요한 기능에만 허용됩니다. 이 변경사항들은 이미지, 미디어, 스크립트에 영향을 줍니다. -securityLevel.safest.description1 = 기본 설정으로 모든 사이트에서 자바스크립트는 비활성화되어 있습니다. -securityLevel.safest.description2 = 일부 글꼴과 아이콘, 수학기호, 이미지는 비활성화 됩니다. -securityLevel.safest.description3 = 오디오와 동영상(HTML5 media) 보려면 누르십시오. -securityLevel.custom.summary = 사용자 지정 브라우저 설정으로 인해 비정상적인 보안 설정이 발생했습니다. 보안 및 개인정보 보호를 위하여 보안 수준의 기본값 중 하나를 선택하는 것이 좋습니다. -securityLevel.learnMore = 더 알아보기 -securityLevel.restoreDefaults = 기본값으로 복구 -securityLevel.advancedSecuritySettings = 고급 보안 설정 diff --git a/chrome/locale/ko/torbutton.dtd b/chrome/locale/ko/torbutton.dtd index 2deef2ba..605c01e8 100644 --- a/chrome/locale/ko/torbutton.dtd +++ b/chrome/locale/ko/torbutton.dtd @@ -24,18 +24,26 @@ <!ENTITY torbutton.prefs.sec_caption "보안 등급"> <!ENTITY torbutton.prefs.sec_caption_tooltip "보안 슬라이더를 사용하면 특정 브라우저 기능이 비활성화 되어 브라우저가 해킹 시도에 취약해질 수 있습니다."> <!ENTITY torbutton.prefs.sec_standard_label "표준"> -<!ENTITY torbutton.prefs.sec_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화됩니다."> <!ENTITY torbutton.prefs.sec_safer_label "더 안전합니다"> -<!ENTITY torbutton.prefs.sec_safer_description "이 설정으로 흔히 위험한 웹사이트의 기능이 비활성화하면 일부의 사이트의 기능들을 사용 할 수 없습니다."> +<!ENTITY torbutton.prefs.sec_safer_description "이 설정을 하여 흔히 위험한 웹사이트의 기능이 비활성화하면, 일부 사이트의 기능들을 사용할 수 없습니다."> <!ENTITY torbutton.prefs.sec_safer_list_label "더 안전한 설정을 선택하고 있습니다:"> <!ENTITY torbutton.prefs.sec_safest_label "제일 안전합니다"> -<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능이만 용남합니다. 그 변경들은 사진이며 메디아며 스크립트를 영향할 것입니다."> +<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능에만 허용됩니다. 이 변경사항들은 이미지, 미디어, 스크립트에 영향을 줍니다."> <!ENTITY torbutton.prefs.sec_safest_list_label "제일 안전한 설정을 선택하고 있습니다:"> <!ENTITY torbutton.prefs.sec_learn_more_label "더 알아보기"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript가 HTTPS을 적용되지 않은 사이트에서 비활성화 됩니다."> -<!ENTITY torbutton.prefs.sec_js_disabled "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다."> -<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴이며 수학기호가 비활성화 됩니다."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴이며 상징이며 수학기호며 사진이 비활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "HTTPS을 적용되지 않은 사이트에서는 JavaScript가 비활성화됩니다."> +<!ENTITY torbutton.prefs.sec_js_disabled "기본 설정으로 모든 사이트에서 자바스크립트는 비활성화되어 있습니다."> +<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴과 수학기호가 비활성화됩니다."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴과 아이콘, 수학기호, 이미지는 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> +<!ENTITY torbutton.prefs.sec_custom_warning "사용자 맞춤"> +<!ENTITY torbutton.prefs.sec_overview "보안과 익명성을 공격하는 데 사용될 수 있는 특정한 웹의 기능을 해제합니다."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "보안 수준:표준"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "보안등급: 더욱 안전"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "보안등급: 매우 안전"> +<!ENTITY torbutton.prefs.sec_custom_summary "사용자 지정 브라우저 설정으로 인해 비정상적인 보안 설정이 발생했습니다. 보안 및 개인정보 보호를 위하여 보안 수준의 기본값 중 하나를 선택하는 것이 좋습니다."> +<!ENTITY torbutton.prefs.sec_restore_defaults "기본값으로 복구"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "고급 보안 설정"> <!ENTITY torbutton.circuit_display.title "토르 서킷"> <!ENTITY torbutton.circuit_display.new_circuit "이 사이트에서 새로운 서킷을 재구축"> diff --git a/chrome/locale/lt/securityLevel.properties b/chrome/locale/lt/securityLevel.properties deleted file mode 100644 index 92fcf4b1..00000000 --- a/chrome/locale/lt/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Atstatyti numatytuosius diff --git a/chrome/locale/lt/torbutton.dtd b/chrome/locale/lt/torbutton.dtd index 6cf6f9ca..ac9fb759 100644 --- a/chrome/locale/lt/torbutton.dtd +++ b/chrome/locale/lt/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Atstatyti numatytuosius"> diff --git a/chrome/locale/lv/securityLevel.properties b/chrome/locale/lv/securityLevel.properties deleted file mode 100644 index f3d2eab9..00000000 --- a/chrome/locale/lv/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Atjaunot noklusējuma vērtības diff --git a/chrome/locale/lv/torbutton.dtd b/chrome/locale/lv/torbutton.dtd index 2b52a966..06410222 100644 --- a/chrome/locale/lv/torbutton.dtd +++ b/chrome/locale/lv/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Noņemt visas, izņemot aizsargātās"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Aizsargāt jaunās sīkdatnes"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neaizsargāt jaunās sīkdatnes"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Atjaunot noklusējuma vērtības"> diff --git a/chrome/locale/mk/securityLevel.properties b/chrome/locale/mk/securityLevel.properties deleted file mode 100644 index ad7824bc..00000000 --- a/chrome/locale/mk/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Безбедносно ниво -securityLevel.customWarning = Прилагодено -securityLevel.overview = Оневозможи одредени веб можности кои можат да бидат користени за напад врз вашата безбедност и анонимност. -securityLevel.standard.level = Стандардно -securityLevel.standard.tooltip = Безбедносно ниво: Стандардно -securityLevel.standard.summary = Сите можности на Tor Browser и веб страните се овозможени. -securityLevel.safer.level = Побезбедно -securityLevel.safer.tooltip = Безбедносно ниво: Побезбедно -securityLevel.safer.summary = Оневозможува можности на веб страните кои често се опасни, сепак воедно предизвикувајќи некои веб страни да ја изгубат функционалноста. -securityLevel.safer.description1 = JavaScript е оневозможен на не-HTTPS веб страните. -securityLevel.safer.description2 = Некои фонтови и математички симболи се оневозможени. -securityLevel.safer.description3 = Аудио и видео (HTML5 медиа), и WebGL се кликни-да-пуштиш. -securityLevel.safest.level = Најбезбедно -securityLevel.safest.tooltip = Безбедносно ниво: Најбезбедно -securityLevel.safest.summary = Дозволува само можности на веб страните потребни за статичните страни и основните услужни сервиси. Овие измени влијаат на сликите, разни мултимедијални датотеки, и скрипти. -securityLevel.safest.description1 = JavaScript е стандардно оневозможен на сите веб страни. -securityLevel.safest.description2 = Некои фонтови, икони, математички симболи, и слики се оневозможени. -securityLevel.safest.description3 = Аудиото и видеото (HTML5 мултимедијата) се кликни-да-почне. -securityLevel.custom.summary = Вашите прилагодени својства на прелистувачот резултираа со невообичаени безбедносни поставки. Од причини поврзани со безбедноста и приватноста, ви препорачуваме да ги изберете почетните безбедносни нивоа. -securityLevel.learnMore = Научи повеќе -securityLevel.restoreDefaults = Врати на стандардно -securityLevel.advancedSecuritySettings = Напредни Безбедносни Поставки diff --git a/chrome/locale/mk/torbutton.dtd b/chrome/locale/mk/torbutton.dtd index 1d7224aa..f4a1aa14 100644 --- a/chrome/locale/mk/torbutton.dtd +++ b/chrome/locale/mk/torbutton.dtd @@ -26,10 +26,10 @@ <!ENTITY torbutton.prefs.sec_standard_label "Стандардно"> <!ENTITY torbutton.prefs.sec_standard_description "Сите можности на Tor Browser и веб страните се овозможени."> <!ENTITY torbutton.prefs.sec_safer_label "Побезбедно"> -<!ENTITY torbutton.prefs.sec_safer_description "Оневозможува можности на веб страните кои често се опасни, предизвикувајќи некои страни да ја изгубат функционалноста."> +<!ENTITY torbutton.prefs.sec_safer_description "Оневозможува можности на веб страните кои често се опасни, сепак воедно предизвикувајќи некои веб страни да ја изгубат функционалноста."> <!ENTITY torbutton.prefs.sec_safer_list_label "На побезбедна поставка:"> <!ENTITY torbutton.prefs.sec_safest_label "Најбезбедно"> -<!ENTITY torbutton.prefs.sec_safest_description "Дозволува само можности на веб страните потребни за статичните страни и основните услужни сервиси. Овие измени влијаат на сликите, разни мултимедијални датотеки, и на скрптите."> +<!ENTITY torbutton.prefs.sec_safest_description "Дозволува само можности на веб страните потребни за статичните страни и основните услужни сервиси. Овие измени влијаат на сликите, разни мултимедијални датотеки, и скрипти."> <!ENTITY torbutton.prefs.sec_safest_list_label "На најбезбедна поставка:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Научи повеќе"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript е оневозможен на не-HTTPS веб страните."> @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Некои фонтови и математички симболи се оневозможени."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Некои фонтови, икони, математички симболи, и слики се оневозможени."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Аудио и видео (HTML5 медиа), и WebGL се кликни-да-пуштиш."> +<!ENTITY torbutton.prefs.sec_custom_warning "Прилагодено"> +<!ENTITY torbutton.prefs.sec_overview "Оневозможи одредени веб можности кои можат да бидат користени за напад врз вашата безбедност и анонимност."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Безбедносно ниво: Стандардно"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Безбедносно ниво: Побезбедно"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Безбедносно ниво: Најбезбедно"> +<!ENTITY torbutton.prefs.sec_custom_summary "Вашите прилагодени својства на прелистувачот резултираа со невообичаени безбедносни поставки. Од причини поврзани со безбедноста и приватноста, ви препорачуваме да ги изберете почетните безбедносни нивоа."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Врати на стандардно"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Напредни Безбедносни Поставки"> <!ENTITY torbutton.circuit_display.title "Tor круг"> <!ENTITY torbutton.circuit_display.new_circuit "Нов круг за оваа веб страна"> diff --git a/chrome/locale/my/securityLevel.properties b/chrome/locale/my/securityLevel.properties deleted file mode 100644 index 69808509..00000000 --- a/chrome/locale/my/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = မူလအတိုင်း ပြန်ထားရန် diff --git a/chrome/locale/my/torbutton.dtd b/chrome/locale/my/torbutton.dtd index 06bc4078..eed16215 100644 --- a/chrome/locale/my/torbutton.dtd +++ b/chrome/locale/my/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "အားလုံးကို ဖယ်ထုတ်ပါ။ သို့သော် အကာအကွယ် လုပ်ထားသည်"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ကွတ်ကီးသစ်များကို ကာကွယ်ရန်"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ကွတ်ကီးသစ်များကို ကာကွယ်ခြင်း မပြုရန်"> +<!ENTITY torbutton.prefs.sec_restore_defaults " မူလအတိုင်း ပြန်ထားရန်"> diff --git a/chrome/locale/nb-NO/securityLevel.properties b/chrome/locale/nb-NO/securityLevel.properties deleted file mode 100644 index 68576128..00000000 --- a/chrome/locale/nb-NO/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Sikkerhetsnivå -securityLevel.customWarning = Egendefinert -securityLevel.overview = Deaktiver visse webfunksjoner som kan brukes til å angripe sikkerheten din og anonymiteten. -securityLevel.standard.level = Forvalg -securityLevel.standard.tooltip = Sikkerhetsnivå: Standard -securityLevel.standard.summary = Alle Tor-nettleser- og nettside-funksjoner er på. -securityLevel.safer.level = Tryggere -securityLevel.safer.tooltip = Sikkerhetsnivå: Sikrere -securityLevel.safer.summary = Skrur av nettsidefunksjoner som ofte er farlige, som gjør at noen sider blir skadelidende. -securityLevel.safer.description1 = JavaScript er avskrudd på sider som ikke er HTTPS. -securityLevel.safer.description2 = Noen skrifter og mattesymboler er avskrudd. -securityLevel.safer.description3 = Lyd og video (HTML5 media), og WebGL er klikk-å-spille. -securityLevel.safest.level = Tryggest -securityLevel.safest.tooltip = Sikkerhetsnivå: Sikreste -securityLevel.safest.summary = Tillater bare nettsidefunksjoner som kreves for statiske sider og grunnleggende tjenester. Disse endringene har innvirkning på bilder, media, og skript. -securityLevel.safest.description1 = JavaScript er som forvalg slått av for alle nettsteder. -securityLevel.safest.description2 = Noen skrifter, ikoner, mattesymboler og bilder er avskrudd. -securityLevel.safest.description3 = Lyd og video (HTML5-media) må klikkes for å spilles av. -securityLevel.custom.summary = Dine nettleserinnstillinger har ført med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivåene. -securityLevel.learnMore = Lær mer -securityLevel.restoreDefaults = Gjenopprett forvalg -securityLevel.advancedSecuritySettings = Avanserte sikkerhetsinnstillinger... diff --git a/chrome/locale/nb-NO/torbutton.dtd b/chrome/locale/nb-NO/torbutton.dtd index c79d3431..2ca38aa4 100644 --- a/chrome/locale/nb-NO/torbutton.dtd +++ b/chrome/locale/nb-NO/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Noen skrifter og mattesymboler er avskrudd."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Noen skrifter, ikoner, mattesymboler og bilder er avskrudd."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Lyd og video (HTML5 media), og WebGL er klikk-å-spille."> +<!ENTITY torbutton.prefs.sec_custom_warning "Egendefinert"> +<!ENTITY torbutton.prefs.sec_overview "Deaktiver visse webfunksjoner som kan brukes til å angripe sikkerheten din og anonymiteten."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Sikkerhetsnivå: Standard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Sikkerhetsnivå: Sikrere"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Sikkerhetsnivå: Sikreste"> +<!ENTITY torbutton.prefs.sec_custom_summary "Dine nettleserinnstillinger har ført med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivåene."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Gjenopprett forvalg"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Avanserte sikkerhetsinnstillinger..."> <!ENTITY torbutton.circuit_display.title "Tor Krets"> <!ENTITY torbutton.circuit_display.new_circuit "Ny Krets for denne siden"> diff --git a/chrome/locale/nl/securityLevel.properties b/chrome/locale/nl/securityLevel.properties deleted file mode 100644 index 25d29f72..00000000 --- a/chrome/locale/nl/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Beveiligingsniveau -securityLevel.customWarning = Aangepast -securityLevel.overview = Bepaalde websitefuncties uitschakelen die kunnen worden gebruikt om uw beveiliging en anonimiteit aan te vallen. -securityLevel.standard.level = Standaard -securityLevel.standard.tooltip = Beveiligingsniveau: standaard -securityLevel.standard.summary = Alle Tor Browser- en websitefuncties zijn ingeschakeld. -securityLevel.safer.level = Veiliger -securityLevel.safer.tooltip = Beveiligingsniveau: veiliger -securityLevel.safer.summary = Schakelt websitefuncties uit die vaak gevaarlijk zijn, waardoor sommige websites functionaliteit verliezen. -securityLevel.safer.description1 = JavaScript is uitgeschakeld op niet-HTTPS-websites. -securityLevel.safer.description2 = Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld. -securityLevel.safer.description3 = Audio en video (HTML5-media) zijn klikken-voor-afspelen. -securityLevel.safest.level = Veiligste -securityLevel.safest.tooltip = Beveiligingsniveau: veiligste -securityLevel.safest.summary = Staat alleen websitefuncties toe die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts. -securityLevel.safest.description1 = JavaScript is standaard uitgeschakeld op alle websites. -securityLevel.safest.description2 = Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld. -securityLevel.safest.description3 = Audio en video (HTML5-media) zijn klikken-voor-afspelen. -securityLevel.custom.summary = Uw aangepaste browservoorkeuren hebben tot ongebruikelijke beveiligingsinstellingen geleid. Uit veiligheids- en privacyoverwegingen raden we aan een van de standaard beveiligingsniveaus te kiezen. -securityLevel.learnMore = Meer info -securityLevel.restoreDefaults = Standaardwaarden herstellen -securityLevel.advancedSecuritySettings = Geavanceerde beveiligingsinstellingen… diff --git a/chrome/locale/nl/torbutton.dtd b/chrome/locale/nl/torbutton.dtd index a49811bb..3ab23642 100644 --- a/chrome/locale/nl/torbutton.dtd +++ b/chrome/locale/nl/torbutton.dtd @@ -29,13 +29,21 @@ <!ENTITY torbutton.prefs.sec_safer_description "Schakelt websitefuncties uit die vaak gevaarlijk zijn, waardoor sommige websites functionaliteit verliezen."> <!ENTITY torbutton.prefs.sec_safer_list_label "Op de veiliger instelling:"> <!ENTITY torbutton.prefs.sec_safest_label "Veiligste"> -<!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> +<!ENTITY torbutton.prefs.sec_safest_description "Staat alleen websitefuncties toe die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Op de veiligste instelling:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Leer Meer"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript zijn uitgeschakeld op non-HTTP sites."> -<!ENTITY torbutton.prefs.sec_js_disabled "Javascript zijn standaard uitgeschakeld op alle sites."> +<!ENTITY torbutton.prefs.sec_learn_more_label "Meer info"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is uitgeschakeld op niet-HTTPS-websites."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is standaard uitgeschakeld op alle websites."> <!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) en WebGL zijn klikken-voor-afspelen."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klikken-voor-afspelen."> +<!ENTITY torbutton.prefs.sec_custom_warning "Aangepast"> +<!ENTITY torbutton.prefs.sec_overview "Bepaalde websitefuncties uitschakelen die kunnen worden gebruikt om uw beveiliging en anonimiteit aan te vallen."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Beveiligingsniveau: standaard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Beveiligingsniveau: veiliger"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Beveiligingsniveau: veiligste"> +<!ENTITY torbutton.prefs.sec_custom_summary "Uw aangepaste browservoorkeuren hebben tot ongebruikelijke beveiligingsinstellingen geleid. Uit veiligheids- en privacyoverwegingen raden we aan een van de standaard beveiligingsniveaus te kiezen."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Standaardwaarden herstellen"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Geavanceerde beveiligingsinstellingen…"> <!ENTITY torbutton.circuit_display.title "Torcircuit"> <!ENTITY torbutton.circuit_display.new_circuit "Nieuw circuit voor deze website"> diff --git a/chrome/locale/pl/securityLevel.properties b/chrome/locale/pl/securityLevel.properties deleted file mode 100644 index 2a1ec00f..00000000 --- a/chrome/locale/pl/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Poziom bezpieczeństwa -securityLevel.customWarning = Dowolne -securityLevel.overview = Wyłącz niektóre funkcje internetowe, które mogą zostać użyte do zaatakowania Twojego bezpieczeństwa i anonimowości. -securityLevel.standard.level = Standardowy -securityLevel.standard.tooltip = Poziom bezpieczeństwa: Standardowy -securityLevel.standard.summary = Wszystkie funkcje Przeglądarki Tor i strony zostały włączone. -securityLevel.safer.level = Bezpieczniej -securityLevel.safer.tooltip = Poziom bezpieczeństwa: bezpieczniejszy -securityLevel.safer.summary = Wyłącza funkcje witryny, które często są niebezpieczne, co powoduje, że niektóre witryny tracą funkcjonalność. -securityLevel.safer.description1 = Obsługa skryptów Java na stronach bez HTTPS jest wyłączona. -securityLevel.safer.description2 = Niektóre fonty i symbole są wyłączone. -securityLevel.safer.description3 = Audio i wideo (media HTML5) i WebGL kliknij, aby odtworzyć. -securityLevel.safest.level = Najbezpieczniejszy -securityLevel.safest.tooltip = Poziom bezpieczeństwa: najbezpieczniejszy -securityLevel.safest.summary = Pozwala tylko na funkcje serwisu wymagane w przypadku witryn statycznych i podstawowych usług. Te zmiany dotyczą obrazów, multimediów i skryptów. -securityLevel.safest.description1 = JavaScript jest domyślnie wyłączona na wszystkich stronach. -securityLevel.safest.description2 = Niektóre fonty, ikony, symbole i obrazki są wyłączone. -securityLevel.safest.description3 = Dźwięk i obraz (media HTML5) to "kliknij, aby odtworzyć". -securityLevel.custom.summary = Niestandardowe preferencje przeglądarki spowodowały nietypowe ustawienia zabezpieczeń. Ze względów bezpieczeństwa i prywatności zalecamy wybranie jednego z domyślnych poziomów zabezpieczeń. -securityLevel.learnMore = Dowiedz się więcej -securityLevel.restoreDefaults = Przywróć domyślne -securityLevel.advancedSecuritySettings = Zaawansowane ustawienia zabezpieczeń… diff --git a/chrome/locale/pl/torbutton.dtd b/chrome/locale/pl/torbutton.dtd index c0760b06..a6cee069 100644 --- a/chrome/locale/pl/torbutton.dtd +++ b/chrome/locale/pl/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Niektóre fonty i symbole są wyłączone."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Niektóre fonty, ikony, symbole i obrazki są wyłączone."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio i wideo (media HTML5) i WebGL kliknij, aby odtworzyć."> +<!ENTITY torbutton.prefs.sec_custom_warning "Dowolne"> +<!ENTITY torbutton.prefs.sec_overview "Wyłącz niektóre funkcje internetowe, które mogą zostać użyte do zaatakowania Twojego bezpieczeństwa i anonimowości."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Poziom bezpieczeństwa: Standardowy"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Poziom bezpieczeństwa: bezpieczniejszy"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Poziom bezpieczeństwa: najbezpieczniejszy"> +<!ENTITY torbutton.prefs.sec_custom_summary "Niestandardowe preferencje przeglądarki spowodowały nietypowe ustawienia zabezpieczeń. Ze względów bezpieczeństwa i prywatności zalecamy wybranie jednego z domyślnych poziomów zabezpieczeń."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Przywróć domyślne"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Zaawansowane ustawienia zabezpieczeń…"> <!ENTITY torbutton.circuit_display.title "Obwód Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Nowy obwód dla tej strony"> diff --git a/chrome/locale/pt-BR/securityLevel.properties b/chrome/locale/pt-BR/securityLevel.properties deleted file mode 100644 index db090667..00000000 --- a/chrome/locale/pt-BR/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Nível de Segurança -securityLevel.customWarning = Personalizado -securityLevel.overview = Desabilita certos recursos web que podem ser usados para atacar sua segurança e anonimato. -securityLevel.standard.level = Padrão -securityLevel.standard.tooltip = Nível de Segurança: Padrão -securityLevel.standard.summary = Todos os recursos do Navegador Tor e do website estão ativos. -securityLevel.safer.level = Seguro -securityLevel.safer.tooltip = Nível de Segurança: Seguro -securityLevel.safer.summary = Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade. -securityLevel.safer.description1 = JavaScript está desativado em todos os sites sem HTTPS. -securityLevel.safer.description2 = Algumas fontes e símbolos matemáticos estão desativados. -securityLevel.safer.description3 = Áudio e vídeo (mídia HTML5) e WebGL são reproduzidos com um clique. -securityLevel.safest.level = Segurança máxima -securityLevel.safest.tooltip = Nível de Segurança: Segurança máxima -securityLevel.safest.summary = Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts. -securityLevel.safest.description1 = JavaScript está desativado por padrão em todos os sites. -securityLevel.safest.description2 = Algumas fontes, ícones, símbolos matemáticas e imagens estão desativadas. -securityLevel.safest.description3 = Clicar para tocar ou ver áudio ou vídeo (mídia HTML5). -securityLevel.custom.summary = As configurações personalizadas do seu navegador ficaram fora do comum. Por razões de segurança e de privacidade, recomendamos que você escolha um dos níveis padrões de segurança. -securityLevel.learnMore = Saber mais -securityLevel.restoreDefaults = Restaurar Padrões -securityLevel.advancedSecuritySettings = Configurações Avançadas de Segurança diff --git a/chrome/locale/pt-BR/torbutton.dtd b/chrome/locale/pt-BR/torbutton.dtd index 7e9db8ed..10fd6924 100644 --- a/chrome/locale/pt-BR/torbutton.dtd +++ b/chrome/locale/pt-BR/torbutton.dtd @@ -31,11 +31,19 @@ <!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Saber mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Algumas fontes e símbolos matemáticos estão desativados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algumas fontes, ícones, símbolos matemáticas e imagens estão desativadas."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Áudio e vídeo (mídia HTML5) e WebGL são reproduzidos com um clique."> +<!ENTITY torbutton.prefs.sec_custom_warning "Personalizado"> +<!ENTITY torbutton.prefs.sec_overview "Desabilita certos recursos web que podem ser usados para atacar sua segurança e anonimato."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Nível de Segurança: Padrão"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Nível de Segurança: Seguro"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Nível de Segurança: Segurança máxima"> +<!ENTITY torbutton.prefs.sec_custom_summary "As configurações personalizadas do seu navegador ficaram fora do comum. Por razões de segurança e de privacidade, recomendamos que você escolha um dos níveis padrões de segurança. "> +<!ENTITY torbutton.prefs.sec_restore_defaults "Restaurar Padrões"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Configurações Avançadas de Segurança"> <!ENTITY torbutton.circuit_display.title "Circuito Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Novo circuito para este site"> diff --git a/chrome/locale/pt/securityLevel.properties b/chrome/locale/pt/securityLevel.properties deleted file mode 100644 index 1c8fdfe2..00000000 --- a/chrome/locale/pt/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.securityLevel = Nível de Segurança diff --git a/chrome/locale/ro/securityLevel.properties b/chrome/locale/ro/securityLevel.properties deleted file mode 100644 index 9e036751..00000000 --- a/chrome/locale/ro/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Nivel Securitate -securityLevel.customWarning = Personalizat -securityLevel.overview = Dezactivează anuminte facilități web care pot fi folosite pentru a-ți ataca securitatea și anonimitatea.\n -securityLevel.standard.level = Standard -securityLevel.standard.tooltip = Nivel Securitate: Normal -securityLevel.standard.summary = Toate facilitățile site-ului web și ale Tor Browser sunt active. -securityLevel.safer.level = Mai sigur -securityLevel.safer.tooltip = Nivel Securitate: Sigur -securityLevel.safer.summary = Dezactivează facilități ale site-ului web care sunt deseori periculoase, provocând uneori pierderea funcționalității -securityLevel.safer.description1 = JavaScript e dezactivat în site-uri non-HTTPS -securityLevel.safer.description2 = Unele fonturi și simboluri matematice sunt dezactivate. -securityLevel.safer.description3 = Fișierele audio și video (HTML5 media) și WebGL sunt pot fi redate la clic. -securityLevel.safest.level = Cel mai sigur -securityLevel.safest.tooltip = Nivel Securitate: Prudent -securityLevel.safest.summary = Permite doar facilitățile necesare pentru site-uri simple și servicii de bază. Aceste modificări afectează imagini, media și scripturi. -securityLevel.safest.description1 = JavaScript e dezactivat implicit în toate site-urile. -securityLevel.safest.description2 = Unele fonturi, pictograme, simboluri matematice și imagini sunt dezactivate. -securityLevel.safest.description3 = Audio și video (multimedia tip HTML5) sunt click-pentru-rulare. -securityLevel.custom.summary = Preferințele dvs. de browser personalizate au avut ca rezultat setări de securitate neobișnuite. Din motive de securitate și confidențialitate, vă recomandăm să alegeți una dintre nivelurile de securitate implicite. -securityLevel.learnMore = Află mai mult -securityLevel.restoreDefaults = Revenire la Setările Inițiale -securityLevel.advancedSecuritySettings = Setări Avansate de Securitate... diff --git a/chrome/locale/ro/torbutton.dtd b/chrome/locale/ro/torbutton.dtd index d9161984..eb075065 100644 --- a/chrome/locale/ro/torbutton.dtd +++ b/chrome/locale/ro/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Unele fonturi și simboluri matematice sunt dezactivate."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Unele fonturi, pictograme, simboluri matematice și imagini sunt dezactivate."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Fișierele audio și video (HTML5 media) și WebGL sunt pot fi redate la clic."> +<!ENTITY torbutton.prefs.sec_custom_warning "Personalizat"> +<!ENTITY torbutton.prefs.sec_overview "Dezactivează anuminte facilități web care pot fi folosite pentru a-ți ataca securitatea și anonimitatea.\n"> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Nivel Securitate: Normal"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Nivel Securitate: Sigur"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Nivel Securitate: Prudent"> +<!ENTITY torbutton.prefs.sec_custom_summary "Preferințele dvs. de browser personalizate au avut ca rezultat setări de securitate neobișnuite. Din motive de securitate și confidențialitate, vă recomandăm să alegeți una dintre nivelurile de securitate implicite."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Revenire la Setările Inițiale"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Setări Avansate de Securitate..."> <!ENTITY torbutton.circuit_display.title "Circuit Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Circuit nou pentru acest site"> diff --git a/chrome/locale/ru/securityLevel.properties b/chrome/locale/ru/securityLevel.properties deleted file mode 100644 index dbb5fdae..00000000 --- a/chrome/locale/ru/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Уровень безопасности -securityLevel.customWarning = Пользовательский -securityLevel.overview = Отключите веб-функции, которые могут использоваться для атаки на вашу безопасность и анонимность. -securityLevel.standard.level = Стандартные -securityLevel.standard.tooltip = Уровень безопасности : Стандартный -securityLevel.standard.summary = Все функции Tor Browser и веб-сайтов включены. -securityLevel.safer.level = Более безопасные -securityLevel.safer.tooltip = Уровень безопасности : Более безопасный -securityLevel.safer.summary = Отключены функции веб-сайтов, которые часто бывают опасны, что может привести к потере функциональности некоторыми сайтами. -securityLevel.safer.description1 = JavaScript отключен на всех не HTTPS сайтах. -securityLevel.safer.description2 = Некоторые шрифты и математические символы отключены. -securityLevel.safer.description3 = Аудио, видео (медиа HTML5) и WebGL проигрываются при нажатии. -securityLevel.safest.level = Наиболее безопасные -securityLevel.safest.tooltip = Уровень безопасности : Наиболее безопасный -securityLevel.safest.summary = Разрешены только функции веб-сайтов, требующиеся для статических сайтов и основных сервисов. Эти изменения влияют на изображения, медиа и скрипты. -securityLevel.safest.description1 = JavaScript отключен по умолчанию на всех сайтах. -securityLevel.safest.description2 = Некоторые шрифты, значки, математические символы и изображения отключены. -securityLevel.safest.description3 = Аудио и видео (HTML5 медиа) проигрываются только после клика. -securityLevel.custom.summary = Ваши настройки браузера привели к необычным параметрам безопасности. По соображениям безопасности и приватности мы рекомендуем выбрать один из уровней безопасности по умолчанию. -securityLevel.learnMore = Узнать больше -securityLevel.restoreDefaults = Восстановить значения по умолчанию -securityLevel.advancedSecuritySettings = Дополнительные настройки безопасности... diff --git a/chrome/locale/ru/torbutton.dtd b/chrome/locale/ru/torbutton.dtd index bc53425e..08b03019 100644 --- a/chrome/locale/ru/torbutton.dtd +++ b/chrome/locale/ru/torbutton.dtd @@ -31,11 +31,19 @@ <!ENTITY torbutton.prefs.sec_safest_label "Наиболее безопасные"> <!ENTITY torbutton.prefs.sec_safest_description "Разрешены только функции веб-сайтов, требующиеся для статических сайтов и основных сервисов. Эти изменения влияют на изображения, медиа и скрипты."> <!ENTITY torbutton.prefs.sec_safest_list_label "При самых безопасных настройках:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Подробнее"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Узнать больше"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only " JavaScript отключен на всех не HTTPS сайтах. "> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript отключен по умолчанию на всех сайтах."> <!ENTITY torbutton.prefs.sec_limit_typography "Некоторые шрифты и математические символы отключены."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Некоторые шрифты, значки, математические символы и изображения отключены."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Аудио, видео (медиа HTML5) и WebGL проигрываются при нажатии."> +<!ENTITY torbutton.prefs.sec_custom_warning "Пользовательский"> +<!ENTITY torbutton.prefs.sec_overview "Отключите веб-функции, которые могут использоваться для атаки на вашу безопасность и анонимность."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Уровень безопасности : Стандартный"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Уровень безопасности : Более безопасный"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Уровень безопасности : Наиболее безопасный"> +<!ENTITY torbutton.prefs.sec_custom_summary "Ваши настройки браузера привели к необычным параметрам безопасности. По соображениям безопасности и приватности мы рекомендуем выбрать один из уровней безопасности по умолчанию."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Восстановить значения по умолчанию"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Дополнительные настройки безопасности..."> <!ENTITY torbutton.circuit_display.title "Схема Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Новая схема для этого Сайта"> diff --git a/chrome/locale/sk/securityLevel.properties b/chrome/locale/sk/securityLevel.properties deleted file mode 100644 index e0a3a746..00000000 --- a/chrome/locale/sk/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Obnoviť predvolené diff --git a/chrome/locale/sk/torbutton.dtd b/chrome/locale/sk/torbutton.dtd index f4e7ad73..e4c5fca6 100644 --- a/chrome/locale/sk/torbutton.dtd +++ b/chrome/locale/sk/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Obnoviť predvolené"> diff --git a/chrome/locale/sl/securityLevel.properties b/chrome/locale/sl/securityLevel.properties deleted file mode 100644 index 4418f738..00000000 --- a/chrome/locale/sl/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Privzete nastavitve diff --git a/chrome/locale/sl/torbutton.dtd b/chrome/locale/sl/torbutton.dtd index f3243f95..4384fbdf 100644 --- a/chrome/locale/sl/torbutton.dtd +++ b/chrome/locale/sl/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ne zaščiti novih piškotkov"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Privzete nastavitve"> diff --git a/chrome/locale/sr/securityLevel.properties b/chrome/locale/sr/securityLevel.properties deleted file mode 100644 index 57f1ebf1..00000000 --- a/chrome/locale/sr/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = Поврати подразумевано diff --git a/chrome/locale/sr/torbutton.dtd b/chrome/locale/sr/torbutton.dtd index dd24b25c..3e8dfd97 100644 --- a/chrome/locale/sr/torbutton.dtd +++ b/chrome/locale/sr/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Уклони све осим заштићених"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Заштити нове колачиће"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не штити нове колачиће"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Поврати подразумевано"> diff --git a/chrome/locale/sv-SE/securityLevel.properties b/chrome/locale/sv-SE/securityLevel.properties deleted file mode 100644 index be275e28..00000000 --- a/chrome/locale/sv-SE/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Säkerhetsnivå -securityLevel.customWarning = Anpassad -securityLevel.overview = Inaktivera vissa webbfunktioner som kan användas för att attackera din säkerhet och anonymitet. -securityLevel.standard.level = Standard -securityLevel.standard.tooltip = Säkerhetsnivå : Standard -securityLevel.standard.summary = Alla funktioner för Tor Browser och webbplatsfunktioner är aktiverade. -securityLevel.safer.level = Säkrare -securityLevel.safer.tooltip = Säkerhetsnivå : Säkrare -securityLevel.safer.summary = Inaktiverar webbplatsfunktioner som ofta är farliga, vilket gör att vissa webbplatser förlorar funktionalitet. -securityLevel.safer.description1 = JavaScript är inaktiverat på webbplatser utan HTTPS. -securityLevel.safer.description2 = Vissa typsnitt och matte symboler är inaktiverade. -securityLevel.safer.description3 = Ljud och video (HTML5-media) och WebGL är klicka-för-att-spela. -securityLevel.safest.level = Säkrast -securityLevel.safest.tooltip = Säkerhetsnivå: Säkrast -securityLevel.safest.summary = Tillåt endast webbplatsfunktioner som krävs för statiska webbplatser och grundläggande tjänster. Dessa förändringar påverkar bilder, media och skript. -securityLevel.safest.description1 = JavaScript är inaktiverat som standard på alla webbplatser. -securityLevel.safest.description2 = Vissa typsnitt, ikoner, matte symboler och bilder är inaktiverade. -securityLevel.safest.description3 = Ljud och video (HTML5-media) är klicka-för-att-spel. -securityLevel.custom.summary = Dina anpassade webbläsarinställningar har resulterat i ovanliga säkerhetsinställningar. Av säkerhets- och integritetsskäl rekommenderar vi att du använder en av de fördefinierade säkerhetsnivåerna. -securityLevel.learnMore = Läs mer -securityLevel.restoreDefaults = Återställ standard -securityLevel.advancedSecuritySettings = Avancerade säkerhetsinställningar… diff --git a/chrome/locale/sv-SE/torbutton.dtd b/chrome/locale/sv-SE/torbutton.dtd index 71b9ae9d..e3213292 100644 --- a/chrome/locale/sv-SE/torbutton.dtd +++ b/chrome/locale/sv-SE/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Vissa typsnitt och matte symboler är inaktiverade."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Vissa typsnitt, ikoner, matte symboler och bilder är inaktiverade."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Ljud och video (HTML5-media) och WebGL är klicka-för-att-spela."> +<!ENTITY torbutton.prefs.sec_custom_warning "Anpassad"> +<!ENTITY torbutton.prefs.sec_overview "Inaktivera vissa webbfunktioner som kan användas för att attackera din säkerhet och anonymitet."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Säkerhetsnivå : Standard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Säkerhetsnivå : Säkrare"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Säkerhetsnivå: Säkrast"> +<!ENTITY torbutton.prefs.sec_custom_summary "Dina anpassade webbläsarinställningar har resulterat i ovanliga säkerhetsinställningar. Av säkerhets- och integritetsskäl rekommenderar vi att du använder en av de fördefinierade säkerhetsnivåerna."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Återställ standard"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Avancerade säkerhetsinställningar…"> <!ENTITY torbutton.circuit_display.title "Tor-krets"> <!ENTITY torbutton.circuit_display.new_circuit "Ny krets för denna webbplats"> diff --git a/chrome/locale/tr/securityLevel.properties b/chrome/locale/tr/securityLevel.properties deleted file mode 100644 index 59e5c4ab..00000000 --- a/chrome/locale/tr/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Güvenlik Düzeyi -securityLevel.customWarning = Özel -securityLevel.overview = Güvenlik ve anonimliğinize saldırmak için kullanılacak belirli web özelliklerini devre dışı bırakır. -securityLevel.standard.level = Standart -securityLevel.standard.tooltip = Güvenlik Düzeyi : Standart -securityLevel.standard.summary = Tüm Tor Browser ve web sitesi özellikleri kullanılabilir. -securityLevel.safer.level = Daha Güvenli -securityLevel.safer.tooltip = Güvenlik Düzeyi : Daha Güvenli -securityLevel.safer.summary = Sıklıkla tehlikeli olan web sitesi özellikleri devre dışı bırakılır ve bazı sitelerin işlevlerinde kayıplar olabilir. -securityLevel.safer.description1 = JavaScript, HTTPS kullanmayan sitelerde devre dışı bırakılır. -securityLevel.safer.description2 = Bazı yazı türleri ve matematik simgeleri devre dışı bırakılır. -securityLevel.safer.description3 = Ses ve görüntü (HTML5 ortamı) ve WebGL tıklayıp oynatılabilir. -securityLevel.safest.level = En Güvenli -securityLevel.safest.tooltip = Güvenlik Düzeyi : En Güvenli -securityLevel.safest.summary = Yalnız durağan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu değişiklikler görselleri, ortamları ve betikleri etkiler. -securityLevel.safest.description1 = JavaScript betikleri tüm sitelerde varsayılan olarak devre dışı bırakılır. -securityLevel.safest.description2 = Bazı yazı türleri, simgeler, matematik simgeleri ve görseller devre dışı bırakılır. -securityLevel.safest.description3 = Ses ve görüntüler (HTML5 ortamı) tıklayarak çalıştırılabilir. -securityLevel.custom.summary = Tarayıcınız standart olmayan özel güvenlik düzeyi ayarları kullanıyor. Güvenlik ve gizliliğinizi korumak için aşağıdaki varsayılan güvenlik ayarı düzeylerinden birini seçmeniz önerilir. -securityLevel.learnMore = Ayrıntılı bilgi alın -securityLevel.restoreDefaults = Varsayılanlara Sıfırla -securityLevel.advancedSecuritySettings = Gelişmiş Güvenlik Düzeyi Ayarları… diff --git a/chrome/locale/tr/torbutton.dtd b/chrome/locale/tr/torbutton.dtd index c064ac66..a10c034d 100644 --- a/chrome/locale/tr/torbutton.dtd +++ b/chrome/locale/tr/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Bazı yazı türleri ve matematik simgeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Bazı yazı türleri, simgeler, matematik simgeleri ve görseller devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Ses ve görüntü (HTML5 ortamı) ve WebGL tıklayıp oynatılabilir."> +<!ENTITY torbutton.prefs.sec_custom_warning "Özel"> +<!ENTITY torbutton.prefs.sec_overview "Güvenlik ve anonimliğinize saldırmak için kullanılacak belirli web özelliklerini devre dışı bırakır."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Güvenlik Düzeyi : Standart"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Güvenlik Düzeyi : Daha Güvenli"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Güvenlik Düzeyi : En Güvenli"> +<!ENTITY torbutton.prefs.sec_custom_summary "Tarayıcınız standart olmayan özel güvenlik düzeyi ayarları kullanıyor. Güvenlik ve gizliliğinizi korumak için aşağıdaki varsayılan güvenlik ayarı düzeylerinden birini seçmeniz önerilir."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Varsayılanlara Sıfırla"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Gelişmiş Güvenlik Düzeyi Ayarları…"> <!ENTITY torbutton.circuit_display.title "Tor Devresi"> <!ENTITY torbutton.circuit_display.new_circuit "Bu Sitenin Devresini Yenile"> diff --git a/chrome/locale/uk/securityLevel.properties b/chrome/locale/uk/securityLevel.properties deleted file mode 100644 index 0148214f..00000000 --- a/chrome/locale/uk/securityLevel.properties +++ /dev/null @@ -1 +0,0 @@ -securityLevel.restoreDefaults = За Замовчуванням diff --git a/chrome/locale/uk/torbutton.dtd b/chrome/locale/uk/torbutton.dtd index 1a746b53..73033678 100644 --- a/chrome/locale/uk/torbutton.dtd +++ b/chrome/locale/uk/torbutton.dtd @@ -17,3 +17,4 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Видалити Усі, Окрім Захищених"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Захищати Нові Куки"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не Захищати Нові Куки"> +<!ENTITY torbutton.prefs.sec_restore_defaults "За Замовчуванням"> diff --git a/chrome/locale/vi/securityLevel.properties b/chrome/locale/vi/securityLevel.properties deleted file mode 100644 index e6d350b0..00000000 --- a/chrome/locale/vi/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = Mức độ Bảo mật -securityLevel.customWarning = Tùy chỉnh -securityLevel.overview = Disable certain web features that can be used to attack your security and anonymity. -securityLevel.standard.level = Chuẩn -securityLevel.standard.tooltip = Security Level : Standard -securityLevel.standard.summary = Tất cả các tính năng của Trình duyệt Tor và trang web đều được bật. -securityLevel.safer.level = An toàn hơn -securityLevel.safer.tooltip = Security Level : Safer -securityLevel.safer.summary = Vô hiệu hóa tính năng website thường gây nguy hiểm, khiến một số trang web mất chức năng. -securityLevel.safer.description1 = JavaScript bị vô hiệu trên các trang web không có HTTPS. -securityLevel.safer.description2 = Một số phông chữ và ký hiêu toán học bị vô hiệu. -securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. -securityLevel.safest.level = An toàn nhất -securityLevel.safest.tooltip = Security Level : Safest -securityLevel.safest.summary = Chỉ cho phép các tính năng trang web được yêu cầu cho các trang web tĩnh và các dịch vụ cơ bản. Những thay đổi này ảnh hưởng đến hình ảnh, phương tiện và tập lệnh. -securityLevel.safest.description1 = JavaScript mặc định bị vô hiệu trên tất cả các trang. -securityLevel.safest.description2 = Một số phông chữ, biểu tượng, và hình ảnh bị vô hiệu. -securityLevel.safest.description3 = Âm thanh và video (HTML5 media) phải bấm-để-phát. -securityLevel.custom.summary = Những điều chỉnh trong trình duyệt của bạn vừa tạo ra những lỗi bảo mật bất thường. Vì những lý do bảo mật và riêng tư, chúng tôi khuyến cáo bạn chọn những cấp độ bảo mật mặc định khác. -securityLevel.learnMore = Biết thêm -securityLevel.restoreDefaults = Khôi phục trạng thái mặc định -securityLevel.advancedSecuritySettings = Advanced Security Settings… diff --git a/chrome/locale/vi/torbutton.dtd b/chrome/locale/vi/torbutton.dtd index 87310337..dfdc73fa 100644 --- a/chrome/locale/vi/torbutton.dtd +++ b/chrome/locale/vi/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Một số phông chữ và ký hiêu toán học bị vô hiệu."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Một số phông chữ, biểu tượng, và hình ảnh bị vô hiệu."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> +<!ENTITY torbutton.prefs.sec_custom_warning "Tùy chỉnh"> +<!ENTITY torbutton.prefs.sec_overview "Disable certain web features that can be used to attack your security and anonymity."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Security Level : Standard"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Security Level : Safer"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Security Level : Safest"> +<!ENTITY torbutton.prefs.sec_custom_summary "Những điều chỉnh trong trình duyệt của bạn vừa tạo ra những lỗi bảo mật bất thường. Vì những lý do bảo mật và riêng tư, chúng tôi khuyến cáo bạn chọn những cấp độ bảo mật mặc định khác."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Khôi phục trạng thái mặc định"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> <!ENTITY torbutton.circuit_display.title "Mạch Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Mạch Tor mới cho trang này"> diff --git a/chrome/locale/zh-CN/securityLevel.properties b/chrome/locale/zh-CN/securityLevel.properties deleted file mode 100644 index b0d26217..00000000 --- a/chrome/locale/zh-CN/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = 安全等级 -securityLevel.customWarning = 自定义 -securityLevel.overview = 禁用部分能影响你安全和匿名性的互联网功能。 -securityLevel.standard.level = 标准安全性 -securityLevel.standard.tooltip = 安全等级：标准 -securityLevel.standard.summary = 将启用 Tor 浏览器和网站的所有功能。 -securityLevel.safer.level = 中等安全性 -securityLevel.safer.tooltip = 安全等级：较安全 -securityLevel.safer.summary = 禁用网站功能通常是危险的，这会导致一些站不能正常运作。 -securityLevel.safer.description1 = 在非HTTPS网站，JavaScripts被禁用。 -securityLevel.safer.description2 = 一些字体与数学符号被禁用。 -securityLevel.safer.description3 = 点击播放音频或视频（HTML5 媒体）和WebGL。 -securityLevel.safest.level = 最高安全性 -securityLevel.safest.tooltip = 安全等级：最安全 -securityLevel.safest.summary = 只允许网站请求静态网页与基本服务。这将会影响图片，媒体与脚本。 -securityLevel.safest.description1 = 在所有网站上默认禁用JavaScript。 -securityLevel.safest.description2 = 一些字体，图标，数学符号与图片被禁用。 -securityLevel.safest.description3 = 点击播放音频或视频（HTML5 媒体）。 -securityLevel.custom.summary = 您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。 -securityLevel.learnMore = 更多详情 -securityLevel.restoreDefaults = 恢复默认设置 -securityLevel.advancedSecuritySettings = 高级安全选项… diff --git a/chrome/locale/zh-CN/torbutton.dtd b/chrome/locale/zh-CN/torbutton.dtd index 22f3b196..b711df55 100644 --- a/chrome/locale/zh-CN/torbutton.dtd +++ b/chrome/locale/zh-CN/torbutton.dtd @@ -37,5 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "一些字体与数学符号被禁用。"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "一些字体，图标，数学符号与图片被禁用。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "点击播放音频或视频（HTML5 媒体）和WebGL。"> +<!ENTITY torbutton.prefs.sec_custom_warning "自定义"> +<!ENTITY torbutton.prefs.sec_overview "禁用部分能影响你安全和匿名性的互联网功能。"> +<!ENTITY torbutton.prefs.sec_standard_tooltip "安全等级：标准"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "安全等级：较安全"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "安全等级：最安全"> +<!ENTITY torbutton.prefs.sec_custom_summary "您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。"> +<!ENTITY torbutton.prefs.sec_restore_defaults "恢复默认设置"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "高级安全选项…"> <!ENTITY torbutton.circuit_display.title "Tor 链路"> <!ENTITY torbutton.circuit_display.new_circuit "为此站点使用新线路"> diff --git a/chrome/locale/zh-TW/securityLevel.properties b/chrome/locale/zh-TW/securityLevel.properties deleted file mode 100644 index 2ed17234..00000000 --- a/chrome/locale/zh-TW/securityLevel.properties +++ /dev/null @@ -1,22 +0,0 @@ -securityLevel.securityLevel = 安全性等級 -securityLevel.customWarning = 自定義 -securityLevel.overview = 停用特定的網頁功能，其可用以損害您的安全性及匿名性。 -securityLevel.standard.level = 標準 -securityLevel.standard.tooltip = 安全性等級：標準 -securityLevel.standard.summary = 啟用 Tor 瀏覽器及網站的所有功能。 -securityLevel.safer.level = 較安全 -securityLevel.safer.tooltip = 安全性等級：更安全 -securityLevel.safer.summary = 停用某些功能,因為其有危險,會造成部份網站失能 -securityLevel.safer.description1 = 所有非HTTPS網站會預設停用JavaScript -securityLevel.safer.description2 = 有些字形與數學符號被停用 -securityLevel.safer.description3 = 聲音和影片（HTML5 媒體），和 WebGL 要點擊播放 -securityLevel.safest.level = 最安全 -securityLevel.safest.tooltip = 安全性等級：最安全 -securityLevel.safest.summary = 只同意靜態網站和基本服務的網站功能.這些變動會影響圖片,媒體和腳本. -securityLevel.safest.description1 = 所有網站會預設停用JavaScript -securityLevel.safest.description2 = 有些字型,圖標,數學符號與圖片被停用 -securityLevel.safest.description3 = 聲音和影片 (HTML5 媒體) 要點擊播放 -securityLevel.custom.summary = 您的瀏覽器個人化設定可能會造成安全性的疑慮。基於個人網路安全與隱私的考量，建議您選用預設的安全性層級選項。 -securityLevel.learnMore = 了解更多 -securityLevel.restoreDefaults = 恢復到預設值 -securityLevel.advancedSecuritySettings = 進階安全性設定… diff --git a/chrome/locale/zh-TW/torbutton.dtd b/chrome/locale/zh-TW/torbutton.dtd index 2839961a..2d85dbca 100644 --- a/chrome/locale/zh-TW/torbutton.dtd +++ b/chrome/locale/zh-TW/torbutton.dtd @@ -21,21 +21,29 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "全部刪除，但受保護"> <!ENTITY torbutton.cookiedialog.saveAllCookies "保護新的 Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保護新的 Cookie"> -<!ENTITY torbutton.prefs.sec_caption "安全等級"> +<!ENTITY torbutton.prefs.sec_caption "安全性等級"> <!ENTITY torbutton.prefs.sec_caption_tooltip "此安全性調整滑棒會關閉某些瀏覽器的功能，導致您的瀏覽器更容易遭受駭客攻擊。"> <!ENTITY torbutton.prefs.sec_standard_label "標準"> -<!ENTITY torbutton.prefs.sec_standard_description "所有瀏覽器與網站的功能都啟用"> +<!ENTITY torbutton.prefs.sec_standard_description "啟用 Tor 瀏覽器及網站的所有功能。"> <!ENTITY torbutton.prefs.sec_safer_label "較安全"> <!ENTITY torbutton.prefs.sec_safer_description "停用某些功能,因為其有危險,會造成部份網站失能"> <!ENTITY torbutton.prefs.sec_safer_list_label "在較安全設定:"> <!ENTITY torbutton.prefs.sec_safest_label "最安全"> <!ENTITY torbutton.prefs.sec_safest_description "只同意靜態網站和基本服務的網站功能.這些變動會影響圖片,媒體和腳本."> <!ENTITY torbutton.prefs.sec_safest_list_label "在最安全設定:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "繼續閱讀"> +<!ENTITY torbutton.prefs.sec_learn_more_label "了解更多"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "所有非HTTPS網站會預設停用JavaScript "> <!ENTITY torbutton.prefs.sec_js_disabled "所有網站會預設停用JavaScript "> <!ENTITY torbutton.prefs.sec_limit_typography "有些字型與數學符號被停用。"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "有些字型、圖示、數學符號與圖片被停用。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "聲音和影片（HTML5 媒體），和 WebGL 要點擊播放。"> +<!ENTITY torbutton.prefs.sec_custom_warning "自定義"> +<!ENTITY torbutton.prefs.sec_overview "停用特定的網頁功能，其可用以損害您的安全性及匿名性。"> +<!ENTITY torbutton.prefs.sec_standard_tooltip "安全性等級：標準"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "安全性等級：更安全"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "安全性等級：最安全"> +<!ENTITY torbutton.prefs.sec_custom_summary "您的瀏覽器個人化設定可能會造成安全性的疑慮。基於個人網路安全與隱私的考量，建議您選用預設的安全性層級選項。"> +<!ENTITY torbutton.prefs.sec_restore_defaults "恢復到預設值"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "進階安全性設定…"> <!ENTITY torbutton.circuit_display.title "Tor 迴路"> <!ENTITY torbutton.circuit_display.new_circuit "建立新的迴路來連接上此網站">

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 24653: merge securityLevel.properties into torbutton.dtd
by gk＠torproject.org 13 Sep '19

13 Sep '19

commit 3b5b0d6d502d712734c2c5b7e35c0d29e5f19204 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Aug 13 11:57:22 2019 +0200 Bug 24653: merge securityLevel.properties into torbutton.dtd --- .../securitylevel/content/securityLevel.js | 89 +++++++++++++--------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 25f6423bc6d3..9dc23d97855d 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -8,61 +8,76 @@ XPCOMUtils.defineLazyModuleGetters(this, { PanelMultiView: "resource:///modules/PanelMultiView.jsm", }); +XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); +XPCOMUtils.defineLazyGetter(this, "domParser", () => new DOMParser()); + /* Security Level Strings Strings loaded from torbutton, but en-US defaults provided in case torbutton addon not enabled */ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", function() { - let sls = null; - try { - sls = Services.strings.createBundle("chrome://torbutton/locale/securityLevel.properties"); - } catch(e) { } + // copied from testing/marionette/l10n.js + let localizeEntity = function(urls, id) { + // Build a string which contains all possible entity locations + let locations = []; + urls.forEach((url, index) => { + locations.push(`<!ENTITY % dtd_${index} SYSTEM "${url}">%dtd_${index};`); + }); + + // Use the DOM parser to resolve the entity and extract its real value + let header = `<?xml version="1.0"?><!DOCTYPE elem [${locations.join("")}]>`; + let elem = `<elem id="elementID">&${id};</elem>`; + let doc = domParser.parseFromString(header + elem, "text/xml"); + let element = doc.querySelector("elem[id='elementID']"); + + if (element === null) { + throw new Error(`Entity with id='${id}' hasn't been found`); + } + + return element.textContent; + }; - // tries to get the given key from the string bundle, return fallback on failure let getString = function(key, fallback) { - let retval = ""; - if (sls) { - try { - retval = sls.GetStringFromName(key); - } catch(e) { } - } - if (retval == "") { - retval = fallback; - } - return retval; + try { + return localizeEntity( + ['chrome://torbutton/locale/torbutton.dtd'], + `torbutton.prefs.sec_${key}` + ); + } catch (e) { } + return fallback; }; // read localized strings from torbutton; but use hard-coded en-US strings as fallbacks in case of error let retval = { - securityLevel : getString("securityLevel.securityLevel", "Security Level"), - customWarning : getString("securityLevel.customWarning", "Custom"), - overview : getString("securityLevel.overview", "Disable certain web features that can be used to attack your security and anonymity."), + securityLevel : getString("caption", "Security Level"), + customWarning : getString("custom_warning", "Custom"), + overview : getString("overview", "Disable certain web features that can be used to attack your security and anonymity."), standard : { - level : getString("securityLevel.standard.level", "Standard"), - tooltip : getString("securityLevel.standard.tooltip", "Security Level : Standard"), - summary : getString("securityLevel.standard.summary", "All Tor Browser and website features are enabled."), + level : getString("standard_label", "Standard"), + tooltip : getString("standard_tooltip", "Security Level : Standard"), + summary : getString("standard_description", "All Tor Browser and website features are enabled."), }, safer : { - level : getString("securityLevel.safer.level", "Safer"), - tooltip : getString("securityLevel.safer.tooltip", "Security Level : Safer"), - summary : getString("securityLevel.safer.summary", "Disables website features that are often dangerous, causing some sites to lose functionality."), - description1 : getString("securityLevel.safer.description1", "JavaScript is disabled on non-HTTPS sites."), - description2 : getString("securityLevel.safer.description2", "Some fonts and math symbols are disabled."), - description3 : getString("securityLevel.safer.description3", "Audio and video (HTML5 media) are click-to-play."), + level : getString("safer_label", "Safer"), + tooltip : getString("safer_tooltip", "Security Level : Safer"), + summary : getString("safer_description", "Disables website features that are often dangerous, causing some sites to lose functionality."), + description1 : getString("js_on_https_sites_only", "JavaScript is disabled on non-HTTPS sites."), + description2 : getString("limit_typography", "Some fonts and math symbols are disabled."), + description3 : getString("click_to_play_media", "Audio and video (HTML5 media), and WebGL are click-to-play."), }, safest : { - level : getString("securityLevel.safest.level", "Safest"), - tooltip : getString("securityLevel.safest.tooltip", "Security Level : Safest"), - summary : getString("securityLevel.safest.summary", "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."), - description1 : getString("securityLevel.safest.description1", "JavaScript is disabled by default on all sites."), - description2 : getString("securityLevel.safest.description2", "Some fonts, icons, math symbols, and images are disabled."), - description3 : getString("securityLevel.safest.description3", "Audio and video (HTML5 media) are click-to-play."), + level : getString("safest_label", "Safest"), + tooltip : getString("safest_tooltip", "Security Level : Safest"), + summary : getString("safest_description", "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."), + description1 : getString("js_disabled", "JavaScript is disabled by default on all sites."), + description2 : getString("limit_graphics_and_typography", "Some fonts, icons, math symbols, and images are disabled."), + description3 : getString("click_to_play_media", "Audio and video (HTML5 media), and WebGL are click-to-play."), }, custom : { - summary : getString("securityLevel.custom.summary", "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."), + summary : getString("custom_summary", "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."), }, - learnMore : getString("securityLevel.learnMore", "Learn more"), + learnMore : getString("learn_more_label", "Learn more"), learnMoreURL : function() { let locale = ""; try { @@ -77,8 +92,8 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", function() { return "https://tb-manual.torproject.org/" + locale + "/security-settings/"; }(), - restoreDefaults : getString("securityLevel.restoreDefaults", "Restore Defaults"), - advancedSecuritySettings : getString("securityLevel.advancedSecuritySettings", "Advanced Security Settings\u2026"), + restoreDefaults : getString("restore_defaults", "Restore Defaults"), + advancedSecuritySettings : getString("advanced_security_settings", "Advanced Security Settings\u2026"), };

1 0

[torbutton/master] Translations update
by gk＠torproject.org 12 Sep '19

12 Sep '19

commit e0e77b8066e782d919d7a6b752590b419d6e552d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 12 08:25:23 2019 +0000 Translations update --- chrome/locale/it/aboutTBUpdate.dtd | 2 +- chrome/locale/nl/aboutTBUpdate.dtd | 4 ++-- chrome/locale/nl/aboutTor.dtd | 6 +++--- chrome/locale/nl/torbutton.dtd | 4 ++-- chrome/locale/zh-TW/torbutton.dtd | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chrome/locale/it/aboutTBUpdate.dtd b/chrome/locale/it/aboutTBUpdate.dtd index e40ec576..d179811b 100644 --- a/chrome/locale/it/aboutTBUpdate.dtd +++ b/chrome/locale/it/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ <!ENTITY aboutTBUpdate.changelogTitle "Cronologia Tor Browser"> -<!ENTITY aboutTBUpdate.updated "Il Browser TOR è stato aggiornato."> +<!ENTITY aboutTBUpdate.updated "Il Tor Browser è stato aggiornato."> <!ENTITY aboutTBUpdate.linkPrefix "Per maggiori informazioni su questa versione,"> <!ENTITY aboutTBUpdate.linkLabel "visita il nostro sito web"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/chrome/locale/nl/aboutTBUpdate.dtd b/chrome/locale/nl/aboutTBUpdate.dtd index 56f0e81d..6d078b5d 100644 --- a/chrome/locale/nl/aboutTBUpdate.dtd +++ b/chrome/locale/nl/aboutTBUpdate.dtd @@ -1,8 +1,8 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-wijzigingslog"> <!ENTITY aboutTBUpdate.updated "Tor Browser is bijgewerkt."> <!ENTITY aboutTBUpdate.linkPrefix "Bezoek "> <!ENTITY aboutTBUpdate.linkLabel "onze website"> <!ENTITY aboutTBUpdate.linkSuffix " voor de meest actuele informatie over deze release."> <!ENTITY aboutTBUpdate.version "Versie"> -<!ENTITY aboutTBUpdate.releaseDate "Releasedatum"> +<!ENTITY aboutTBUpdate.releaseDate "Uitgavedatum"> <!ENTITY aboutTBUpdate.releaseNotes "Uitgaveopmerkingen"> diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index b4ac52c4..68f4c848 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Over Tor"> -<!ENTITY aboutTor.viewChangelog.label "Wijzigingslog bekijken"> +<!ENTITY aboutTor.viewChangelog.label "Wijzigingslogboek bekijken"> <!ENTITY aboutTor.ready.label "Verken. Privé."> <!ENTITY aboutTor.ready2.label "U bent klaar voor de meest private surfervaring ter wereld."> @@ -19,10 +19,10 @@ <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Vragen?"> <!ENTITY aboutTor.torbrowser_user_manual_link.label "Bekijk onze Tor Browser-handleiding »">  -<!ENTITY aboutTor.torbrowser_user_manual.accesskey "h"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "H"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-handleiding"> -<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een US 501(c)(3)-non-profitorganisatie die de rechten en vrijheden van de mens bevordert door vrije en open source anonimiteits- en privacytechnologie te maken en toe te passen, hun onbeperkte beschikbaarheid en gebruik te steunen, en hun wetenschappelijke en populaire begrip te bevorderen."> +<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een 501(c)(3)-organisatie zonder winstoogmerk gevestigd in de VS die rechten en vrijheden van de mens bevordert door vrije en open-broncode anonimiteits- en privacytechnologieën te ontwikkelen en te implementeren, de onbeperkte beschikbaarheid en het gebruik ervan te steunen, en het begrip ervoor in de wetenschap en bij het algemeen publiek te bevorderen."> <!ENTITY aboutTor.getInvolved.label "Meedoen »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/chrome/locale/nl/torbutton.dtd b/chrome/locale/nl/torbutton.dtd index 7125d44f..a49811bb 100644 --- a/chrome/locale/nl/torbutton.dtd +++ b/chrome/locale/nl/torbutton.dtd @@ -26,10 +26,10 @@ <!ENTITY torbutton.prefs.sec_standard_label "Standaard"> <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- en websitefuncties zijn ingeschakeld."> <!ENTITY torbutton.prefs.sec_safer_label "Veiliger"> -<!ENTITY torbutton.prefs.sec_safer_description "Uitgeschakelde websitefuncties die zijn meestal gevaarlijk, waardoor sommige sites functionaliteit vaak verliezen."> +<!ENTITY torbutton.prefs.sec_safer_description "Schakelt websitefuncties uit die vaak gevaarlijk zijn, waardoor sommige websites functionaliteit verliezen."> <!ENTITY torbutton.prefs.sec_safer_list_label "Op de veiliger instelling:"> <!ENTITY torbutton.prefs.sec_safest_label "Veiligste"> -<!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die vereist zijn voor statische sites en basis diensten. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> +<!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Op de veiligste instelling:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Leer Meer"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript zijn uitgeschakeld op non-HTTP sites."> diff --git a/chrome/locale/zh-TW/torbutton.dtd b/chrome/locale/zh-TW/torbutton.dtd index 7868343e..2839961a 100644 --- a/chrome/locale/zh-TW/torbutton.dtd +++ b/chrome/locale/zh-TW/torbutton.dtd @@ -34,8 +34,8 @@ <!ENTITY torbutton.prefs.sec_learn_more_label "繼續閱讀"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "所有非HTTPS網站會預設停用JavaScript "> <!ENTITY torbutton.prefs.sec_js_disabled "所有網站會預設停用JavaScript "> -<!ENTITY torbutton.prefs.sec_limit_typography "有些字形與數學符號被停用"> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "有些字型,圖標,數學符號與圖片被停用"> +<!ENTITY torbutton.prefs.sec_limit_typography "有些字型與數學符號被停用。"> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "有些字型、圖示、數學符號與圖片被停用。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "聲音和影片（HTML5 媒體），和 WebGL 要點擊播放。"> <!ENTITY torbutton.circuit_display.title "Tor 迴路"> <!ENTITY torbutton.circuit_display.new_circuit "建立新的迴路來連接上此網站">

1 0

[tor-browser-build/master] Add missing Changelog item for 9.0a6
by gk＠torproject.org 11 Sep '19

11 Sep '19

commit e82857e90d8bbbf963d5060b6ea4922625162136 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 11 17:33:22 2019 +0000 Add missing Changelog item for 9.0a6 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f97cb65..2ecd3d1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -51,6 +51,7 @@ Tor Browser 9.0a6 -- September 4 2019 * Backport fix for bug 1572844 to fix broken build * OS X * Bug 29818: Adapt #13379 patch for 68esr + * Bug 31464: meek and moat are broken on macOS 10.9 with Go 1.12 * Bug 31403: Bump snowflake commit to cd650fa009 * Linux * Bug 31403: Bump snowflake commit to cd650fa009

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31596'
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 4e92d40f4cee86426752aa21f7ddbb102be9d0c9 Merge: f08dbd5 3ea80a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 13:02:09 2019 +0200 Merge remote-tracking branch 'gk/bug_31596' projects/mingw-w64-clang/31567_1.patch | 33 -------------- projects/mingw-w64-clang/31567_2.patch | 82 ---------------------------------- projects/mingw-w64-clang/build | 3 +- projects/mingw-w64-clang/config | 4 +- projects/mingw-w64/config | 2 +- 5 files changed, 3 insertions(+), 121 deletions(-)

1 0

[tor-browser-build/master] Bug 31596: Bump mingw-w64 version for fix for #31567
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 3ea80a42a85edc5e931cd241218cc5f0f2ff5b57 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 3 06:22:58 2019 +0000 Bug 31596: Bump mingw-w64 version for fix for #31567 --- projects/mingw-w64-clang/31567_1.patch | 33 -------------- projects/mingw-w64-clang/31567_2.patch | 82 ---------------------------------- projects/mingw-w64-clang/build | 3 +- projects/mingw-w64-clang/config | 4 +- projects/mingw-w64/config | 2 +- 5 files changed, 3 insertions(+), 121 deletions(-) diff --git a/projects/mingw-w64-clang/31567_1.patch b/projects/mingw-w64-clang/31567_1.patch deleted file mode 100644 index be316ee..0000000 --- a/projects/mingw-w64-clang/31567_1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d9c7a5aa3ac8d29b98f28af71d862c2d3931e7d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Sun, 1 Sep 2019 06:05:40 +0000 -Subject: [PATCH 1/2] This function was moved from inline in header to a - statically linked one in 52a34d52d6f5f1789d329abd4e, where the use of this - define was dropped. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As this function is statically linked, the caller can't control -and change the behaviour of the function by defining -UCRTBASE_PRINTF_DEFAULT_WIDE in the calling translation unit, -but we should at least use the headers' default value (which currently -is zero). - -Signed-off-by: Martin Storsjö <martin(a)martin.st> - -diff --git a/mingw-w64-crt/stdio/ucrt__vsnwprintf.c b/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -index bf9f4de2..c505c31e 100644 ---- a/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -+++ b/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -@@ -10,6 +10,6 @@ - - int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN - { -- return __stdio_common_vswprintf(UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); -+ return __stdio_common_vswprintf(UCRTBASE_PRINTF_DEFAULT_WIDE | UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); - } - int __cdecl (*__MINGW_IMP_SYMBOL(_vsnwprintf))(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, va_list) = _vsnwprintf; --- -2.23.0.rc1 - diff --git a/projects/mingw-w64-clang/31567_2.patch b/projects/mingw-w64-clang/31567_2.patch deleted file mode 100644 index 12070aa..0000000 --- a/projects/mingw-w64-clang/31567_2.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 44d0691f6fa51d2b3a0df911652c801635424e4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Sun, 1 Sep 2019 06:08:24 +0000 -Subject: [PATCH 2/2] When __USE_MINGW_ANSI_STDIO is defined, we still call the - custom implementation bundled in libmingwex, which has the C99 standard - semantics for %s in wide format strings. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This matches how the wide stdio functions behave both when using -msvcrt.dll, and in all versions of MSVC, even the modern ones that -use ucrt. - -Signed-off-by: Martin Storsjö <martin(a)martin.st> - -diff --git a/mingw-w64-headers/crt/conio.h b/mingw-w64-headers/crt/conio.h -index 363203c3..a92ee059 100644 ---- a/mingw-w64-headers/crt/conio.h -+++ b/mingw-w64-headers/crt/conio.h -@@ -21,12 +21,13 @@ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - -diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h -index e183236d..e8d3c857 100644 ---- a/mingw-w64-headers/crt/stdio.h -+++ b/mingw-w64-headers/crt/stdio.h -@@ -147,12 +147,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - -diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h -index cd26e098..d1348bc2 100644 ---- a/mingw-w64-headers/crt/wchar.h -+++ b/mingw-w64-headers/crt/wchar.h -@@ -247,12 +247,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - --- -2.23.0.rc1 - diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 820346d..b4000f5 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -69,8 +69,7 @@ default_win32_winnt=0x601 cd $builddir/mingw-w64-clang patch -p1 < $rootdir/mingw-winrt.patch -patch -p1 < $rootdir/31567_1.patch -patch -p1 < $rootdir/31567_2.patch + cd mingw-w64-headers mkdir build && cd build ../configure --host=[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 16adee8..a6b6cde 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 2d52c4b3433e55b1c454f9567c0ae9adc4b83b41 +git_hash: 330025c54b85512d54b6960fad07498365c8fee3 version: '[% c("abbrev") %]' llvm_version: 8.0.0 gpg_keyring: clang.gpg @@ -36,5 +36,3 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch - - filename: 31567_1.patch - - filename: 31567_2.patch diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3bb1dda..0145194 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 2d52c4b3433e55b1c454f9567c0ae9adc4b83b41 +git_hash: 330025c54b85512d54b6960fad07498365c8fee3 version: '[% c("abbrev") %]' var: container:

1 0

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

11 Sep '19

commit e489c5048b762b3226db23b6ea9ffc440617615e Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 17:49:40 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 31601: Disable recommended extensions again --- browser/app/profile/000-tor-browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 81352dcbaece..b2cecfdb1a82 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -273,8 +273,9 @@ pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); // We don't know what extensions Mozilla is advertising to our users and we // don't want to have some random Google Analytics script running either on the -// about:addons page, see bug 22073 and 22900. +// about:addons page, see bug 22073, 22900 and 31601. pref("extensions.getAddons.showPane", false); +pref("extensions.htmlaboutaddons.recommendations.enabled", false); // Show our legacy extensions directly on about:addons and get rid of the // warning for the default theme. pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton(a)torproject.org");

1 0

[tor-browser-build/master] Bug 31621: Add --verbose flag to mach again
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 5648e1499c10d2565e2cd9ca23599b532df8cff4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 4 18:53:58 2019 +0000 Bug 31621: Add --verbose flag to mach again The underlying node bug got worked around in Mozilla's bug 1500436 and we cherry-pick that patch onto our esr68 branches. Thanks to a cypherpunk for finding that bugfix. --- projects/firefox/build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1450576..1a7893d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -104,9 +104,7 @@ rm -f js/src/configure # Android does not support --enable-bundled-fonts option ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] [% IF ! c("var/android") %]--enable-bundled-fonts[% END -%] --with-branding=[% c("var/branding_directory") %] -# Don't build with --verbose anymore or otherwise Stylo compilation breaks on -# Linux. See: #30321 for details. -./mach build +./mach build --verbose [% IF c("var/android") %] # Building a multi-locale .apk

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31621'
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit f08dbd57ed76faa08007608130da50c4f80a9d64 Merge: 873865a 5648e14 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 12:26:32 2019 +0200 Merge remote-tracking branch 'gk/bug_31621' projects/firefox/build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1500436 - Redirect node.js's stderr to a pipe. r=froydnj
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 4458b4e8a09aaa759f1735b36aec860aa61f3ba7 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Wed Jun 26 21:44:00 2019 +0000 Bug 1500436 - Redirect node.js's stderr to a pipe. r=froydnj This works around https://github.com/nodejs/node/issues/14752, which causes problems with make. Differential Revision: https://phabricator.services.mozilla.com/D35986 --HG-- extra : moz-landing-system : lando --- python/mozbuild/mozbuild/action/node.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py index de4e094a9471..73f13ac48503 100644 --- a/python/mozbuild/mozbuild/action/node.py +++ b/python/mozbuild/mozbuild/action/node.py @@ -52,14 +52,25 @@ def execute_node_cmd(node_cmd_list): print('Executing "{}"'.format(printable_cmd), file=sys.stderr) sys.stderr.flush() - output = subprocess.check_output(node_cmd_list) + # We need to redirect stderr to a pipe because + # https://github.com/nodejs/node/issues/14752 causes issues with make. + proc = subprocess.Popen( + node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + stdout, stderr = proc.communicate() + retcode = proc.wait() + + if retcode != 0: + print(stderr, file=sys.stderr) + sys.stderr.flush() + sys.exit(retcode) # Process the node script output # # XXX Starting with an empty list means that node scripts can # (intentionally or inadvertently) remove deps. Do we want this? deps = [] - for line in output.splitlines(): + for line in stdout.splitlines(): if 'dep:' in line: deps.append(line.replace('dep:', '')) else:

1 0

[tor-browser-build/master] Update rbm for #31264
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 873865aa9dc3d3f734458e86dbe542db67ad1929 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 12:06:51 2019 +0200 Update rbm for #31264 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index e04f03f..5a41aae 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e04f03f9626e993bb66d7784d258f95ca07bc769 +Subproject commit 5a41aae4a0d745f74b675d3c9c142b3d5fb3ca09

1 0

[rbm/master] Bug 31264: Remove timestamps from gzip headers
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 5a41aae4a0d745f74b675d3c9c142b3d5fb3ca09 Author: JeremyRand <biolizard89(a)gmail.com> Date: Tue Jul 30 22:34:19 2019 +0000 Bug 31264: Remove timestamps from gzip headers See https://wiki.debian.org/ReproducibleBuilds/TimestampsInGzipHeaders Thanks to boklm for helping with this patch. --- lib/RBM.pm | 2 +- lib/RBM/DefaultConfig.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 75912af..087ebe3 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -582,7 +582,7 @@ sub maketar { } my %compress = ( xz => ['xz', '-f'], - gz => ['gzip', '-f'], + gz => ['gzip', '--no-name', '-f'], bz2 => ['bzip2', '-f'], ); if (my $c = project_config($project, 'compress_tar', $options)) { diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index f8165c3..f7de8bb 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -575,7 +575,7 @@ OPT_END find [% src.join(' ') %] [% IF c('gnu_utils') %]-executable[% ELSE %]-perm +0111[% END %] -exec chmod 700 {} \\; find [% src.join(' ') %] ! [% IF c('gnu_utils') %]-executable[% ELSE %]-perm +0111[% END %] -exec chmod 600 {} \\; find [% src.join(' ') %] | sort | \ - tar --no-recursion [% IF c('gnu_utils') -%] + GZIP="--no-name \${GZIP}" tar --no-recursion [% IF c('gnu_utils') -%] --owner=root --group=root --mtime=@[% c('timestamp') %] [%- END -%] [% c('tar_args', { error_if_undef => 1 }) %] -T -

1 0

[tor-browser-build/master] Bug 31450: Use still GCC for our ASan builds
by boklm＠torproject.org 10 Sep '19

10 Sep '19

commit 47670953afb9026f2e49301f494d5a2faba15ec2 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 8 09:38:58 2019 +0000 Bug 31450: Use still GCC for our ASan builds --- projects/firefox/build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 87f8532..ba8422a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -29,8 +29,11 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" [% IF c("var/linux") || c("var/android") %] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" - # Use clang for everything on Linux now. - export PATH="/var/tmp/dist/clang/bin:$PATH" + # Use clang for everything on Linux and Android now if we don't build with + # ASan. + [% IF ! c("var/asan") -%] + export PATH="/var/tmp/dist/clang/bin:$PATH" + [% END -%] [% END -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31450'
by boklm＠torproject.org 10 Sep '19

10 Sep '19

commit 71eb0d2431d59ec06e4c1832df595fcd4a30cbf8 Merge: 82d382d 4767095 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 10 21:41:49 2019 +0200 Merge remote-tracking branch 'gk/bug_31450' projects/firefox/build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31450: Setting proper BINDGEN_CFLAGS
by boklm＠torproject.org 10 Sep '19

10 Sep '19

commit 56be840ce8e2c852bb040b39640db812a714a73b Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 8 14:54:53 2019 +0000 Bug 31450: Setting proper BINDGEN_CFLAGS --- .mozconfig-asan | 1 + 1 file changed, 1 insertion(+) diff --git a/.mozconfig-asan b/.mozconfig-asan index 04dd4373cd1f..8748f5825d3e 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -15,6 +15,7 @@ export HOST_LDFLAGS="-ldl" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 +export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --enable-address-sanitizer ac_add_options --disable-jemalloc

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 82d382db0d7ca83896ae1bc75b3c923904f626b1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 19:23:38 2019 +0000 Fold in stable Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6fcd33a..f97cb65 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 8.5.6 -- September 9 2019 + * Android + * Update Torbutton to 2.1.14 + * Bug 31616: Fix JIT related crashes on aarch64 + Tor Browser 9.0a6 -- September 4 2019 * All platforms * Update Firefox to 68.1.0esr

1 0

[tor-browser-build/master] Add missing item in 9.0a6 Changelog
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit ff6fd56b61cbd0773448845c1187fb62f9adb7f4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 19:23:01 2019 +0000 Add missing item in 9.0a6 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2cf1c5a..6fcd33a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -24,6 +24,7 @@ Tor Browser 9.0a6 -- September 4 2019 * Bug 25214: Canvas data extraction on locale pdf file should be allowed * Bug 30657: Locale is leaked via title of link tag on non-html page * Bug 31015: Disabling SVG hides UI icons in extensions + * Bug 30538: Unable to comment on The Independent Newspaper * Bug 31357: Retire Tom's default obfs4 bridge * Windows + OS X + Linux * Update Tor to 0.4.1.5

1 0

[tor-browser-build/maint-8.5] Prepare 8.5.6 for Android
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 816407cfd7ee029b677e1b225d7faef255c51863 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 06:09:24 2019 +0000 Prepare 8.5.6 for Android Changelog update and version bump --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ rbm.conf | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 2d022aa..544cdd2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 27d86a9..088b96d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 8.5.6 -- September 9 2019 + * Android + * Update Torbutton to 2.1.14 + * Bug 31616: Fix JIT related crashes on aarch64 + Tor Browser 8.5.5 -- September 3 2019 * All platforms * Update Firefox to 60.9.0esr diff --git a/rbm.conf b/rbm.conf index 2a95652..6783d6d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,8 +24,8 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5.5' - torbrowser_build: 'build2' + torbrowser_version: '8.5.6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5.4 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.9.0esr-8.5-2] Pick up Torbutton 2.1.14
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 0e179ca39eabf6465b585d719832f3020e5df790 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 06:03:00 2019 +0000 Pick up Torbutton 2.1.14 --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 850024dd1bef..6963d9bfe669 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 850024dd1bef30256f0ef443d4761aa43a3b84f6 +Subproject commit 6963d9bfe669dcb03ac23058c68989a74e3b7d1c

1 0

[torbutton/maint-2.1] Release prep for 2.1.14
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 6963d9bfe669dcb03ac23058c68989a74e3b7d1c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 05:59:06 2019 +0000 Release prep for 2.1.14 CHANGELOG update and version bump --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 9435d991..17a8e15a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +2.1.14 + * Bug 31616: Do not enable JIT on aarch64 + 2.1.13 * Bug 31520: Remove monthly giving banner from Tor Browser * Bug 31140: Do not enable IonMonkey on AARCH64 diff --git a/src/install.rdf b/src/install.rdf index df859c72..dedb2c81 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>2.1.13</em:version> + <em:version>2.1.14</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-2.1] Bug 31616: Fix JIT related crashes on aarch64
by gk＠torproject.org 08 Sep '19

08 Sep '19

commit 7d292d774a3605673c912b2d3a248b95c6fabcb1 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 7 20:19:56 2019 +0000 Bug 31616: Fix JIT related crashes on aarch64 Patch by sysrqb. --- src/modules/security-prefs.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index fb465a05..a0a4ad4d 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -47,9 +47,11 @@ const kCustomPref = "extensions.torbutton.security_custom"; var write_setting_to_prefs = function (settingIndex) { Object.keys(kSecuritySettings).forEach( prefName => { - // Bug 31140 - Do not enable IonMonkey on AARCH64. + // Bug 31140 and 31616 - Do not enable JIT on aarch64. if (XPCOMABI.split("-")[0] == "aarch64" && - prefName == "javascript.options.ion") { + (prefName == "javascript.options.ion" || + prefName == "javascript.options.baselinejit" || + prefName == "javascript.options.native_regexp")) { setBoolPref(prefName, false); return; }

1 0

[torbutton/master] Bug 31562: Fix circuit display for error pages
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit bb975009a65ab9039641d03b11023fe6c52f5b7a Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 5 17:56:08 2019 +0200 Bug 31562: Fix circuit display for error pages --- chrome/content/torbutton.js | 2 +- modules/utils.js | 49 +++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 9d6a5c48..94206ea5 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -850,7 +850,7 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New IP Address function torbutton_new_circuit() { - let firstPartyDomain = getDomainForBrowser(gBrowser); + let firstPartyDomain = getDomainForBrowser(gBrowser.selectedBrowser); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/modules/utils.js b/modules/utils.js index ea41fce9..0caf475f 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -4,9 +4,6 @@ // ### Import Mozilla Services const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -// ### About firstPartyDomain literal -const k_tb_about_uri_first_party_domain = "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla"; - // ## Pref utils // __prefs__. A shortcut to Mozilla Services.prefs. @@ -212,30 +209,34 @@ var show_torbrowser_manual = () => { return availableLocales.indexOf(shortLocale) >= 0; } +var getFPDFromHost = (hostname) => { + try { + return Services.eTLD.getBaseDomainFromHost(hostname); + } catch (e) { + if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || + e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { + return hostname; + } + } + return null; +} + +// Assuming this is called with gBrowser.selectedBrowser var getDomainForBrowser = (browser) => { - let firstPartyDomain = browser.contentPrincipal.originAttributes.firstPartyDomain; - // Bug 22538: For neterror or certerror, get firstPartyDomain causing it from the u param - if (firstPartyDomain === k_tb_about_uri_first_party_domain) { - let knownErrors = ["about:neterror", "about:certerror"]; - let origin = browser.contentPrincipal.origin || ''; - if (knownErrors.some(x => origin.startsWith(x))) { - try { - let urlOrigin = new URL(origin); - let { hostname } = new URL(urlOrigin.searchParams.get('u')); - if (hostname) { - try { - firstPartyDomain = Services.eTLD.getBaseDomainFromHost(hostname); - } catch (e) { - if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || - e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { - firstPartyDomain = hostname; - } - } - } - } catch (e) {} + let fpd = browser.contentPrincipal.originAttributes.firstPartyDomain; + // Bug 31562: For neterror or certerror, get the original URL from + // browser.currentURI and use it to calculate the firstPartyDomain. + let knownErrors = ["about:neterror", "about:certerror"]; + let documentURI = browser.documentURI; + if (documentURI && documentURI.schemeIs('about') && + knownErrors.some(x => documentURI.spec.startsWith(x))) { + let knownSchemes = ["http", "https", "ftp"]; + let currentURI = browser.currentURI; + if (currentURI && knownSchemes.some(x => currentURI.schemeIs(x))) { + fpd = getFPDFromHost(currentURI.host) || fpd; } } - return firstPartyDomain; + return fpd; }; // Export utility functions for external use.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31457: disable per-installation profiles
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 31d00e2f9c23184c2378d125c11a4e1219a8b59e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 4 08:23:19 2019 -0400 Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. --- browser/moz.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/moz.configure b/browser/moz.configure index 3057a5040c5f..43bc0c1fe59b 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -7,7 +7,7 @@ imply_option('MOZ_PLACES', True) imply_option('MOZ_SERVICES_HEALTHREPORT', True) imply_option('MOZ_SERVICES_SYNC', True) -imply_option('MOZ_DEDICATED_PROFILES', True) +imply_option('MOZ_DEDICATED_PROFILES', False) imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) with only_when(target_is_linux & compile_environment):

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up Torbutton changes for onboarding
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 936ea93a3e8dc9846c2e738096a3ad8a0fe90325 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 6 10:02:40 2019 +0000 Pick up Torbutton changes for onboarding --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 1edfec57049a..d796dd27d128 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 1edfec57049a76052fda8eb17b6e3b8f281e3361 +Subproject commit d796dd27d12850bd176a85e160002755bfccfab2

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 28822: Convert onboarding to webextension
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit b4e8db514df16856b567be1e13cb9af11a7de6e5 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:06:24 2019 +0200 fixup! Bug 28822: Convert onboarding to webextension --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- extensions/permissions/nsPermissionManager.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 33777dd27d6e..059701f78960 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -8,7 +8,7 @@ var EXPORTED_SYMBOLS = ["Onboarding"]; -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css"; const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties"; diff --git a/extensions/permissions/nsPermissionManager.cpp b/extensions/permissions/nsPermissionManager.cpp index 1a652bef4222..2e23d48623e8 100644 --- a/extensions/permissions/nsPermissionManager.cpp +++ b/extensions/permissions/nsPermissionManager.cpp @@ -125,6 +125,9 @@ static const nsLiteralCString kPreloadPermissions[] = { NS_LITERAL_CSTRING("cookie"), NS_LITERAL_CSTRING("trackingprotection"), NS_LITERAL_CSTRING("trackingprotection-pb"), + // Bug 28822: Make sure uitour permissions are preloaded in content processes. + NS_LITERAL_CSTRING("uitour"), + USER_INTERACTION_PERM}; // NOTE: nullptr can be passed as aType - if it is this function will return

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 535d41fd820d5b94caf43f3e403dc74b3566c837 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 11:45:55 2019 +0200 fixup! Bug 29768: Introduce new features to users Fixes bug 30560 --- .../content/img/figure_tor-security-level.png | Bin 10888 -> 11263 bytes .../content/img/figure_tor-toolbar-layout.png | Bin 5837 -> 10569 bytes .../extensions/onboarding/content/onboarding.css | 8 ++------ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/browser/extensions/onboarding/content/img/figure_tor-security-level.png b/browser/extensions/onboarding/content/img/figure_tor-security-level.png index 4f940ea008ef..9a5c221c8d8e 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-security-level.png and b/browser/extensions/onboarding/content/img/figure_tor-security-level.png differ diff --git a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png index 0a8161087827..624ef6514d39 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png and b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png differ diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index 7373e0da53fc..f71ec1d13789 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -27,7 +27,7 @@ padding: 16px 0 0 0; position: fixed; top: 4px; - offset-inline-start: 12px; + inset-inline-start: 12px; } /* @@ -41,7 +41,7 @@ width: 20px; height: 20px; top: -8px; - offset-inline-start: -16px; + inset-inline-start: -16px; background-color: #00E2B1; border-radius: 50%; animation: pulsate 2.0s ease-out; @@ -61,11 +61,7 @@ } #onboarding-overlay-button { - padding: 10px 0 0 0; - position: fixed; cursor: pointer; - top: 4px; - inset-inline-start: 12px; border: none; /* Set to none so no grey contrast background in the high-contrast mode */ background: none;

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26962 - implement new features onboarding (part 1).
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 915d521a2fae009509a229bdaeb1d3a95a17b8c1 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:12:18 2019 +0200 fixup! Bug 26962 - implement new features onboarding (part 1). --- browser/app/permissions | 2 -- browser/themes/shared/UITour.inc.css | 1 - 2 files changed, 3 deletions(-) diff --git a/browser/app/permissions b/browser/app/permissions index c9feba65b69f..fa17e78db211 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -9,8 +9,6 @@ # UITour # DuckDuckGo .onion (used for circuit display onboarding). origin uitour 1 https://3g2upl4pq6kufc4m.onion -origin uitour 1 about:home -origin uitour 1 about:newtab origin uitour 1 about:tor # Remote troubleshooting diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css index bfc782c68c5f..235e4d898e78 100644 --- a/browser/themes/shared/UITour.inc.css +++ b/browser/themes/shared/UITour.inc.css @@ -132,7 +132,6 @@ padding-right: 10px; } -/* The primary button gets the same color as the customize button. */ #UITourTooltipButtons > button.button-primary { background-color: #420C5D; color: white;

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs"
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 5d0ffb6cea1e3eca56884f087120f2b40aa2926b Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:48:36 2019 +0200 Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. --- browser/components/BrowserGlue.jsm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 7503ca7037e6..a99a29a014ad 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -3086,17 +3086,6 @@ BrowserGlue.prototype = { ); } - if (currentUIVersion < 76) { - // Clear old onboarding prefs from profile (bug 1462415) - let onboardingPrefs = Services.prefs.getBranch("browser.onboarding."); - if (onboardingPrefs) { - let onboardingPrefsArray = onboardingPrefs.getChildList(""); - for (let item of onboardingPrefsArray) { - Services.prefs.clearUserPref("browser.onboarding." + item); - } - } - } - if (currentUIVersion < 77) { // Remove currentset from all the toolbars let toolbars = [

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit e1ad91f3031dd08a0591d0f9d472cb49e015ad75 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 2 12:20:00 2019 +0200 fixup! Bug 26961: New user onboarding. --- browser/components/uitour/UITour.jsm | 2 +- browser/extensions/onboarding/api.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index 6eba73a8f51a..2a4c81d69374 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -789,7 +789,7 @@ var UITour = { let securityLevelButton = window.document.getElementById("security-level-button"); if (securityLevelButton) - securityLevelButton.doCommand(); + securityLevelButton.click(); break; } diff --git a/browser/extensions/onboarding/api.js b/browser/extensions/onboarding/api.js index db10a6d16248..d11e525b9f8c 100644 --- a/browser/extensions/onboarding/api.js +++ b/browser/extensions/onboarding/api.js @@ -8,7 +8,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { OnboardingTourType: "resource://onboarding/modules/OnboardingTourType.jsm", - OnboardingTelemetry: "resource://onboarding/modules/OnboardingTelemetry.jsm", Services: "resource://gre/modules/Services.jsm", UIState: "resource://services-sync/UIState.jsm", });

1 0

[torbutton/master] Bug 28822: Change about:tor CSP so that UITour-lib.js can be loaded
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit d796dd27d12850bd176a85e160002755bfccfab2 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 13:09:35 2019 +0200 Bug 28822: Change about:tor CSP so that UITour-lib.js can be loaded --- chrome/content/aboutTor/aboutTor.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 80716e5f..b146fb1b 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -20,7 +20,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: 'unsafe-inline';" /> + <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: resource: 'unsafe-inline';" /> <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all"

1 0

[tor-browser-build/master] Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser
by gk＠torproject.org 06 Sep '19

06 Sep '19

commit 34626bda99acdcc94d45e7095313d6d3882cdd32 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 30 18:45:23 2019 +0200 Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser --- projects/cbindgen/build | 9 ++------- projects/debootstrap-image/config | 7 ------- projects/firefox/build | 5 +---- projects/firefox/config | 6 +++++- projects/firefox/mozconfig-windows-i686 | 3 --- projects/gcc/build | 1 - projects/gcc/config | 1 - projects/go/build | 1 - projects/go/config | 1 - projects/mingw-w64-clang/build | 4 +--- projects/mingw-w64/config | 1 - projects/rust/build | 3 +-- projects/rust/config | 5 +---- projects/webrtc/build | 1 - rbm.conf | 14 ++------------ 15 files changed, 13 insertions(+), 49 deletions(-) diff --git a/projects/cbindgen/build b/projects/cbindgen/build index 402a216..429f567 100644 --- a/projects/cbindgen/build +++ b/projects/cbindgen/build @@ -22,13 +22,8 @@ replace-with = "vendored-sources" directory = "/var/tmp/build/cbindgen/vendor" EOF -[% IF ! c("var/windows-i686") -%] - target=x86_64 -[% ELSE -%] - target=i686 -[% END -%] -cargo build --release --frozen --target $target-unknown-linux-gnu -mv target/$target-unknown-linux-gnu/release/cbindgen $distdir/[% project %] +cargo build --release --frozen --target x86_64-unknown-linux-gnu +mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %] cd $distdir [% c('tar', { diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index cad9c77..a50cbf1 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -65,13 +65,6 @@ targets: suite: stretch arch: amd64 - stretch-i386: - var: - minimal_apt_version: 1.4.9 - container: - suite: stretch - arch: i386 - input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' diff --git a/projects/firefox/build b/projects/firefox/build index 1450576..87f8532 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,5 +1,4 @@ #!/bin/bash -[% c("var/setarch") -%] [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] @@ -11,9 +10,7 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/fxc2') %] export PATH="/var/tmp/dist/fxc2/bin:$PATH" # fxc2 requires Wine. - [% IF c("var/windows-x86_64") %] - export WINEARCH=win64 - [% END %] + export WINEARCH=[% IF c("var/windows-x86_64") %]win64[% ELSE %]win32[% END %] export HOME=/var/tmp/home mkdir -p $HOME WINEROOT=$HOME/.wine/drive_c diff --git a/projects/firefox/config b/projects/firefox/config index b13635c..334a1a8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -111,11 +111,15 @@ targets: arch_deps: - wine pre_pkginst: | + [% IF c("var/windows-i686") -%] + # We need this to install wine32 + dpkg --add-architecture i386 + [% END -%] echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list post_pkginst: | # We need to have at least 3.0.3 which Mozilla is using in the # mingw-w64/clang build process - apt-get -y -t stretch-backports install wine + apt-get -y -t stretch-backports install wine[% IF c("var/windows-i686") %]32[% END %] compiler: mingw-w64-clang windows-i686: diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 5538bc1..eaa704f 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -24,9 +24,6 @@ export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug -# Until we build on a 64bit host we need to hack around linker errors due to -# memory constraints -ac_add_options --disable-debug-symbols ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --enable-official-branding diff --git a/projects/gcc/build b/projects/gcc/build index 1d055b4..bd7e837 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -1,6 +1,5 @@ #!/bin/sh [% c("var/set_default_env") -%] -[% c("var/setarch") -%] [% IF c("var/linux") -%] # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 diff --git a/projects/gcc/config b/projects/gcc/config index 9fef3c4..d776a2c 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -8,7 +8,6 @@ var: - build-essential - libmpc-dev setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/gcc/bin:$PATH" diff --git a/projects/go/build b/projects/go/build index b9057a5..4945c88 100644 --- a/projects/go/build +++ b/projects/go/build @@ -1,6 +1,5 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist diff --git a/projects/go/config b/projects/go/config index fd96bb6..ffe07ea 100644 --- a/projects/go/config +++ b/projects/go/config @@ -8,7 +8,6 @@ var: use_container: 1 setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] export GOOS=[% c("var/GOOS") %] diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 820346d..b63a87f 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -24,9 +24,7 @@ tar -xf $rootdir/[% c('input_files_by_name/llvm-mingw') %] # Adding the wrappers and symlinks we need cd $distdir/bin exception_flags="" -target="" [% IF c("var/windows-i686") %] - target="--target=i686-linux-gnu" exception_flags="-fsjlj-exceptions" [% END -%] compiler_flags="--sysroot \$DIR/../[% c("arch") %]-w64-mingw32 -rtlib=compiler-rt -stdlib=libc++ -fuse-ld=lld $exception_flags -fuse-cxa-atexit -Qunused-arguments" @@ -49,7 +47,7 @@ ln -s llvm-nm [% c("arch") %]-w64-mingw32-nm ln -s llvm-strip [% c("arch") %]-w64-mingw32-strip ln -s llvm-readobj [% c("arch") %]-w64-mingw32-readobj ln -s llvm-objcopy [% c("arch") %]-w64-mingw32-objcopy -./clang $builddir/llvm-mingw/wrappers/windres-wrapper.c $target -O2 -Wl,-s -o [% c("arch") %]-w64-mingw32-windres +./clang $builddir/llvm-mingw/wrappers/windres-wrapper.c -O2 -Wl,-s -o [% c("arch") %]-w64-mingw32-windres # Building mingw-w64 export PATH="$distdir/bin:/var/tmp/dist/cmake/bin:$PATH" diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3bb1dda..658c83d 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -12,7 +12,6 @@ var: - build-essential - libmpc-dev setup: | - [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/mingw-w64/bin:$PATH" diff --git a/projects/rust/build b/projects/rust/build index ce039ea..9a6b54a 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -1,12 +1,11 @@ #!/bin/bash -[% c('var/setarch') %] [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] -cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('var/rust_arch') %]-unknown-linux-gnu +cd /var/tmp/dist/rust-[% c('var/prev_version') %]-x86_64-unknown-linux-gnu ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" diff --git a/projects/rust/config b/projects/rust/config index 106c709..dbde815 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -4,14 +4,12 @@ version: 1.34.2 var: prev_version: 1.33.0 - rust_arch: '[% c("arch") %]' container: use_container: 1 targets: android: var: - rust_arch: x86_64 arch_deps: - libssl-dev - pkg-config @@ -30,7 +28,6 @@ targets: linux: var: - rust_arch: x86_64 deps: - libc6-dev-i386 - lib32stdc++6 @@ -98,7 +95,7 @@ input_files: sig_ext: asc file_gpg_id: 1 gpg_keyring: rust.gpg - - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-[% c("var/rust_arch") %]-unknown-linux-gnu.tar.xz' + - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-x86_64-unknown-linux-gnu.tar.xz' name: prev_rust sig_ext: asc file_gpg_id: 1 diff --git a/projects/webrtc/build b/projects/webrtc/build index 77d4026..2ede64b 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -1,7 +1,6 @@ #!/bin/bash set -e [% c("var/set_default_env") -%] -[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/rbm.conf b/rbm.conf index 967eb08..581bd0e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -280,9 +280,6 @@ targets: var: windows-x86_64: 1 osname: windows-x86_64 - container: - arch: amd64 - faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # HEASLR is 64 bit only (see bug 12968) flag_HEASLR: '-Wl,--high-entropy-va' windows-i686: @@ -290,25 +287,18 @@ targets: var: windows-i686: 1 osname: windows-i686 - container: - arch: i386 - faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1 - setarch: | - if test -z "$RBM_SETARCH" - then - export RBM_SETARCH=1 - exec setarch i686 ./build - fi windows: var: windows: 1 container: suite: stretch + arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 deps: - build-essential - python

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit 21a73d6109f1e1f68b2dc9f7f2ca4a5922bcdd0a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 5 13:37:46 2019 +0000 Fold in stable Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bd20859..2cf1c5a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -85,6 +85,30 @@ Tor Browser 9.0a6 -- September 4 2019 * Bug 30461: Update tor-android-service project to use Firefox 68 toolchain * Bug 28753: Use Gradle with --offline when building the browser part +Tor Browser 8.5.5 -- September 3 2019 + * All platforms + * Update Firefox to 60.9.0esr + * Update Torbutton to 2.1.13 + * Bug 31520: Remove monthly giving banner from Tor Browser + * Bug 31140: Do not enable IonMonkey on AARCH64 + * Translations update + * Update NoScript to 11.0.3 + * Bug 26847: NoScript pops up a full-site window for XSS warning + * Bug 31287: NoScript leaks browser locale + * Bug 31357: Retire Tom's default obfs4 bridge + * Windows + OS X + Linux + * Update Tor to 0.4.1.5 + * Windows + * Bug 31547: Back out patch for Mozilla's bug 1574980 + * Bug 27503: Provide full support for accessibility tools + * Bug 30575: Don't allow enterprise policies in Tor Browser + * Bug 31141: Fix typo in font.system.whitelist + * Android + * Bug 28119: Tor Browser for aarch64 + * Build System + * All platforms + * Bug 31465: Bump Go to 1.12.9 + Tor Browser 9.0a5 -- July 31 2019 * Android * Bug 31260: Backport bug 1477259 for aarch64 support on Google Play

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up fix for #31598
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit a327f24b9b730258da19c37e7d09ad52b7cc2e9f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 5 07:19:36 2019 +0000 Pick up fix for #31598 --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 0efb110e9bc6..1edfec57049a 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 0efb110e9bc65e3289c58d093c32a25877f61e0b +Subproject commit 1edfec57049a76052fda8eb17b6e3b8f281e3361

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit f19b6946fcccb42b3b060c5ecf53ba8ec524b420 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 12:13:01 2019 +0200 squash! TB4: Tor Browser's Firefox preference overrides. Bug 31598: Enable letterboxing --- 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 6c2d2476e1b3..81352dcbaece 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -161,6 +161,8 @@ pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authenticati pref("browser.cache.frecency_experiment", -1); // Bug 2874: Block Components.interfaces from content pref("dom.use_components_shim", false); +// Enable letterboxing +pref("privacy.resistFingerprinting.letterboxing", true); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[torbutton/master] Bug 31598: Disable warning on window resize if letterboxing is enabled
by gk＠torproject.org 05 Sep '19

05 Sep '19

commit 1edfec57049a76052fda8eb17b6e3b8f281e3361 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 4 11:38:45 2019 +0200 Bug 31598: Disable warning on window resize if letterboxing is enabled --- chrome/content/torbutton.js | 14 ++++++++------ defaults/preferences/preferences.js | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 6209b6b8..9d6a5c48 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -92,6 +92,7 @@ var torbutton_unique_pref_observer = m_tb_prefs.addObserver("plugin.disable", this, false); m_tb_prefs.addObserver("privacy.firstparty.isolate", this, false); m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false); + m_tb_prefs.addObserver("privacy.resistFingerprinting.letterboxing", this, false); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Services.obs; @@ -107,6 +108,7 @@ var torbutton_unique_pref_observer = m_tb_prefs.removeObserver("plugin.disable", this); m_tb_prefs.removeObserver("privacy.firstparty.isolate", this); m_tb_prefs.removeObserver("privacy.resistFingerprinting", this); + m_tb_prefs.removeObserver("privacy.resistFingerprinting.letterboxing", this); var observerService = Services.obs; observerService.removeObserver(this, "xpcom-category-entry-added"); @@ -156,6 +158,7 @@ var torbutton_unique_pref_observer = torbutton_use_nontor_proxy(); break; case "privacy.resistFingerprinting": + case "privacy.resistFingerprinting.letterboxing": torbutton_update_fingerprinting_prefs(); break; case "privacy.firstparty.isolate": @@ -1508,14 +1511,14 @@ function torbutton_update_disk_prefs() { function torbutton_update_fingerprinting_prefs() { var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting"); + var letterboxing = m_tb_prefs.getBoolPref("privacy.resistFingerprinting.letterboxing", false); m_tb_prefs.setBoolPref("webgl.disable-extensions", mode); m_tb_prefs.setBoolPref("dom.network.enabled", !mode); m_tb_prefs.setBoolPref("dom.enable_performance", !mode); m_tb_prefs.setBoolPref("plugin.expose_full_path", !mode); m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", !mode); - - m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode); + m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode && !letterboxing); // Force prefs to be synced to disk Services.prefs.savePrefFile(null); @@ -1915,8 +1918,7 @@ function torbutton_new_window(event) let progress = Cc["@mozilla.org/docloaderservice;1"] .getService(Ci.nsIWebProgress); - if (m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows") - && torbutton_is_windowed(window)) { + if (torbutton_is_windowed(window)) { progress.addProgressListener(torbutton_resizelistener, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } @@ -1999,8 +2001,8 @@ var torbutton_resizelistener = await new Promise(resolve => setTimeout(resolve, 0)); if (window.windowState === window.STATE_MAXIMIZED || window.windowState === window.STATE_FULLSCREEN) { - if (m_tb_prefs. - getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { + if (m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows") && + m_tb_prefs.getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { // Do not add another notification if one is already showing. const kNotificationName = "torbutton-maximize-notification"; diff --git a/defaults/preferences/preferences.js b/defaults/preferences/preferences.js index e5d66d55..acea0a3d 100644 --- a/defaults/preferences/preferences.js +++ b/defaults/preferences/preferences.js @@ -30,7 +30,7 @@ pref("extensions.torbutton.cookie_protections",true); pref("extensions.torbutton.cookie_auto_protect",false); pref("extensions.torbutton.clear_http_auth",true); pref("extensions.torbutton.close_newnym",true); -pref("extensions.torbutton.resize_new_windows",true); +pref("extensions.torbutton.resize_new_windows",false); pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last pref("extensions.torbutton.tor_memory_jar",false); pref("extensions.torbutton.nontor_memory_jar",false);

1 0

[tor-browser-spec/master] Bug 31606: Don't update Tor Browser release date on the website
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 44866943861e1da1959c06e711c8be4b222eee91 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 3 14:05:14 2019 +0200 Bug 31606: Don't update Tor Browser release date on the website The new website does not include the Tor Browser release date, so there is no need to update it. --- processes/ReleaseProcess | 1 - 1 file changed, 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index a358959..41e268d 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -144,7 +144,6 @@ torsocks git pull origin # Update `version-win32-stable` as well if we include a new stable tor # version. See: #14152. - # Update the release date (via releasedate-torbrowserbundle*). See: #8968. # In the RecommendedTBBVersions file, only add the new version. Don't # remove the old one yet. That comes later. vim databags/versions.ini content/projects/torbrowser/RecommendedTBBVersions/contents.lr

1 0

[tor-browser-spec/master] Bug 31606: Fix instructions for updating the Windows Expert Bundle version
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 23c956584436ec12795af873aef02a700d49cf20 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 3 14:09:11 2019 +0200 Bug 31606: Fix instructions for updating the Windows Expert Bundle version --- processes/ReleaseProcess | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 41e268d..c183c9a 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -142,8 +142,9 @@ #. Update website's torbrowser versions file in the website git cd tpo torsocks git pull origin - # Update `version-win32-stable` as well if we include a new stable tor - # version. See: #14152. + # Update `win32` in the `torbrowser-stable` section as well if we + # include a new stable tor version (called the Windows Expert Bundle + # on the website). See: #14152. # In the RecommendedTBBVersions file, only add the new version. Don't # remove the old one yet. That comes later. vim databags/versions.ini content/projects/torbrowser/RecommendedTBBVersions/contents.lr

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 1330467 - part 7. Confirm FPI in permission manager tests; r=Ehsan
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit a8c2fe1a361abb926e6dbbce91940a1c56b0b9bf Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 09:41:37 2019 +0200 fixup! Bug 1330467 - part 7. Confirm FPI in permission manager tests; r=Ehsan --- extensions/permissions/test/unit/test_permmanager_defaults.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/permissions/test/unit/test_permmanager_defaults.js b/extensions/permissions/test/unit/test_permmanager_defaults.js index cfd42f49e92a..c586982a133c 100644 --- a/extensions/permissions/test/unit/test_permmanager_defaults.js +++ b/extensions/permissions/test/unit/test_permmanager_defaults.js @@ -156,11 +156,12 @@ add_task(async function do_test() { Ci.nsIPermissionManager.ALLOW_ACTION, pm.testPermissionFromPrincipal(principal4, TEST_PERMISSION) ); - // make sure principals with a firstPartyDomain use different permissions + // make sure principals with userContextId use the same permissions Assert.equal( Ci.nsIPermissionManager.ALLOW_ACTION, pm.testPermissionFromPrincipal(principal6, TEST_PERMISSION) ); + // make sure principals with a firstPartyDomain use different permissions Assert.equal( Ci.nsIPermissionManager.UNKNOWN_ACTION, pm.testPermissionFromPrincipal(principal7, TEST_PERMISSION)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 5b5b014217a2df562ea4551ae68d0bc267cedf97 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 09:12:56 2019 +0200 squash! TB4: Tor Browser's Firefox preference overrides. Bug 31065: Explicitly allow proxying localhost --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0d84455051e5..6c2d2476e1b3 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -173,6 +173,7 @@ pref("network.proxy.socks", "127.0.0.1"); pref("network.proxy.socks_port", 9150); pref("network.proxy.socks_remote_dns", true); pref("network.proxy.no_proxies_on", ""); // For fingerprinting and local service vulns (#10419) +pref("network.proxy.allow_hijacking_localhost", true); // Allow proxies for localhost (#31065) pref("network.proxy.type", 1); pref("network.security.ports.banned", "9050,9051,9150,9151"); pref("network.dns.disablePrefetch", true);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1560574 - use FormatPRExplodedTime to display GMT; r=kershaw
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit a2e76dee549c9efb60bfa13c0e6e4e5f8b5edd76 Author: Liang-Heng Chen <xeonchen(a)gmail.com> Date: Tue Aug 20 14:00:31 2019 +0000 Bug 1560574 - use FormatPRExplodedTime to display GMT; r=kershaw Differential Revision: https://phabricator.services.mozilla.com/D36502 --HG-- extra : moz-landing-system : lando --- .../streamconv/converters/nsFTPDirListingConv.cpp | 2 +- netwerk/streamconv/converters/nsIndexedToHTML.cpp | 25 +++++++++++--- netwerk/test/unit/test_bug365133.js | 16 ++++----- netwerk/test/unit/test_bug484684.js | 40 +++++++++++----------- netwerk/test/unit/test_bug515583.js | 4 +-- netwerk/test/unit/test_bug543805.js | 24 ++++++------- 6 files changed, 64 insertions(+), 47 deletions(-) diff --git a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index af0093fd5c6c..b721016afd8f 100644 --- a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -294,7 +294,7 @@ char* nsFTPDirListingConv::DigestBufferLines(char* aBuffer, // the application/http-index-format specs // viewers of such a format can then reformat this into the // current locale (or anything else they choose) - PR_FormatTimeUSEnglish(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S", + PR_FormatTimeUSEnglish(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S GMT", &result.fe_time); nsAutoCString escaped; diff --git a/netwerk/streamconv/converters/nsIndexedToHTML.cpp b/netwerk/streamconv/converters/nsIndexedToHTML.cpp index cb8cf9c2f065..9ff8985cd48a 100644 --- a/netwerk/streamconv/converters/nsIndexedToHTML.cpp +++ b/netwerk/streamconv/converters/nsIndexedToHTML.cpp @@ -25,6 +25,7 @@ #include "nsDirIndexParser.h" #include "nsNativeCharsetUtils.h" #include "nsString.h" +#include "nsContentUtils.h" #include <algorithm> #include "nsIChannel.h" #include "mozilla/Unused.h" @@ -670,6 +671,24 @@ nsIndexedToHTML::OnDataAvailable(nsIRequest* aRequest, nsIInputStream* aInput, return mParser->OnDataAvailable(aRequest, aInput, aOffset, aCount); } +static nsresult FormatTime(const nsDateFormatSelector aDateFormatSelector, + const nsTimeFormatSelector aTimeFormatSelector, + const PRTime aPrTime, nsAString& aStringOut) { + // FormatPRExplodedTime will use GMT based formatted string (e.g. GMT+1) + // instead of local time zone name (e.g. CEST). + // To avoid this case when ResistFingerprinting is disabled, use + // |FormatPRTime| to show exact time zone name. + if (!nsContentUtils::ShouldResistFingerprinting()) { + return mozilla::DateTimeFormat::FormatPRTime( + aDateFormatSelector, aTimeFormatSelector, aPrTime, aStringOut); + } + + PRExplodedTime prExplodedTime; + PR_ExplodeTime(aPrTime, PR_GMTParameters, &prExplodedTime); + return mozilla::DateTimeFormat::FormatPRExplodedTime( + aDateFormatSelector, aTimeFormatSelector, &prExplodedTime, aStringOut); +} + NS_IMETHODIMP nsIndexedToHTML::OnIndexAvailable(nsIRequest* aRequest, nsISupports* aCtxt, nsIDirIndex* aIndex) { @@ -816,12 +835,10 @@ nsIndexedToHTML::OnIndexAvailable(nsIRequest* aRequest, nsISupports* aCtxt, pushBuffer.AppendInt(static_cast<int64_t>(t)); pushBuffer.AppendLiteral("\">"); nsAutoString formatted; - mozilla::DateTimeFormat::FormatPRTime(kDateFormatShort, kTimeFormatNone, t, - formatted); + FormatTime(kDateFormatShort, kTimeFormatNone, t, formatted); AppendNonAsciiToNCR(formatted, pushBuffer); pushBuffer.AppendLiteral("</td>\n <td>"); - mozilla::DateTimeFormat::FormatPRTime(kDateFormatNone, kTimeFormatSeconds, - t, formatted); + FormatTime(kDateFormatNone, kTimeFormatSeconds, t, formatted); // use NCR to show date in any doc charset AppendNonAsciiToNCR(formatted, pushBuffer); } diff --git a/netwerk/test/unit/test_bug365133.js b/netwerk/test/unit/test_bug365133.js index d9aabd5c6ea9..a872d7a5c7d9 100644 --- a/netwerk/test/unit/test_bug365133.js +++ b/netwerk/test/unit/test_bug365133.js @@ -8,7 +8,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "a%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 DIRECTORY \n', + '201: "a%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT DIRECTORY \n', ], [ /* Unix style listing, space at the end of link name */ @@ -17,7 +17,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "l%20" 2 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "l%20" 2 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* Unix style listing, regular file with " -> " in name */ @@ -26,7 +26,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "arrow%20-%3E%20in%20name%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "arrow%20-%3E%20in%20name%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], [ /* Unix style listing, tab at the end of filename */ @@ -35,7 +35,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "t%09" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 DIRECTORY \n', + '201: "t%09" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT DIRECTORY \n', ], [ /* Unix style listing, multiple " -> " in filename */ @@ -44,7 +44,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "symlink%20with%20arrow%20-%3E%20in%20name" 26 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "symlink%20with%20arrow%20-%3E%20in%20name" 26 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* Unix style listing, multiple " -> " in filename, incorrect filesize */ @@ -53,7 +53,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "symlink%20with%20arrow%20-%3E%20in%20name%20-%3E%20file%20with%20arrow" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "symlink%20with%20arrow%20-%3E%20in%20name%20-%3E%20file%20with%20arrow" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* DOS style listing, space at the end of filename, year 1999 */ @@ -62,7 +62,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file%20" 1024 Fri%2C%2001%20Jan%201999%2001%3A00%3A00 FILE \n', + '201: "file%20" 1024 Fri%2C%2001%20Jan%201999%2001%3A00%3A00%20GMT FILE \n', ], [ /* DOS style listing, tab at the end of filename, year 2000 */ @@ -71,7 +71,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file%09" 1024 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "file%09" 1024 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], ]; diff --git a/netwerk/test/unit/test_bug484684.js b/netwerk/test/unit/test_bug484684.js index ae0d8276aaa4..e867d0c01637 100644 --- a/netwerk/test/unit/test_bug484684.js +++ b/netwerk/test/unit/test_bug484684.js @@ -10,8 +10,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "%20file2" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "%20file2" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // old Hellsoft unix format [ @@ -22,8 +22,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "file2" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "file2" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // new Hellsoft unix format [ @@ -34,8 +34,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "%20file2" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "%20file2" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // DOS format with correct offsets [ @@ -50,12 +50,12 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n' + - '201: "%20dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "%20junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "%20file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n' + + '201: "%20dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "%20junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "%20file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], // DOS format with wrong offsets [ @@ -72,14 +72,14 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "dir3" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "junction3" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n' + - '201: "file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "dir3" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "junction3" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n' + + '201: "file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], ]; diff --git a/netwerk/test/unit/test_bug515583.js b/netwerk/test/unit/test_bug515583.js index 85db9fd8e9ef..fe958747e25c 100644 --- a/netwerk/test/unit/test_bug515583.js +++ b/netwerk/test/unit/test_bug515583.js @@ -14,8 +14,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "A" 2048 Wed%2C%2003%20Mar%201993%2018%3A09%3A01 FILE \n' + - '201: "E" 2048 Mon%2C%2008%20Mar%201993%2018%3A09%3A01 FILE \n', + '201: "A" 2048 Wed%2C%2003%20Mar%201993%2018%3A09%3A01%20GMT FILE \n' + + '201: "E" 2048 Mon%2C%2008%20Mar%201993%2018%3A09%3A01%20GMT FILE \n', ], [ "\r\r\r\n", diff --git a/netwerk/test/unit/test_bug543805.js b/netwerk/test/unit/test_bug543805.js index f4dec7e099b4..8ea493982e01 100644 --- a/netwerk/test/unit/test_bug543805.js +++ b/netwerk/test/unit/test_bug543805.js @@ -22,24 +22,24 @@ const tests = [ day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "%20test.blankfile" 22 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n' + + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n' + '201: "nodup.file" 44 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "test.file" 55 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n', + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n', ], // standard ls format @@ -59,24 +59,24 @@ const tests = [ day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "%20test.blankfile" 22 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n' + + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n' + '201: "nodup.file" 44 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "test.file" 55 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n', + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n', ], ];

1 0

[tor-browser-build/master] Pick up another fix for obfs4 compilation bustage
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 9fde9fe3b38b8785d08ea0d1fc291ac0c266ed04 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 21:12:39 2019 +0000 Pick up another fix for obfs4 compilation bustage --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 244421c..967eb08 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a6' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 9.0a4 project_name: tor-browser

1 0

[tor-browser-build/master] fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek.
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 8cb36805e3f408b9958d3bf75811d87cb54453e2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 21:11:30 2019 +0000 fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek. --- projects/goutls/config | 1 - projects/goxnet/config | 8 +------- projects/obfs4/build | 25 +++++++------------------ projects/obfs4/config | 2 -- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/projects/goutls/config b/projects/goutls/config index d738305..fa4b5d8 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -28,4 +28,3 @@ input_files: - name: gobsaes project: gobsaes - filename: sessionid.patch - enable: '[% c("var/nightly") || c("var/alpha") %]' diff --git a/projects/goxnet/config b/projects/goxnet/config index 6aa5a0e..ae574c6 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: 7dbad50ab5b31073856416cdcfeb2796d682f844 +git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -13,12 +13,6 @@ var: go_lib_install: - golang.org/x/net/proxy -targets: - nightly: - # Nightly version of obfs4 requires a more recent version of goxnet - # See bug 29193 - git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 - input_files: - project: container-image - name: go diff --git a/projects/obfs4/build b/projects/obfs4/build index 3f650c4..33b0add 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -11,29 +11,18 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] -[% IF c("var/nightly") || c("var/alpha") -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] -[% END -%] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/nightly") || c("var/alpha") -%] - # Remove go.mod and go.sum files until we can build using Go module - # versioning (see bug 28325). - rm -f go.mod go.sum -[% END -%] -# Commit 70d0e90c861be34ce3c5425ef1366a0b2ceb3026 changed the canonical obfs4 -# upstream repo to gitlab.com/yawning/obfs4.git. -[% IF c("var/nightly") || c("var/alpha") %] - mkdir -p "$GOPATH/src/gitlab.com/yawning" - ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git" -[% ELSE %] - mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" - ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" -[% END %] +# Remove go.mod and go.sum files until we can build using Go module +# versioning (see bug 28325). +rm -f go.mod go.sum +mkdir -p "$GOPATH/src/gitlab.com/yawning" +ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git" cd obfs4proxy go build -ldflags '-s' cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR diff --git a/projects/obfs4/config b/projects/obfs4/config index ce57cdc..d9357bb 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -34,7 +34,5 @@ input_files: project: goxnet - name: goutls project: goutls - enable: '[% c("var/nightly") || c("var/alpha") %]' - name: goxtext project: goxtext - enable: '[% c("var/nightly") || c("var/alpha") %]'

1 0

[tor-browser-build/master] Pick up fix for obfs4 compilation bustage
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 708993137e2cea1cdc979722a76c3eedd3f6cfd5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 20:32:50 2019 +0000 Pick up fix for obfs4 compilation bustage --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index c16e8ae..244421c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a6' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.0a4 project_name: tor-browser

1 0

[tor-browser-build/master] fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek.
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 86021a7ad8c95feaf26247ff33481be3bb863fcc Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 20:31:25 2019 +0000 fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek. --- projects/obfs4/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/obfs4/config b/projects/obfs4/config index 48afc2f..ce57cdc 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -34,7 +34,7 @@ input_files: project: goxnet - name: goutls project: goutls - enable: '[% c("var/nightly") %]' + enable: '[% c("var/nightly") || c("var/alpha") %]' - name: goxtext project: goxtext - enable: '[% c("var/nightly") %]' + enable: '[% c("var/nightly") || c("var/alpha") %]'

1 0

[tor-browser-build/master] Pick up fix for #31592
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 4e2920301010a8c6f127828a40321aa81b28820c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 15:47:45 2019 +0000 Pick up fix for #31592 --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 6bdcf8d..b13635c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1

1 0