- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-115.11.0esr-13.5-1] 2 commits: fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 29 May '24

29 May '24

Pier Angelo Vendrame pushed to branch tor-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 77793754 by Pier Angelo Vendrame at 2024-05-29T20:31:38+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42604: Log the circuit nodes when we see the CIRC BUILT event (with debug level). - - - - - 46c67143 by Pier Angelo Vendrame at 2024-05-29T20:31:43+02:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. Bug 42604: Log a message when we update the data about a certain circuit. - - - - - 2 changed files: - toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs ===================================== @@ -588,6 +588,7 @@ class TorDomainIsolatorImpl { data = await Promise.all( circuit.map(fingerprint => provider.getNodeInfo(fingerprint)) ); + logger.debug(`Updating circuit ${id}`, data); this.#knownCircuits.set(id, data); // We know that something changed, but we cannot know if anyone is // interested in this change. So, we have to notify all the possible ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -1035,6 +1035,7 @@ export class TorProvider { */ async onCircuitBuilt(id, nodes) { this.#circuits.set(id, nodes); + logger.debug(`Built tor circuit ${id}`, nodes); // Ignore circuits of length 1, that are used, for example, to probe // bridges. So, only store them, since we might see streams that use them, // but then early-return. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5826b2… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5826b2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41151: Explicitly initialize the plugin directory on the Windows installer.
by richard (＠richard) 29 May '24

29 May '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 87212fc3 by Pier Angelo Vendrame at 2024-05-29T18:46:39+02:00 Bug 41151: Explicitly initialize the plugin directory on the Windows installer. Otherwise, the Windows installer might show an error when opening. - - - - - 1 changed file: - projects/browser/windows-installer/browser-install.nsi Changes: ===================================== projects/browser/windows-installer/browser-install.nsi ===================================== @@ -64,6 +64,7 @@ Function .onInit ; Skip NSIS's language selection prompt and try to use the OS language without ; further confirmations. + InitPluginsDir File /oname=$PLUGINSDIR\${WELCOME_IMAGE} "${WELCOME_IMAGE}" ReadRegStr $existingInstall HKCU "${UNINST_KEY}" "InstallLocation" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41129: Make an rpm package for Mullvad Browser
by boklm (＠boklm) 29 May '24

29 May '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0d395222 by Nicolas Vigier at 2024-05-29T12:04:09+02:00 Bug 41129: Make an rpm package for Mullvad Browser - - - - - 10 changed files: - projects/linux-packages/Makefile.in - projects/linux-packages/debian/browser.desktop.in → projects/linux-packages/browser.desktop.in - projects/linux-packages/build - projects/linux-packages/config - − projects/linux-packages/debian/install.in - − projects/linux-packages/debian/links.in - + projects/linux-packages/rpm-package.spec - projects/release/build - projects/release/config - tools/signing/linux-signer-gpg-sign Changes: ===================================== projects/linux-packages/Makefile.in ===================================== @@ -3,5 +3,25 @@ build: echo 'This is a packaged app.' > "${DEB_TARGET_ARCH}/Browser/is-packaged-app" [% c("touch") %] "${DEB_TARGET_ARCH}/Browser/is-packaged-app" +install: + mkdir -p "${DESTDIR}/[% c('var/system_pkg/install_path') %]" + cp -a "${DEB_TARGET_ARCH}/Browser"/* "${DESTDIR}/[% c('var/system_pkg/install_path') %]" + chmod -R go+rX "${DESTDIR}/[% c('var/system_pkg/install_path') %]" + mkdir -p "${DESTDIR}/usr/share/applications" + cp -a [% c("var/system_pkg/pkg_name") %].desktop "${DESTDIR}/usr/share/applications" + mkdir -p "${DESTDIR}/usr/bin" + ln -s "/[% c('var/system_pkg/install_path') %]/start-[% c('var/project-name') %]" \ + "${DESTDIR}/usr/bin/[% c('var/system_pkg/pkg_name') %]" + for res in 16 32 48 64 128 ;\ + do \ + resdir="${DESTDIR}/usr/share/icons/hicolor/$${res}x$${res}/apps"; \ + mkdir -p "$$resdir"; \ + ln -s "/[% c('var/system_pkg/install_path') %]/browser/chrome/icons/default/default$${res}.png" \ + "$${resdir}/[% c('var/system_pkg/pkg_name') %].png"; \ + done + mkdir -p "${DESTDIR}/usr/share/icons/hicolor/scalable/apps" + ln -s "/[% c('var/system_pkg/install_path') %]/browser/chrome/icons/default/about-logo.svg" \ + "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/[% c('var/system_pkg/pkg_name') %].svg" + clean: rm -f "${DEB_TARGET_ARCH}/Browser/is-packaged-app" ===================================== projects/linux-packages/debian/browser.desktop.in → projects/linux-packages/browser.desktop.in ===================================== ===================================== projects/linux-packages/build ===================================== @@ -7,12 +7,13 @@ mkdir -p $OUTDIR mkdir -p "$distdir" export SOURCE_DATE_EPOCH='[% c("timestamp") %]' +umask 0022 [% IF c("var/build_deb_pkg") -%] cd $distdir project_dir=[% c("var/system_pkg/pkg_name") %]-[% c("var/system_pkg/pkg_version") %] mkdir "$project_dir" - mv $rootdir/Makefile "$project_dir" + cp -a $rootdir/Makefile $rootdir/[% c("var/system_pkg/pkg_name") %].desktop "$project_dir" [% c('tar', { tar_src => [ '$project_dir' ], tar_args => '-cJf ' _ c("var/system_pkg/pkg_name") _ '_' _ c("var/system_pkg/pkg_version") _ '.orig.tar.xz', @@ -20,7 +21,7 @@ export SOURCE_DATE_EPOCH='[% c("timestamp") %]' cd "$project_dir" mv $rootdir/debian . - chmod +x debian/install debian/docs debian/rules + chmod +x debian/docs debian/rules mkdir debian/source echo -n '3.0 (quilt)' > debian/source/format @@ -30,7 +31,7 @@ export SOURCE_DATE_EPOCH='[% c("timestamp") %]' deb_arch="$2" mkdir $deb_arch tar -C $deb_arch --strip-components=1 -xf "$src_tar" - mv "$src_tar" \ + cp "$src_tar" \ ../[% c("var/system_pkg/pkg_name") %]_[% c("var/system_pkg/pkg_version") %].orig-$deb_arch.tar.xz } [% IF c("var/browser-linux-x86_64") -%] @@ -52,4 +53,34 @@ export SOURCE_DATE_EPOCH='[% c("timestamp") %]' mv -f "$deb_file_name" *.dsc *.orig.tar.xz *.debian.tar.xz "$OUTDIR/" popd [% END -%] + + cd .. +[% END %] + +[% IF c("var/build_rpm_pkg") -%] + + cat > ~/.rpmmacros << EOF + %clamp_mtime_to_source_date_epoch 1 + %use_source_date_epoch_as_buildtime 1 + %build_mtime_policy clamp_to_source_date_epoch + %_buildhost localhost +EOF + + mkdir rpm + cd rpm + mkdir SPECS SOURCES + cp -a $rootdir/[% c("var/system_pkg/pkg_name") %].spec SPECS + cp -a $rootdir/Makefile $rootdir/[% c("var/system_pkg/pkg_name") %].desktop SOURCES/ + [% IF c("var/browser-linux-x86_64") -%] + cp -a $rootdir/[% c('input_files_by_name/linux-x86_64') %]/[% c("var/project-name") %]-linux-x86_64-[% c("version") %].tar.xz \ + SOURCES/[% c("var/system_pkg/pkg_name") %]-linux-x86_64-[% c("var/system_pkg/pkg_version") %].tar.xz + [% END -%] + [% IF c("var/browser-linux-i686") -%] + cp -a $rootdir/[% c('input_files_by_name/linux-i686') %]/[% c("var/project-name") %]-linux-i686-[% c("version") %].tar.xz \ + SOURCES/[% c("var/system_pkg/pkg_name") %]-linux-i686-[% c("var/system_pkg/pkg_version") %].tar.xz + [% END -%] + rpmdir=$(pwd) + rpmbuild --define "_topdir $rpmdir" -v -bb SPECS/[% c("var/system_pkg/pkg_name") %].spec + mv RPMS/*/*.rpm "$OUTDIR/" + [% END %] ===================================== projects/linux-packages/config ===================================== @@ -6,11 +6,10 @@ container: use_container: 1 var: - build_deb_pkg: '[% c("var/mullvad-browser") %]' system_pkg: install_path: 'usr/lib/[% c("var/system_pkg/pkg_name") %]' pkg_name: '[% c("var/project-name") %]-[% c("var/channel") %]' - pkg_version: '[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]' + pkg_version: '[% c("var/torbrowser_version") %]' pkg_revision: '1' pkg_description: '[% c("var/display_name") %]' deb_release_date: '[% USE date; date.format(c("timestamp"), format = "%a, %d %b %Y 01:02:03 +0000", locale = "en_US") %]' @@ -19,25 +18,42 @@ var: - '[% IF c("var/browser-linux-x86_64") %]amd64[% END %]' - '[% IF c("var/browser-linux-i686") %]i386[% END %]' - arch_deps: - # Packages needed to build the deb package - - dpkg-dev - - debhelper - - dh-exec - # Packages needed to generate dependencies for the deb package - - linux-libc-dev - - libasound2-dev - - libfontconfig1-dev - - libfreetype6-dev - - libgconf2-dev - - libgtk-3-dev - - libpango1.0-dev - - libpulse-dev - - libx11-xcb-dev - - libxt-dev targets: + deb: + var: + build_deb_pkg: '[% c("var/mullvad-browser") %]' + arch_deps: + # Packages needed to build the deb package + - dpkg-dev + - debhelper + - dh-exec + # Packages needed to generate dependencies for the deb package + - linux-libc-dev + - libasound2-dev + - libfontconfig1-dev + - libfreetype6-dev + - libgconf2-dev + - libgtk-3-dev + - libpango1.0-dev + - libpulse-dev + - libx11-xcb-dev + - libxt-dev + + rpm: + var: + build_rpm_pkg: '[% c("var/mullvad-browser") %]' + + arch_deps: + # Packages needed to build the rpm package + - rpm + + # Use bookworm since rpm version from stretch does not produce + # reproducible rpm files + container: + suite: bookworm + browser-all: - browser-linux-x86_64 - browser-linux-i686 @@ -54,6 +70,8 @@ targets: torbrowser: var: browser_type: torbrowser + system_pkg: + pkg_url: 'https://torproject.org/' basebrowser: var: browser_type: basebrowser @@ -62,6 +80,7 @@ targets: browser_type: mullvadbrowser system_pkg: pkg_description: 'Mullvad Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting.' + pkg_url: 'https://mullvad.net/browser' release: var: @@ -105,6 +124,11 @@ input_files: content: "[% INCLUDE 'Makefile.in' %]" refresh_input: 1 + - filename: '[% c("var/system_pkg/pkg_name") %].desktop' + content: "[% INCLUDE 'browser.desktop.in' %]" + refresh_input: 1 + enable: '[% c("var/build_deb_pkg") || c("var/build_rpm_pkg") %]' + # Debian Package - filename: debian/changelog content: "[% INCLUDE 'debian/changelog.in' %]" @@ -120,25 +144,19 @@ input_files: content: "[% INCLUDE 'debian/copyright.in' %]" refresh_input: 1 enable: '[% c("var/build_deb_pkg") %]' - - filename: debian/install - content: "[% INCLUDE 'debian/install.in' %]" - refresh_input: 1 - enable: '[% c("var/build_deb_pkg") %]' - filename: debian/docs content: "[% INCLUDE 'debian/docs.in' %]" refresh_input: 1 enable: '[% c("var/build_deb_pkg") %]' - - filename: 'debian/[% c("var/system_pkg/pkg_name") %].desktop' - content: "[% INCLUDE 'debian/browser.desktop.in' %]" - refresh_input: 1 - enable: '[% c("var/build_deb_pkg") %]' - - filename: debian/links - content: "[% INCLUDE 'debian/links.in' %]" - refresh_input: 1 - enable: '[% c("var/build_deb_pkg") %]' - filename: debian/rules enable: '[% c("var/build_deb_pkg") %]' + # rpm package + - filename: '[% c("var/system_pkg/pkg_name") %].spec' + content: "[% INCLUDE 'rpm-package.spec' %]" + refresh_input: 1 + enable: '[% c("var/build_rpm_pkg") %]' + --- | # This part of the file contains options written in perl ( ===================================== projects/linux-packages/debian/install.in deleted ===================================== @@ -1,3 +0,0 @@ -#! /usr/bin/dh-exec -${DEB_HOST_ARCH}/Browser/* [% c("var/system_pkg/install_path") %] -debian/[% c("var/system_pkg/pkg_name") %].desktop usr/share/applications ===================================== projects/linux-packages/debian/links.in deleted ===================================== @@ -1,7 +0,0 @@ -[% c("var/system_pkg/install_path") %]/start-[% c("var/project-name") %] usr/bin/[% c("var/system_pkg/pkg_name") %] -[% c("var/system_pkg/install_path") %]/browser/chrome/icons/default/default16.png usr/share/icons/hicolor/16x16/apps/[% c("var/system_pkg/pkg_name") %].png -[% c("var/system_pkg/install_path") %]/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/[% c("var/system_pkg/pkg_name") %].png -[% c("var/system_pkg/install_path") %]/browser/chrome/icons/default/default48.png usr/share/icons/hicolor/48x48/apps/[% c("var/system_pkg/pkg_name") %].png -[% c("var/system_pkg/install_path") %]/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/[% c("var/system_pkg/pkg_name") %].png -[% c("var/system_pkg/install_path") %]/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/[% c("var/system_pkg/pkg_name") %].png -[% c("var/system_pkg/install_path") %]/browser/chrome/icons/default/about-logo.svg usr/share/icons/hicolor/scalable/apps/[% c("var/system_pkg/pkg_name") %].svg ===================================== projects/linux-packages/rpm-package.spec ===================================== @@ -0,0 +1,69 @@ +# Avoid provides/requires from private libraries +%global privlibs libfreeblpriv3 +%global privlibs %{privlibs}|libipcclientcerts +%global privlibs %{privlibs}|liblgpllibs +%global privlibs %{privlibs}|libmozavcodec +%global privlibs %{privlibs}|libmozavutil +%global privlibs %{privlibs}|libmozgtk +%global privlibs %{privlibs}|libmozsandbox +%global privlibs %{privlibs}|libmozsqlite3 +%global privlibs %{privlibs}|libmozwayland +%global privlibs %{privlibs}|libnspr4 +%global privlibs %{privlibs}|libnss3 +%global privlibs %{privlibs}|libnssckbi +%global privlibs %{privlibs}|libnssutil3 +%global privlibs %{privlibs}|libplc4 +%global privlibs %{privlibs}|libplds4 +%global privlibs %{privlibs}|libsmime3 +%global privlibs %{privlibs}|libsoftokn3 +%global privlibs %{privlibs}|libssl3 +%global privlibs %{privlibs}|libstdc\\+\\+ +%global privlibs %{privlibs}|libxul +%global __provides_exclude ^(%{privlibs})\\.so +%global __requires_exclude ^(%{privlibs})\\.so + +Summary: [% c("var/display_name") %] +Name: [% c("var/system_pkg/pkg_name") %] +Version: [% c("var/system_pkg/pkg_version") %] +Release: [% c("var/system_pkg/pkg_revision") %] +URL: [% c("var/system_pkg/pkg_url") %] +License: MPL-2.0 AND GPL-3.0-or-later AND OFL-1.1 AND Apache-2.0[% IF c("var/tor-browser") %] AND BSD-3-Clause AND CC0-1.0 AND MIT[% END %] +Source0: Makefile +Source1: [% c("var/system_pkg/pkg_name") %].desktop +[% IF c("var/browser-linux-x86_64") -%] +Source2: %{name}-linux-x86_64-%{version}.tar.xz +[% END -%] +[% IF c("var/browser-linux-i686") -%] +Source3: %{name}-linux-i686-%{version}.tar.xz +[% END -%] + +%description +[% c("var/system_pkg/pkg_description") %] + +%prep +mkdir -p "%name-%version" +cd "%name-%version" +cp %{_sourcedir}/Makefile . +cp %{_sourcedir}/[% c("var/system_pkg/pkg_name") %].desktop . +mkdir %{_arch} +tar -C %{_arch} --strip-components=1 -xf %{_sourcedir}/%{name}-linux-%{_arch}-%{version}.tar.xz + +%build +cd "%name-%version" +DEB_TARGET_ARCH=%{_arch} make build + +%install +cd "%name-%version" +DEB_TARGET_ARCH=%{_arch} make install DESTDIR="$RPM_BUILD_ROOT" + +%files +%defattr(-,root,root) +/[% c('var/system_pkg/install_path') %] +/usr/bin/[% c('var/system_pkg/pkg_name') %] +/usr/share/applications/[% c("var/system_pkg/pkg_name") %].desktop +/usr/share/icons/hicolor/16x16/apps/[% c("var/system_pkg/pkg_name") %].png +/usr/share/icons/hicolor/32x32/apps/[% c("var/system_pkg/pkg_name") %].png +/usr/share/icons/hicolor/48x48/apps/[% c("var/system_pkg/pkg_name") %].png +/usr/share/icons/hicolor/64x64/apps/[% c("var/system_pkg/pkg_name") %].png +/usr/share/icons/hicolor/128x128/apps/[% c("var/system_pkg/pkg_name") %].png +/usr/share/icons/hicolor/scalable/apps/[% c("var/system_pkg/pkg_name") %].svg ===================================== projects/release/build ===================================== @@ -38,7 +38,8 @@ mkdir -p "$destdir" mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ [% END -%] [% IF c("var/linux-packages") -%] - mv [% c('input_files_by_name/linux-packages') %]/* "$destdir"/ + mv [% c('input_files_by_name/deb-packages') %]/* "$destdir"/ + mv [% c('input_files_by_name/rpm-packages') %]/* "$destdir"/ [% END -%] [% IF c("var/browser-src") -%] mv [% c('input_files_by_name/src-firefox') %] \ @@ -62,7 +63,7 @@ EOF # empty any existing sh256sums file echo -n > sha256sums-unsigned-build.txt # concat sha256sum entry for each file in set -for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.bspatch *.json *.deb | grep -v '\.incremental\.mar$' | sort) +for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.bspatch *.json *.deb *.rpm | grep -v '\.incremental\.mar$' | sort) do sha256sum $i >> sha256sums-unsigned-build.txt done ===================================== projects/release/config ===================================== @@ -188,11 +188,21 @@ input_files: - '[% c("var/build_target") %]' - '[% c("var/browser_type") %]-linux-i686' - - name: linux-packages + - name: deb-packages project: linux-packages enable: '[% c("var/linux-packages") %]' # Add linux-x86_64 targets for container config target_prepend: + - deb + - linux-x86_64 + - linux + + - name: rpm-packages + project: linux-packages + enable: '[% c("var/linux-packages") %]' + # Add linux-x86_64 targets for container config + target_prepend: + - rpm - linux-x86_64 - linux ===================================== tools/signing/linux-signer-gpg-sign ===================================== @@ -10,7 +10,7 @@ test -n "$GPG_PASS" || read -sp "Enter gpg passphrase: " GPG_PASS currentdir=$(pwd) for i in `find . -name "*.dmg" -o -name "*.exe" -o -name "*.tar.xz" \ -o -name "*.txt" -o -name "*.zip" -o -name "*.tar.gz" -o -name "*.apk" \ - -o -name "*.deb" | sort` + -o -name "*.deb" -o -name "*.rpm" | sort` do if test -f "$i.asc" then View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.11.0esr-13.5-1] Bug 1858056 - Favor RawConfigParser.read_file instead of deprecated readfp r=saschanaz
by richard (＠richard) 29 May '24

29 May '24

richard pushed to branch mullvad-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 2cfc1d0d by Henry Wilkes at 2024-05-29T10:27:26+00:00 Bug 1858056 - Favor RawConfigParser.read_file instead of deprecated readfp r=saschanaz readfp is deprecated since Python 3.2 Differential Revision: https://phabricator.services.mozilla.com/D190532 - - - - - 2 changed files: - python/mach/mach/config.py - testing/web-platform/unittestrunner.py Changes: ===================================== python/mach/mach/config.py ===================================== @@ -309,7 +309,7 @@ class ConfigSettings(collections.abc.Mapping): """Load config data by reading file objects.""" for fp in fps: - self._config.readfp(fp) + self._config.read_file(fp) def write(self, fh): """Write the config to a file object.""" ===================================== testing/web-platform/unittestrunner.py ===================================== @@ -49,7 +49,7 @@ class ReplaceRequirements(object): parser = configparser.ConfigParser() path = os.path.join(self.tox_path, "tox.ini") with open(path) as f: - parser.readfp(f) + parser.read_file(f) deps = parser.get("testenv", "deps") dep_re = re.compile("(?:.*:\s*)?-r(.*)") View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/2cf… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/2cf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.11.0esr-13.5-1] Bug 1858056 - Favor RawConfigParser.read_file instead of deprecated readfp r=saschanaz
by richard (＠richard) 29 May '24

29 May '24

richard pushed to branch base-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: d4e0350b by Henry Wilkes at 2024-05-29T10:20:41+00:00 Bug 1858056 - Favor RawConfigParser.read_file instead of deprecated readfp r=saschanaz readfp is deprecated since Python 3.2 Differential Revision: https://phabricator.services.mozilla.com/D190532 - - - - - 2 changed files: - python/mach/mach/config.py - testing/web-platform/unittestrunner.py Changes: ===================================== python/mach/mach/config.py ===================================== @@ -309,7 +309,7 @@ class ConfigSettings(collections.abc.Mapping): """Load config data by reading file objects.""" for fp in fps: - self._config.readfp(fp) + self._config.read_file(fp) def write(self, fh): """Write the config to a file object.""" ===================================== testing/web-platform/unittestrunner.py ===================================== @@ -49,7 +49,7 @@ class ReplaceRequirements(object): parser = configparser.ConfigParser() path = os.path.join(self.tox_path, "tox.ini") with open(path) as f: - parser.readfp(f) + parser.read_file(f) deps = parser.get("testenv", "deps") dep_re = re.compile("(?:.*:\s*)?-r(.*)") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d4e0350… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d4e0350… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.11.0esr-13.5-1] Bug 1858056 - Favor RawConfigParser.read_file instead of deprecated readfp r=saschanaz
by richard (＠richard) 29 May '24

29 May '24

richard pushed to branch tor-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 5826b22f by Henry Wilkes at 2024-05-21T10:10:27+01:00 Bug 1858056 - Favor RawConfigParser.read_file instead of deprecated readfp r=saschanaz readfp is deprecated since Python 3.2 Differential Revision: https://phabricator.services.mozilla.com/D190532 - - - - - 2 changed files: - python/mach/mach/config.py - testing/web-platform/unittestrunner.py Changes: ===================================== python/mach/mach/config.py ===================================== @@ -309,7 +309,7 @@ class ConfigSettings(collections.abc.Mapping): """Load config data by reading file objects.""" for fp in fps: - self._config.readfp(fp) + self._config.read_file(fp) def write(self, fh): """Write the config to a file object.""" ===================================== testing/web-platform/unittestrunner.py ===================================== @@ -49,7 +49,7 @@ class ReplaceRequirements(object): parser = configparser.ConfigParser() path = os.path.join(self.tox_path, "tox.ini") with open(path) as f: - parser.readfp(f) + parser.read_file(f) deps = parser.get("testenv", "deps") dep_re = re.compile("(?:.*:\s*)?-r(.*)") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5826b22… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5826b22… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Modify build system
by Dan Ballard (＠dan) 28 May '24

28 May '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 06b84467 by Pier Angelo Vendrame at 2024-05-28T15:01:21+00:00 fixup! Modify build system Bug 42581: Check if a file exists before trying to sign it. - - - - - 1 changed file: - fenix/tools/tba-sign-devbuilds.sh Changes: ===================================== fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -29,6 +29,9 @@ fi sign () { apk="$(realpath $1)" out="$apk" + if [ ! -f "$apk" ]; then + return + fi out="${out/unsigned/signed}" aligned="$apk" aligned="${aligned/unsigned/aligned}" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/06b… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/06b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41150: Do not check for SSE2 in the Windows installer anymore.
by Pier Angelo Vendrame (＠pierov) 28 May '24

28 May '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c37f7e92 by Pier Angelo Vendrame at 2024-05-28T16:45:15+02:00 Bug 41150: Do not check for SSE2 in the Windows installer anymore. Tor Browser requires SSE2, so a long time ago we added a check on the Windows installer to warn users in case their machine did not support this instruction set. However, Windows 7 is the minimum OS we support, and from 2018 it also requires SSE2. Moreover, 14.0 will require Windows 10. We are going to add translations for the installer, and at this point it makes more sense to remove this check, rather than asking translators to translate a messages nobody will see in a few months from now. - - - - - 1 changed file: - projects/browser/windows-installer/common.nsh Changes: ===================================== projects/browser/windows-installer/common.nsh ===================================== @@ -66,15 +66,6 @@ Function CheckRequirements SetErrorLevel 1 Quit ${EndIf} - - ; Don't install on systems that don't support SSE2. The parameter value of - ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the - ; SSE2 instruction set is available. - System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" - ${If} "$R7" == "0" - MessageBox MB_OK|MB_ICONSTOP "${PROJECT_NAME} requires a processor with SSE2 support." - Quit - ${EndIf} FunctionEnd Function CheckIfTargetDirectoryExists View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41149: Add be, bg, and pt-PT to nightlies.
by Pier Angelo Vendrame (＠pierov) 28 May '24

28 May '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 80452869 by Pier Angelo Vendrame at 2024-05-28T16:41:13+02:00 Bug 41149: Add be, bg, and pt-PT to nightlies. Also, add support for skipping languages when they are evaluated as empty strings after being processed as templates. We already process them for Japanese, but with this change we will be able to enable/disable languages for specific channels. Also, fix a typo in the "id" language code in the map we use to associate language names to codes for NSIS. - - - - - 3 changed files: - projects/browser/windows-installer/language-map.sh - projects/firefox-l10n/config - rbm.conf Changes: ===================================== projects/browser/windows-installer/language-map.sh ===================================== @@ -1,4 +1,9 @@ #!/bin/bash + +# Usually NSIS uses English name with capital first letter. +# You can check the exact language names on NSIS's archive or here: +# https://sourceforge.net/p/nsis/code/HEAD/tree/NSIS/trunk/Contrib/Language%2… + declare -A nsis_languages nsis_languages[ar]="Arabic" nsis_languages[ca]="Catalan" @@ -13,7 +18,7 @@ nsis_languages[fr]="French" nsis_languages[ga-IE]="ScotsGaelic" nsis_languages[he]="Hebrew" nsis_languages[hu]="Hungarian" -nsis_languages[d]="Indonesian" +nsis_languages[id]="Indonesian" nsis_languages[is]="Icelandic" nsis_languages[it]="Italian" nsis_languages[ja]="Japanese" @@ -37,3 +42,8 @@ nsis_languages[uk]="Ukrainian" nsis_languages[vi]="Vietnamese" nsis_languages[zh-CN]="SimpChinese" nsis_languages[zh-TW]="TradChinese" + +# Currently nightly only +nsis_languages[be]="Belarusian" +nsis_languages[bg]="Bulgarian" +nsis_languages[pt-PT]="Portuguese" ===================================== projects/firefox-l10n/config ===================================== @@ -29,6 +29,7 @@ steps: my $locales = project_config($project, $locales_key, $options); foreach my $loc (@$locales) { my $locale = process_template($project, $loc, '.'); + next unless $locale; $locale =~ s/-r/-/; $locale = "id" if ($is_android && $locale eq "in"); $locale = "he" if ($is_android && $locale eq "iw"); ===================================== rbm.conf ===================================== @@ -149,6 +149,9 @@ var: - vi - zh-CN - zh-TW + - '[% IF c("var/nightly") %]be[% END %]' + - '[% IF c("var/nightly") %]bg[% END %]' + - '[% IF c("var/nightly") %]pt-PT[% END %]' locales_mobile: - ar - ca View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.11.0esr-13.5-1] 4 commits: fixup! Bug 42562: Normalized the Accepted Languages on Android.
by Pier Angelo Vendrame (＠pierov) 27 May '24

27 May '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: bc36a149 by Pier Angelo Vendrame at 2024-05-27T10:27:12+02:00 fixup! Bug 42562: Normalized the Accepted Languages on Android. Bug 42582: Use toLanguageTag() instead of toString() - - - - - 37ecad70 by Henry Wilkes at 2024-05-27T10:27:14+02:00 fixup! Base Browser strings Bug 42347: Add a notification for dropped OS version support. - - - - - 8649b2b1 by Henry Wilkes at 2024-05-27T10:27:14+02:00 Bug 42347: Add a notification for dropped OS version support. - - - - - 6e6cdac6 by Henry Wilkes at 2024-05-27T10:27:14+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 42573: Avoid async l10n.formatValue. - - - - - 6 changed files: - browser/base/content/browser.xhtml - + browser/base/content/droppedSupportNotification.js - browser/base/content/languageNotification.js - browser/base/jar.mn - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/base/content/browser.xhtml ===================================== @@ -123,6 +123,7 @@ Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); + Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); ===================================== browser/base/content/droppedSupportNotification.js ===================================== @@ -0,0 +1,69 @@ +"use strict"; + +// Show a prompt that a user's system will no longer be supported. +window.addEventListener("load", () => { + let labelId; + // Expire date is 2024-10-01 (1st October 2024). + const isExpired = Date.now() > Date.UTC(2024, 9, 1); + + if ( + AppConstants.platform === "macosx" && + Services.vc.compare( + Services.sysinfo.getProperty("version"), + "19.0" // MacOS 10.15 begins with Darwin 19.0 + ) < 0 + ) { + labelId = isExpired + ? "dropped-support-notification-macos-version-less-than-10-15-expired" + : "dropped-support-notification-macos-version-less-than-10-15"; + } else if ( + AppConstants.platform === "win" && + Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0 + ) { + labelId = isExpired + ? "dropped-support-notification-win-os-version-less-than-10-expired" + : "dropped-support-notification-win-os-version-less-than-10"; + } + + const dismissedPref = + "browser.dropped_support_notification_v14.dismiss_version"; + + if (!labelId) { + // Avoid setting any preferences for supported versions, and clean up any + // old values if the user ported their profile. + Services.prefs.clearUserPref(dismissedPref); + return; + } + + if ( + !isExpired && + Services.prefs.getStringPref(dismissedPref, "") === + AppConstants.BASE_BROWSER_VERSION + ) { + // Already dismissed since the last update. + return; + } + + const buttons = isExpired + ? undefined + : [ + { + "l10n-id": "dropped-support-notification-dismiss-button", + callback: () => { + Services.prefs.setStringPref( + dismissedPref, + AppConstants.BASE_BROWSER_VERSION + ); + }, + }, + ]; + + gNotificationBox.appendNotification( + "dropped-support-notification", + { + label: { "l10n-id": labelId }, + priority: gNotificationBox.PRIORITY_WARNING_HIGH, + }, + buttons + ); +}); ===================================== browser/base/content/languageNotification.js ===================================== @@ -2,7 +2,7 @@ // Show a prompt to suggest to the user that they can change the UI language. // Show it only the first time, and then do not show it anymore -window.addEventListener("load", async () => { +window.addEventListener("load", () => { const PREF_NAME = "intl.language_notification.shown"; if (Services.prefs.getBoolPref(PREF_NAME, false)) { @@ -35,12 +35,12 @@ window.addEventListener("load", async () => { Services.locale.requestedLocales, Services.locale.availableLocales ).length; - const label = await document.l10n.formatValue( - matchingSystem + const label = { + "l10n-id": matchingSystem ? "language-notification-label-system" : "language-notification-label", - { language } - ); + "l10n-args": { language }, + }; const buttons = [ { ===================================== browser/base/jar.mn ===================================== @@ -105,4 +105,5 @@ browser.jar: content/browser/spotlight.js (content/spotlight.js) * content/browser/default-bookmarks.html (content/default-bookmarks.html) + content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js) content/browser/languageNotification.js (content/languageNotification.js) ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java ===================================== @@ -843,7 +843,7 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { } } } - String acceptLanguages = locale != null ? locale.toString().replace('_', '-') : "en-US"; + String acceptLanguages = locale != null ? locale.toLanguageTag().replace('_', '-') : "en-US"; if (acceptLanguages.equals("en-US")) { // For consistency with spoof English. acceptLanguages += ", en"; ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -166,3 +166,21 @@ security-level-summary-custom = Your custom browser preferences have resulted in # Button to undo custom changes to the security level and place the user in one of the standard security levels. # Shown in the security level panel and settings. security-level-restore-defaults-button = Restore defaults + +## Notification for dropped operating system support. + +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "14.0" refers to the browser versions number: Tor Browser 14.0. +# "macOS" is a brand name, and 10.15 is the macOS version number. +dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates. +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "macOS" is a brand name, and 10.15 is the macOS version number. +dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates. +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "14.0" refers to the browser versions number: Tor Browser 14.0. +# "Windows" is a brand name, and "Windows 10" is the version. +dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates. +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "Windows" is a brand name, and "Windows 10" is the version. +dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates. +dropped-support-notification-dismiss-button = Got it View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ad… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ad… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.11.0esr-13.5-1] fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages
by Pier Angelo Vendrame (＠pierov) 27 May '24

27 May '24

Pier Angelo Vendrame pushed to branch base-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 1f9f11ca by Henry Wilkes at 2024-05-27T10:15:09+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 42573: Avoid async l10n.formatValue. - - - - - 1 changed file: - browser/base/content/languageNotification.js Changes: ===================================== browser/base/content/languageNotification.js ===================================== @@ -2,7 +2,7 @@ // Show a prompt to suggest to the user that they can change the UI language. // Show it only the first time, and then do not show it anymore -window.addEventListener("load", async () => { +window.addEventListener("load", () => { const PREF_NAME = "intl.language_notification.shown"; if (Services.prefs.getBoolPref(PREF_NAME, false)) { @@ -35,12 +35,12 @@ window.addEventListener("load", async () => { Services.locale.requestedLocales, Services.locale.availableLocales ).length; - const label = await document.l10n.formatValue( - matchingSystem + const label = { + "l10n-id": matchingSystem ? "language-notification-label-system" : "language-notification-label", - { language } - ); + "l10n-args": { language }, + }; const buttons = [ { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1f9f11c… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1f9f11c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.11.0esr-13.5-1] 3 commits: fixup! Bug 42562: Normalized the Accepted Languages on Android.
by Pier Angelo Vendrame (＠pierov) 27 May '24

27 May '24

Pier Angelo Vendrame pushed to branch base-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 00a60291 by Pier Angelo Vendrame at 2024-05-27T10:08:37+02:00 fixup! Bug 42562: Normalized the Accepted Languages on Android. Bug 42582: Use toLanguageTag() instead of toString() - - - - - 623ab54b by Henry Wilkes at 2024-05-27T10:08:39+02:00 fixup! Base Browser strings Bug 42347: Add a notification for dropped OS version support. - - - - - 68c9e866 by Henry Wilkes at 2024-05-27T10:08:39+02:00 Bug 42347: Add a notification for dropped OS version support. - - - - - 5 changed files: - browser/base/content/browser.xhtml - + browser/base/content/droppedSupportNotification.js - browser/base/jar.mn - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/base/content/browser.xhtml ===================================== @@ -123,6 +123,7 @@ Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); + Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); ===================================== browser/base/content/droppedSupportNotification.js ===================================== @@ -0,0 +1,69 @@ +"use strict"; + +// Show a prompt that a user's system will no longer be supported. +window.addEventListener("load", () => { + let labelId; + // Expire date is 2024-10-01 (1st October 2024). + const isExpired = Date.now() > Date.UTC(2024, 9, 1); + + if ( + AppConstants.platform === "macosx" && + Services.vc.compare( + Services.sysinfo.getProperty("version"), + "19.0" // MacOS 10.15 begins with Darwin 19.0 + ) < 0 + ) { + labelId = isExpired + ? "dropped-support-notification-macos-version-less-than-10-15-expired" + : "dropped-support-notification-macos-version-less-than-10-15"; + } else if ( + AppConstants.platform === "win" && + Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0 + ) { + labelId = isExpired + ? "dropped-support-notification-win-os-version-less-than-10-expired" + : "dropped-support-notification-win-os-version-less-than-10"; + } + + const dismissedPref = + "browser.dropped_support_notification_v14.dismiss_version"; + + if (!labelId) { + // Avoid setting any preferences for supported versions, and clean up any + // old values if the user ported their profile. + Services.prefs.clearUserPref(dismissedPref); + return; + } + + if ( + !isExpired && + Services.prefs.getStringPref(dismissedPref, "") === + AppConstants.BASE_BROWSER_VERSION + ) { + // Already dismissed since the last update. + return; + } + + const buttons = isExpired + ? undefined + : [ + { + "l10n-id": "dropped-support-notification-dismiss-button", + callback: () => { + Services.prefs.setStringPref( + dismissedPref, + AppConstants.BASE_BROWSER_VERSION + ); + }, + }, + ]; + + gNotificationBox.appendNotification( + "dropped-support-notification", + { + label: { "l10n-id": labelId }, + priority: gNotificationBox.PRIORITY_WARNING_HIGH, + }, + buttons + ); +}); ===================================== browser/base/jar.mn ===================================== @@ -105,4 +105,5 @@ browser.jar: content/browser/spotlight.js (content/spotlight.js) * content/browser/default-bookmarks.html (content/default-bookmarks.html) + content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js) content/browser/languageNotification.js (content/languageNotification.js) ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java ===================================== @@ -843,7 +843,7 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { } } } - String acceptLanguages = locale != null ? locale.toString().replace('_', '-') : "en-US"; + String acceptLanguages = locale != null ? locale.toLanguageTag().replace('_', '-') : "en-US"; if (acceptLanguages.equals("en-US")) { // For consistency with spoof English. acceptLanguages += ", en"; ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -166,3 +166,21 @@ security-level-summary-custom = Your custom browser preferences have resulted in # Button to undo custom changes to the security level and place the user in one of the standard security levels. # Shown in the security level panel and settings. security-level-restore-defaults-button = Restore defaults + +## Notification for dropped operating system support. + +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "14.0" refers to the browser versions number: Tor Browser 14.0. +# "macOS" is a brand name, and 10.15 is the macOS version number. +dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates. +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "macOS" is a brand name, and 10.15 is the macOS version number. +dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates. +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "14.0" refers to the browser versions number: Tor Browser 14.0. +# "Windows" is a brand name, and "Windows 10" is the version. +dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates. +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "Windows" is a brand name, and "Windows 10" is the version. +dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates. +dropped-support-notification-dismiss-button = Got it View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/50d371… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/50d371… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.11.0esr-13.5-1] fixup! Bug 41916: Letterboxing preferences UI
by Pier Angelo Vendrame (＠pierov) 27 May '24

27 May '24

Pier Angelo Vendrame pushed to branch base-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 50d37108 by Henry Wilkes at 2024-05-27T10:00:13+02:00 fixup! Bug 41916: Letterboxing preferences UI Bug 42583: Use moz-support-link for the letterboxing preference. Also update the url. - - - - - 1 changed file: - browser/components/preferences/letterboxing.inc.xhtml Changes: ===================================== browser/components/preferences/letterboxing.inc.xhtml ===================================== @@ -11,13 +11,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> </vbox> <groupbox @@ -32,13 +30,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <checkbox id="letterboxingRememberSize" @@ -59,13 +55,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <description id="letterboxingAlignmentDesc" @@ -110,13 +104,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <hbox align="center"> <label View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/50d3710… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/50d3710… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] alpha: new version, 13.5a8
by richard (＠richard) 17 May '24

17 May '24

richard pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: b29247d8 by Richard Pospesel at 2024-05-17T10:09:54+00:00 alpha: new version, 13.5a8 - - - - - 29 changed files: - update_1/alpha/.htaccess - − update_1/alpha/13.5a4-13.5a7-linux-x86_64-ALL.xml - − update_1/alpha/13.5a4-13.5a7-macos-ALL.xml - − update_1/alpha/13.5a4-13.5a7-windows-x86_64-ALL.xml - − update_1/alpha/13.5a5-13.5a7-linux-x86_64-ALL.xml - − update_1/alpha/13.5a5-13.5a7-macos-ALL.xml - − update_1/alpha/13.5a5-13.5a7-windows-x86_64-ALL.xml - + update_1/alpha/13.5a5-13.5a8-linux-x86_64-ALL.xml - + update_1/alpha/13.5a5-13.5a8-macos-ALL.xml - + update_1/alpha/13.5a5-13.5a8-windows-x86_64-ALL.xml - − update_1/alpha/13.5a6-13.5a7-linux-x86_64-ALL.xml - − update_1/alpha/13.5a6-13.5a7-macos-ALL.xml - − update_1/alpha/13.5a6-13.5a7-windows-x86_64-ALL.xml - + update_1/alpha/13.5a6-13.5a8-linux-x86_64-ALL.xml - + update_1/alpha/13.5a6-13.5a8-macos-ALL.xml - + update_1/alpha/13.5a6-13.5a8-windows-x86_64-ALL.xml - + update_1/alpha/13.5a7-13.5a8-linux-x86_64-ALL.xml - + update_1/alpha/13.5a7-13.5a8-macos-ALL.xml - + update_1/alpha/13.5a7-13.5a8-windows-x86_64-ALL.xml - − update_1/alpha/13.5a7-linux-x86_64-ALL.xml - − update_1/alpha/13.5a7-macos-ALL.xml - − update_1/alpha/13.5a7-windows-x86_64-ALL.xml - + update_1/alpha/13.5a8-linux-x86_64-ALL.xml - + update_1/alpha/13.5a8-macos-ALL.xml - + update_1/alpha/13.5a8-windows-x86_64-ALL.xml - update_1/alpha/download-linux-x86_64.json - update_1/alpha/download-macos.json - update_1/alpha/download-windows-x86_64.json - update_1/alpha/downloads.json Changes: ===================================== update_1/alpha/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/13.5a7/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a7-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a7-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a6/ALL 13.5a6-13.5a7-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a7-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 13.5a7-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a6/ALL 13.5a6-13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a4/ALL 13.5a4-13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a5/ALL 13.5a5-13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a6/ALL 13.5a6-13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 13.5a7-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a4/ALL 13.5a4-13.5a7-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a5/ALL 13.5a5-13.5a7-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a6/ALL 13.5a6-13.5a7-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a7-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a7-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/13.5a8/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a8-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a6/ALL 13.5a6-13.5a8-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a7/ALL 13.5a7-13.5a8-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a8-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.5a8-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a6/ALL 13.5a6-13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a7/ALL 13.5a7-13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a5/ALL 13.5a5-13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a6/ALL 13.5a6-13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a7/ALL 13.5a7-13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a8-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.5a8-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a5/ALL 13.5a5-13.5a8-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a6/ALL 13.5a6-13.5a8-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a7/ALL 13.5a7-13.5a8-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a8-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a8-windows-x86_64-ALL.xml [last] ===================================== update_1/alpha/13.5a4-13.5a7-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7_…" hashFunction="SHA512" hashValue="2f3c39a28b3da65e5592c6cf82a48849253e396b66cd564e57213cf1f7aa6946dd4a043cbaae823e8b881578661c16b6997c294a386ab79e9c35e582420532f0" size="108177359" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64--13.5a4…" hashFunction="SHA512" hashValue="aba1a3b3334ee8b8833cbd2c466049ec3e8633af7936b94b7bf105e138d6d066684029c4eeeef26c2e057162ec6f5d89d8ec6a87a24f96782ff0e89a9002c208" size="11357278" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a7-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7_ALL.mar" hashFunction="SHA512" hashValue="b169353967ad22a9e5b7f9911db2a0330e494971d98f009543ad29de3ca04d43945eca8707e8ceababcd84ce9e2f52bc02a3e9e343843ae545d6a619ca35aee4" size="115580635" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos--13.5a4-13.5a7…" hashFunction="SHA512" hashValue="954f52fde24e217ebcb9297d3b4de06437179343d723939f929a313b346b8d8267ea4ce11adc248288d91362f451cb7579263027f1d4159cbb35dd6ffdc7dc9f" size="75438707" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a7-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="07b79ad9c1a9be538b56219a64531fb77972a581adb9996241a17456b062314970c949ce5ef8d31ac2bd6e4f0aef9a8a9d7ed7332c63cf19e026e156f8f81b90" size="89800128" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="8a7add2e7f21554e649388793eed84e72ad6e378167c54db0b1cd6c2d38b861309eb0b7135c3beb1888a14cf9ccc77934462c3cfec26a87c462cf8b2ce12d7d3" size="10938745" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a7-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7_…" hashFunction="SHA512" hashValue="2f3c39a28b3da65e5592c6cf82a48849253e396b66cd564e57213cf1f7aa6946dd4a043cbaae823e8b881578661c16b6997c294a386ab79e9c35e582420532f0" size="108177359" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64--13.5a5…" hashFunction="SHA512" hashValue="20f6c406be2a65fc95cb6f55217df1de1e404989e3e44375daf6b3247e26a4c3d7550fa750e73c09b3634b06b95549c3cef103f678fcdebd26e64381bb2b7b73" size="10785100" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a7-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7_ALL.mar" hashFunction="SHA512" hashValue="b169353967ad22a9e5b7f9911db2a0330e494971d98f009543ad29de3ca04d43945eca8707e8ceababcd84ce9e2f52bc02a3e9e343843ae545d6a619ca35aee4" size="115580635" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos--13.5a5-13.5a7…" hashFunction="SHA512" hashValue="eb7b6890b3eb2020b8f916fe1def6c05da2b20da5f4ff03175806a847fe34b7b04e770b306cd3a9cbdcb0505d03420e8b5cc54272788ebb93f941d8352c8892a" size="75285209" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a7-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="07b79ad9c1a9be538b56219a64531fb77972a581adb9996241a17456b062314970c949ce5ef8d31ac2bd6e4f0aef9a8a9d7ed7332c63cf19e026e156f8f81b90" size="89800128" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="6b15fb4cb9dc42972602ad0558db2c395987ebc57fbce059a67a1192af8f6a8fc771877c9824c0e81d80933340014a39c6d51d7fdcbc35d104bc802571467834" size="9916729" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a8-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64-13.5a8_…" hashFunction="SHA512" hashValue="cd7cd93d15f482fdb6df922c83a5eb674c6ecd27009c9e8bf348297ff31392d4b442b9126ed7e5c7becb78ffa4714e3ee1cbf2e40a7b65ca467f2f39e9b2a799" size="108340195" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64--13.5a5…" hashFunction="SHA512" hashValue="f497012c8673d2db13452e36cb8050115a8fa0f422d016e9d4edb9ccaf451f4b5cdabe0f0969458ada0dde6452f1cc33d988a1444487cdfb7ec3c6b295e6dcbb" size="13958644" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a8-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos-13.5a8_ALL.mar" hashFunction="SHA512" hashValue="472e67795622bf987880e68b0f2e70b2a92ad001ed443cac6be4b6e5d73b94abdf2fcee9b41a676895ed4ebcbc06b4b0c526ba540f6d99de9778477361c95418" size="115757279" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos--13.5a5-13.5a8…" hashFunction="SHA512" hashValue="6fb306d81387f8d7f967619fad8b1b125857a6f87d4340e8f3609c977504a32acabd8a6718e8b38eec5c6e579effe8ad417bfb5d617be0e745b4b5ca9c35c081" size="17833382" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a8-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="0e783c9d6cbf50853ca63c84dd761ea1f0bd83d9b4fa513e41b906099e3e362cc5b14c6beebd07da9c40b6cf9891dfcf3c55827d446994350a1c2c16d7612063" size="89972252" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="ff7dda31b54859ef443708c5eec82dbc1f9d6a0a959ec3cbb957b0ee2881a250e327e37e0c1b5f2fe02b3e87fa040101a92031836b403eebfea1867b6df19df3" size="13718349" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a7-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7_…" hashFunction="SHA512" hashValue="2f3c39a28b3da65e5592c6cf82a48849253e396b66cd564e57213cf1f7aa6946dd4a043cbaae823e8b881578661c16b6997c294a386ab79e9c35e582420532f0" size="108177359" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64--13.5a6…" hashFunction="SHA512" hashValue="9edd25e8674b44b3e132a01aec0388e6d19a33674a8551e2af03c4cc4342b2abc705247b4c55f4100c578b6f149e2995df467ff22a97246e109bf21e7ef8883a" size="8750651" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a7-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7_ALL.mar" hashFunction="SHA512" hashValue="b169353967ad22a9e5b7f9911db2a0330e494971d98f009543ad29de3ca04d43945eca8707e8ceababcd84ce9e2f52bc02a3e9e343843ae545d6a619ca35aee4" size="115580635" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos--13.5a6-13.5a7…" hashFunction="SHA512" hashValue="a8c6ea5ed2d6c25061572a9e7c7dab835836f988333d69c1d63c7856221f3a8ed7a50c75747389b717794618f79c44d700f89471c6ca0859d88bea95e08c7ece" size="74047521" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a7-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="07b79ad9c1a9be538b56219a64531fb77972a581adb9996241a17456b062314970c949ce5ef8d31ac2bd6e4f0aef9a8a9d7ed7332c63cf19e026e156f8f81b90" size="89800128" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="6e772f84a813cddf33a10164de58e43512909b445e42ee93b84627d70b206be0e4eb837f4cd3a2b23dd706e3dce0ad9bda31c3620ea016d818bf75708950b1e7" size="8577815" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a8-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64-13.5a8_…" hashFunction="SHA512" hashValue="cd7cd93d15f482fdb6df922c83a5eb674c6ecd27009c9e8bf348297ff31392d4b442b9126ed7e5c7becb78ffa4714e3ee1cbf2e40a7b65ca467f2f39e9b2a799" size="108340195" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64--13.5a6…" hashFunction="SHA512" hashValue="bb74092b78dfe6ee417c81237d50ad495d0d7b9fde36864dcc2ae3b907bb9d9b8a5b9eec1c3ad8ec9d7c1259de27bda640d890104a2d5753c8c095fecc4fb4b2" size="12506903" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a8-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos-13.5a8_ALL.mar" hashFunction="SHA512" hashValue="472e67795622bf987880e68b0f2e70b2a92ad001ed443cac6be4b6e5d73b94abdf2fcee9b41a676895ed4ebcbc06b4b0c526ba540f6d99de9778477361c95418" size="115757279" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos--13.5a6-13.5a8…" hashFunction="SHA512" hashValue="fcbacbbeec2367d54c10ee7a4c00ca3c2f08ac09f3b97a166e97e64a6397d15957c224110d98d96f8fa63136f0527abff9041ef6f98cca46264d76c188581b37" size="16185610" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a8-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="0e783c9d6cbf50853ca63c84dd761ea1f0bd83d9b4fa513e41b906099e3e362cc5b14c6beebd07da9c40b6cf9891dfcf3c55827d446994350a1c2c16d7612063" size="89972252" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="146c538c112da3dafadf8bad19d241733b902a1e15b266e2d033bf5892887b22b4611b2624fdd3ab4483727416c451cf66292974084eb11f2b71698d5a973ab5" size="12241243" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a7-13.5a8-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64-13.5a8_…" hashFunction="SHA512" hashValue="cd7cd93d15f482fdb6df922c83a5eb674c6ecd27009c9e8bf348297ff31392d4b442b9126ed7e5c7becb78ffa4714e3ee1cbf2e40a7b65ca467f2f39e9b2a799" size="108340195" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64--13.5a7…" hashFunction="SHA512" hashValue="7c1ae03459b8f6dd0e593a4ddf7e4b95419f1e413a6d0f0026b3ffa4d5867b0e3be5337608ac0f6a4065576c1d55744b93e914af772ce8ce94efb211ad7dab94" size="8182053" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a7-13.5a8-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos-13.5a8_ALL.mar" hashFunction="SHA512" hashValue="472e67795622bf987880e68b0f2e70b2a92ad001ed443cac6be4b6e5d73b94abdf2fcee9b41a676895ed4ebcbc06b4b0c526ba540f6d99de9778477361c95418" size="115757279" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos--13.5a7-13.5a8…" hashFunction="SHA512" hashValue="30625d4d3234b7488c9fd94d141243eeb0b019e5f4a33a9a6e7c8a9c37d158e5e4324e474ff406f75fe5c4a33618f9cb7bfab41f1729c62200e406720a70cb47" size="11658581" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a7-13.5a8-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="0e783c9d6cbf50853ca63c84dd761ea1f0bd83d9b4fa513e41b906099e3e362cc5b14c6beebd07da9c40b6cf9891dfcf3c55827d446994350a1c2c16d7612063" size="89972252" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="d3e9fb4c59204c794a77b326c388d98d2997e8d89b2ae21d39973906e4ff201cc030c51d3d86c297326281996efa9d6b85655b8d9a4986573eb8acbd1c915663" size="8369705" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a7-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7_…" hashFunction="SHA512" hashValue="2f3c39a28b3da65e5592c6cf82a48849253e396b66cd564e57213cf1f7aa6946dd4a043cbaae823e8b881578661c16b6997c294a386ab79e9c35e582420532f0" size="108177359" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a7-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7_ALL.mar" hashFunction="SHA512" hashValue="b169353967ad22a9e5b7f9911db2a0330e494971d98f009543ad29de3ca04d43945eca8707e8ceababcd84ce9e2f52bc02a3e9e343843ae545d6a619ca35aee4" size="115580635" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a7-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="07b79ad9c1a9be538b56219a64531fb77972a581adb9996241a17456b062314970c949ce5ef8d31ac2bd6e4f0aef9a8a9d7ed7332c63cf19e026e156f8f81b90" size="89800128" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a8-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64-13.5a8_…" hashFunction="SHA512" hashValue="cd7cd93d15f482fdb6df922c83a5eb674c6ecd27009c9e8bf348297ff31392d4b442b9126ed7e5c7becb78ffa4714e3ee1cbf2e40a7b65ca467f2f39e9b2a799" size="108340195" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a8-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos-13.5a8_ALL.mar" hashFunction="SHA512" hashValue="472e67795622bf987880e68b0f2e70b2a92ad001ed443cac6be4b6e5d73b94abdf2fcee9b41a676895ed4ebcbc06b4b0c526ba540f6d99de9778477361c95418" size="115757279" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a8-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a8" appVersion="13.5a8" platformVersion="115.11.0" buildID="20240516000000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a8" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="0e783c9d6cbf50853ca63c84dd761ea1f0bd83d9b4fa513e41b906099e3e362cc5b14c6beebd07da9c40b6cf9891dfcf3c55827d446994350a1c2c16d7612063" size="89972252" type="complete"></patch></update></updates> ===================================== update_1/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7.…","git_tag":"mb-13.5a7-build2","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7.…","version":"13.5a7"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64-13.5a8.…","git_tag":"mb-13.5a8-build1","sig":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64-13.5a8.…","version":"13.5a8"} \ No newline at end of file ===================================== update_1/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7.dmg","git_tag":"mb-13.5a7-build2","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7.dmg.asc","version":"13.5a7"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos-13.5a8.dmg","git_tag":"mb-13.5a8-build1","sig":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos-13.5a8.dmg.asc","version":"13.5a8"} \ No newline at end of file ===================================== update_1/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.5a7-build2","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-porta…","version":"13.5a7"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.5a8-build1","sig":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64-porta…","version":"13.5a8"} \ No newline at end of file ===================================== update_1/alpha/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7.…","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7.dmg","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.5a7-build2","version":"13.5a7"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64-13.5a8.…","sig":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-linux-x86_64-13.5a8.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos-13.5a8.dmg","sig":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-macos-13.5a8.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.5a8/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.5a8-build1","version":"13.5a8"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 13.5a8
by richard (＠richard) 17 May '24

17 May '24

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 19bb9e94 by Richard Pospesel at 2024-05-17T09:42:32+00:00 alpha: new version, 13.5a8 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/13.5a4-13.5a7-linux-i686-ALL.xml - − update_3/alpha/13.5a4-13.5a7-linux-x86_64-ALL.xml - − update_3/alpha/13.5a4-13.5a7-macos-ALL.xml - − update_3/alpha/13.5a4-13.5a7-windows-i686-ALL.xml - − update_3/alpha/13.5a4-13.5a7-windows-x86_64-ALL.xml - − update_3/alpha/13.5a5-13.5a7-linux-i686-ALL.xml - − update_3/alpha/13.5a5-13.5a7-linux-x86_64-ALL.xml - − update_3/alpha/13.5a5-13.5a7-macos-ALL.xml - − update_3/alpha/13.5a5-13.5a7-windows-i686-ALL.xml - − update_3/alpha/13.5a5-13.5a7-windows-x86_64-ALL.xml - + update_3/alpha/13.5a5-13.5a8-linux-i686-ALL.xml - + update_3/alpha/13.5a5-13.5a8-linux-x86_64-ALL.xml - + update_3/alpha/13.5a5-13.5a8-macos-ALL.xml - + update_3/alpha/13.5a5-13.5a8-windows-i686-ALL.xml - + update_3/alpha/13.5a5-13.5a8-windows-x86_64-ALL.xml - − update_3/alpha/13.5a6-13.5a7-linux-i686-ALL.xml - − update_3/alpha/13.5a6-13.5a7-linux-x86_64-ALL.xml - − update_3/alpha/13.5a6-13.5a7-macos-ALL.xml - − update_3/alpha/13.5a6-13.5a7-windows-i686-ALL.xml - − update_3/alpha/13.5a6-13.5a7-windows-x86_64-ALL.xml - + update_3/alpha/13.5a6-13.5a8-linux-i686-ALL.xml - + update_3/alpha/13.5a6-13.5a8-linux-x86_64-ALL.xml - + update_3/alpha/13.5a6-13.5a8-macos-ALL.xml - + update_3/alpha/13.5a6-13.5a8-windows-i686-ALL.xml - + update_3/alpha/13.5a6-13.5a8-windows-x86_64-ALL.xml - + update_3/alpha/13.5a7-13.5a8-linux-i686-ALL.xml - + update_3/alpha/13.5a7-13.5a8-linux-x86_64-ALL.xml - + update_3/alpha/13.5a7-13.5a8-macos-ALL.xml - + update_3/alpha/13.5a7-13.5a8-windows-i686-ALL.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.5a8-build1
by richard (＠richard) 16 May '24

16 May '24

richard pushed new tag mb-13.5a8-build1 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5a8-build1
by richard (＠richard) 16 May '24

16 May '24

richard pushed new tag tbb-13.5a8-build1 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41125, 41131: Tor, Mullvad Browser 13.5a8 Release Prep
by richard (＠richard) 16 May '24

16 May '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6ffbf30c by Richard Pospesel at 2024-05-16T13:09:54+00:00 Bug 41125,41131: Tor,Mullvad Browser 13.5a8 Release Prep - - - - - 10 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/firefox-android/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,48 @@ +Mullvad Browser 13.5a8 - May 16 2024 + * All Platforms + * Updated Firefox to 115.11.0esr + * Bug 222: Hide "List all tabs" when the tabs don't overflow [mullvad-browser] + * Bug 241: Move network.proxy.failover_direct=false pref to base-browser [mullvad-browser] + * Bug 284: Should we reflect the actual channel in about:debugging? [mullvad-browser] + * Bug 290: Add default bookmarks in the alpha channels for testing [mullvad-browser] + * Bug 297: Rebase Mullvad Browser alpha onto 115.11.0esr [mullvad-browser] + * Bug 41930: intl.accept_languages gets into a stuck modifed state [tor-browser] + * Bug 42391: IndexDB's private directory not removed on browser shutdown in global private browsing mode [tor-browser] + * Bug 42405: Fix betterboxing + findbar horizontal bounce if the scrollbar is not an overlay [tor-browser] + * Bug 42565: Backport Android and desktop security fixes from Firefox 126 [tor-browser] + * Bug 42574: Exempt pdf.js from letterboxing [tor-browser] + * Bug 42583: Modify moz-support-link [tor-browser] + * Windows + macOS + * Bug 41405: Win ≤8.1 and macOS ≤10.14 not supported in ESR 128 [tor-browser] + * Bug 42347: Add a banner warning users about the upcoming EOL for Win ≤8.1 and macOS ≤10.14 [tor-browser] + * Windows + * Bug 278: Create asset(s) for the Mullvad Browser installer [mullvad-browser] + * Linux + * Bug 28: deb installation package for Linux [mullvad-browser] + * Bug 295: Filepicker string chars are tofu for the .deb package in Ubuntu 22.04 / Debian 11 [mullvad-browser] + * Bug 41135: 13.5a7's start-tor-browser seems to break KeePassXC-Browser? [tor-browser-build] + * Bug 41136: Include *.deb in the list of files to gpg sign [tor-browser-build] + * Build System + * All Platforms + * Bug 41001: Create Release Prep MR generating script [tor-browser-build] + * Bug 41148: Update projects/browser/Bundle-Data/Docs/Licenses/NoScript.txt [tor-browser-build] + * Bug 40076: Correctly refresh file when computing input_files_id and a file is set as refresh_input [rbm] + * Windows + * Bug 200: Build system installer for Mullvad Browser on Windows [mullvad-browser] + +Mullvad Browser 13.0.15 - May 15 2024 + * All Platforms + * Updated Firefox to 115.11.0esr + * Bug 296: Rebase Mullvad Browser stable onto 115.10.0esr [mullvad-browser] + * Bug 42391: IndexDB's private directory not removed on browser shutdown in global private browsing mode [tor-browser] + * Bug 42532: Use the HomePage module for new identity checks [tor-browser] + * Bug 42565: Backport Android and desktop security fixes from Firefox 126 [tor-browser] + * Build System + * All Platforms + * Bug 41122: Add release date to rbm.conf [tor-browser-build] + * macOS + * Bug 42535: mac: app change to ja doesn't apply ja translations to most (all?) chrome [tor-browser] + Mullvad Browser 13.5a7 - April 25 2024 * All Platforms * Updated Firefox to 115.10.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,67 @@ +Tor Browser 13.5a8 - May 16 2024 + * All Platforms + * Bug 42290: "DuckDuckGoOnion" is a weird naming format for onion search engines [tor-browser] + * Bug 42549: Remove brand.dtd [tor-browser] + * Bug 42560: Rebase Tor Browser alpha onto 115.11.0esr [tor-browser] + * Bug 42565: Backport Android and desktop security fixes from Firefox 126 [tor-browser] + * Bug 42583: Modify moz-support-link [tor-browser] + * Bug 41137: Build gcc-cross and tor-expert-bundle for linux-aarch64 [tor-browser-build] + * Bug 241: Move network.proxy.failover_direct=false pref to base-browser [mullvad-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.11.0esr + * Bug 41621: Tweak about:torconnect styling [tor-browser] + * Bug 41930: intl.accept_languages gets into a stuck modifed state [tor-browser] + * Bug 42391: IndexDB's private directory not removed on browser shutdown in global private browsing mode [tor-browser] + * Bug 42405: Fix betterboxing + findbar horizontal bounce if the scrollbar is not an overlay [tor-browser] + * Bug 42541: Circuit Display does not work when using Conjure pluggable transport [tor-browser] + * Bug 42542: Quirks when onion authentication prompt is shared between two tabs [tor-browser] + * Bug 42557: Fix regression in Onion Services authentication prompt focus [tor-browser] + * Bug 42573: Tweak language notification to avoid formatValue [tor-browser] + * Bug 42574: Exempt pdf.js from letterboxing [tor-browser] + * Windows + macOS + * Bug 41405: Win ≤8.1 and macOS ≤10.14 not supported in ESR 128 [tor-browser] + * Bug 42347: Add a banner warning users about the upcoming EOL for Win ≤8.1 and macOS ≤10.14 [tor-browser] + * Linux + * Bug 41136: Include *.deb in the list of files to gpg sign [tor-browser-build] + * Android + * Updated GeckoView to 115.11.0esr + * Bug 42317: Update "Security Settings" menu item [tor-browser] + * Bug 42409: TTP-03-011 WP3: Potential DoS due to Deep Link abuse [tor-browser] + * Bug 42552: TBA: formatting APIs are en-US only [tor-browser] + * Bug 42562: Restrict the accepted languages to the ones whose localization is available [tor-browser] + * Bug 42566: Remove 'Enable beta connection features' menu item in stable release channel [tor-browser] + * Bug 42567: Remove 'Enable beta connection features' toggle [tor-browser] + * Bug 42571: The new bootstrap on Android breaks if the browser goes in background [tor-browser] + * Bug 42576: Backport Bug 1885171: use the private keyboard for prompts on Android [tor-browser] + * Bug 42578: Reject Android "open in Tor Browser" intent [tor-browser] + * Bug 42582: Accepted languages should use id and he on Android [tor-browser] + * Bug 41143: Enable multi-locales also on GeckoView [tor-browser-build] + * Build System + * All Platforms + * Updated Go to 1.21.10 + * Bug 41001: Create Release Prep MR generating script [tor-browser-build] + * Bug 41148: Update projects/browser/Bundle-Data/Docs/Licenses/NoScript.txt [tor-browser-build] + * Bug 40076: Correctly refresh file when computing input_files_id and a file is set as refresh_input [rbm] + * Android + * Bug 42568: Remove legacy tor dependencies from firefox-android [tor-browser] + +Tor Browser 13.0.15 - May 14 2024 + * All Platforms + * Bug 42559: Rebase Tor Browser stable onto 115.11.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.11.0esr + * Bug 42391: IndexDB's private directory not removed on browser shutdown in global private browsing mode [tor-browser] + * Bug 42532: Use the HomePage module for new identity checks [tor-browser] + * Bug 42557: Fix regression in Onion Services authentication prompt focus [tor-browser] + * Bug 42565: Backport Android and desktop security fixes from Firefox 126 [tor-browser] + * Android + * Updated GeckoView to 115.11.0esr + * Bug 42195: Fix "What's new" URL to direct to latest version [tor-browser] + * Bug 42562: Restrict the accepted languages to the ones whose localization is available [tor-browser] + * Build System + * macOS + * Bug 42535: mac: app change to ja doesn't apply ja translations to most (all?) chrome [tor-browser] + Tor Browser 13.5a7 - April 25 2024 * All Platforms * Updated Tor to 0.4.8.11 ===================================== projects/browser/allowed_addons.json ===================================== Binary files a/projects/browser/allowed_addons.json and b/projects/browser/allowed_addons.json differ ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.5-1 - browser_build: 9 + browser_build: 10 variant: Beta # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 1 ===================================== projects/firefox/config ===================================== @@ -19,7 +19,7 @@ var: browser_series: '13.5' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 1 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -16,7 +16,7 @@ container: var: geckoview_version: 115.11.0esr browser_branch: 13.5-1 - browser_build: 1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/go/config ===================================== @@ -7,7 +7,7 @@ container: var: use_go_1_20: 0 - go_1_21: 1.21.9 + go_1_21: 1.21.10 go_1_20: 1.20.14 no_crosscompile: 1 setup: | @@ -131,7 +131,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go[% c("var/go_1_21") %].src.tar.gz' name: go - sha256sum: 58f0c5ced45a0012bce2ff7a9df03e128abcc8818ebabe5027bb92bafe20e421 + sha256sum: 900e0afe8900c1ee65a8a8c4f0c5a3ca02dcf85c1d1cb13a652be22c21399394 enable: '[% !c("var/use_go_1_20") %]' - URL: 'https://go.dev/dl/go[% c("var/go_1_20") %].src.tar.gz' name: go ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 161678 +version: 168690 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -23,6 +23,6 @@ input_files: - project: container-image - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip' name: manual - sha256sum: 5ceaec926295a62a946f41ec2e270dfd9d8d2fb3b57d11700ab67ed982ccc6e8 + sha256sum: f2abffe1471ae63046cff06b853685c6614e117cc67bdf51228dc0792344441c - filename: packagemanual.py name: package_script ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 76f037ba6fb13fdae3604f2ae4cdf6fcd284812a + git_hash: 02d2dc0ff0ec101c63a125646c3e92cfa80c0b20 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 03ef36ed51d2ef339c673c607097eb3a4472120c + git_hash: c41ffa18b5fc7e7d40cd98e482a689d727a506eb targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 523e656f6baf0977fb798187ab83a308bc34c784 + git_hash: 1a73b419bbfbf792a2d20e26d167d99f9a6cf90f compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5a7' - torbrowser_build: 'build2' + torbrowser_version: '13.5a8' + torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/04/25 12:00:00' + browser_release_date: '2024/05/16 00:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: - - '13.5a6' - - '13.5a5' - - '13.5a4' + - 13.5a7 + - 13.5a6 + - 13.5a5 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.5-1-build10
by richard (＠richard) 16 May '24

16 May '24

richard pushed new tag firefox-android-115.2.1-13.5-1-build10 at The Tor Project / Applications / firefox-android -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.11.0esr-13.5-1-build2
by richard (＠richard) 16 May '24

16 May '24

richard pushed new tag mullvad-browser-115.11.0esr-13.5-1-build2 at The Tor Project / Applications / Mullvad Browser -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.11.0esr-13.5-1-build2
by richard (＠richard) 16 May '24

16 May '24

richard pushed new tag tor-browser-115.11.0esr-13.5-1-build2 at The Tor Project / Applications / Tor Browser -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.11.0esr-13.5-1] 2 commits: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by richard (＠richard) 16 May '24

16 May '24

richard pushed to branch tor-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4eca7b01 by Henry Wilkes at 2024-05-16T14:22:43+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41621: Tweak about:torconnect style. - - - - - 6db4a9b2 by Henry Wilkes at 2024-05-16T14:22:43+00:00 fixup! Temporary changes to about:torconnect for Android. Bug 41621: Make sure button's layout parent is .button-container when not on android. - - - - - 4 changed files: - toolkit/components/torconnect/content/aboutTorConnect.css - toolkit/components/torconnect/content/aboutTorConnect.html - toolkit/components/torconnect/content/aboutTorConnect.js - toolkit/components/torconnect/content/onion-pattern.svg Changes: ===================================== toolkit/components/torconnect/content/aboutTorConnect.css ===================================== @@ -7,7 +7,6 @@ :root { --onion-opacity: 1; --onion-color: var(--card-outline-color); - --onion-radius: 75px; } html { @@ -236,34 +235,47 @@ input[type="checkbox"]:not(:disabled):active:checked { } } -#progressBar { +#progressBar:not([hidden]) { position: fixed; - top: 0; - inset-inline-start: 0; - width: 0%; - padding: 0; - margin: 0; - animation: progressAnimation 5s ease infinite; + inset-block-start: 0; + inset-inline: 0; + display: grid; + --progress-percent: 0%; + --progress-animation: progressAnimation 5s ease infinite; + --progress-bar-height: 7px; +} + +#progressBar > * { + grid-area: 1 / 1; +} + +#progressBarBackground { + width: 100%; + height: var(--progress-bar-height); + background: var(--in-content-box-info-background); } #progressBackground { + z-index: 1; + width: var(--progress-percent); height: 66px; - margin-top: -26px; + margin-block-start: -26px; background-image: linear-gradient(var(--progressbar-shadow-start), var(--in-content-page-background) 100%), var(--progressbar-gradient); - background-position: inherit; + animation: var(--progress-animation); filter: blur(5px); border-end-end-radius: 33px; } #progressSolid { - position: absolute; - top: 0; - width: 100%; - height: 7px; + z-index: 2; + width: var(--progress-percent); + height: var(--progress-bar-height); + border-start-end-radius: calc(var(--progress-bar-height) / 2); + border-end-end-radius: calc(var(--progress-bar-height) / 2); background-image: var(--progressbar-gradient); - background-position: inherit; + animation: var(--progress-animation); } #progressBackground, #progressSolid { @@ -300,8 +312,8 @@ input[type="checkbox"]:not(:disabled):active:checked { max-width: 45em; } -#quickstartCheckbox, #quickstartCheckboxLabel { - vertical-align: middle; +#quickstartToggle { + width: max-content; } /* mirrors p element spacing */ @@ -309,18 +321,25 @@ input[type="checkbox"]:not(:disabled):active:checked { margin: 1em 0; } -body { - padding: 0px !important; +body.aboutTorConnect { justify-content: space-between; - background-color: var(--in-content-page-background); + background: + local + url("chrome://global/content/torconnect/onion-pattern.svg") + center bottom + repeat-x; + /* Always reserve 150px for the background, plus 15px padding with content. */ + padding-block-end: 175px; } -.title { +body.aboutTorConnect .title { background-image: url("chrome://global/content/torconnect/tor-connect.svg"); -moz-context-properties: stroke, fill, fill-opacity; fill-opacity: var(--onion-opacity); fill: var(--onion-color); stroke: var(--onion-color); + /* Make sure there is no padding between the title and #breadcrumbs. */ + padding-block-start: 0; } .title.offline { @@ -336,35 +355,6 @@ body { stroke: var(--warning-color); } -.onion-pattern-container { - flex: auto; /* grow to consume remaining space on the page */ - display: flex; - margin: 0 auto; - width: 100%; - /* two onions tall, 4x the radius */ - height: calc(4 * var(--onion-radius)); - max-height: calc(4 * var(--onion-radius)); - min-height: calc(4 * var(--onion-radius)); - direction: ltr; -} - -.onion-pattern-crop { - height: 100%; - width: 100%; - - -moz-context-properties: fill; - fill: var(--onion-color, currentColor); - /* opacity of the entire div, not context-opacity */ - opacity: var(--onion-opacity, 1); - - background-image: url("chrome://global/content/torconnect/onion-pattern.svg"); - background-repeat: repeat; - background-attachment: local; - background-position: center; - /* svg source is 6 onions wide and 2 onions tall */ - background-size: calc(6 * 2 * var(--onion-radius)) calc(2 * 2 * var(--onion-radius));; -} - :root { --android-dark-accents-buttons: #9059FF; --android-dark-background-secondary: #E1E0E7; @@ -459,6 +449,11 @@ body.android { flex: 1; } +body:not(.android) #connectButtonContainer { + /* Use the .button-container context */ + display: contents; +} + .android #connectButtonContainer { width: 100%; padding-bottom: 18px; ===================================== toolkit/components/torconnect/content/aboutTorConnect.html ===================================== @@ -6,18 +6,24 @@ http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> - <meta name="viewport" content="width=device-width"> + <meta name="viewport" content="width=device-width" /> <link rel="stylesheet" href="chrome://global/content/torconnect/aboutTorConnect.css" type="text/css" media="all" /> + + <script + type="module" + src="chrome://global/content/elements/moz-toggle.mjs" + ></script> </head> - <body> - <div id="progressBar"> - <div id="progressBackground"></div> + <body class="aboutTorConnect"> + <div id="progressBar" hidden="hidden"> <div id="progressSolid"></div> + <div id="progressBackground"></div> + <div id="progressBarBackground"></div> </div> <div id="connectPageContainer" class="container"> <div id="breadcrumbs" class="hidden"> @@ -56,8 +62,7 @@ <button id="viewLogButton"></button> <div id="quickstartContainer"> - <input id="quickstartCheckbox" type="checkbox" /> - <label id="quickstartCheckboxLabel" for="quickstartCheckbox"></label> + <moz-toggle id="quickstartToggle" label-align-after=""></moz-toggle> </div> <div class="button-container"> @@ -76,9 +81,6 @@ </div> </div> </div> - <div class="onion-pattern-container"> - <div class="onion-pattern-crop"></div> - </div> <script src="chrome://global/content/torconnect/aboutTorConnect.js"></script> </body> </html> ===================================== toolkit/components/torconnect/content/aboutTorConnect.js ===================================== @@ -60,8 +60,7 @@ class AboutTorConnect { }, quickstart: { container: "div#quickstartContainer", - checkbox: "input#quickstartCheckbox", - label: "label#quickstartCheckboxLabel", + toggle: "#quickstartToggle", }, buttons: { restart: "button#restartButton", @@ -116,10 +115,7 @@ class AboutTorConnect { quickstartContainer: document.querySelector( this.selectors.quickstart.container ), - quickstartCheckbox: document.querySelector( - this.selectors.quickstart.checkbox - ), - quickstartLabel: document.querySelector(this.selectors.quickstart.label), + quickstartToggle: document.querySelector(this.selectors.quickstart.toggle), restartButton: document.querySelector(this.selectors.buttons.restart), configureButton: document.querySelector(this.selectors.buttons.configure), cancelButton: document.querySelector(this.selectors.buttons.cancel), @@ -310,7 +306,10 @@ class AboutTorConnect { this.elements.progressDescription.textContent = description; if (visible) { this.show(this.elements.progressMeter); - this.elements.progressMeter.style.width = `${percent}%`; + this.elements.progressMeter.style.setProperty( + "--progress-percent", + `${percent}%` + ); } else { this.hide(this.elements.progressMeter); } @@ -407,7 +406,7 @@ class AboutTorConnect { updateUI(state) { // calls update_$state() this[`update_${state.State}`](state); - this.elements.quickstartCheckbox.checked = state.QuickStartEnabled; + this.elements.quickstartToggle.pressed = state.QuickStartEnabled; } /* Per-state updates */ @@ -762,12 +761,14 @@ class AboutTorConnect { RPMSendAsyncMessage("torconnect:view-tor-logs"); }); - this.elements.quickstartCheckbox.addEventListener("change", () => { - const quickstart = this.elements.quickstartCheckbox.checked; + this.elements.quickstartToggle.addEventListener("toggle", () => { + const quickstart = this.elements.quickstartToggle.pressed; RPMSendAsyncMessage("torconnect:set-quickstart", quickstart); }); - this.elements.quickstartLabel.textContent = - TorStrings.settings.quickstartCheckbox; + this.elements.quickstartToggle.setAttribute( + "label", + TorStrings.settings.quickstartCheckbox + ); this.elements.restartButton.textContent = TorStrings.torConnect.restartTorBrowser; ===================================== toolkit/components/torconnect/content/onion-pattern.svg ===================================== @@ -1,22 +1,30 @@ -<svg fill="context-fill" viewBox="0 0 900 300" width="900" height="300" xmlns="http://www.w3.org/2000/svg"> - <g> - <path d="m825 0c41.421 0 75 33.5786 75 75 0 41.421-33.579 75-75 75z" fill-opacity=".3"/> - <path d="m750 0c41.421 0 75 33.5786 75 75 0 41.421-33.579 75-75 75z" fill-opacity=".15"/> - <path d="m525 225c0-41.421-33.579-75-75-75s-75 33.579-75 75z" fill-opacity=".3"/> - <path d="m525 300c0-41.421-33.579-75-75-75s-75 33.579-75 75z" fill-opacity=".15"/> - <path d="m300 0c0 41.4214-33.579 75-75 75s-75-33.5786-75-75z" fill-opacity=".3"/> - <path d="m300 75c0 41.421-33.579 75-75 75s-75-33.579-75-75z" fill-opacity=".15"/> - <g clip-rule="evenodd" fill-opacity=".3" fill-rule="evenodd"> - <path d="m525 .25c-.176 0-.351.000606-.527.001817-.966.006671-1.744.795563-1.737 1.762033.006.96648.795 1.74455 1.762 1.73788.167-.00115.334-.00173.502-.00173s.335.00058.502.00173c.967.00667 1.756-.7714 1.762-1.73788.007-.96647-.771-1.755363-1.737-1.762033-.176-.001211-.351-.001817-.527-.001817zm7.849.407251c-.962-.100329-1.822.597609-1.923 1.558879-.1.96128.598 1.82188 1.559 1.92221.333.03473.665.07174.996.11103.96.11381 1.83-.57199 1.944-1.53176s-.572-1.830084-1.532-1.943891c-.347-.041214-.695-.080042-1.044-.116468zm-15.334 3.481099c.961-.10034 1.659-.96094 1.559-1.92221-.101-.96128-.961-1.659216-1.923-1.558886-.349.036426-.697.075254-1.044.116468-.96.113808-1.646.984118-1.532 1.943888.114.95978.984 1.64557 1.944 1.53176.331-.03928.663-.0763.996-.11102zm23.612-2.14381c-.944-.2076-1.877.38933-2.085 1.33327-.207.94394.389 1.87744 1.333 2.08504.326.07165.651.14553.975.22162.941.2209 1.883-.36277 2.104-1.30369.221-.94091-.363-1.88275-1.304-2.10366-.34-.07986-.681-.15739-1.023-.23258zm-31.502 3.41832c.944-.2076 1.54-1.14111 1.333-2.08505-.208-.94394-1.141-1.54086-2.085-1.33326-.342.07519-.683.15272-1.023.23257-.941.22091-1.525 1.16276-1.304 2.10367s1.163 1.52459 2.104 1.30368c.324-.07609.649-.14997.975-.22161zm39.576-1.15763c-.914-.31276-1.909.17503-2.222 1.08953-.312.91449.175 1.90938 1.09 2.22214.315.10775.629.21764.942.32966.91.32565 1.912-.14805 2.237-1.05804.326-.90998-.148-1.91166-1.058-2.23731-.328-.11756-.658-.2329-.989-.34598zm-47.27 3.31168c.915-.31277 1.402-1.30766 1.09-2.22215-.313-.91449-1.308-1.40229-2.222-1.08952-.331.11308-.661.22841-.989.34598-.91.32565-1.384 1.32733-1.058 2.23731.325.90999 1.327 1.38369 2.237 1.05804.313-.11202.627-.22191.942-.32966zm55.037-.15521c-.874-.41383-1.917-.04125-2.331.83218-.414.87342-.041 1.91692.832 2.33072.301.1427.601.2875.9.4343.868.426 1.916.0682 2.343-.7993.426-.86751.068-1.91617-.8-2.34226-.313-.15402-.628-.3059-.944-.45564zm-62.437 3.163c.873-.4139 1.246-1.45739.832-2.33082-.414-.87342-1.457-1.246-2.331-.83217-.316.14973-.631.30162-.944.45564-.868.42608-1.226 1.47475-.8 2.34225s1.475 1.2254 2.343.7993c.298-.1468.599-.2916.9-.4342zm69.8.8472c-.822-.5092-1.901-.2561-2.41.5653-.509.8215-.256 1.9002.565 2.4095.284.1756.566.3532.846.5327.815.5207 1.897.2827 2.418-.5315.52-.8143.282-1.8965-.532-2.4172-.294-.1883-.59-.3746-.887-.5588zm-76.817 2.9748c.821-.5092 1.074-1.588.565-2.4095-.509-.8214-1.588-1.0745-2.41-.5653-.297.1843-.593.3705-.887.5588-.814.5207-1.052 1.6029-.532 2.4172.521.8142 1.603 1.0522 2.418.5315.28-.1795.562-.3571.846-.5327zm83.683 1.834c-.759-.5978-1.859-.4668-2.457.2927-.598.7594-.467 1.8597.292 2.4575.262.206.523.4139.781.6235.751.6084 1.853.4927 2.462-.2583.608-.7511.492-1.8531-.259-2.4614-.271-.2199-.544-.4379-.819-.654zm-90.229 2.7502c.759-.5978.89-1.6981.292-2.4575-.598-.7595-1.698-.8905-2.457-.2927-.275.2161-.548.4341-.819.654-.751.6083-.867 1.7103-.259 2.4614.609.751 1.711.8667 2.462.2583.258-.2096.519-.4175.781-.6235zm96.516 2.7935c-.688-.6786-1.796-.6709-2.475.0173-.678.6881-.67 1.7962.018 2.4748.237.2339.473.4695.706.7067.679.6882 1.787.6959 2.475.0173s.696-1.7867.018-2.4748c-.246-.2488-.493-.4959-.742-.7413zm-102.511 2.4921c.688-.6786.696-1.7866.017-2.4748-.678-.6882-1.786-.6959-2.474-.0173-.249.2454-.496.4925-.742.7413-.678.6881-.67 1.7962.018 2.4748s1.796.6709 2.474-.0173c.234-.2372.47-.4728.707-.7067zm108.142 3.7171c-.608-.751-1.71-.8667-2.461-.2583-.751.6083-.867 1.7103-.258 2.4613.209.2588.417.5191.623.7809.598.7595 1.698.8905 2.458.2927.759-.5978.89-1.698.292-2.4575-.216-.2746-.434-.5476-.654-.8191zm-113.511 2.203c.609-.751.493-1.853-.258-2.4613-.751-.6084-1.853-.4927-2.461.2583-.22.2715-.438.5445-.654.8191-.598.7595-.467 1.8598.292 2.4575.76.5978 1.86.4668 2.458-.2927.206-.2618.414-.5221.623-.7809zm118.415 4.5953c-.52-.8142-1.603-1.0522-2.417-.5315s-1.052 1.6029-.531 2.4171c.179.2807.357.5627.532.8461.51.8214 1.588 1.0745 2.41.5653.821-.5092 1.074-1.588.565-2.4094-.184-.2973-.37-.5931-.559-.8876zm-123.09 1.8856c.521-.8142.283-1.8964-.531-2.4171s-1.897-.2827-2.417.5315c-.189.2945-.375.5903-.559.8876-.509.8215-.256 1.9002.565 2.4094.822.5093 1.9.2561 2.41-.5653.175-.2834.353-.5654.532-.8461zm127.204 5.4202c-.426-.8675-1.475-1.2254-2.343-.7993-.867.4261-1.225 1.4748-.799 2.3423.147.2988.292.5988.434.9.414.8734 1.458 1.246 2.331.8322.874-.4139 1.246-1.4574.832-2.3308-.149-.3161-.301-.6309-.455-.9444zm-131.124 1.543c.426-.8675.068-1.9162-.799-2.3423-.868-.4261-1.917-.0682-2.343.7993-.154.3135-.306.6284-.455.9444-.414.8734-.042 1.9169.832 2.3308.873.4138 1.917.0412 2.331-.8322.142-.3012.287-.6012.434-.9zm134.39 6.1791c-.326-.91-1.328-1.3837-2.238-1.0581-.91.3257-1.383 1.3273-1.058 2.2373.112.3131.222.6271.33.9421.313.9145 1.308 1.4023 2.222 1.0896.915-.3128 1.403-1.3077 1.09-2.2222-.113-.3306-.229-.6602-.346-.9887zm-137.502 1.1793c.325-.91-.148-1.9117-1.058-2.2374-.91-.3256-1.912.1481-2.238 1.0581-.117.3285-.233.6581-.346.9887-.313.9145.175 1.9094 1.09 2.2222.914.3127 1.909-.1751 2.222-1.0895.108-.3151.218-.6291.33-.9421zm139.876 6.8607c-.221-.9409-1.163-1.5246-2.104-1.3037s-1.524 1.1628-1.303 2.1037c.076.3241.15.649.221.9748.208.9439 1.141 1.5408 2.085 1.3332s1.541-1.1411 1.333-2.085c-.075-.3419-.152-.6829-.232-1.023zm-142.139.8c.221-.9409-.362-1.8828-1.303-2.1037s-1.883.3628-2.104 1.3037c-.08.3401-.157.6811-.232 1.023-.208.944.389 1.8775 1.333 2.0851s1.877-.3894 2.085-1.3333c.071-.3258.145-.6507.221-.9748zm143.592 7.4568c-.114-.9598-.984-1.6456-1.944-1.5318-.959.1138-1.645.9841-1.531 1.9439.039.3313.076.6634.111.9961.1.9612.961 1.6592 1.922 1.5588.961-.1003 1.659-.9609 1.559-1.9222-.037-.349-.076-.6973-.117-1.0448zm-144.977.4121c.114-.9597-.572-1.8301-1.531-1.9439-.96-.1138-1.83.572-1.944 1.5318-.041.3476-.08.6959-.117 1.0449-.1.9612.598 1.8218 1.559 1.9222.961.1003 1.822-.5976 1.922-1.5589.035-.3327.072-.6647.111-.9961zm145.499 7.9547c-.006-.9665-.795-1.7445-1.762-1.7379-.966.0067-1.744.7956-1.738 1.7621.001.0523.001.1046.001.1569l.001.0826v.2629c0 .1676-.001.3351-.002.5024-.006.9665.772 1.7554 1.738 1.762.967.0067 1.756-.7714 1.762-1.7378.001-.1754.002-.3509.002-.5266s-.001-.3512-.002-.5266zm-145.996.0242c.006-.9665-.772-1.7554-1.738-1.762-.967-.0067-1.756.7714-1.762 1.7378-.001.1754-.002.3509-.002.5266s.001.3512.002.5266c.006.9665.795 1.7445 1.762 1.7379.966-.0067 1.744-.7956 1.738-1.7621-.001-.1673-.002-.3348-.002-.5024s.001-.3351.002-.5024zm145.591 8.3509c.1-.9612-.598-1.8218-1.559-1.9222-.961-.1003-1.822.5976-1.922 1.5589-.035.3327-.072.6647-.111.9961-.114.9597.572 1.83 1.531 1.9439.96.1138 1.83-.572 1.944-1.5318.042-.3476.08-.6959.117-1.0449zm-145.205-.3633c-.1-.9612-.961-1.6592-1.922-1.5588-.961.1003-1.659.9609-1.559 1.9222.037.349.076.6973.117 1.0448.114.9598.984 1.6456 1.944 1.5318.959-.1138 1.645-.9841 1.531-1.9439-.039-.3313-.076-.6634-.111-.9961zm143.867 8.642c.208-.944-.389-1.8775-1.333-2.0851s-1.877.3894-2.085 1.3333c-.071.3258-.145.6507-.221.9748-.221.9409.362 1.8828 1.303 2.1037s1.883-.3628 2.104-1.3037c.08-.3401.157-.6811.232-1.023zm-142.592-.7518c-.208-.9439-1.141-1.5408-2.085-1.3332s-1.541 1.1411-1.333 2.085c.075.3419.152.6829.232 1.023.221.9409 1.163 1.5246 2.104 1.3037s1.524-1.1628 1.303-2.1037c-.076-.3241-.149-.649-.221-.9748zm140.332 8.8261c.313-.9145-.175-1.9094-1.09-2.2222-.914-.3127-1.909.1751-2.222 1.0895-.108.3151-.218.6291-.33.9421-.325.91.148 1.9121 1.058 2.2371.91.326 1.912-.148 2.238-1.058.117-.3283.233-.6579.346-.9885zm-138.178-1.1326c-.313-.9145-1.308-1.4023-2.222-1.0896-.915.3128-1.403 1.3077-1.09 2.2222.113.3306.229.6602.346.9885.326.91 1.328 1.384 2.238 1.058.91-.325 1.383-1.327 1.058-2.237-.112-.3131-.222-.6271-.33-.9421zm135.021 8.8991c.414-.874.042-1.917-.832-2.331-.873-.414-1.917-.041-2.331.832-.142.301-.287.601-.434.9-.426.868-.068 1.916.799 2.343.868.426 1.917.068 2.343-.8.154-.313.306-.628.455-.944zm-132.013-1.499c-.414-.873-1.458-1.246-2.331-.832-.874.414-1.246 1.457-.832 2.331.149.316.301.631.455.944.426.868 1.475 1.226 2.343.8.867-.426 1.225-1.475.799-2.343-.147-.298-.292-.599-.434-.9zm128.003 8.862c.509-.822.256-1.901-.565-2.41-.822-.509-1.9-.256-2.41.565-.175.284-.353.566-.532.846-.521.815-.283 1.897.531 2.418.814.52 1.897.282 2.417-.532.189-.294.375-.59.559-.887zm-124.181-1.845c-.51-.821-1.588-1.074-2.41-.565-.821.509-1.074 1.588-.565 2.41.184.297.37.593.559.887.52.814 1.603 1.052 2.417.532.814-.521 1.052-1.603.531-2.418-.179-.28-.357-.562-.532-.846zm119.372 8.711c.598-.759.467-1.859-.292-2.457-.76-.598-1.86-.467-2.458.292-.206.262-.414.523-.623.781-.609.751-.493 1.853.258 2.462.751.608 1.853.492 2.461-.259.22-.271.438-.544.654-.819zm-114.788-2.165c-.598-.759-1.698-.89-2.458-.292-.759.598-.89 1.698-.292 2.457.216.275.434.548.654.819.608.751 1.71.867 2.461.259.751-.609.867-1.711.258-2.462-.209-.258-.417-.519-.623-.781zm109.245 8.452c.678-.688.67-1.796-.018-2.475-.688-.678-1.796-.67-2.474.018-.234.237-.47.473-.707.706-.688.679-.696 1.787-.017 2.475.678.688 1.786.696 2.474.018.249-.246.496-.493.742-.742zm-103.959-2.457c-.679-.688-1.787-.696-2.475-.017-.688.678-.696 1.786-.018 2.474.246.249.493.496.742.742.688.678 1.796.67 2.474-.018.679-.688.671-1.796-.017-2.474-.237-.234-.473-.47-.706-.707zm5.92 5.369c-.751-.609-1.853-.493-2.462.258-.608.751-.492 1.853.259 2.461.271.22.544.438.819.654.759.598 1.859.467 2.457-.292.598-.76.467-1.86-.292-2.458-.262-.206-.523-.414-.781-.623zm91.829 2.719c.751-.608.867-1.71.259-2.461-.609-.751-1.711-.867-2.462-.258-.258.209-.519.417-.781.623-.759.598-.89 1.698-.292 2.458.598.759 1.698.89 2.457.292.275-.216.548-.434.819-.654zm-6.798 4.904c.814-.52 1.052-1.603.532-2.417-.521-.814-1.603-1.052-2.418-.531-.28.179-.562.357-.846.532-.821.51-1.074 1.588-.565 2.41.509.821 1.588 1.074 2.41.565.297-.184.593-.37.887-.559zm-78.55-2.948c-.815-.521-1.897-.283-2.418.531-.52.814-.282 1.897.532 2.417.294.189.59.375.887.559.822.509 1.901.256 2.41-.565.509-.822.256-1.9-.565-2.41-.284-.175-.566-.353-.846-.532zm6.963 3.92c-.868-.426-1.916-.068-2.343.799-.426.868-.068 1.917.8 2.343.313.154.628.306.944.455.874.414 1.917.042 2.331-.832.414-.873.041-1.917-.832-2.331-.301-.142-.601-.287-.9-.434zm64.281 3.142c.868-.426 1.226-1.475.8-2.343-.426-.867-1.475-1.225-2.343-.799-.298.147-.599.292-.9.434-.873.414-1.246 1.458-.832 2.331.414.874 1.457 1.246 2.331.832.316-.149.631-.301.944-.455zm-7.722 3.266c.91-.326 1.384-1.328 1.058-2.238-.325-.91-1.327-1.383-2.237-1.058-.313.112-.627.222-.942.33-.915.313-1.402 1.308-1.09 2.222.313.915 1.308 1.403 2.222 1.09.331-.113.661-.229.989-.346zm-49.201-3.296c-.91-.325-1.912.148-2.237 1.058-.326.91.148 1.912 1.058 2.238.328.117.658.233.989.346.914.313 1.909-.175 2.222-1.09.312-.914-.175-1.909-1.09-2.222-.315-.108-.629-.218-.942-.33zm41.161 5.67c.941-.221 1.525-1.163 1.304-2.104s-1.163-1.524-2.104-1.303c-.324.076-.649.15-.975.221-.944.208-1.54 1.141-1.333 2.085.208.944 1.141 1.541 2.085 1.333.342-.075.683-.152 1.023-.232zm-33.5-3.407c-.941-.221-1.883.362-2.104 1.303s.363 1.883 1.304 2.104c.34.08.681.157 1.023.232.944.208 1.877-.389 2.085-1.333.207-.944-.389-1.877-1.333-2.085-.326-.071-.651-.145-.975-.221zm7.869 1.385c-.96-.114-1.83.572-1.944 1.531-.114.96.572 1.83 1.532 1.944.347.042.695.08 1.044.117.962.1 1.822-.598 1.923-1.559.1-.961-.598-1.822-1.559-1.922-.333-.035-.665-.072-.996-.111zm17.374 3.475c.96-.114 1.646-.984 1.532-1.944-.114-.959-.984-1.645-1.944-1.531-.331.039-.663.076-.996.111-.961.1-1.659.961-1.559 1.922.101.961.961 1.659 1.923 1.559.349-.037.697-.076 1.044-.117zm-9.395-2.978c-.967-.006-1.756.772-1.762 1.738-.007.967.771 1.756 1.737 1.762.176.001.351.002.527.002s.351-.001.527-.002c.966-.006 1.744-.795 1.737-1.762-.006-.966-.795-1.744-1.762-1.738-.167.001-.334.002-.502.002-.093 0-.185 0-.278-.001-.045 0-.089 0-.134 0-.03 0-.06-.001-.09-.001zm.502-130.998c-.179 0-.357.0008-.536.0024-.966.0084-1.743.7988-1.734 1.7653.008.9664.799 1.743 1.765 1.7345.168-.0015.337-.0022.505-.0022s.337.0007.505.0022c.966.0085 1.757-.7681 1.765-1.7345.009-.9665-.768-1.7569-1.734-1.7653-.179-.0016-.357-.0024-.536-.0024zm-7.515 3.9974c.958-.1279 1.631-1.0081 1.503-1.9661s-1.008-1.631-1.966-1.5031c-.352.047-.703.097-1.053.1501-.956.1449-1.613 1.037-1.468 1.9926s1.037 1.6127 1.993 1.4678c.329-.0499.66-.0971.991-.1413zm15.493-3.4692c-.958-.1279-1.838.5451-1.966 1.5031s.545 1.8382 1.503 1.9661c.331.0442.662.0914.991.1413.956.1449 1.848-.5122 1.993-1.4678s-.512-1.8477-1.468-1.9926c-.35-.0531-.701-.1031-1.053-.1501zm-23.35 5.0976c.929-.2635 1.47-1.231 1.206-2.1609-.264-.9298-1.231-1.47-2.161-1.2064-.342.097-.683.1969-1.023.2998-.925.2803-1.447 1.2573-1.167 2.1823s1.257 1.4476 2.182 1.1674c.32-.0968.641-.1909.963-.2822zm31.699-3.3673c-.93-.2636-1.897.2766-2.161 1.2064-.264.9299.277 1.8974 1.206 2.1609.322.0913.643.1854.963.2822.925.2802 1.902-.2424 2.182-1.1674s-.242-1.902-1.167-2.1823c-.34-.1029-.681-.2028-1.023-.2998zm-39.242 6.1049c.882-.3942 1.278-1.4291.884-2.3116s-1.429-1.2783-2.311-.8842c-.325.1451-.648.293-.97.4436-.875.4099-1.253 1.4518-.843 2.3271.41.8752 1.452 1.2525 2.327.8426.303-.1418.607-.281.913-.4175zm47.257-3.1958c-.882-.3941-1.917.0017-2.311.8842s.002 1.9174.884 2.3116c.306.1365.61.2757.913.4175.875.4099 1.917.0326 2.327-.8426.41-.8753.032-1.9172-.843-2.3271-.322-.1506-.645-.2985-.97-.4436zm7.516 4.0254c-.817-.516-1.898-.2718-2.414.5454s-.271 1.898.546 2.4141c.283.1787.564.3599.844.5436.808.5305 1.893.3056 2.423-.5022.531-.8079.306-1.8929-.502-2.4234-.297-.1951-.596-.3876-.897-.5775zm-61.848 2.9595c.817-.5161 1.062-1.5969.546-2.4141s-1.597-1.0614-2.414-.5454c-.301.1899-.6.3824-.897.5775-.808.5305-1.033 1.6155-.502 2.4234.53.8079 1.615 1.0327 2.423.5022.28-.1837.561-.3649.844-.5436zm68.714 2.0935c-.735-.6268-1.84-.5384-2.467.1974-.626.7357-.538 1.8402.198 2.467.255.2171.508.4364.759.658.724.6397 1.83.5709 2.47-.1536.639-.7245.571-1.8304-.154-2.4701-.266-.2353-.535-.4682-.806-.6987zm-75.179 2.6644c.736-.6268.824-1.7313.198-2.467-.627-.7358-1.732-.8242-2.467-.1974-.271.2305-.54.4634-.806.6987-.725.6397-.793 1.7456-.154 2.4701.64.7245 1.746.7933 2.47.1536.251-.2216.504-.4409.759-.658zm81.26 3.3095c-.639-.7245-1.745-.7933-2.47-.1536-.724.6397-.793 1.7456-.153 2.4701.221.2509.441.5039.658.7587.626.7358 1.731.8242 2.467.1975.735-.6268.824-1.7313.197-2.467-.231-.2707-.463-.5393-.699-.8057zm-86.987 2.3165c.64-.7245.571-1.8304-.153-2.4701-.725-.6397-1.831-.5709-2.47.1536-.236.2664-.468.535-.699.8057-.627.7357-.538 1.8402.197 2.467.736.6267 1.841.5383 2.467-.1975.217-.2548.437-.5078.658-.7587zm92.162 4.4585c-.531-.8079-1.616-1.0327-2.424-.5022s-1.033 1.6155-.502 2.4234c.184.2796.365.5611.544.8442.516.8172 1.596 1.0614 2.414.5453.817-.516 1.061-1.5968.545-2.414-.19-.3007-.382-.5996-.577-.8967zm-97.034 1.9212c.531-.8079.306-1.8929-.502-2.4234s-1.893-.3057-2.424.5022c-.195.2971-.387.596-.577.8967-.516.8172-.272 1.898.545 2.414.818.5161 1.898.2719 2.414-.5453.179-.2831.36-.5646.544-.8442zm-3.915 7.0062c.41-.8753.033-1.9171-.843-2.3271-.875-.4099-1.917-.0326-2.327.8427-.15.3217-.298.6449-.443.9697-.395.8825.001 1.9174.884 2.3116.882.3941 1.917-.0018 2.311-.8842.137-.3057.276-.61.418-.9127zm105.108-1.4844c-.41-.8753-1.452-1.2526-2.327-.8427-.876.41-1.253 1.4518-.843 2.3271.142.3027.281.607.418.9127.394.8824 1.429 1.2783 2.311.8842.883-.3942 1.279-1.4291.884-2.3116-.145-.3248-.293-.648-.443-.9697zm-107.981 8.9773c.28-.925-.242-1.902-1.167-2.1822-.925-.2803-1.902.2424-2.183 1.1674-.103.3396-.203.6805-.3 1.0227-.263.9299.277 1.8973 1.207 2.1609s1.897-.2766 2.161-1.2064c.091-.322.185-.6428.282-.9624zm111.034-1.0148c-.281-.925-1.258-1.4477-2.183-1.1674-.925.2802-1.447 1.2572-1.167 2.1822.097.3196.191.6404.282.9624.264.9298 1.231 1.47 2.161 1.2064s1.47-1.231 1.207-2.1609c-.097-.3422-.197-.6831-.3-1.0227zm-112.803 8.8434c.145-.9556-.513-1.8477-1.468-1.9926-.956-.1449-1.848.5122-1.993 1.4678-.053.3501-.103.7012-.15 1.0532-.128.958.545 1.8383 1.503 1.9661.958.1279 1.839-.5451 1.966-1.5031.045-.3314.092-.6619.142-.9914zm114.683-.5248c-.145-.9556-1.037-1.6127-1.993-1.4678-.955.1449-1.613 1.037-1.468 1.9926.05.3295.097.66.142.9914.127.958 1.008 1.631 1.966 1.5031.958-.1278 1.631-1.0081 1.503-1.9661-.047-.352-.097-.7031-.15-1.0532zm-115.32 8.5262c.009-.9665-.768-1.7568-1.734-1.7653-.967-.0085-1.757.7681-1.766 1.7346-.001.1783-.002.3568-.002.5355s.001.3572.002.5355c.009.9665.799 1.7431 1.766 1.7346.966-.0085 1.743-.7989 1.734-1.7653-.001-.1681-.002-.3364-.002-.5048s.001-.3367.002-.5048zm115.996-.0307c-.009-.9665-.799-1.7431-1.766-1.7346-.966.0085-1.743.7989-1.734 1.7653.001.1016.001.2033.002.305v.1998c0 .1684-.001.3367-.002.5048-.009.9665.768 1.7568 1.734 1.7653.967.0085 1.757-.7681 1.766-1.7346.001-.1783.002-.3568.002-.5355s-.001-.3572-.002-.5355zm-115.501 8.0503c-.127-.958-1.008-1.631-1.966-1.5031-.958.1278-1.631 1.0081-1.503 1.9661.047.352.097.7031.15 1.0532.145.9555 1.037 1.6127 1.993 1.4678.955-.1449 1.613-1.037 1.468-1.9926-.05-.3295-.097-.66-.142-.9914zm114.975.463c.128-.958-.545-1.8383-1.503-1.9661-.958-.1279-1.839.5451-1.966 1.5031-.045.3314-.092.6619-.142.9914-.145.9556.513 1.8477 1.468 1.9926.956.1449 1.848-.5122 1.993-1.4678.053-.3501.103-.7012.15-1.0532zm-113.346 7.3946c-.264-.9298-1.231-1.47-2.161-1.2064s-1.47 1.231-1.207 2.1609c.097.3422.197.6831.3 1.0227.281.925 1.258 1.4477 2.183 1.1674.925-.2802 1.447-1.2572 1.167-2.1822-.097-.3196-.191-.6404-.282-.9624zm111.616.9545c.263-.9299-.277-1.8973-1.207-2.1609s-1.897.2766-2.161 1.2064c-.091.322-.185.6428-.282.9624-.28.925.242 1.902 1.167 2.1822.925.2803 1.902-.2424 2.183-1.1674.103-.3396.203-.6805.3-1.0227zm-108.879 6.5881c-.394-.8824-1.429-1.2783-2.311-.8842-.883.3942-1.279 1.4291-.884 2.3116.145.3248.293.648.443.9696.41.875 1.452 1.253 2.327.843.876-.41 1.253-1.452.843-2.3273-.142-.3027-.281-.607-.418-.9127zm105.969 1.4274c.395-.8825-.001-1.9174-.884-2.3116-.882-.3941-1.917.0018-2.311.8842-.137.3057-.276.61-.418.9127-.41.8753-.033 1.9173.843 2.3273.875.41 1.917.032 2.327-.843.15-.3216.298-.6448.443-.9696zm-102.18 5.6476c-.516-.817-1.596-1.062-2.414-.546-.817.516-1.061 1.597-.545 2.414.19.301.382.6.577.897.531.808 1.616 1.033 2.424.502.808-.53 1.033-1.615.502-2.423-.184-.28-.365-.561-.544-.844zm98.155 1.868c.516-.817.272-1.898-.545-2.414-.818-.516-1.898-.271-2.414.546-.179.283-.36.564-.544.844-.531.808-.306 1.893.502 2.423.808.531 1.893.306 2.424-.502.195-.297.387-.596.577-.897zm-93.397 4.597c-.626-.736-1.731-.824-2.467-.198-.735.627-.824 1.732-.197 2.467.231.271.463.54.699.806.639.725 1.745.793 2.47.154.724-.64.793-1.746.153-2.47-.221-.251-.441-.504-.658-.759zm88.344 2.269c.627-.735.538-1.84-.197-2.467-.736-.626-1.841-.538-2.467.198-.217.255-.437.508-.658.759-.64.724-.571 1.83.153 2.47.725.639 1.831.571 2.47-.154.236-.266.468-.535.699-.806zm-5.974 6.081c.725-.639.793-1.745.154-2.47-.64-.724-1.746-.793-2.47-.153-.251.221-.504.441-.759.658-.736.626-.824 1.731-.198 2.467.627.735 1.732.824 2.467.197.271-.231.54-.463.806-.699zm-76.744-2.623c-.724-.64-1.83-.571-2.47.153-.639.725-.571 1.831.154 2.47.266.236.535.468.806.699.735.627 1.84.538 2.467-.197.626-.736.538-1.841-.198-2.467-.255-.217-.508-.437-.759-.658zm6.38 4.872c-.808-.531-1.893-.306-2.423.502-.531.808-.306 1.893.502 2.424.297.195.596.387.897.577.817.516 1.898.272 2.414-.545.516-.818.271-1.898-.546-2.414-.283-.179-.564-.36-.844-.544zm63.589 2.926c.808-.531 1.033-1.616.502-2.424-.53-.808-1.615-1.033-2.423-.502-.28.184-.561.365-.844.544-.817.516-1.062 1.596-.546 2.414.516.817 1.597 1.061 2.414.545.301-.19.6-.382.897-.577zm-56.583.989c-.875-.41-1.917-.033-2.327.843-.41.875-.032 1.917.843 2.327.322.15.645.298.97.443.882.395 1.917-.001 2.311-.884.394-.882-.002-1.917-.884-2.311-.306-.137-.61-.276-.913-.418zm49.14 3.17c.875-.41 1.253-1.452.843-2.327-.41-.876-1.452-1.253-2.327-.843-.303.142-.607.281-.913.418-.882.394-1.278 1.429-.884 2.311.394.883 1.429 1.279 2.311.884.325-.145.648-.293.97-.443zm-41.647-.297c-.925-.28-1.902.242-2.182 1.167s.242 1.902 1.167 2.183c.34.103.681.203 1.023.3.93.263 1.897-.277 2.161-1.207s-.277-1.897-1.206-2.161c-.322-.091-.643-.185-.963-.282zm33.685 3.35c.925-.281 1.447-1.258 1.167-2.183s-1.257-1.447-2.182-1.167c-.32.097-.641.191-.963.282-.929.264-1.47 1.231-1.206 2.161s1.231 1.47 2.161 1.207c.342-.097.683-.197 1.023-.3zm-25.856-1.581c-.956-.145-1.848.513-1.993 1.468-.145.956.512 1.848 1.468 1.993.35.053.701.103 1.053.15.958.128 1.838-.545 1.966-1.503s-.545-1.839-1.503-1.966c-.331-.045-.662-.092-.991-.142zm17.537 3.461c.956-.145 1.613-1.037 1.468-1.993-.145-.955-1.037-1.613-1.993-1.468-.329.05-.66.097-.991.142-.958.127-1.631 1.008-1.503 1.966s1.008 1.631 1.966 1.503c.352-.047.703-.097 1.053-.15zm-9.536-2.824c-.966-.009-1.757.768-1.765 1.734-.009.967.768 1.757 1.734 1.766h.102l.16.001c.091.001.183.001.274.001.112 0 .225 0 .337-.001h.091l.108-.001c.966-.009 1.743-.799 1.734-1.766-.008-.966-.799-1.743-1.765-1.734-.168.001-.337.002-.505.002-.064 0-.128 0-.192 0-.104-.001-.209-.001-.313-.002zm-.022-98.9948c.176-.0021.351-.0032.527-.0032s.351.0011.527.0032c.966.0117 1.74.8046 1.728 1.771-.011.9664-.804 1.7404-1.771 1.7287-.161-.0019-.322-.0029-.484-.0029s-.323.001-.484.0029c-.967.0117-1.76-.7623-1.771-1.7287-.012-.9664.762-1.7593 1.728-1.771zm-5.261 2.1143c.176.9504-.452 1.8634-1.402 2.0392-.316.0585-.63.1208-.944.1868-.945.1992-1.874-.4059-2.073-1.3517-.199-.9457.406-1.8739 1.352-2.0731.341-.072.684-.1398 1.028-.2035.951-.1759 1.864.4519 2.039 1.4023zm11.576 0c.175-.9504 1.088-1.5782 2.039-1.4023.344.0637.687.1315 1.028.2035.946.1992 1.551 1.1274 1.352 2.0731-.199.9458-1.128 1.5509-2.073 1.3517-.313-.066-.628-.1283-.944-.1868-.95-.1758-1.578-1.0888-1.402-2.0392zm-19.392 1.9036c.359.8973-.077 1.9158-.974 2.275-.299.1193-.595.2423-.89.3687-.888.3812-1.917-.0298-2.298-.9179s.03-1.9171.918-2.2984c.321-.1377.644-.2717.969-.4018.897-.3591 1.916.0771 2.275.9744zm27.208 0c.359-.8973 1.378-1.3335 2.275-.9744.325.1301.648.2641.969.4018.888.3813 1.299 1.4103.918 2.2984-.381.8882-1.41 1.2991-2.298.9179-.295-.1264-.591-.2494-.89-.3687-.897-.3592-1.333-1.3777-.974-2.275zm-34.499 3.4018c.528.8097.3 1.8939-.51 2.4217-.269.1754-.536.3541-.8.5359-.797.5475-1.886.3456-2.434-.4508-.547-.7965-.346-1.886.451-2.4335.288-.198.579-.3926.872-.5836.809-.5278 1.894-.2993 2.421.5103zm41.79 0c.527-.8096 1.612-1.0381 2.421-.5103.293.1911.584.3856.872.5836.797.5475.998 1.637.451 2.4335-.548.7964-1.637.9983-2.434.4508-.264-.1818-.531-.3604-.8-.5359-.81-.5278-1.038-1.612-.51-2.4217zm-48.276 4.7598c.675.6917.662 1.7997-.03 2.4747-.23.2244-.457.4515-.682.6814-.675.6917-1.783.7052-2.474.0302-.692-.675-.705-1.783-.03-2.4747.244-.2502.491-.4975.741-.7417.692-.6751 1.8-.6616 2.475.0301zm54.762 0c.675-.6917 1.783-.7052 2.475-.0301.25.2442.497.4915.741.7417.675.6917.662 1.7997-.03 2.4747-.691.6751-1.799.6615-2.474-.0302-.225-.2299-.452-.457-.682-.6814-.692-.675-.705-1.7829-.03-2.4747zm-60.201 5.9284c.796.5475.998 1.637.451 2.4335-.182.2645-.361.5313-.536.8004-.528.8097-1.612 1.0382-2.422.5104s-1.038-1.6121-.51-2.4217c.191-.2931.385-.5837.583-.8717.548-.7965 1.637-.9984 2.434-.4509zm65.64 0c.797-.5475 1.886-.3456 2.434.4509.198.288.392.5786.583.8717.528.8097.3 1.8939-.51 2.4217s-1.894.2993-2.422-.5103c-.175-.2692-.354-.536-.536-.8005-.547-.7965-.345-1.886.451-2.4335zm-69.823 6.873c.888.3812 1.299 1.4102.918 2.2984-.127.2945-.25.5909-.369.8891-.359.8972-1.378 1.3335-2.275.9743s-1.333-1.3777-.974-2.275c.13-.325.264-.648.402-.9689.381-.8882 1.41-1.2991 2.298-.9179zm74.006 0c.888-.3812 1.917.0297 2.298.9179.138.3209.272.6439.402.9689.359.8973-.077 1.9158-.974 2.275s-1.916-.0771-2.275-.9743c-.119-.2982-.242-.5946-.369-.8891-.381-.8882.03-1.9172.918-2.2984zm-76.761 7.559c.946.1992 1.551 1.1274 1.351 2.0732-.066.3132-.128.6278-.186.9438-.176.9504-1.089 1.5782-2.04 1.4023-.95-.1759-1.578-1.0889-1.402-2.0392.064-.3443.132-.6871.204-1.0285.199-.9457 1.127-1.5509 2.073-1.3516zm79.516 0c.946-.1993 1.874.4059 2.073 1.3516.072.3414.14.6842.204 1.0285.176.9503-.452 1.8633-1.402 2.0392-.951.1759-1.864-.4519-2.04-1.4023-.058-.316-.12-.6306-.186-.9438-.2-.9458.405-1.874 1.351-2.0732zm-80.734 7.9517c.967.0116 1.741.8045 1.729 1.771-.002.1611-.003.3225-.003.4842s.001.3231.003.4842c.012.9665-.762 1.7594-1.729 1.771-.966.0117-1.759-.7622-1.771-1.7287-.002-.1752-.003-.3507-.003-.5265s.001-.3513.003-.5265c.012-.9665.805-1.7404 1.771-1.7287zm81.952 0c.966-.0117 1.759.7622 1.771 1.7287.001.0705.001.1411.002.2117.001.1048.001.2098.001.3148 0 .1318-.001.2635-.002.395l-.001.1315c-.012.9665-.805 1.7404-1.771 1.7287-.967-.0116-1.741-.8045-1.729-1.771.002-.1611.003-.3225.003-.4842s-.001-.3231-.003-.4842c-.012-.9665.762-1.7594 1.729-1.771zm-81.609 8.0428c.951-.1759 1.864.4519 2.04 1.4023.058.316.12.6306.186.9438.2.9458-.405 1.874-1.351 2.0732-.946.1993-1.874-.4059-2.073-1.3516-.072-.3414-.14-.6842-.204-1.0285-.176-.9503.452-1.8633 1.402-2.0392zm81.265 0c.951.1759 1.579 1.0889 1.403 2.0392-.064.3443-.132.6871-.204 1.0285-.199.9457-1.127 1.5509-2.073 1.3516-.946-.1992-1.551-1.1274-1.351-2.0732.066-.3132.128-.6278.186-.9438.176-.9504 1.089-1.5782 2.039-1.4023zm-79.361 7.8165c.897-.3592 1.916.0771 2.275.9743.119.2982.242.5946.369.8891.381.8882-.03 1.9172-.918 2.2984s-1.917-.0297-2.298-.9179c-.138-.3209-.272-.6439-.402-.9689-.359-.8973.077-1.9158.974-2.275zm77.458 0c.897.3592 1.333 1.3777.974 2.275-.13.325-.264.648-.402.9689-.381.8882-1.41 1.2991-2.298.9179s-1.299-1.4102-.918-2.2984c.127-.2945.25-.5909.369-.8891.359-.8972 1.378-1.3335 2.275-.9743zm-74.056 7.2905c.81-.5278 1.894-.2993 2.422.5104.175.2691.354.5359.536.8004.547.7965.345 1.886-.451 2.4335-.797.5471-1.886.3456-2.434-.4509-.198-.288-.392-.5786-.583-.8717-.528-.8097-.3-1.8939.51-2.4217zm70.654 0c.81.5278 1.038 1.6121.51 2.4217-.191.2931-.385.5837-.583.8717-.548.7965-1.637.998-2.434.4509-.796-.5475-.998-1.637-.451-2.4335.182-.2645.361-.5313.536-.8004.528-.8097 1.612-1.0382 2.422-.5104zm-65.894 6.4864c.691-.675 1.799-.662 2.474.03.225.23.452.457.682.682.692.675.705 1.783.03 2.474-.675.692-1.783.705-2.475.03-.25-.244-.497-.491-.741-.741-.675-.692-.662-1.8.03-2.475zm61.134 0c.692.675.705 1.783.03 2.475-.244.25-.491.497-.741.741-.692.675-1.8.662-2.475-.03-.675-.691-.662-1.799.03-2.474.23-.225.457-.452.682-.682.675-.692 1.783-.705 2.474-.03zm-55.206 5.439c.548-.796 1.637-.998 2.434-.451.264.182.531.361.8.536.81.528 1.038 1.612.51 2.422-.527.81-1.612 1.038-2.421.51-.293-.191-.584-.385-.872-.583-.797-.548-.998-1.637-.451-2.434zm49.278 0c.547.797.346 1.886-.451 2.434-.288.198-.579.392-.872.583-.809.528-1.894.3-2.421-.51-.528-.81-.3-1.894.51-2.422.269-.175.536-.354.8-.536.797-.547 1.886-.345 2.434.451zm-42.405 4.183c.381-.888 1.41-1.299 2.298-.918.295.127.591.25.89.369.897.359 1.333 1.378.974 2.275s-1.378 1.333-2.275.974c-.325-.13-.648-.264-.969-.402-.888-.381-1.299-1.41-.918-2.298zm35.532 0c.381.888-.03 1.917-.918 2.298-.321.138-.644.272-.969.402-.897.359-1.916-.077-2.275-.974s.077-1.916.974-2.275c.299-.119.595-.242.89-.369.888-.381 1.917.03 2.298.918zm-27.973 2.755c.199-.946 1.128-1.551 2.073-1.351.313.066.628.128.944.186.95.176 1.578 1.089 1.402 2.039-.175.951-1.088 1.579-2.039 1.403-.344-.064-.687-.132-1.028-.204-.946-.199-1.551-1.127-1.352-2.073zm20.414 0c.199.946-.406 1.874-1.352 2.073-.341.072-.684.14-1.028.204-.951.176-1.864-.452-2.039-1.402-.176-.951.452-1.864 1.402-2.04.316-.058.63-.12.944-.186.945-.2 1.874.405 2.073 1.351zm-12.462 1.218c.011-.967.804-1.741 1.771-1.729.161.002.322.003.484.003s.323-.001.484-.003c.967-.012 1.76.762 1.771 1.729.012.966-.762 1.759-1.728 1.771-.044 0-.088.001-.132.001-.132.001-.263.002-.395.002-.105 0-.21 0-.315-.001-.07-.001-.141-.001-.212-.002-.966-.012-1.74-.805-1.728-1.771zm2.255-66.726c-.169 0-.338.0016-.507.0049-.966.0187-1.734.8172-1.716 1.7835.019.9663.818 1.7345 1.784 1.7158.146-.0028.292-.0042.439-.0042s.293.0014.439.0042c.966.0187 1.765-.7495 1.784-1.7158.018-.9663-.75-1.7648-1.716-1.7835-.169-.0033-.338-.0049-.507-.0049zm7.477 1.1027c-.925-.2802-1.902.2424-2.183 1.1674-.28.925.243 1.902 1.168 2.1822.279.0847.556.1746.831.2698.913.3167 1.91-.1669 2.226-1.0801.317-.9131-.167-1.9101-1.08-2.2267-.318-.1103-.639-.2146-.962-.3126zm-13.939 3.3496c.925-.2802 1.448-1.2572 1.168-2.1822-.281-.925-1.258-1.4476-2.183-1.1674-.323.098-.644.2023-.962.3126-.913.3166-1.397 1.3136-1.08 2.2267.316.9132 1.313 1.3968 2.226 1.0801.275-.0952.552-.1851.831-.2698zm21.188.1714c-.793-.5533-1.884-.3595-2.437.4329-.553.7925-.359 1.8834.433 2.4367.239.1669.475.3384.707.5143.77.5839 1.868.4329 2.451-.3373.584-.7702.433-1.8679-.337-2.4518-.268-.2034-.541-.4018-.817-.5948zm-27.448 2.8696c.792-.5533.986-1.6442.433-2.4367-.553-.7924-1.644-.9862-2.437-.4329-.276.193-.549.3914-.817.5948-.77.5839-.921 1.6816-.337 2.4518.583.7702 1.681.9212 2.451.3373.232-.1759.468-.3474.707-.5143zm33.253 2.7135c-.583-.7701-1.681-.9211-2.451-.3372s-.922 1.6816-.338 2.4518c.176.232.348.4676.515.7066.553.7924 1.644.9862 2.436.4329.793-.5533.987-1.6442.433-2.4367-.193-.2765-.391-.549-.595-.8174zm-38.273 2.1146c.583-.7702.432-1.8679-.338-2.4518s-1.868-.4329-2.451.3373c-.204.2683-.402.5408-.595.8173-.554.7925-.36 1.8834.433 2.4367.792.5533 1.883.3595 2.436-.4329.167-.239.339-.4746.515-.7066zm42.077 4.9894c-.317-.9132-1.314-1.3968-2.227-1.0801-.913.3166-1.397 1.3136-1.08 2.2267.095.2746.185.5515.27.8308.28.925 1.257 1.4477 2.182 1.1674.925-.2802 1.448-1.2572 1.167-2.1822-.098-.3236-.202-.6445-.312-.9626zm-45.363 1.1466c.317-.9131-.167-1.9101-1.08-2.2267-.913-.3167-1.91.1669-2.227 1.0801-.11.3181-.214.639-.312.9626-.281.925.242 1.902 1.167 2.1822.925.2803 1.902-.2424 2.182-1.1674.085-.2793.175-.5562.27-.8308zm46.773 6.7859c-.019-.9664-.817-1.7346-1.783-1.7159-.967.0187-1.735.8172-1.716 1.7835.003.146.004.2924.004.4391s-.001.2931-.004.4391c-.019.9663.749 1.7648 1.716 1.7835.966.0187 1.764-.7495 1.783-1.7159.003-.1685.005-.3374.005-.5067s-.002-.3382-.005-.5067zm-47.991.0676c.019-.9663-.749-1.7648-1.716-1.7835-.966-.0187-1.764.7495-1.783 1.7159-.003.1685-.005.3374-.005.5067s.002.3382.005.5067c.019.9664.817 1.7346 1.783 1.7159.967-.0187 1.735-.8172 1.716-1.7835-.003-.146-.004-.2924-.004-.4391s.001-.2931.004-.4391zm46.893 7.9157c.281-.925-.242-1.902-1.167-2.1822-.925-.2803-1.902.2424-2.182 1.1674-.085.2793-.175.5562-.27.8308-.317.9131.167 1.9101 1.08 2.2267.913.3167 1.91-.1669 2.227-1.0801.11-.3181.214-.639.312-.9626zm-45.945-1.0148c-.28-.925-1.257-1.4477-2.182-1.1674-.925.2802-1.448 1.2572-1.167 2.1822.098.3236.202.6445.312.9626.317.9132 1.314 1.3968 2.227 1.0801.913-.3166 1.397-1.3136 1.08-2.2267-.095-.2746-.185-.5515-.27-.8308zm42.424 8.264c.554-.7925.36-1.8834-.433-2.4367-.792-.5534-1.883-.3595-2.436.4329-.167.239-.339.4746-.515.7066-.583.7702-.432 1.8679.338 2.4518s1.868.4329 2.451-.3372c.204-.2684.402-.5409.595-.8174zm-39.383-2.0038c-.553-.7924-1.644-.9862-2.436-.4329-.793.5533-.987 1.6442-.433 2.4367.193.2765.391.549.595.8174.583.7701 1.681.9211 2.451.3372s.922-1.6816.338-2.4518c-.176-.232-.348-.4676-.515-.7066zm33.8 7.8095c.77-.5839.921-1.6816.337-2.4518-.583-.7702-1.681-.9212-2.451-.3373-.232.1759-.468.3474-.707.5143-.792.5533-.986 1.6442-.433 2.4367.553.7924 1.644.9862 2.437.4329.276-.193.549-.3914.817-.5948zm-28.972-2.7891c-.77-.5839-1.868-.4329-2.451.3373-.584.7702-.433 1.8679.337 2.4518.268.2034.541.4018.817.5948.793.5533 1.884.3595 2.437-.4329.553-.7925.359-1.8834-.433-2.4367-.239-.1669-.475-.3384-.707-.5143zm6.136 3.2855c-.913-.3167-1.91.1669-2.226 1.0801-.317.9131.167 1.9101 1.08 2.2267.318.1103.639.2146.962.3126.925.2802 1.902-.2424 2.183-1.1674.28-.925-.243-1.902-1.168-2.1822-.279-.0847-.556-.1746-.831-.2698zm15.732 3.3068c.913-.3166 1.397-1.3136 1.08-2.2267-.316-.9132-1.313-1.3968-2.226-1.0801-.275.0952-.552.1851-.831.2698-.925.2802-1.448 1.2572-1.168 2.1822.281.925 1.258 1.4476 2.183 1.1674.323-.098.644-.2023.962-.3126zm-8.878-2.0889c-.966-.0187-1.765.7495-1.784 1.7158-.018.9663.75 1.7644 1.716 1.7834.169.003.338.005.507.005s.338-.002.507-.005c.966-.019 1.734-.8171 1.716-1.7834-.019-.9663-.818-1.7345-1.784-1.7158-.146.0028-.292.0042-.439.0042s-.293-.0014-.439-.0042z"/> - <path d="m3.75 75c0-39.3503 31.8997-71.25 71.25-71.25 39.35 0 71.25 31.8997 71.25 71.25 0 39.35-31.9 71.25-71.25 71.25-39.3503 0-71.25-31.9-71.25-71.25zm71.25-74.75c-41.2833 0-74.75 33.4667-74.75 74.75 0 41.283 33.4667 74.75 74.75 74.75 41.283 0 74.75-33.467 74.75-74.75 0-41.2833-33.467-74.75-74.75-74.75zm-55.25 74.75c0-30.5137 24.7363-55.25 55.25-55.25 30.514 0 55.25 24.7363 55.25 55.25 0 30.514-24.736 55.25-55.25 55.25-30.5137 0-55.25-24.736-55.25-55.25zm55.25-58.75c-32.4467 0-58.75 26.3033-58.75 58.75 0 32.447 26.3033 58.75 58.75 58.75 32.447 0 58.75-26.303 58.75-58.75 0-32.4467-26.303-58.75-58.75-58.75zm0 19.5c-21.6772 0-39.25 17.5728-39.25 39.25s17.5728 39.25 39.25 39.25 39.25-17.5728 39.25-39.25-17.5728-39.25-39.25-39.25zm-42.75 39.25c0-23.6102 19.1398-42.75 42.75-42.75s42.75 19.1398 42.75 42.75-19.1398 42.75-42.75 42.75-42.75-19.1398-42.75-42.75zm20.5 0c0-12.2883 9.9617-22.25 22.25-22.25s22.25 9.9617 22.25 22.25-9.9617 22.25-22.25 22.25-22.25-9.9617-22.25-22.25zm22.25-25.75c-14.2213 0-25.75 11.5287-25.75 25.75s11.5287 25.75 25.75 25.75 25.75-11.5287 25.75-25.75-11.5287-25.75-25.75-25.75z"/> - <path d="m228.75 225c0-39.35 31.9-71.25 71.25-71.25s71.25 31.9 71.25 71.25-31.9 71.25-71.25 71.25-71.25-31.9-71.25-71.25zm71.25-74.75c-41.283 0-74.75 33.467-74.75 74.75s33.467 74.75 74.75 74.75 74.75-33.467 74.75-74.75-33.467-74.75-74.75-74.75zm-55.25 74.75c0-30.514 24.736-55.25 55.25-55.25s55.25 24.736 55.25 55.25-24.736 55.25-55.25 55.25-55.25-24.736-55.25-55.25zm55.25-58.75c-32.447 0-58.75 26.303-58.75 58.75s26.303 58.75 58.75 58.75 58.75-26.303 58.75-58.75-26.303-58.75-58.75-58.75zm0 19.5c-21.677 0-39.25 17.573-39.25 39.25s17.573 39.25 39.25 39.25 39.25-17.573 39.25-39.25-17.573-39.25-39.25-39.25zm-42.75 39.25c0-23.61 19.14-42.75 42.75-42.75s42.75 19.14 42.75 42.75-19.14 42.75-42.75 42.75-42.75-19.14-42.75-42.75zm20.5 0c0-12.288 9.962-22.25 22.25-22.25s22.25 9.962 22.25 22.25-9.962 22.25-22.25 22.25-22.25-9.962-22.25-22.25zm22.25-25.75c-14.221 0-25.75 11.529-25.75 25.75s11.529 25.75 25.75 25.75 25.75-11.529 25.75-25.75-11.529-25.75-25.75-25.75z"/> - <path d="m828.75 225c0-39.35 31.9-71.25 71.25-71.25v-3.5c-41.283 0-74.75 33.467-74.75 74.75s33.467 74.75 74.75 74.75v-3.5c-39.35 0-71.25-31.9-71.25-71.25zm16 0c0-30.514 24.736-55.25 55.25-55.25v-3.5c-32.447 0-58.75 26.303-58.75 58.75s26.303 58.75 58.75 58.75v-3.5c-30.514 0-55.25-24.736-55.25-55.25zm55.25-39.25c-21.677 0-39.25 17.573-39.25 39.25s17.573 39.25 39.25 39.25v3.5c-23.61 0-42.75-19.14-42.75-42.75s19.14-42.75 42.75-42.75zm-22.25 39.25c0-12.288 9.962-22.25 22.25-22.25v-3.5c-14.221 0-25.75 11.529-25.75 25.75s11.529 25.75 25.75 25.75v-3.5c-12.288 0-22.25-9.962-22.25-22.25z"/> - <path d="m71.25 225c0-39.35-31.8997-71.25-71.25-71.25v-3.5c41.2833 0 74.75 33.467 74.75 74.75s-33.4667 74.75-74.75 74.75v-3.5c39.3503 0 71.25-31.9 71.25-71.25zm-16 0c0-30.514-24.7363-55.25-55.25-55.25v-3.5c32.4467 0 58.75 26.303 58.75 58.75s-26.3033 58.75-58.75 58.75v-3.5c30.5137 0 55.25-24.736 55.25-55.25zm-55.25-39.25c21.6772 0 39.25 17.573 39.25 39.25s-17.5728 39.25-39.25 39.25v3.5c23.6102 0 42.75-19.14 42.75-42.75s-19.1398-42.75-42.75-42.75zm22.25 39.25c0-12.288-9.9617-22.25-22.25-22.25v-3.5c14.2213 0 25.75 11.529 25.75 25.75s-11.5287 25.75-25.75 25.75v-3.5c12.2883 0 22.25-9.962 22.25-22.25z"/> - <path d="m303.75 75c0-39.3503 31.9-71.25 71.25-71.25s71.25 31.8997 71.25 71.25c0 39.35-31.9 71.25-71.25 71.25s-71.25-31.9-71.25-71.25zm71.25-74.75c-41.283 0-74.75 33.4667-74.75 74.75 0 41.283 33.467 74.75 74.75 74.75s74.75-33.467 74.75-74.75c0-41.2833-33.467-74.75-74.75-74.75zm-55.25 74.75c0-30.5137 24.736-55.25 55.25-55.25s55.25 24.7363 55.25 55.25c0 30.514-24.736 55.25-55.25 55.25s-55.25-24.736-55.25-55.25zm55.25-58.75c-32.447 0-58.75 26.3033-58.75 58.75 0 32.447 26.303 58.75 58.75 58.75s58.75-26.303 58.75-58.75c0-32.4467-26.303-58.75-58.75-58.75zm0 19.5c-21.677 0-39.25 17.5728-39.25 39.25s17.573 39.25 39.25 39.25 39.25-17.5728 39.25-39.25-17.573-39.25-39.25-39.25zm-42.75 39.25c0-23.6102 19.14-42.75 42.75-42.75s42.75 19.1398 42.75 42.75-19.14 42.75-42.75 42.75-42.75-19.1398-42.75-42.75zm20.5 0c0-12.2883 9.962-22.25 22.25-22.25s22.25 9.9617 22.25 22.25-9.962 22.25-22.25 22.25-22.25-9.9617-22.25-22.25zm22.25-25.75c-14.221 0-25.75 11.5287-25.75 25.75s11.529 25.75 25.75 25.75 25.75-11.5287 25.75-25.75-11.529-25.75-25.75-25.75z"/> - <path d="m603.75 75c0-39.3503 31.9-71.25 71.25-71.25s71.25 31.8997 71.25 71.25c0 39.35-31.9 71.25-71.25 71.25s-71.25-31.9-71.25-71.25zm71.25-74.75c-41.283 0-74.75 33.4667-74.75 74.75 0 41.283 33.467 74.75 74.75 74.75s74.75-33.467 74.75-74.75c0-41.2833-33.467-74.75-74.75-74.75zm-55.25 74.75c0-30.5137 24.736-55.25 55.25-55.25s55.25 24.7363 55.25 55.25c0 30.514-24.736 55.25-55.25 55.25s-55.25-24.736-55.25-55.25zm55.25-58.75c-32.447 0-58.75 26.3033-58.75 58.75 0 32.447 26.303 58.75 58.75 58.75s58.75-26.303 58.75-58.75c0-32.4467-26.303-58.75-58.75-58.75zm0 19.5c-21.677 0-39.25 17.5728-39.25 39.25s17.573 39.25 39.25 39.25 39.25-17.5728 39.25-39.25-17.573-39.25-39.25-39.25zm-42.75 39.25c0-23.6102 19.14-42.75 42.75-42.75s42.75 19.1398 42.75 42.75-19.14 42.75-42.75 42.75-42.75-19.1398-42.75-42.75zm20.5 0c0-12.2883 9.962-22.25 22.25-22.25s22.25 9.9617 22.25 22.25-9.962 22.25-22.25 22.25-22.25-9.9617-22.25-22.25zm22.25-25.75c-14.221 0-25.75 11.5287-25.75 25.75s11.529 25.75 25.75 25.75 25.75-11.5287 25.75-25.75-11.529-25.75-25.75-25.75z"/> - <path d="m150 150.25c-.878 0-1.753.015-2.624.045-.966.034-1.722.844-1.689 1.81.033.965.843 1.721 1.809 1.688.831-.029 1.666-.043 2.504-.043s1.673.014 2.504.043c.966.033 1.776-.723 1.809-1.688.033-.966-.723-1.776-1.689-1.81-.871-.03-1.746-.045-2.624-.045zm-11.449 4.415c.954-.154 1.603-1.053 1.449-2.007s-1.053-1.603-2.007-1.449c-1.735.281-3.45.621-5.143 1.018-.941.221-1.525 1.163-1.304 2.104s1.163 1.524 2.104 1.303c1.613-.378 3.248-.702 4.901-.969zm23.456-3.456c-.954-.154-1.853.495-2.007 1.449s.495 1.853 1.449 2.007c1.653.267 3.288.591 4.901.969.941.221 1.883-.362 2.104-1.303s-.363-1.883-1.304-2.104c-1.693-.397-3.408-.737-5.143-1.018zm-36.956 7.031c.905-.339 1.365-1.347 1.026-2.252-.338-.906-1.347-1.365-2.252-1.027-1.642.615-3.258 1.285-4.843 2.009-.879.401-1.266 1.439-.865 2.319.402.879 1.44 1.266 2.319.865 1.511-.69 3.05-1.329 4.615-1.914zm51.124-3.279c-.905-.338-1.914.121-2.252 1.027-.339.905.121 1.913 1.026 2.252 1.565.585 3.104 1.224 4.615 1.914.879.401 1.917.014 2.319-.865.401-.88.014-1.918-.865-2.319-1.585-.724-3.201-1.394-4.843-2.009zm-63.661 9.436c.821-.51 1.074-1.588.565-2.41-.509-.821-1.588-1.074-2.41-.565-1.487.922-2.94 1.895-4.355 2.916-.784.565-.961 1.659-.395 2.443.565.784 1.659.961 2.443.395 1.349-.973 2.734-1.9 4.152-2.779zm76.817-2.975c-.822-.509-1.901-.256-2.41.565-.509.822-.256 1.9.565 2.41 1.418.879 2.803 1.806 4.152 2.779.784.566 1.878.389 2.443-.395.566-.784.389-1.878-.395-2.443-1.415-1.021-2.868-1.994-4.355-2.916zm-87.915 11.461c.707-.659.745-1.767.086-2.474-.659-.706-1.7663-.745-2.4731-.086-1.2779 1.192-2.5139 2.428-3.7057 3.706-.6591.707-.6205 1.814.0863 2.473s1.8142.621 2.4733-.086c1.1363-1.218 2.3152-2.397 3.5332-3.533zm99.555-2.56c-.707-.659-1.814-.62-2.473.086-.659.707-.621 1.815.086 2.474 1.218 1.136 2.397 2.315 3.533 3.533.659.707 1.767.745 2.474.086.706-.659.745-1.766.086-2.473-1.192-1.278-2.428-2.514-3.706-3.706zm-108.7948 13.039c.5655-.784.3884-1.878-.3954-2.443-.7838-.566-1.8776-.389-2.4431.395-1.021 1.415-1.9938 2.868-2.9158 4.355-.5092.822-.2561 1.901.5653 2.41.8215.509 1.9003.256 2.4095-.565.8789-1.418 1.8061-2.803 2.7795-4.152zm118.4858-2.048c-.565-.784-1.659-.961-2.443-.395-.784.565-.961 1.659-.395 2.443.973 1.349 1.9 2.734 2.779 4.152.51.821 1.588 1.074 2.41.565.821-.509 1.074-1.588.565-2.41-.922-1.487-1.895-2.94-2.916-4.355zm-125.5085 14.122c.4015-.879.0143-1.917-.8649-2.319-.8792-.401-1.9173-.014-2.3188.865-.724 1.585-1.3942 3.201-2.0083 4.843-.3385.905.121 1.914 1.0263 2.252.9053.339 1.9135-.121 2.252-1.026.5852-1.565 1.2238-3.104 1.9137-4.615zm132.8765-1.454c-.401-.879-1.439-1.266-2.319-.865-.879.402-1.266 1.44-.865 2.319.69 1.511 1.329 3.05 1.914 4.615.339.905 1.347 1.365 2.252 1.026.906-.338 1.365-1.347 1.027-2.252-.615-1.642-1.285-3.258-2.009-4.843zm-137.3955 14.668c.2209-.941-.3628-1.883-1.3037-2.104s-1.8828.363-2.1037 1.304c-.3975 1.693-.7374 3.408-1.0176 5.143-.1541.954.4944 1.853 1.4486 2.007.9541.154 1.8525-.495 2.0066-1.449.267-1.653.591-3.288.9698-4.901zm142.1385-.8c-.221-.941-1.163-1.525-2.104-1.304s-1.524 1.163-1.303 2.104c.378 1.613.702 3.248.969 4.901.154.954 1.053 1.603 2.007 1.449s1.603-1.053 1.449-2.007c-.281-1.735-.621-3.45-1.018-5.143zm-143.9799 14.646c.0334-.966-.7226-1.776-1.6885-1.809-.966-.033-1.776.723-1.8094 1.689-.03.871-.0452 1.746-.0452 2.624s.0152 1.753.0452 2.624c.0334.966.8434 1.722 1.8094 1.689.9659-.033 1.7219-.843 1.6885-1.809-.0286-.831-.0431-1.666-.0431-2.504s.0145-1.673.0431-2.504zm145.9119-.12c-.034-.966-.844-1.722-1.81-1.689-.965.033-1.721.843-1.688 1.809.029.831.043 1.666.043 2.504s-.014 1.673-.043 2.504c-.033.966.723 1.776 1.688 1.809.966.033 1.776-.723 1.81-1.689.03-.871.045-1.746.045-2.624s-.015-1.753-.045-2.624zm-145.0403 14.073c-.1541-.954-1.0525-1.603-2.0066-1.449-.9542.154-1.6027 1.053-1.4486 2.007.2802 1.735.6201 3.45 1.0176 5.143.2209.941 1.1628 1.525 2.1037 1.304s1.5246-1.163 1.3037-2.104c-.3788-1.613-.7028-3.248-.9698-4.901zm144.1263.558c.154-.954-.495-1.853-1.449-2.007s-1.853.495-2.007 1.449c-.267 1.653-.591 3.288-.969 4.901-.221.941.362 1.883 1.303 2.104s1.883-.363 2.104-1.304c.397-1.693.737-3.408 1.018-5.143zm-140.5512 12.942c-.3385-.905-1.3467-1.365-2.252-1.026-.9053.338-1.3648 1.347-1.0263 2.252.6141 1.642 1.2843 3.258 2.0083 4.843.4015.879 1.4396 1.266 2.3188.865.8792-.402 1.2664-1.44.8649-2.319-.6899-1.511-1.3285-3.05-1.9137-4.615zm136.7992 1.226c.338-.905-.121-1.914-1.027-2.252-.905-.339-1.913.121-2.252 1.026-.585 1.565-1.224 3.104-1.914 4.615-.401.879-.014 1.917.865 2.319.88.401 1.918.014 2.319-.865.724-1.585 1.394-3.201 2.009-4.843zm-130.6423 11.311c-.5093-.821-1.588-1.074-2.4095-.565-.8214.509-1.0745 1.588-.5653 2.41.922 1.487 1.8948 2.94 2.9158 4.355.5655.784 1.6593.961 2.4431.395.7838-.565.9609-1.659.3954-2.443-.9734-1.349-1.9006-2.734-2.7795-4.152zm124.1813 1.845c.509-.822.256-1.901-.565-2.41-.822-.509-1.9-.256-2.41.565-.879 1.418-1.806 2.803-2.779 4.152-.566.784-.389 1.878.395 2.443.784.566 1.878.389 2.443-.395 1.021-1.415 1.994-2.868 2.916-4.355zm-115.6952 9.253c-.6592-.707-1.7665-.745-2.4733-.086s-.7455 1.766-.0863 2.473c1.1918 1.278 2.4278 2.514 3.7057 3.706.7068.659 1.8141.62 2.4731-.086.659-.707.621-1.815-.086-2.474-1.218-1.136-2.3969-2.315-3.5332-3.533zm106.7942 2.387c.659-.707.62-1.814-.086-2.473-.707-.659-1.815-.621-2.474.086-1.136 1.218-2.315 2.397-3.533 3.533-.707.659-.745 1.767-.086 2.474.659.706 1.766.745 2.473.086 1.278-1.192 2.514-2.428 3.706-3.706zm-96.315 6.853c-.784-.566-1.878-.389-2.443.395-.566.784-.389 1.878.395 2.443 1.415 1.021 2.868 1.994 4.355 2.916.822.509 1.901.256 2.41-.565.509-.822.256-1.9-.565-2.41-1.418-.879-2.803-1.806-4.152-2.779zm85.324 2.838c.784-.565.961-1.659.395-2.443-.565-.784-1.659-.961-2.443-.395-1.349.973-2.734 1.9-4.152 2.779-.821.51-1.074 1.588-.565 2.41.509.821 1.588 1.074 2.41.565 1.487-.922 2.94-1.895 4.355-2.916zm-73.25 4.184c-.879-.401-1.917-.014-2.319.865-.401.88-.014 1.918.865 2.319 1.585.724 3.201 1.394 4.843 2.009.905.338 1.914-.121 2.252-1.027.339-.905-.121-1.913-1.026-2.252-1.565-.585-3.104-1.224-4.615-1.914zm60.582 3.184c.879-.401 1.266-1.439.865-2.319-.402-.879-1.44-1.266-2.319-.865-1.511.69-3.05 1.329-4.615 1.914-.905.339-1.365 1.347-1.026 2.252.338.906 1.347 1.365 2.252 1.027 1.642-.615 3.258-1.285 4.843-2.009zm-47.368 1.336c-.941-.221-1.883.362-2.104 1.303s.363 1.883 1.304 2.104c1.693.397 3.408.737 5.143 1.018.954.154 1.853-.495 2.007-1.449s-.495-1.853-1.449-2.007c-1.653-.267-3.288-.591-4.901-.969zm33.5 3.407c.941-.221 1.525-1.163 1.304-2.104s-1.163-1.524-2.104-1.303c-1.613.378-3.248.702-4.901.969-.954.154-1.603 1.053-1.449 2.007s1.053 1.603 2.007 1.449c1.735-.281 3.45-.621 5.143-1.018zm-19.654-1.566c-.966-.033-1.776.723-1.809 1.688-.033.966.723 1.776 1.689 1.81.871.03 1.746.045 2.624.045s1.753-.015 2.624-.045c.966-.034 1.722-.844 1.689-1.81-.033-.965-.843-1.721-1.809-1.688-.831.029-1.666.043-2.504.043s-1.673-.014-2.504-.043zm2.504-130.957c-.802 0-1.601.016-2.396.047-.965.038-1.717.852-1.679 1.818s.852 1.718 1.817 1.679c.749-.029 1.502-.044 2.258-.044s1.509.015 2.258.044c.966.039 1.779-.713 1.817-1.679s-.714-1.78-1.679-1.818c-.795-.031-1.594-.047-2.396-.047zm-10.317 4.444c.95-.176 1.578-1.09 1.402-2.04s-1.089-1.578-2.04-1.402c-1.579.293-3.136.648-4.668 1.062-.933.252-1.485 1.213-1.233 2.146s1.213 1.485 2.146 1.233c1.442-.39 2.907-.724 4.393-.999zm21.272-3.442c-.951-.176-1.864.452-2.04 1.402s.452 1.864 1.402 2.04c1.486.275 2.951.609 4.393.999.933.252 1.894-.3 2.146-1.233s-.3-1.894-1.233-2.146c-1.532-.414-3.089-.769-4.668-1.062zm12.799 3.907c-.887-.385-1.917.022-2.302.909-.384.887.023 1.917.909 2.302 1.383.599 2.737 1.253 4.059 1.958.853.454 1.913.132 2.368-.721.454-.853.132-1.913-.721-2.368-1.405-.749-2.844-1.443-4.313-2.08zm-46.115 3.211c.886-.385 1.293-1.415.909-2.302-.385-.887-1.415-1.294-2.302-.909-1.469.637-2.908 1.331-4.313 2.08-.853.455-1.175 1.515-.721 2.368.455.853 1.515 1.175 2.368.721 1.322-.705 2.676-1.359 4.059-1.958zm-10.921 6.278c.779-.573.946-1.668.373-2.447-.572-.778-1.667-.945-2.446-.373-1.287.946-2.535 1.943-3.741 2.987-.731.633-.81 1.738-.177 2.469.632.73 1.738.81 2.468.177 1.136-.983 2.311-1.922 3.523-2.813zm68.637-2.82c-.779-.572-1.874-.405-2.446.373-.573.779-.406 1.874.373 2.447 1.212.891 2.387 1.83 3.523 2.813.73.633 1.836.553 2.468-.177.633-.731.554-1.836-.177-2.469-1.206-1.044-2.454-2.041-3.741-2.987zm-77.894 11.367c.633-.73.553-1.836-.177-2.468-.731-.633-1.836-.554-2.469.177-1.044 1.206-2.041 2.454-2.987 3.741-.572.779-.405 1.874.373 2.446.779.573 1.874.406 2.447-.373.891-1.212 1.83-2.387 2.813-3.523zm87.724-2.291c-.633-.731-1.738-.81-2.469-.177-.73.632-.81 1.738-.177 2.468.983 1.136 1.922 2.311 2.813 3.523.573.779 1.668.946 2.447.373.778-.572.945-1.667.373-2.446-.946-1.287-1.943-2.535-2.987-3.741zm7.576 11.029c-.455-.853-1.515-1.175-2.368-.721-.853.455-1.175 1.515-.721 2.368.705 1.322 1.359 2.676 1.958 4.059.385.886 1.415 1.293 2.302.909.887-.385 1.294-1.415.909-2.302-.637-1.469-1.331-2.908-2.08-4.313zm-102.433 1.647c.454-.853.132-1.913-.7213-2.368-.8529-.454-1.9128-.132-2.3675.721-.7489 1.405-1.4433 2.844-2.0805 4.313-.3846.887.0224 1.917.9091 2.302.8867.384 1.9173-.023 2.3019-.909.5996-1.383 1.2532-2.737 1.9583-4.059zm-4.6354 11.71c.2521-.933-.2999-1.894-1.233-2.146-.933-.252-1.8937.3-2.1459 1.233-.4141 1.532-.7688 3.089-1.0614 4.668-.1761.951.4515 1.864 1.4018 2.04s1.8635-.452 2.0396-1.402c.2754-1.486.6092-2.951.9989-4.393zm111.9934-.913c-.252-.933-1.213-1.485-2.146-1.233s-1.485 1.213-1.233 2.146c.39 1.442.724 2.907.999 4.393.176.95 1.09 1.578 2.04 1.402s1.578-1.089 1.402-2.04c-.293-1.579-.648-3.136-1.062-4.668zm-113.8915 13.365c.0381-.966-.7139-1.779-1.6797-1.817-.9657-.038-1.7795.714-1.8176 1.679-.0314.795-.0472 1.594-.0472 2.396s.0158 1.601.0472 2.396c.0381.965.8519 1.717 1.8176 1.679.9658-.038 1.7178-.852 1.6797-1.817-.0296-.749-.0445-1.502-.0445-2.258s.0149-1.509.0445-2.258zm115.9085-.138c-.038-.965-.852-1.717-1.818-1.679s-1.718.852-1.679 1.817c.029.749.044 1.502.044 2.258s-.015 1.509-.044 2.258c-.039.966.713 1.779 1.679 1.817s1.78-.714 1.818-1.679c.031-.795.047-1.594.047-2.396s-.016-1.601-.047-2.396zm-115.0093 12.713c-.1761-.95-1.0893-1.578-2.0396-1.402s-1.5779 1.089-1.4018 2.04c.2926 1.579.6473 3.136 1.0614 4.668.2521.933 1.2129 1.485 2.1459 1.233.9331-.252 1.4851-1.213 1.233-2.146-.3897-1.442-.7235-2.907-.9989-4.393zm114.0543.638c.176-.951-.452-1.864-1.402-2.04s-1.864.452-2.04 1.402c-.275 1.486-.609 2.951-.999 4.393-.252.933.3 1.894 1.233 2.146s1.894-.3 2.146-1.233c.414-1.532.769-3.089 1.062-4.668zm-110.3783 11.406c-.3846-.886-1.4152-1.293-2.3019-.909-.8867.385-1.2937 1.415-.9091 2.302.6372 1.469 1.3316 2.908 2.0805 4.313.4547.853 1.5146 1.175 2.3675.721.8533-.455 1.1753-1.515.7213-2.368-.7051-1.322-1.3587-2.676-1.9583-4.059zm106.4713 1.393c.385-.887-.022-1.917-.909-2.302-.887-.384-1.917.023-2.302.909-.599 1.383-1.253 2.737-1.958 4.059-.454.853-.132 1.913.721 2.368.853.454 1.913.132 2.368-.721.749-1.405 1.443-2.844 2.08-4.313zm-100.193 9.528c-.573-.779-1.668-.946-2.447-.373-.778.572-.945 1.667-.373 2.446.946 1.287 1.943 2.535 2.987 3.741.633.731 1.738.81 2.469.177.73-.632.81-1.738.177-2.468-.983-1.136-1.922-2.311-2.813-3.523zm93.524 2.073c.572-.779.405-1.874-.373-2.446-.779-.573-1.874-.406-2.447.373-.891 1.212-1.83 2.387-2.813 3.523-.633.73-.553 1.836.177 2.468.731.633 1.836.554 2.469-.177 1.044-1.206 2.041-2.454 2.987-3.741zm-84.977 7.184c-.73-.633-1.836-.553-2.468.177-.633.731-.554 1.836.177 2.469 1.206 1.044 2.454 2.041 3.741 2.987.779.572 1.874.405 2.446-.373.573-.779.406-1.874-.373-2.447-1.212-.891-2.387-1.83-3.523-2.813zm75.901 2.646c.731-.633.81-1.738.177-2.469-.632-.73-1.738-.81-2.468-.177-1.136.983-2.311 1.922-3.523 2.813-.779.573-.946 1.668-.373 2.447.572.778 1.667.945 2.446.373 1.287-.946 2.535-1.943 3.741-2.987zm-65.516 4.487c-.853-.454-1.913-.132-2.368.721-.454.853-.132 1.913.721 2.368 1.405.749 2.844 1.443 4.313 2.08.887.385 1.917-.022 2.302-.909.384-.887-.023-1.917-.909-2.302-1.383-.599-2.737-1.253-4.059-1.958zm54.487 3.089c.853-.455 1.175-1.515.721-2.368-.455-.853-1.515-1.175-2.368-.721-1.322.705-2.676 1.359-4.059 1.958-.886.385-1.293 1.415-.909 2.302.385.887 1.415 1.294 2.302.909 1.469-.637 2.908-1.331 4.313-2.08zm-42.777 1.546c-.933-.252-1.894.3-2.146 1.233s.3 1.894 1.233 2.146c1.532.414 3.089.769 4.668 1.062.951.176 1.864-.452 2.04-1.402s-.452-1.864-1.402-2.04c-1.486-.275-2.951-.609-4.393-.999zm30.333 3.379c.933-.252 1.485-1.213 1.233-2.146s-1.213-1.485-2.146-1.233c-1.442.39-2.907.724-4.393.999-.95.176-1.578 1.09-1.402 2.04s1.089 1.578 2.04 1.402c1.579-.293 3.136-.648 4.668-1.062zm-17.881-1.48c-.966-.039-1.779.713-1.817 1.679s.714 1.78 1.679 1.818c.795.031 1.594.047 2.396.047s1.601-.016 2.396-.047c.965-.038 1.717-.852 1.679-1.818s-.852-1.718-1.817-1.679c-.749.029-1.502.044-2.258.044s-1.509-.015-2.258-.044zm-.139-98.89c.794-.044 1.593-.066 2.397-.066s1.603.022 2.397.066c.965.053 1.704.879 1.65 1.844-.053.965-.878 1.704-1.843 1.651-.73-.041-1.464-.061-2.204-.061s-1.474.02-2.204.061c-.965.053-1.79-.686-1.843-1.651-.054-.965.685-1.791 1.65-1.844zm-6.378 2.587c.247.934-.312 1.891-1.246 2.137-1.429.377-2.826.831-4.186 1.36-.901.35-1.915-.097-2.265-.998s.097-1.915.997-2.265c1.483-.576 3.005-1.071 4.563-1.481.934-.246 1.891.312 2.137 1.247zm17.55 0c.246-.935 1.203-1.493 2.137-1.247 1.558.41 3.08.905 4.563 1.481.901.35 1.347 1.364.997 2.265s-1.364 1.348-2.265.998c-1.36-.529-2.757-.983-4.186-1.36-.934-.246-1.493-1.203-1.246-2.137zm-29.509 4.675c.525.812.291 1.895-.521 2.419-1.236.798-2.424 1.663-3.559 2.591-.749.611-1.851.5-2.463-.248-.611-.749-.5-1.851.248-2.463 1.236-1.01 2.53-1.952 3.876-2.82.812-.525 1.895-.291 2.419.521zm41.468 0c.524-.812 1.607-1.046 2.419-.521 1.346.868 2.64 1.81 3.876 2.82.748.612.859 1.714.248 2.463-.612.748-1.714.859-2.463.248-1.135-.928-2.323-1.793-3.559-2.591-.812-.524-1.046-1.607-.521-2.419zm-51.394 8.145c.748.612.859 1.714.248 2.463-.928 1.135-1.793 2.323-2.591 3.559-.524.812-1.607 1.046-2.419.521-.812-.524-1.046-1.607-.521-2.419.868-1.346 1.81-2.64 2.82-3.876.612-.748 1.714-.859 2.463-.248zm61.32 0c.749-.611 1.851-.5 2.463.248 1.01 1.236 1.952 2.53 2.82 3.876.525.812.291 1.895-.521 2.419-.812.525-1.895.291-2.419-.521-.798-1.236-1.663-2.424-2.591-3.559-.611-.749-.5-1.851.248-2.463zm-68.258 10.805c.901.35 1.348 1.364.998 2.265-.529 1.36-.983 2.757-1.36 4.186-.246.934-1.203 1.493-2.137 1.246-.935-.246-1.493-1.203-1.247-2.137.41-1.558.905-3.08 1.481-4.563.35-.9 1.364-1.347 2.265-.997zm75.196 0c.901-.35 1.915.097 2.265.997.576 1.483 1.071 3.005 1.481 4.563.246.934-.312 1.891-1.247 2.137-.934.247-1.891-.312-2.137-1.246-.377-1.429-.831-2.826-1.36-4.186-.35-.901.097-1.915.998-2.265zm-78.438 12.425c.965.053 1.704.878 1.651 1.843-.041.73-.061 1.464-.061 2.204s.02 1.474.061 2.204c.053.965-.686 1.79-1.651 1.843-.965.054-1.791-.685-1.844-1.65-.044-.794-.066-1.593-.066-2.397s.022-1.603.066-2.397c.053-.965.879-1.704 1.844-1.65zm81.68 0c.965-.054 1.791.685 1.844 1.65.044.794.066 1.593.066 2.397s-.022 1.603-.066 2.397c-.053.965-.879 1.704-1.844 1.65-.965-.053-1.704-.878-1.651-1.843.041-.73.061-1.464.061-2.204s-.02-1.474-.061-2.204c-.053-.965.686-1.79 1.651-1.843zm-80.937 12.822c.934-.247 1.891.312 2.137 1.246.377 1.429.831 2.826 1.36 4.186.35.901-.097 1.915-.998 2.265s-1.915-.097-2.265-.997c-.576-1.483-1.071-3.005-1.481-4.563-.246-.934.312-1.891 1.247-2.137zm80.194 0c.935.246 1.493 1.203 1.247 2.137-.41 1.558-.905 3.08-1.481 4.563-.35.901-1.364 1.347-2.265.997s-1.348-1.364-.998-2.265c.529-1.36.983-2.757 1.36-4.186.246-.934 1.203-1.493 2.137-1.246zm-75.519 11.959c.812-.525 1.895-.291 2.419.521.798 1.236 1.663 2.424 2.591 3.559.611.749.5 1.851-.248 2.463-.749.611-1.851.5-2.463-.248-1.01-1.236-1.952-2.53-2.82-3.876-.525-.812-.291-1.895.521-2.419zm70.844 0c.812.524 1.046 1.607.521 2.419-.868 1.346-1.81 2.64-2.82 3.876-.612.748-1.714.859-2.463.248-.748-.612-.859-1.714-.248-2.463.928-1.135 1.793-2.323 2.591-3.559.524-.812 1.607-1.046 2.419-.521zm-62.699 9.926c.612-.748 1.714-.859 2.463-.248 1.135.928 2.323 1.793 3.559 2.591.812.524 1.046 1.607.521 2.419-.524.812-1.607 1.046-2.419.521-1.346-.868-2.64-1.81-3.876-2.82-.748-.612-.859-1.714-.248-2.463zm54.554 0c.611.749.5 1.851-.248 2.463-1.236 1.01-2.53 1.952-3.876 2.82-.812.525-1.895.291-2.419-.521-.525-.812-.291-1.895.521-2.419 1.236-.798 2.424-1.663 3.559-2.591.749-.611 1.851-.5 2.463.248zm-43.749 6.938c.35-.901 1.364-1.348 2.265-.998 1.36.529 2.757.983 4.186 1.36.934.246 1.493 1.203 1.246 2.137-.246.935-1.203 1.493-2.137 1.247-1.558-.41-3.08-.905-4.563-1.481-.9-.35-1.347-1.364-.997-2.265zm32.944 0c.35.901-.097 1.915-.997 2.265-1.483.576-3.005 1.071-4.563 1.481-.934.246-1.891-.312-2.137-1.247-.247-.934.312-1.891 1.246-2.137 1.429-.377 2.826-.831 4.186-1.36.901-.35 1.915.097 2.265.998zm-20.519 3.242c.053-.965.878-1.704 1.843-1.651.73.041 1.464.061 2.204.061s1.474-.02 2.204-.061c.965-.053 1.79.686 1.843 1.651.054.965-.685 1.791-1.65 1.844-.794.044-1.593.066-2.397.066s-1.603-.022-2.397-.066c-.965-.053-1.704-.879-1.65-1.844zm4.047-66.59c-.81 0-1.612.037-2.403.111-.963.089-1.671.941-1.582 1.904.09.962.942 1.67 1.904 1.581.685-.064 1.379-.096 2.081-.096s1.396.032 2.081.096c.962.089 1.814-.619 1.904-1.581.089-.963-.619-1.815-1.582-1.904-.791-.074-1.593-.111-2.403-.111zm10.74 2.34c-.878-.403-1.917-.018-2.32.86-.404.878-.019 1.917.859 2.321 1.267.582 2.47 1.28 3.596 2.08.788.56 1.88.375 2.44-.412.56-.788.376-1.881-.412-2.441-1.303-.925-2.695-1.733-4.163-2.408zm-20.019 3.181c.878-.404 1.263-1.443.859-2.321-.403-.878-1.442-1.263-2.32-.86-1.468.675-2.86 1.483-4.163 2.408-.788.56-.972 1.653-.412 2.441.56.787 1.652.972 2.44.412 1.126-.8 2.329-1.498 3.596-2.08zm30.281 5.326c-.56-.788-1.653-.972-2.441-.412s-.972 1.652-.412 2.44c.8 1.126 1.498 2.329 2.08 3.596.404.878 1.443 1.263 2.321.859.878-.403 1.263-1.442.86-2.32-.675-1.468-1.483-2.86-2.408-4.163zm-39.151 2.028c.56-.788.375-1.88-.412-2.44-.788-.56-1.881-.376-2.441.412-.925 1.303-1.733 2.695-2.408 4.163-.403.878-.018 1.917.86 2.32.878.404 1.917.019 2.321-.859.582-1.267 1.28-2.47 2.08-3.596zm-4.005 10.794c.089-.962-.619-1.814-1.581-1.904-.963-.089-1.815.619-1.904 1.582-.074.791-.111 1.593-.111 2.403s.037 1.612.111 2.403c.089.963.941 1.671 1.904 1.582.962-.09 1.67-.942 1.581-1.904-.064-.685-.096-1.379-.096-2.081s.032-1.396.096-2.081zm47.793-.322c-.089-.963-.941-1.671-1.904-1.582-.962.09-1.67.942-1.581 1.904.064.685.096 1.379.096 2.081s-.032 1.396-.096 2.081c-.089.962.619 1.814 1.581 1.904.963.089 1.815-.619 1.904-1.582.074-.791.111-1.593.111-2.403s-.037-1.612-.111-2.403zm-2.229 13.143c.403-.878.018-1.917-.86-2.32-.878-.404-1.917-.019-2.321.859-.582 1.267-1.28 2.47-2.08 3.596-.56.788-.376 1.88.412 2.44s1.881.376 2.441-.412c.925-1.303 1.733-2.695 2.408-4.163zm-43.639-1.461c-.404-.878-1.443-1.263-2.321-.859-.878.403-1.263 1.442-.86 2.32.675 1.468 1.483 2.86 2.408 4.163.56.788 1.653.972 2.441.412.787-.56.972-1.652.412-2.44-.8-1.126-1.498-2.329-2.08-3.596zm7.354 8.87c-.788-.56-1.88-.376-2.44.412s-.376 1.881.412 2.441c1.303.925 2.695 1.733 4.163 2.408.878.403 1.917.018 2.32-.86.404-.878.019-1.917-.859-2.321-1.267-.582-2.47-1.28-3.596-2.08zm27.778 2.853c.788-.56.972-1.653.412-2.441s-1.652-.972-2.44-.412c-1.126.8-2.329 1.498-3.596 2.08-.878.404-1.263 1.443-.859 2.321.403.878 1.442 1.263 2.32.86 1.468-.675 2.86-1.483 4.163-2.408zm-16.984 1.152c-.962-.089-1.814.619-1.904 1.581-.089.963.619 1.815 1.582 1.904.791.074 1.593.111 2.403.111s1.612-.037 2.403-.111c.963-.089 1.671-.941 1.582-1.904-.09-.962-.942-1.67-1.904-1.581-.685.064-1.379.096-2.081.096s-1.396-.032-2.081-.096z"/> - <path d="m750 150.25c-.878 0-1.753.015-2.624.045-.966.034-1.722.844-1.689 1.81.033.965.843 1.721 1.809 1.688.831-.029 1.666-.043 2.504-.043s1.673.014 2.504.043c.966.033 1.776-.723 1.809-1.688.033-.966-.723-1.776-1.689-1.81-.871-.03-1.746-.045-2.624-.045zm-11.449 4.415c.954-.154 1.603-1.053 1.449-2.007s-1.053-1.603-2.007-1.449c-1.735.281-3.45.621-5.143 1.018-.941.221-1.525 1.163-1.304 2.104s1.163 1.524 2.104 1.303c1.613-.378 3.248-.702 4.901-.969zm23.456-3.456c-.954-.154-1.853.495-2.007 1.449s.495 1.853 1.449 2.007c1.653.267 3.288.591 4.901.969.941.221 1.883-.362 2.104-1.303s-.363-1.883-1.304-2.104c-1.693-.397-3.408-.737-5.143-1.018zm-36.956 7.031c.905-.339 1.365-1.347 1.026-2.252-.338-.906-1.347-1.365-2.252-1.027-1.642.615-3.258 1.285-4.843 2.009-.879.401-1.266 1.439-.865 2.319.402.879 1.44 1.266 2.319.865 1.511-.69 3.05-1.329 4.615-1.914zm51.124-3.279c-.905-.338-1.914.121-2.252 1.027-.339.905.121 1.913 1.026 2.252 1.565.585 3.104 1.224 4.615 1.914.879.401 1.917.014 2.319-.865.401-.88.014-1.918-.865-2.319-1.585-.724-3.201-1.394-4.843-2.009zm-63.661 9.436c.821-.51 1.074-1.588.565-2.41-.509-.821-1.588-1.074-2.41-.565-1.487.922-2.94 1.895-4.355 2.916-.784.565-.961 1.659-.395 2.443.565.784 1.659.961 2.443.395 1.349-.973 2.734-1.9 4.152-2.779zm76.817-2.975c-.822-.509-1.901-.256-2.41.565-.509.822-.256 1.9.565 2.41 1.418.879 2.803 1.806 4.152 2.779.784.566 1.878.389 2.443-.395.566-.784.389-1.878-.395-2.443-1.415-1.021-2.868-1.994-4.355-2.916zm-87.915 11.461c.707-.659.745-1.767.086-2.474-.659-.706-1.766-.745-2.473-.086-1.278 1.192-2.514 2.428-3.706 3.706-.659.707-.62 1.814.086 2.473.707.659 1.815.621 2.474-.086 1.136-1.218 2.315-2.397 3.533-3.533zm99.555-2.56c-.707-.659-1.814-.62-2.473.086-.659.707-.621 1.815.086 2.474 1.218 1.136 2.397 2.315 3.533 3.533.659.707 1.767.745 2.474.086.706-.659.745-1.766.086-2.473-1.192-1.278-2.428-2.514-3.706-3.706zm-108.795 13.039c.566-.784.389-1.878-.395-2.443-.784-.566-1.878-.389-2.443.395-1.021 1.415-1.994 2.868-2.916 4.355-.509.822-.256 1.901.565 2.41.822.509 1.9.256 2.41-.565.879-1.418 1.806-2.803 2.779-4.152zm118.486-2.048c-.565-.784-1.659-.961-2.443-.395-.784.565-.961 1.659-.395 2.443.973 1.349 1.9 2.734 2.779 4.152.51.821 1.588 1.074 2.41.565.821-.509 1.074-1.588.565-2.41-.922-1.487-1.895-2.94-2.916-4.355zm-125.508 14.122c.401-.879.014-1.917-.865-2.319-.88-.401-1.918-.014-2.319.865-.724 1.585-1.394 3.201-2.009 4.843-.338.905.121 1.914 1.027 2.252.905.339 1.913-.121 2.252-1.026.585-1.565 1.224-3.104 1.914-4.615zm132.876-1.454c-.401-.879-1.439-1.266-2.319-.865-.879.402-1.266 1.44-.865 2.319.69 1.511 1.329 3.05 1.914 4.615.339.905 1.347 1.365 2.252 1.026.906-.338 1.365-1.347 1.027-2.252-.615-1.642-1.285-3.258-2.009-4.843zm-137.396 14.668c.221-.941-.362-1.883-1.303-2.104s-1.883.363-2.104 1.304c-.397 1.693-.737 3.408-1.018 5.143-.154.954.495 1.853 1.449 2.007s1.853-.495 2.007-1.449c.267-1.653.591-3.288.969-4.901zm142.139-.8c-.221-.941-1.163-1.525-2.104-1.304s-1.524 1.163-1.303 2.104c.378 1.613.702 3.248.969 4.901.154.954 1.053 1.603 2.007 1.449s1.603-1.053 1.449-2.007c-.281-1.735-.621-3.45-1.018-5.143zm-143.98 14.646c.033-.966-.723-1.776-1.688-1.809-.966-.033-1.776.723-1.81 1.689-.03.871-.045 1.746-.045 2.624s.015 1.753.045 2.624c.034.966.844 1.722 1.81 1.689.965-.033 1.721-.843 1.688-1.809-.029-.831-.043-1.666-.043-2.504s.014-1.673.043-2.504zm145.912-.12c-.034-.966-.844-1.722-1.81-1.689-.965.033-1.721.843-1.688 1.809.029.831.043 1.666.043 2.504s-.014 1.673-.043 2.504c-.033.966.723 1.776 1.688 1.809.966.033 1.776-.723 1.81-1.689.03-.871.045-1.746.045-2.624s-.015-1.753-.045-2.624zm-145.04 14.073c-.154-.954-1.053-1.603-2.007-1.449s-1.603 1.053-1.449 2.007c.281 1.735.621 3.45 1.018 5.143.221.941 1.163 1.525 2.104 1.304s1.524-1.163 1.303-2.104c-.378-1.613-.702-3.248-.969-4.901zm144.126.558c.154-.954-.495-1.853-1.449-2.007s-1.853.495-2.007 1.449c-.267 1.653-.591 3.288-.969 4.901-.221.941.362 1.883 1.303 2.104s1.883-.363 2.104-1.304c.397-1.693.737-3.408 1.018-5.143zm-140.551 12.942c-.339-.905-1.347-1.365-2.252-1.026-.906.338-1.365 1.347-1.027 2.252.615 1.642 1.285 3.258 2.009 4.843.401.879 1.439 1.266 2.319.865.879-.402 1.266-1.44.865-2.319-.69-1.511-1.329-3.05-1.914-4.615zm136.799 1.226c.338-.905-.121-1.914-1.027-2.252-.905-.339-1.913.121-2.252 1.026-.585 1.565-1.224 3.104-1.914 4.615-.401.879-.014 1.917.865 2.319.88.401 1.918.014 2.319-.865.724-1.585 1.394-3.201 2.009-4.843zm-130.642 11.311c-.51-.821-1.588-1.074-2.41-.565-.821.509-1.074 1.588-.565 2.41.922 1.487 1.895 2.94 2.916 4.355.565.784 1.659.961 2.443.395.784-.565.961-1.659.395-2.443-.973-1.349-1.9-2.734-2.779-4.152zm124.181 1.845c.509-.822.256-1.901-.565-2.41-.822-.509-1.9-.256-2.41.565-.879 1.418-1.806 2.803-2.779 4.152-.566.784-.389 1.878.395 2.443.784.566 1.878.389 2.443-.395 1.021-1.415 1.994-2.868 2.916-4.355zm-115.695 9.253c-.659-.707-1.767-.745-2.474-.086-.706.659-.745 1.766-.086 2.473 1.192 1.278 2.428 2.514 3.706 3.706.707.659 1.814.62 2.473-.086.659-.707.621-1.815-.086-2.474-1.218-1.136-2.397-2.315-3.533-3.533zm106.794 2.387c.659-.707.62-1.814-.086-2.473-.707-.659-1.815-.621-2.474.086-1.136 1.218-2.315 2.397-3.533 3.533-.707.659-.745 1.767-.086 2.474.659.706 1.766.745 2.473.086 1.278-1.192 2.514-2.428 3.706-3.706zm-96.315 6.853c-.784-.566-1.878-.389-2.443.395-.566.784-.389 1.878.395 2.443 1.415 1.021 2.868 1.994 4.355 2.916.822.509 1.901.256 2.41-.565.509-.822.256-1.9-.565-2.41-1.418-.879-2.803-1.806-4.152-2.779zm85.324 2.838c.784-.565.961-1.659.395-2.443-.565-.784-1.659-.961-2.443-.395-1.349.973-2.734 1.9-4.152 2.779-.821.51-1.074 1.588-.565 2.41.509.821 1.588 1.074 2.41.565 1.487-.922 2.94-1.895 4.355-2.916zm-73.25 4.184c-.879-.401-1.917-.014-2.319.865-.401.88-.014 1.918.865 2.319 1.585.724 3.201 1.394 4.843 2.009.905.338 1.914-.121 2.252-1.027.339-.905-.121-1.913-1.026-2.252-1.565-.585-3.104-1.224-4.615-1.914zm60.582 3.184c.879-.401 1.266-1.439.865-2.319-.402-.879-1.44-1.266-2.319-.865-1.511.69-3.05 1.329-4.615 1.914-.905.339-1.365 1.347-1.026 2.252.338.906 1.347 1.365 2.252 1.027 1.642-.615 3.258-1.285 4.843-2.009zm-47.368 1.336c-.941-.221-1.883.362-2.104 1.303s.363 1.883 1.304 2.104c1.693.397 3.408.737 5.143 1.018.954.154 1.853-.495 2.007-1.449s-.495-1.853-1.449-2.007c-1.653-.267-3.288-.591-4.901-.969zm33.5 3.407c.941-.221 1.525-1.163 1.304-2.104s-1.163-1.524-2.104-1.303c-1.613.378-3.248.702-4.901.969-.954.154-1.603 1.053-1.449 2.007s1.053 1.603 2.007 1.449c1.735-.281 3.45-.621 5.143-1.018zm-19.654-1.566c-.966-.033-1.776.723-1.809 1.688-.033.966.723 1.776 1.689 1.81.871.03 1.746.045 2.624.045s1.753-.015 2.624-.045c.966-.034 1.722-.844 1.689-1.81-.033-.965-.843-1.721-1.809-1.688-.831.029-1.666.043-2.504.043s-1.673-.014-2.504-.043zm2.504-130.957c-.802 0-1.601.016-2.396.047-.965.038-1.717.852-1.679 1.818s.852 1.718 1.817 1.679c.749-.029 1.502-.044 2.258-.044s1.509.015 2.258.044c.966.039 1.779-.713 1.817-1.679s-.714-1.78-1.679-1.818c-.795-.031-1.594-.047-2.396-.047zm-10.317 4.444c.95-.176 1.578-1.09 1.402-2.04s-1.089-1.578-2.04-1.402c-1.579.293-3.136.648-4.668 1.062-.933.252-1.485 1.213-1.233 2.146s1.213 1.485 2.146 1.233c1.442-.39 2.907-.724 4.393-.999zm21.272-3.442c-.951-.176-1.864.452-2.04 1.402s.452 1.864 1.402 2.04c1.486.275 2.951.609 4.393.999.933.252 1.894-.3 2.146-1.233s-.3-1.894-1.233-2.146c-1.532-.414-3.089-.769-4.668-1.062zm12.799 3.907c-.887-.385-1.917.022-2.302.909-.384.887.023 1.917.909 2.302 1.383.599 2.737 1.253 4.059 1.958.853.454 1.913.132 2.368-.721.454-.853.132-1.913-.721-2.368-1.405-.749-2.844-1.443-4.313-2.08zm-46.115 3.211c.886-.385 1.293-1.415.909-2.302-.385-.887-1.415-1.294-2.302-.909-1.469.637-2.908 1.331-4.313 2.08-.853.455-1.175 1.515-.721 2.368.455.853 1.515 1.175 2.368.721 1.322-.705 2.676-1.359 4.059-1.958zm-10.921 6.278c.779-.573.946-1.668.373-2.447-.572-.778-1.667-.945-2.446-.373-1.287.946-2.535 1.943-3.741 2.987-.731.633-.81 1.738-.177 2.469.632.73 1.738.81 2.468.177 1.136-.983 2.311-1.922 3.523-2.813zm68.637-2.82c-.779-.572-1.874-.405-2.446.373-.573.779-.406 1.874.373 2.447 1.212.891 2.387 1.83 3.523 2.813.73.633 1.836.553 2.468-.177.633-.731.554-1.836-.177-2.469-1.206-1.044-2.454-2.041-3.741-2.987zm-77.894 11.367c.633-.73.553-1.836-.177-2.468-.731-.633-1.836-.554-2.469.177-1.044 1.206-2.041 2.454-2.987 3.741-.572.779-.405 1.874.373 2.446.779.573 1.874.406 2.447-.373.891-1.212 1.83-2.387 2.813-3.523zm87.724-2.291c-.633-.731-1.738-.81-2.469-.177-.73.632-.81 1.738-.177 2.468.983 1.136 1.922 2.311 2.813 3.523.573.779 1.668.946 2.447.373.778-.572.945-1.667.373-2.446-.946-1.287-1.943-2.535-2.987-3.741zm7.576 11.029c-.455-.853-1.515-1.175-2.368-.721-.853.455-1.175 1.515-.721 2.368.705 1.322 1.359 2.676 1.958 4.059.385.886 1.415 1.293 2.302.909.887-.385 1.294-1.415.909-2.302-.637-1.469-1.331-2.908-2.08-4.313zm-102.433 1.647c.454-.853.132-1.913-.721-2.368-.853-.454-1.913-.132-2.368.721-.749 1.405-1.443 2.844-2.08 4.313-.385.887.022 1.917.909 2.302.887.384 1.917-.023 2.302-.909.599-1.383 1.253-2.737 1.958-4.059zm-4.635 11.71c.252-.933-.3-1.894-1.233-2.146s-1.894.3-2.146 1.233c-.414 1.532-.769 3.089-1.062 4.668-.176.951.452 1.864 1.402 2.04s1.864-.452 2.04-1.402c.275-1.486.609-2.951.999-4.393zm111.993-.913c-.252-.933-1.213-1.485-2.146-1.233s-1.485 1.213-1.233 2.146c.39 1.442.724 2.907.999 4.393.176.95 1.09 1.578 2.04 1.402s1.578-1.089 1.402-2.04c-.293-1.579-.648-3.136-1.062-4.668zm-113.892 13.365c.039-.966-.713-1.779-1.679-1.817s-1.78.714-1.818 1.679c-.031.795-.047 1.594-.047 2.396s.016 1.601.047 2.396c.038.965.852 1.717 1.818 1.679s1.718-.852 1.679-1.817c-.029-.749-.044-1.502-.044-2.258s.015-1.509.044-2.258zm115.909-.138c-.038-.965-.852-1.717-1.818-1.679s-1.718.852-1.679 1.817c.029.749.044 1.502.044 2.258s-.015 1.509-.044 2.258c-.039.966.713 1.779 1.679 1.817s1.78-.714 1.818-1.679c.031-.795.047-1.594.047-2.396s-.016-1.601-.047-2.396zm-115.009 12.713c-.176-.95-1.09-1.578-2.04-1.402s-1.578 1.089-1.402 2.04c.293 1.579.648 3.136 1.062 4.668.252.933 1.213 1.485 2.146 1.233s1.485-1.213 1.233-2.146c-.39-1.442-.724-2.907-.999-4.393zm114.054.638c.176-.951-.452-1.864-1.402-2.04s-1.864.452-2.04 1.402c-.275 1.486-.609 2.951-.999 4.393-.252.933.3 1.894 1.233 2.146s1.894-.3 2.146-1.233c.414-1.532.769-3.089 1.062-4.668zm-110.378 11.406c-.385-.886-1.415-1.293-2.302-.909-.887.385-1.294 1.415-.909 2.302.637 1.469 1.331 2.908 2.08 4.313.455.853 1.515 1.175 2.368.721.853-.455 1.175-1.515.721-2.368-.705-1.322-1.359-2.676-1.958-4.059zm106.471 1.393c.385-.887-.022-1.917-.909-2.302-.887-.384-1.917.023-2.302.909-.599 1.383-1.253 2.737-1.958 4.059-.454.853-.132 1.913.721 2.368.853.454 1.913.132 2.368-.721.749-1.405 1.443-2.844 2.08-4.313zm-100.193 9.528c-.573-.779-1.668-.946-2.447-.373-.778.572-.945 1.667-.373 2.446.946 1.287 1.943 2.535 2.987 3.741.633.731 1.738.81 2.469.177.73-.632.81-1.738.177-2.468-.983-1.136-1.922-2.311-2.813-3.523zm93.524 2.073c.572-.779.405-1.874-.373-2.446-.779-.573-1.874-.406-2.447.373-.891 1.212-1.83 2.387-2.813 3.523-.633.73-.553 1.836.177 2.468.731.633 1.836.554 2.469-.177 1.044-1.206 2.041-2.454 2.987-3.741zm-84.977 7.184c-.73-.633-1.836-.553-2.468.177-.633.731-.554 1.836.177 2.469 1.206 1.044 2.454 2.041 3.741 2.987.779.572 1.874.405 2.446-.373.573-.779.406-1.874-.373-2.447-1.212-.891-2.387-1.83-3.523-2.813zm75.901 2.646c.731-.633.81-1.738.177-2.469-.632-.73-1.738-.81-2.468-.177-1.136.983-2.311 1.922-3.523 2.813-.779.573-.946 1.668-.373 2.447.572.778 1.667.945 2.446.373 1.287-.946 2.535-1.943 3.741-2.987zm-65.516 4.487c-.853-.454-1.913-.132-2.368.721-.454.853-.132 1.913.721 2.368 1.405.749 2.844 1.443 4.313 2.08.887.385 1.917-.022 2.302-.909.384-.887-.023-1.917-.909-2.302-1.383-.599-2.737-1.253-4.059-1.958zm54.487 3.089c.853-.455 1.175-1.515.721-2.368-.455-.853-1.515-1.175-2.368-.721-1.322.705-2.676 1.359-4.059 1.958-.886.385-1.293 1.415-.909 2.302.385.887 1.415 1.294 2.302.909 1.469-.637 2.908-1.331 4.313-2.08zm-42.777 1.546c-.933-.252-1.894.3-2.146 1.233s.3 1.894 1.233 2.146c1.532.414 3.089.769 4.668 1.062.951.176 1.864-.452 2.04-1.402s-.452-1.864-1.402-2.04c-1.486-.275-2.951-.609-4.393-.999zm30.333 3.379c.933-.252 1.485-1.213 1.233-2.146s-1.213-1.485-2.146-1.233c-1.442.39-2.907.724-4.393.999-.95.176-1.578 1.09-1.402 2.04s1.089 1.578 2.04 1.402c1.579-.293 3.136-.648 4.668-1.062zm-17.881-1.48c-.966-.039-1.779.713-1.817 1.679s.714 1.78 1.679 1.818c.795.031 1.594.047 2.396.047s1.601-.016 2.396-.047c.965-.038 1.717-.852 1.679-1.818s-.852-1.718-1.817-1.679c-.749.029-1.502.044-2.258.044s-1.509-.015-2.258-.044zm-.139-98.89c.794-.044 1.593-.066 2.397-.066s1.603.022 2.397.066c.965.053 1.704.879 1.65 1.844-.053.965-.878 1.704-1.843 1.651-.73-.041-1.464-.061-2.204-.061s-1.474.02-2.204.061c-.965.053-1.79-.686-1.843-1.651-.054-.965.685-1.791 1.65-1.844zm-6.378 2.587c.247.934-.312 1.891-1.246 2.137-1.429.377-2.826.831-4.186 1.36-.901.35-1.915-.097-2.265-.998s.097-1.915.997-2.265c1.483-.576 3.005-1.071 4.563-1.481.934-.246 1.891.312 2.137 1.247zm17.55 0c.246-.935 1.203-1.493 2.137-1.247 1.558.41 3.08.905 4.563 1.481.901.35 1.347 1.364.997 2.265s-1.364 1.348-2.265.998c-1.36-.529-2.757-.983-4.186-1.36-.934-.246-1.493-1.203-1.246-2.137zm-29.509 4.675c.525.812.291 1.895-.521 2.419-1.236.798-2.424 1.663-3.559 2.591-.749.611-1.851.5-2.463-.248-.611-.749-.5-1.851.248-2.463 1.236-1.01 2.53-1.952 3.876-2.82.812-.525 1.895-.291 2.419.521zm41.468 0c.524-.812 1.607-1.046 2.419-.521 1.346.868 2.64 1.81 3.876 2.82.748.612.859 1.714.248 2.463-.612.748-1.714.859-2.463.248-1.135-.928-2.323-1.793-3.559-2.591-.812-.524-1.046-1.607-.521-2.419zm-51.394 8.145c.748.612.859 1.714.248 2.463-.928 1.135-1.793 2.323-2.591 3.559-.524.812-1.607 1.046-2.419.521-.812-.524-1.046-1.607-.521-2.419.868-1.346 1.81-2.64 2.82-3.876.612-.748 1.714-.859 2.463-.248zm61.32 0c.749-.611 1.851-.5 2.463.248 1.01 1.236 1.952 2.53 2.82 3.876.525.812.291 1.895-.521 2.419-.812.525-1.895.291-2.419-.521-.798-1.236-1.663-2.424-2.591-3.559-.611-.749-.5-1.851.248-2.463zm-68.258 10.805c.901.35 1.348 1.364.998 2.265-.529 1.36-.983 2.757-1.36 4.186-.246.934-1.203 1.493-2.137 1.246-.935-.246-1.493-1.203-1.247-2.137.41-1.558.905-3.08 1.481-4.563.35-.9 1.364-1.347 2.265-.997zm75.196 0c.901-.35 1.915.097 2.265.997.576 1.483 1.071 3.005 1.481 4.563.246.934-.312 1.891-1.247 2.137-.934.247-1.891-.312-2.137-1.246-.377-1.429-.831-2.826-1.36-4.186-.35-.901.097-1.915.998-2.265zm-78.438 12.425c.965.053 1.704.878 1.651 1.843-.041.73-.061 1.464-.061 2.204s.02 1.474.061 2.204c.053.965-.686 1.79-1.651 1.843-.965.054-1.791-.685-1.844-1.65-.044-.794-.066-1.593-.066-2.397s.022-1.603.066-2.397c.053-.965.879-1.704 1.844-1.65zm81.68 0c.965-.054 1.791.685 1.844 1.65.044.794.066 1.593.066 2.397s-.022 1.603-.066 2.397c-.053.965-.879 1.704-1.844 1.65-.965-.053-1.704-.878-1.651-1.843.041-.73.061-1.464.061-2.204s-.02-1.474-.061-2.204c-.053-.965.686-1.79 1.651-1.843zm-80.937 12.822c.934-.247 1.891.312 2.137 1.246.377 1.429.831 2.826 1.36 4.186.35.901-.097 1.915-.998 2.265s-1.915-.097-2.265-.997c-.576-1.483-1.071-3.005-1.481-4.563-.246-.934.312-1.891 1.247-2.137zm80.194 0c.935.246 1.493 1.203 1.247 2.137-.41 1.558-.905 3.08-1.481 4.563-.35.901-1.364 1.347-2.265.997s-1.348-1.364-.998-2.265c.529-1.36.983-2.757 1.36-4.186.246-.934 1.203-1.493 2.137-1.246zm-75.519 11.959c.812-.525 1.895-.291 2.419.521.798 1.236 1.663 2.424 2.591 3.559.611.749.5 1.851-.248 2.463-.749.611-1.851.5-2.463-.248-1.01-1.236-1.952-2.53-2.82-3.876-.525-.812-.291-1.895.521-2.419zm70.844 0c.812.524 1.046 1.607.521 2.419-.868 1.346-1.81 2.64-2.82 3.876-.612.748-1.714.859-2.463.248-.748-.612-.859-1.714-.248-2.463.928-1.135 1.793-2.323 2.591-3.559.524-.812 1.607-1.046 2.419-.521zm-62.699 9.926c.612-.748 1.714-.859 2.463-.248 1.135.928 2.323 1.793 3.559 2.591.812.524 1.046 1.607.521 2.419-.524.812-1.607 1.046-2.419.521-1.346-.868-2.64-1.81-3.876-2.82-.748-.612-.859-1.714-.248-2.463zm54.554 0c.611.749.5 1.851-.248 2.463-1.236 1.01-2.53 1.952-3.876 2.82-.812.525-1.895.291-2.419-.521-.525-.812-.291-1.895.521-2.419 1.236-.798 2.424-1.663 3.559-2.591.749-.611 1.851-.5 2.463.248zm-43.749 6.938c.35-.901 1.364-1.348 2.265-.998 1.36.529 2.757.983 4.186 1.36.934.246 1.493 1.203 1.246 2.137-.246.935-1.203 1.493-2.137 1.247-1.558-.41-3.08-.905-4.563-1.481-.9-.35-1.347-1.364-.997-2.265zm32.944 0c.35.901-.097 1.915-.997 2.265-1.483.576-3.005 1.071-4.563 1.481-.934.246-1.891-.312-2.137-1.247-.247-.934.312-1.891 1.246-2.137 1.429-.377 2.826-.831 4.186-1.36.901-.35 1.915.097 2.265.998zm-20.519 3.242c.053-.965.878-1.704 1.843-1.651.73.041 1.464.061 2.204.061s1.474-.02 2.204-.061c.965-.053 1.79.686 1.843 1.651.054.965-.685 1.791-1.65 1.844-.794.044-1.593.066-2.397.066s-1.603-.022-2.397-.066c-.965-.053-1.704-.879-1.65-1.844zm4.047-66.59c-.81 0-1.612.037-2.403.111-.963.089-1.671.941-1.582 1.904.09.962.942 1.67 1.904 1.581.685-.064 1.379-.096 2.081-.096s1.396.032 2.081.096c.962.089 1.814-.619 1.904-1.581.089-.963-.619-1.815-1.582-1.904-.791-.074-1.593-.111-2.403-.111zm10.74 2.34c-.878-.403-1.917-.018-2.32.86-.404.878-.019 1.917.859 2.321 1.267.582 2.47 1.28 3.596 2.08.788.56 1.88.375 2.44-.412.56-.788.376-1.881-.412-2.441-1.303-.925-2.695-1.733-4.163-2.408zm-20.019 3.181c.878-.404 1.263-1.443.859-2.321-.403-.878-1.442-1.263-2.32-.86-1.468.675-2.86 1.483-4.163 2.408-.788.56-.972 1.653-.412 2.441.56.787 1.652.972 2.44.412 1.126-.8 2.329-1.498 3.596-2.08zm30.281 5.326c-.56-.788-1.653-.972-2.441-.412s-.972 1.652-.412 2.44c.8 1.126 1.498 2.329 2.08 3.596.404.878 1.443 1.263 2.321.859.878-.403 1.263-1.442.86-2.32-.675-1.468-1.483-2.86-2.408-4.163zm-39.151 2.028c.56-.788.375-1.88-.412-2.44-.788-.56-1.881-.376-2.441.412-.925 1.303-1.733 2.695-2.408 4.163-.403.878-.018 1.917.86 2.32.878.404 1.917.019 2.321-.859.582-1.267 1.28-2.47 2.08-3.596zm-4.005 10.794c.089-.962-.619-1.814-1.581-1.904-.963-.089-1.815.619-1.904 1.582-.074.791-.111 1.593-.111 2.403s.037 1.612.111 2.403c.089.963.941 1.671 1.904 1.582.962-.09 1.67-.942 1.581-1.904-.064-.685-.096-1.379-.096-2.081s.032-1.396.096-2.081zm47.793-.322c-.089-.963-.941-1.671-1.904-1.582-.962.09-1.67.942-1.581 1.904.064.685.096 1.379.096 2.081s-.032 1.396-.096 2.081c-.089.962.619 1.814 1.581 1.904.963.089 1.815-.619 1.904-1.582.074-.791.111-1.593.111-2.403s-.037-1.612-.111-2.403zm-2.229 13.143c.403-.878.018-1.917-.86-2.32-.878-.404-1.917-.019-2.321.859-.582 1.267-1.28 2.47-2.08 3.596-.56.788-.376 1.88.412 2.44s1.881.376 2.441-.412c.925-1.303 1.733-2.695 2.408-4.163zm-43.639-1.461c-.404-.878-1.443-1.263-2.321-.859-.878.403-1.263 1.442-.86 2.32.675 1.468 1.483 2.86 2.408 4.163.56.788 1.653.972 2.441.412.787-.56.972-1.652.412-2.44-.8-1.126-1.498-2.329-2.08-3.596zm7.354 8.87c-.788-.56-1.88-.376-2.44.412s-.376 1.881.412 2.441c1.303.925 2.695 1.733 4.163 2.408.878.403 1.917.018 2.32-.86.404-.878.019-1.917-.859-2.321-1.267-.582-2.47-1.28-3.596-2.08zm27.778 2.853c.788-.56.972-1.653.412-2.441s-1.652-.972-2.44-.412c-1.126.8-2.329 1.498-3.596 2.08-.878.404-1.263 1.443-.859 2.321.403.878 1.442 1.263 2.32.86 1.468-.675 2.86-1.483 4.163-2.408zm-16.984 1.152c-.962-.089-1.814.619-1.904 1.581-.089.963.619 1.815 1.582 1.904.791.074 1.593.111 2.403.111s1.612-.037 2.403-.111c.963-.089 1.671-.941 1.582-1.904-.09-.962-.942-1.67-1.904-1.581-.685.064-1.379.096-2.081.096s-1.396-.032-2.081-.096z"/> - <path d="m528.75 225c0-39.35 31.9-71.25 71.25-71.25s71.25 31.9 71.25 71.25-31.9 71.25-71.25 71.25-71.25-31.9-71.25-71.25zm71.25-74.75c-41.283 0-74.75 33.467-74.75 74.75s33.467 74.75 74.75 74.75 74.75-33.467 74.75-74.75-33.467-74.75-74.75-74.75zm-55.25 74.75c0-30.514 24.736-55.25 55.25-55.25s55.25 24.736 55.25 55.25-24.736 55.25-55.25 55.25-55.25-24.736-55.25-55.25zm55.25-58.75c-32.447 0-58.75 26.303-58.75 58.75s26.303 58.75 58.75 58.75 58.75-26.303 58.75-58.75-26.303-58.75-58.75-58.75zm0 19.5c-21.677 0-39.25 17.573-39.25 39.25s17.573 39.25 39.25 39.25 39.25-17.573 39.25-39.25-17.573-39.25-39.25-39.25zm-42.75 39.25c0-23.61 19.14-42.75 42.75-42.75s42.75 19.14 42.75 42.75-19.14 42.75-42.75 42.75-42.75-19.14-42.75-42.75zm20.5 0c0-12.288 9.962-22.25 22.25-22.25s22.25 9.962 22.25 22.25-9.962 22.25-22.25 22.25-22.25-9.962-22.25-22.25zm22.25-25.75c-14.221 0-25.75 11.529-25.75 25.75s11.529 25.75 25.75 25.75 25.75-11.529 25.75-25.75-11.529-25.75-25.75-25.75z"/> - </g> - </g> -</svg> \ No newline at end of file +<svg width="1200" height="150" viewBox="0 0 1200 150" fill="none" xmlns="http://www.w3.org/2000/svg"> +<circle cx="3" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="3" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="3" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="3" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<path d="M223 0C225.761 0 228.017 2.24554 227.836 5.001C225.262 44.0907 192.741 75 153 75C113.259 75 80.7375 44.0907 78.1641 5.001C77.9827 2.24554 80.2386 0 83 0H223Z" fill="#D7D7DB" fill-opacity="0.3"/> +<path d="M223 75C225.761 75 228.017 77.2455 227.836 80.001C225.262 119.091 192.741 150 153 150C113.259 150 80.7375 119.091 78.1641 80.001C77.9827 77.2455 80.2386 75 83 75H223Z" fill="#D7D7DB" fill-opacity="0.2"/> +<circle cx="303" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="303" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="303" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="303" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<path d="M378 5C378 2.23859 380.246 -0.0173187 383.001 0.164093C422.091 2.7375 453 35.2591 453 75C453 114.741 422.091 147.262 383.001 149.836C380.246 150.017 378 147.761 378 145V5Z" fill="#D7D7DB" fill-opacity="0.3"/> +<path d="M453 5C453 2.23859 455.246 -0.0173187 458.001 0.164093C497.091 2.7375 528 35.2591 528 75C528 114.741 497.091 147.262 458.001 149.836C455.246 150.017 453 147.761 453 145V5Z" fill="#D7D7DB" fill-opacity="0.2"/> +<circle cx="603" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="603" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="603" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="603" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<path d="M823 0C825.761 0 828.017 2.24554 827.836 5.001C825.262 44.0907 792.741 75 753 75C713.259 75 680.738 44.0907 678.164 5.001C677.983 2.24554 680.239 0 683 0H823Z" fill="#D7D7DB" fill-opacity="0.3"/> +<path d="M823 75C825.761 75 828.017 77.2455 827.836 80.001C825.262 119.091 792.741 150 753 150C713.259 150 680.738 119.091 678.164 80.001C677.983 77.2455 680.239 75 683 75H823Z" fill="#D7D7DB" fill-opacity="0.2"/> +<circle cx="903" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="903" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="903" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="903" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<path d="M1128 145C1128 147.761 1125.75 150.017 1123 149.836C1083.91 147.262 1053 114.741 1053 75C1053 35.2591 1083.91 2.73751 1123 0.164089C1125.75 -0.0173134 1128 2.23858 1128 5V145Z" fill="#D7D7DB" fill-opacity="0.3"/> +<path d="M1053 145C1053 147.761 1050.75 150.017 1048 149.836C1008.91 147.262 978 114.741 978 75C978 35.2591 1008.91 2.73751 1048 0.164089C1050.75 -0.0173134 1053 2.23858 1053 5V145Z" fill="#D7D7DB" fill-opacity="0.2"/> +<circle cx="1203" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="1203" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="1203" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="1203" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +</svg> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c5ee42… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c5ee42… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.11.0esr-13.5-1] 2 commits: fixup! Bug 40925: Implemented the Security Level component
by ma1 (＠ma1) 16 May '24

16 May '24

ma1 pushed to branch base-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: b6dc6774 by Henry Wilkes at 2024-05-16T16:13:07+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 42583: Use moz-support-link for the security level "Learn more" links. These take you to the tor project web link in base browser. - - - - - cb6a91ea by Henry Wilkes at 2024-05-16T16:13:08+02:00 Bug 42583: Modify moz-support-link for Base Browser. - - - - - 4 changed files: - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - toolkit/content/widgets/moz-support-link/moz-support-link.mjs Changes: ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -157,6 +157,9 @@ var SecurityLevelPanel = { _populated: false, _populateXUL() { + // TODO: Used for #securityLevel-learnMore. Remove with esr 128. + window.ensureCustomElements("moz-support-link"); + this._elements = { panel: document.getElementById("securityLevel-panel"), background: document.getElementById("securityLevel-background"), @@ -171,9 +174,7 @@ var SecurityLevelPanel = { const learnMoreEl = document.getElementById("securityLevel-learnMore"); learnMoreEl.addEventListener("click", event => { - window.openTrustedLinkIn(learnMoreEl.href, "tab"); this.hide(); - event.preventDefault(); }); this._elements.restoreDefaultsButton.addEventListener("command", () => { ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -23,9 +23,10 @@ </html:p> <html:p id="securityLevel-summary"></html:p> <html:a + is="moz-support-link" id="securityLevel-learnMore" + tor-manual-page="security-settings" data-l10n-id="security-level-panel-learn-more-link" - href="about:manual#security-settings" ></html:a> </vbox> <hbox class="panel-footer"> ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -12,14 +12,11 @@ class="tail-with-learn-more" data-l10n-id="security-level-preferences-overview" ></html:span> - <label - id="securityLevel-learnMore" - class="learnMore text-link" - is="text-link" + <html:a + is="moz-support-link" + tor-manual-page="security-settings" data-l10n-id="security-level-preferences-learn-more-link" - href="about:manual#security-settings" - useoriginprincipal="true" - /> + ></html:a> </description> <hbox id="securityLevel-customNotification" ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -17,7 +17,9 @@ MozXULElement.insertFTLIfNeeded("browser/components/mozSupportLink.ftl"); export default class MozSupportLink extends HTMLAnchorElement { static SUPPORT_URL = "https://www.mozilla.org/"; static get observedAttributes() { - return ["support-page", "utm-content"]; + // We add tor-manual-page for pages hosted at tor project. Also shared with + // base-browser/mullvad-browser. See tor-browser#42583. + return ["support-page", "utm-content", "tor-manual-page"]; } /** @@ -96,12 +98,33 @@ export default class MozSupportLink extends HTMLAnchorElement { } attributeChangedCallback(attrName, oldVal, newVal) { - if (attrName === "support-page" || attrName === "utm-content") { + if ( + attrName === "support-page" || + attrName === "utm-content" || + attrName === "tor-manual-page" + ) { this.#setHref(); } } #setHref() { + let torManualPage = this.getAttribute("tor-manual-page"); + if (torManualPage) { + const [page, anchor] = torManualPage.split("_", 2); + + let locale = Services.locale.appLocaleAsBCP47; + if (locale === "ja-JP-macos") { + // Convert quirk-locale to the locale used for tor project. + locale = "ja"; + } + + let href = `https://tb-manual.torproject.org/${locale}/${page}/`; + if (anchor) { + href = `${href}#${anchor}`; + } + this.href = href; + return; + } let supportPage = this.getAttribute("support-page") ?? ""; let base = MozSupportLink.SUPPORT_URL + supportPage; this.href = this.hasAttribute("utm-content") @@ -122,21 +145,7 @@ customElements.define("moz-support-link", MozSupportLink, { extends: "a" }); * Otherwise the url in unmodified form. */ export function formatUTMParams(contentAttribute, url) { - if (!contentAttribute) { - return url; - } - let parsedUrl = new URL(url); - let domain = `.${parsedUrl.hostname}`; - if ( - !domain.endsWith(".mozilla.org") && - // For testing: addons-dev.allizom.org and addons.allizom.org - !domain.endsWith(".allizom.org") - ) { - return url; - } - - parsedUrl.searchParams.set("utm_source", "firefox-browser"); - parsedUrl.searchParams.set("utm_medium", "firefox-browser"); - parsedUrl.searchParams.set("utm_content", contentAttribute); - return parsedUrl.href; + // Do not add utm parameters. See tor-browser#42583. + // NOTE: This method is also present in about:addons. + return url; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4384bb… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4384bb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.11.0esr-13.5-1] 3 commits: fixup! Bug 41916: Letterboxing preferences UI
by ma1 (＠ma1) 16 May '24

16 May '24

ma1 pushed to branch mullvad-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 334f5c22 by Henry Wilkes at 2024-05-16T15:56:19+02:00 fixup! Bug 41916: Letterboxing preferences UI Bug 42583: Use moz-support-link for the letterboxing preference. Also update the url. - - - - - cfddacb5 by Henry Wilkes at 2024-05-16T16:11:27+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 42583: Use moz-support-link for the security level "Learn more" links. These take you to the tor project web link in base browser. - - - - - adcbe40d by Henry Wilkes at 2024-05-16T16:12:08+02:00 Bug 42583: Modify moz-support-link for Base Browser. - - - - - 5 changed files: - browser/components/preferences/letterboxing.inc.xhtml - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - toolkit/content/widgets/moz-support-link/moz-support-link.mjs Changes: ===================================== browser/components/preferences/letterboxing.inc.xhtml ===================================== @@ -11,13 +11,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> </vbox> <groupbox @@ -32,13 +30,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <checkbox id="letterboxingRememberSize" @@ -59,13 +55,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <description id="letterboxingAlignmentDesc" @@ -110,13 +104,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <hbox align="center"> <label ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -157,6 +157,9 @@ var SecurityLevelPanel = { _populated: false, _populateXUL() { + // TODO: Used for #securityLevel-learnMore. Remove with esr 128. + window.ensureCustomElements("moz-support-link"); + this._elements = { panel: document.getElementById("securityLevel-panel"), background: document.getElementById("securityLevel-background"), @@ -171,9 +174,7 @@ var SecurityLevelPanel = { const learnMoreEl = document.getElementById("securityLevel-learnMore"); learnMoreEl.addEventListener("click", event => { - window.openTrustedLinkIn(learnMoreEl.href, "tab"); this.hide(); - event.preventDefault(); }); this._elements.restoreDefaultsButton.addEventListener("command", () => { ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -23,9 +23,10 @@ </html:p> <html:p id="securityLevel-summary"></html:p> <html:a + is="moz-support-link" id="securityLevel-learnMore" + tor-manual-page="security-settings" data-l10n-id="security-level-panel-learn-more-link" - href="https://mullvad.net/en/browser/hard-facts#security-levels" ></html:a> </vbox> <hbox class="panel-footer"> ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -12,13 +12,11 @@ class="tail-with-learn-more" data-l10n-id="security-level-preferences-overview" ></html:span> - <label - id="securityLevel-learnMore" - class="learnMore text-link" - is="text-link" + <html:a + is="moz-support-link" + tor-manual-page="security-settings" data-l10n-id="security-level-preferences-learn-more-link" - href="https://mullvad.net/en/browser/hard-facts#security-levels" - /> + ></html:a> </description> <hbox id="securityLevel-customNotification" ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -17,7 +17,9 @@ MozXULElement.insertFTLIfNeeded("browser/components/mozSupportLink.ftl"); export default class MozSupportLink extends HTMLAnchorElement { static SUPPORT_URL = "https://www.mozilla.org/"; static get observedAttributes() { - return ["support-page", "utm-content"]; + // We add tor-manual-page for pages hosted at tor project. Also shared with + // base-browser/mullvad-browser. See tor-browser#42583. + return ["support-page", "utm-content", "tor-manual-page"]; } /** @@ -96,12 +98,33 @@ export default class MozSupportLink extends HTMLAnchorElement { } attributeChangedCallback(attrName, oldVal, newVal) { - if (attrName === "support-page" || attrName === "utm-content") { + if ( + attrName === "support-page" || + attrName === "utm-content" || + attrName === "tor-manual-page" + ) { this.#setHref(); } } #setHref() { + let torManualPage = this.getAttribute("tor-manual-page"); + if (torManualPage) { + const [page, anchor] = torManualPage.split("_", 2); + + let locale = Services.locale.appLocaleAsBCP47; + if (locale === "ja-JP-macos") { + // Convert quirk-locale to the locale used for tor project. + locale = "ja"; + } + + let href = `https://tb-manual.torproject.org/${locale}/${page}/`; + if (anchor) { + href = `${href}#${anchor}`; + } + this.href = href; + return; + } let supportPage = this.getAttribute("support-page") ?? ""; // Customize the link in about:preferences. // See mullvad-browser#244 and tor-browser#41910. @@ -128,21 +151,7 @@ customElements.define("moz-support-link", MozSupportLink, { extends: "a" }); * Otherwise the url in unmodified form. */ export function formatUTMParams(contentAttribute, url) { - if (!contentAttribute) { - return url; - } - let parsedUrl = new URL(url); - let domain = `.${parsedUrl.hostname}`; - if ( - !domain.endsWith(".mozilla.org") && - // For testing: addons-dev.allizom.org and addons.allizom.org - !domain.endsWith(".allizom.org") - ) { - return url; - } - - parsedUrl.searchParams.set("utm_source", "firefox-browser"); - parsedUrl.searchParams.set("utm_medium", "firefox-browser"); - parsedUrl.searchParams.set("utm_content", contentAttribute); - return parsedUrl.href; + // Do not add utm parameters. See tor-browser#42583. + // NOTE: This method is also present in about:addons. + return url; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/90… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/90… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.11.0esr-13.5-1] 5 commits: fixup! Bug 41916: Letterboxing preferences UI
by ma1 (＠ma1) 16 May '24

16 May '24

ma1 pushed to branch tor-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: d018a7b3 by Henry Wilkes at 2024-05-16T13:03:37+00:00 fixup! Bug 41916: Letterboxing preferences UI Bug 42583: Use moz-support-link for the letterboxing preference. Also update the url. - - - - - db143d45 by Henry Wilkes at 2024-05-16T13:03:37+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 42583: Use moz-support-link for the security level "Learn more" links. These take you to the tor project web link in base browser. - - - - - 7c7573c4 by Henry Wilkes at 2024-05-16T13:03:37+00:00 Bug 42583: Modify moz-support-link for Base Browser. - - - - - c6a32aa5 by Henry Wilkes at 2024-05-16T13:03:37+00:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 42583: Move moz-support-link change out of the branding commit. - - - - - c5ee42b4 by Henry Wilkes at 2024-05-16T13:03:37+00:00 Bug 42583: Modify moz-support-link for Tor Browser. - - - - - 5 changed files: - browser/components/preferences/letterboxing.inc.xhtml - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - toolkit/content/widgets/moz-support-link/moz-support-link.mjs Changes: ===================================== browser/components/preferences/letterboxing.inc.xhtml ===================================== @@ -11,13 +11,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> </vbox> <groupbox @@ -32,13 +30,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <checkbox id="letterboxingRememberSize" @@ -59,13 +55,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <description id="letterboxingAlignmentDesc" @@ -110,13 +104,11 @@ data-l10n-id="letterboxing-overview" class="tail-with-learn-more" ></html:span> - <label + <html:a + is="moz-support-link" + tor-manual-page="anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" - class="learnMore text-link" - is="text-link" - href="about:manual#letterboxing" - useoriginprincipal="true" - /> + ></html:a> </description> <hbox align="center"> <label ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -157,6 +157,9 @@ var SecurityLevelPanel = { _populated: false, _populateXUL() { + // TODO: Used for #securityLevel-learnMore. Remove with esr 128. + window.ensureCustomElements("moz-support-link"); + this._elements = { panel: document.getElementById("securityLevel-panel"), background: document.getElementById("securityLevel-background"), @@ -171,9 +174,7 @@ var SecurityLevelPanel = { const learnMoreEl = document.getElementById("securityLevel-learnMore"); learnMoreEl.addEventListener("click", event => { - window.openTrustedLinkIn(learnMoreEl.href, "tab"); this.hide(); - event.preventDefault(); }); this._elements.restoreDefaultsButton.addEventListener("command", () => { ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -23,9 +23,10 @@ </html:p> <html:p id="securityLevel-summary"></html:p> <html:a + is="moz-support-link" id="securityLevel-learnMore" + tor-manual-page="security-settings" data-l10n-id="security-level-panel-learn-more-link" - href="about:manual#security-settings" ></html:a> </vbox> <hbox class="panel-footer"> ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -12,14 +12,11 @@ class="tail-with-learn-more" data-l10n-id="security-level-preferences-overview" ></html:span> - <label - id="securityLevel-learnMore" - class="learnMore text-link" - is="text-link" + <html:a + is="moz-support-link" + tor-manual-page="security-settings" data-l10n-id="security-level-preferences-learn-more-link" - href="about:manual#security-settings" - useoriginprincipal="true" - /> + ></html:a> </description> <hbox id="securityLevel-customNotification" ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -17,7 +17,9 @@ MozXULElement.insertFTLIfNeeded("browser/components/mozSupportLink.ftl"); export default class MozSupportLink extends HTMLAnchorElement { static SUPPORT_URL = "https://www.mozilla.org/"; static get observedAttributes() { - return ["support-page", "utm-content"]; + // We add tor-manual-page for pages hosted at tor project. Also shared with + // base-browser/mullvad-browser. See tor-browser#42583. + return ["support-page", "utm-content", "tor-manual-page"]; } /** @@ -96,12 +98,21 @@ export default class MozSupportLink extends HTMLAnchorElement { } attributeChangedCallback(attrName, oldVal, newVal) { - if (attrName === "support-page" || attrName === "utm-content") { + if ( + attrName === "support-page" || + attrName === "utm-content" || + attrName === "tor-manual-page" + ) { this.#setHref(); } } #setHref() { + let torManualPage = this.getAttribute("tor-manual-page"); + if (torManualPage) { + this.href = `about:manual#${torManualPage}`; + return; + } let supportPage = this.getAttribute("support-page") ?? ""; // For tor-browser we sometimes want to override firefox support links with // our own. @@ -112,7 +123,7 @@ export default class MozSupportLink extends HTMLAnchorElement { // Instead of directing to support for preferences, we link to general // tor browser support. // See tor-browser#32092. - this.href = "https://support.torproject.org/tbb" + this.href = "https://support.torproject.org/tbb"; return; // Fall through to support.mozilla.org } @@ -135,21 +146,7 @@ customElements.define("moz-support-link", MozSupportLink, { extends: "a" }); * Otherwise the url in unmodified form. */ export function formatUTMParams(contentAttribute, url) { - if (!contentAttribute) { - return url; - } - let parsedUrl = new URL(url); - let domain = `.${parsedUrl.hostname}`; - if ( - !domain.endsWith(".mozilla.org") && - // For testing: addons-dev.allizom.org and addons.allizom.org - !domain.endsWith(".allizom.org") - ) { - return url; - } - - parsedUrl.searchParams.set("utm_source", "firefox-browser"); - parsedUrl.searchParams.set("utm_medium", "firefox-browser"); - parsedUrl.searchParams.set("utm_content", contentAttribute); - return parsedUrl.href; + // Do not add utm parameters. See tor-browser#42583. + // NOTE: This method is also present in about:addons. + return url; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4a1e3b… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4a1e3b… You're receiving this email because of your account on gitlab.torproject.org.

1 0