- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 13.0.9
by richard (＠richard) 22 Jan '24

22 Jan '24

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: dae6d47c by Richard Pospesel at 2024-01-22T14:57:04+00:00 release: new version, 13.0.9 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/13.0.5-13.0.8-linux-i686-ALL.xml - − update_3/release/13.0.5-13.0.8-linux-x86_64-ALL.xml - − update_3/release/13.0.5-13.0.8-macos-ALL.xml - − update_3/release/13.0.5-13.0.8-windows-i686-ALL.xml - − update_3/release/13.0.5-13.0.8-windows-x86_64-ALL.xml - − update_3/release/13.0.6-13.0.8-linux-i686-ALL.xml - − update_3/release/13.0.6-13.0.8-linux-x86_64-ALL.xml - − update_3/release/13.0.6-13.0.8-macos-ALL.xml - − update_3/release/13.0.6-13.0.8-windows-i686-ALL.xml - − update_3/release/13.0.6-13.0.8-windows-x86_64-ALL.xml - + update_3/release/13.0.6-13.0.9-linux-i686-ALL.xml - + update_3/release/13.0.6-13.0.9-linux-x86_64-ALL.xml - + update_3/release/13.0.6-13.0.9-macos-ALL.xml - + update_3/release/13.0.6-13.0.9-windows-i686-ALL.xml - + update_3/release/13.0.6-13.0.9-windows-x86_64-ALL.xml - − update_3/release/13.0.7-13.0.8-linux-i686-ALL.xml - − update_3/release/13.0.7-13.0.8-linux-x86_64-ALL.xml - − update_3/release/13.0.7-13.0.8-macos-ALL.xml - − update_3/release/13.0.7-13.0.8-windows-i686-ALL.xml - − update_3/release/13.0.7-13.0.8-windows-x86_64-ALL.xml - + update_3/release/13.0.7-13.0.9-linux-i686-ALL.xml - + update_3/release/13.0.7-13.0.9-linux-x86_64-ALL.xml - + update_3/release/13.0.7-13.0.9-macos-ALL.xml - + update_3/release/13.0.7-13.0.9-windows-i686-ALL.xml - + update_3/release/13.0.7-13.0.9-windows-x86_64-ALL.xml - + update_3/release/13.0.8-13.0.9-linux-i686-ALL.xml - + update_3/release/13.0.8-13.0.9-linux-x86_64-ALL.xml - + update_3/release/13.0.8-13.0.9-macos-ALL.xml - + update_3/release/13.0.8-13.0.9-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… -- 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][tor-browser-115.7.0esr-13.0-1] Bug 1867408 - NSS backport
by richard (＠richard) 22 Jan '24

22 Jan '24

richard pushed to branch tor-browser-115.7.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 734de07b by hackademix at 2024-01-19T22:48:05+01:00 Bug 1867408 - NSS backport - - - - - 1 changed file: - security/nss/lib/ssl/sslsecur.c Changes: ===================================== security/nss/lib/ssl/sslsecur.c ===================================== @@ -488,7 +488,12 @@ ssl_SendSavedWriteData(sslSocket *ss) if (rv < 0) { return rv; } - ss->pendingBuf.len -= rv; + if (rv > ss->pendingBuf.len) { + PORT_Assert(0); /* This shouldn't happen */ + ss->pendingBuf.len = 0; + } else { + ss->pendingBuf.len -= rv; + } if (ss->pendingBuf.len > 0 && rv > 0) { /* UGH !! This shifts the whole buffer down by copying it */ PORT_Memmove(ss->pendingBuf.buf, ss->pendingBuf.buf + rv, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/734de07… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/734de07… 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.0.9-build1
by richard (＠richard) 19 Jan '24

19 Jan '24

richard pushed new tag tbb-13.0.9-build1 at The Tor Project / Applications / tor-browser-build -- 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][maint-13.0] Bug 41055: Prepare Tor Browser Stable 13.0.9
by richard (＠richard) 19 Jan '24

19 Jan '24

richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 8d066a5c by Richard Pospesel at 2024-01-19T11:59:22+00:00 Bug 41055: Prepare Tor Browser Stable 13.0.9 - updated changelog - - - - - 1 changed file: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -3,7 +3,8 @@ Tor Browser 13.0.9 - January 23 2024 * Updated Snowflake to 2.8.1 * Bug 42363: Tab thumbnails enhancements [tor-browser] * Bug 42365: Rebase Tor Browser Stable onto Firefox 115.7.0esr [tor-browser] - * Bug 42367: Backport Android seucirty fixes from Firefox 122 [tor-browser] + * Bug 42367: Backport Android security fixes from Firefox 122 [tor-browser] + * Bug 42369: Revert YEC 2023 changes [tor-browser] * Bug 41058: Update Snowflake to 2.8.1 [tor-browser-build] * Windows + macOS + Linux * Updated Firefox to 115.7.0esr View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- 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/firefox-android] Pushed new tag firefox-android-115.2.1-13.0-1-build12
by richard (＠richard) 19 Jan '24

19 Jan '24

richard pushed new tag firefox-android-115.2.1-13.0-1-build12 at The Tor Project / Applications / firefox-android -- 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/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Bug 42074: YEC 2023 Android
by Dan Ballard (＠dan) 18 Jan '24

18 Jan '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: f80ca9bc by Pier Angelo Vendrame at 2024-01-16T15:06:15+01:00 fixup! Bug 42074: YEC 2023 Android Revert "fixup! Bug 42074: YEC 2023 Android" This reverts commit 19ec8acc732943a2ddb154f735a3eab4d3fbda99. Revert "Bug 42074: YEC 2023 Android" This reverts commit 465ea2a837e49ba529605c0fa74e7130e93511ad. - - - - - 12 changed files: - fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt - − fenix/app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml - − fenix/app/src/main/res/drawable/tor_yec_popup_rounded_corners.xml - − fenix/app/src/main/res/drawable/yec_heart.xml - − fenix/app/src/main/res/drawable/yec_illustration_android.xml - − fenix/app/src/main/res/font/roboto_bold.ttf - − fenix/app/src/main/res/font/roboto_regular.ttf - fenix/app/src/main/res/layout/fragment_home.xml - fenix/app/src/main/res/values/colors.xml - fenix/app/src/main/res/values/styles.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -20,6 +20,8 @@ import android.widget.PopupWindow import androidx.annotation.VisibleForTesting import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat +import androidx.core.view.children +import androidx.core.view.doOnLayout import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.Fragment @@ -61,8 +63,6 @@ import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged -import mozilla.components.support.locale.LocaleManager -import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.GleanMetrics.HomeScreen import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcutCfr @@ -112,7 +112,6 @@ import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks import org.mozilla.fenix.perf.runBlockingIncrement import org.mozilla.fenix.search.toolbar.DefaultSearchSelectorController import org.mozilla.fenix.search.toolbar.SearchSelectorMenu -import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.tor.TorBootstrapFragmentDirections import org.mozilla.fenix.tor.TorBootstrapStatus @@ -121,8 +120,6 @@ import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHO import org.mozilla.fenix.utils.allowUndo import org.mozilla.fenix.wallpapers.Wallpaper import java.lang.ref.WeakReference -import java.text.NumberFormat -import java.util.Locale import kotlin.math.min @Suppress("TooManyFunctions", "LargeClass") @@ -139,8 +136,6 @@ class HomeFragment : Fragment() { private val homeViewModel: HomeScreenViewModel by activityViewModels() - private var hideYEC = false - private val snackbarAnchorView: View? get() = when (requireContext().settings().toolbarPosition) { ToolbarPosition.BOTTOM -> binding.toolbarLayout @@ -448,27 +443,6 @@ class HomeFragment : Fragment() { FxNimbus.features.homescreen.recordExposure() - controlYECDisplay() - - binding.donateNowButton.setOnClickListener { - val country = LocaleManager.getSelectedLocale(requireContext()).country - var locale = LocaleManager.getSelectedLocale(requireContext()).language - if (country != "") { - locale = "${locale}-${country}" - } - val localeUrl = "https://www.torproject.org/donate/2023yec-${locale}-mobile" - activity.openToBrowserAndLoad( - searchTermOrURL = localeUrl, - newTab = true, - from = BrowserDirection.FromHome - ) - } - - binding.yecClose.setOnClickListener { - this.hideYEC = true - controlYECDisplay() - } - // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! requireComponents.core.engine.profiler?.addMarker( MarkersFragmentLifecycleCallbacks.MARKER_NAME, @@ -478,105 +452,6 @@ class HomeFragment : Fragment() { return binding.root } - fun controlYECDisplay() { - val yec23show = ((activity as? HomeActivity)?.themeManager?.isYECActive ?: false) && ! this.hideYEC - val yec23matchingShow = ((activity as? HomeActivity)?.themeManager?.isYECPhase2Active ?: false) && ! this.hideYEC - - // hude onion pattern during EOY event - binding.onionPatternImage.apply { - visibility = if (!yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide tor browser header EOY event - binding.exploreprivately.apply { - visibility = if (!yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide EOY header text before EOY event - binding.yecIntroText.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide EOY matching announcement before its time - binding.yecMatchingText.apply { - visibility = if (yec23matchingShow) { - View.VISIBLE - } else { - View.GONE - } - } - binding.yecMatchingText.text = binding.yecMatchingText.text.replace(Regex("%s"), NumberFormat.getNumberInstance(Locale.getDefault()).format(75000)) - - // Hide the EOY image before EOY event - binding.yecIllustration.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - binding.yecPleaseDonateText.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - binding.yecFreeToUse.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide the EOY donate button before EOY event - binding.donateNowButton.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide the EOY image before EOY event - binding.yecPopup.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - binding.exploreprivately.apply { - visibility = if (yec23show) { - View.GONE - } else { - View.VISIBLE - } - } - - binding.homeAppBar.apply { - if (!yec23show){ - setExpanded(true, true) - } - } - - } - override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) ===================================== fenix/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -23,23 +23,11 @@ import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity -import java.util.Date abstract class ThemeManager { - // 1696118400000 // 2022 10 04 - testing - // 1697414400000 // 2023 10 16 - private val yec2023LaunchDate = Date(1697414400000) - // 1700614800000 // 2023 11 22 - private val yec2023Phase2 = Date(1700614800000) - // 1704067200000 // 2024 01 01 - private val yec2023EndDate = Date(1704067200000) - abstract var currentTheme: BrowsingMode - val isYECActive get() = Date().after(yec2023LaunchDate) && Date().before(yec2023EndDate) - val isYECPhase2Active get() = Date().after(yec2023Phase2) && Date().before(yec2023EndDate) - /** * Returns the style resource corresponding to the [currentTheme]. */ ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt ===================================== @@ -116,10 +116,6 @@ class TorBootstrapFragment : Fragment() { binding.toolbarLayout.apply { visibility = View.GONE } - - binding.yecPopup.apply { - visibility = View.GONE - } } // This function should be paired with adjustHomeFragmentView() ===================================== fenix/app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml deleted ===================================== @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - - - -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#FFBD4F" /> - <corners android:radius="10dp" /> -</shape> ===================================== fenix/app/src/main/res/drawable/tor_yec_popup_rounded_corners.xml deleted ===================================== @@ -1,5 +0,0 @@ -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#1F0333" /> - <corners android:radius="10dp" /> -</shape> ===================================== fenix/app/src/main/res/drawable/yec_heart.xml deleted ===================================== @@ -1,12 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="20dp" - android:height="20dp" - android:viewportWidth="16" - android:viewportHeight="16"> - <path - android:pathData="M8,6C8,6 8,2 11.5,2C15,2 15,5 15,6C15,10.5 8,15 8,15V6Z" - android:fillColor="#1C1B22"/> - <path - android:pathData="M8,6C8,6 8,2 4.5,2C1,2 1,5 1,6C1,10.5 8,15 8,15L9,9L8,6Z" - android:fillColor="#1C1B22"/> -</vector> ===================================== fenix/app/src/main/res/drawable/yec_illustration_android.xml deleted ===================================== @@ -1,294 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="166dp" - android:height="148dp" - android:viewportWidth="166" - android:viewportHeight="148"> - <path - android:pathData="M126.13,91.93L125.73,68.74L130.04,68.67L130.44,91.98H131.45C131.55,88.57 134.35,85.84 137.78,85.84H151.17C154.68,85.84 157.51,88.68 157.51,92.18V99.25C157.51,102.73 154.69,105.55 151.21,105.55C147.73,105.55 144.91,102.73 144.91,99.25V98.32C144.91,97.2 144,96.29 142.88,96.29H130.51L130.6,101.24H131.24C134.74,101.24 137.58,104.08 137.58,107.58V112.36C137.58,115.86 134.74,118.7 131.24,118.7H130.89L131.15,134.12C131.22,137.68 128.3,140.57 124.78,140.57C121.3,140.57 118.41,137.75 118.41,134.22V120.73C118.41,117.23 121.25,114.39 124.75,114.39H126.51L126.36,105.55H120.12C116.61,105.55 113.78,102.71 113.78,99.21V87.67C113.78,84.69 116.19,82.28 119.16,82.28C122.14,82.28 124.55,84.69 124.55,87.67V89.95C124.55,90.91 125.22,91.72 126.13,91.93ZM126.2,96.28C122.88,96.08 120.24,93.32 120.24,89.95V87.67C120.24,87.07 119.76,86.59 119.16,86.59C118.57,86.59 118.08,87.07 118.08,87.67V99.21C118.08,100.33 118.99,101.24 120.12,101.24H126.29L126.2,96.28ZM130.67,105.55L130.82,114.39H131.24C132.37,114.39 133.27,113.48 133.27,112.36V107.58C133.27,106.46 132.37,105.55 131.24,105.55H130.67ZM126.58,118.7H124.75C123.63,118.7 122.72,119.61 122.72,120.73V134.22C122.72,135.32 123.64,136.26 124.78,136.26C125.94,136.26 126.86,135.3 126.85,134.19L126.58,118.7ZM135.76,91.98H142.88C146.38,91.98 149.22,94.82 149.22,98.32V99.25C149.22,100.35 150.11,101.24 151.21,101.24C152.31,101.24 153.21,100.35 153.21,99.25V92.18C153.21,91.06 152.29,90.15 151.17,90.15H137.78C136.73,90.15 135.86,90.95 135.76,91.98Z" - android:strokeWidth="0.667939" - android:fillColor="#F5F5F5" - android:fillType="evenOdd" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M128.04,91.89L127.64,68.71L131.95,68.64L132.35,91.94H133.35C133.46,88.53 136.26,85.8 139.69,85.8H153.08C156.58,85.8 159.42,88.64 159.42,92.14V99.21C159.42,102.69 156.6,105.52 153.12,105.52C149.64,105.52 146.82,102.69 146.82,99.21V98.28C146.82,97.16 145.91,96.25 144.79,96.25H132.42L132.51,101.21H133.15C136.65,101.21 139.49,104.05 139.49,107.55V112.32C139.49,115.82 136.65,118.66 133.15,118.66H132.8L133.06,134.08C133.12,137.65 130.21,140.53 126.69,140.53C123.21,140.53 120.32,137.71 120.32,134.19V120.69C120.32,117.19 123.15,114.35 126.66,114.35H128.42L128.27,105.52H122.03C118.52,105.52 115.68,102.68 115.68,99.17V87.63C115.68,84.66 118.1,82.25 121.07,82.25C124.04,82.25 126.46,84.66 126.46,87.63V89.91C126.46,90.88 127.13,91.69 128.04,91.89ZM128.11,96.24C124.78,96.04 122.15,93.29 122.15,89.91V87.63C122.15,87.04 121.67,86.56 121.07,86.56C120.47,86.56 119.99,87.04 119.99,87.63V99.17C119.99,100.3 120.9,101.21 122.03,101.21H128.2L128.11,96.24ZM132.58,105.52L132.73,114.35H133.15C134.27,114.35 135.18,113.44 135.18,112.32V107.55C135.18,106.43 134.27,105.52 133.15,105.52H132.58ZM128.49,118.66H126.66C125.54,118.66 124.63,119.57 124.63,120.69V134.19C124.63,135.29 125.55,136.22 126.69,136.22C127.85,136.22 128.77,135.27 128.76,134.15L128.49,118.66ZM137.67,91.94H144.79C148.29,91.94 151.13,94.78 151.13,98.28V99.21C151.13,100.31 152.02,101.21 153.12,101.21C154.22,101.21 155.11,100.31 155.11,99.21V92.14C155.11,91.02 154.2,90.11 153.08,90.11H139.69C138.64,90.11 137.77,90.91 137.67,91.94Z" - android:strokeWidth="0.667939" - android:fillColor="#1F0333" - android:fillType="evenOdd" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M93.9,101.29H93.56V101.63V103.55C93.56,104.84 94.61,105.89 95.91,105.89H100.17C103.5,105.89 106.2,108.59 106.2,111.92V118.45C106.2,121.78 103.5,124.48 100.17,124.48H94.71C93.84,124.48 93.13,125.19 93.13,126.06C93.13,126.93 93.84,127.64 94.71,127.64H100.17C103.5,127.64 106.2,130.34 106.2,133.67V134.17C106.2,137.5 103.5,140.2 100.17,140.2H63.16C59.83,140.2 57.13,137.5 57.13,134.17V130.84C57.13,127.51 59.83,124.82 63.16,124.82H64.81C66.1,124.82 67.15,123.77 67.15,122.47V121.78C67.15,120.49 66.1,119.44 64.81,119.44H63.16C59.83,119.44 57.13,116.74 57.13,113.41V111.06C57.13,107.72 59.83,105.03 63.16,105.03H70.02C71.31,105.03 72.36,103.98 72.36,102.68V101.63V101.29H72.03H68.87C65.54,101.29 62.84,98.6 62.84,95.27V93.36C62.84,90.03 65.54,87.33 68.87,87.33H70.02C73.35,87.33 76.05,90.03 76.05,93.36V97.28V97.61H76.38H89.55H89.88V97.28V91.35V91.02H89.55H87.06C83.73,91.02 81.03,88.32 81.03,84.99V69.52H84.71V84.99C84.71,86.29 85.76,87.33 87.06,87.33H97.91C101.24,87.33 103.94,90.03 103.94,93.36V95.27C103.94,98.6 101.24,101.29 97.91,101.29H93.9ZM93.56,97.28V97.61H93.9H97.91C99.2,97.61 100.25,96.56 100.25,95.27V93.36C100.25,92.07 99.2,91.02 97.91,91.02H93.9H93.56V91.35V97.28ZM76.38,101.29H76.05V101.63V102.68C76.05,106.01 73.35,108.71 70.02,108.71H63.16C61.86,108.71 60.81,109.76 60.81,111.06V113.41C60.81,114.7 61.86,115.75 63.16,115.75H64.81C68.13,115.75 70.83,118.45 70.83,121.78V122.47C70.83,125.8 68.13,128.5 64.81,128.5H63.16C61.86,128.5 60.81,129.55 60.81,130.84V134.17C60.81,135.46 61.86,136.51 63.16,136.51H100.17C101.47,136.51 102.51,135.46 102.51,134.17V133.67C102.51,132.37 101.47,131.32 100.17,131.32H94.71C91.81,131.32 89.45,128.97 89.45,126.06C89.45,123.15 91.81,120.8 94.71,120.8H100.17C101.47,120.8 102.51,119.75 102.51,118.45V111.92C102.51,110.63 101.47,109.58 100.17,109.58H95.91C92.58,109.58 89.88,106.88 89.88,103.55V101.63V101.29H89.55H76.38ZM72.03,97.61H72.36V97.28V93.36C72.36,92.07 71.31,91.02 70.02,91.02H68.87C67.57,91.02 66.52,92.07 66.52,93.36V95.27C66.52,96.56 67.57,97.61 68.87,97.61H72.03Z" - android:strokeWidth="0.667939" - android:fillColor="#F5F5F5" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M95.81,101.29H95.47V101.63V103.55C95.47,104.84 96.52,105.89 97.82,105.89H102.08C105.41,105.89 108.11,108.59 108.11,111.92V118.45C108.11,121.78 105.41,124.48 102.08,124.48H96.62C95.75,124.48 95.04,125.19 95.04,126.06C95.04,126.93 95.75,127.64 96.62,127.64H102.08C105.41,127.64 108.11,130.34 108.11,133.67V134.17C108.11,137.5 105.41,140.2 102.08,140.2H65.07C61.74,140.2 59.04,137.5 59.04,134.17V130.84C59.04,127.51 61.74,124.82 65.07,124.82H66.71C68.01,124.82 69.06,123.77 69.06,122.47V121.78C69.06,120.49 68.01,119.44 66.71,119.44H65.07C61.74,119.44 59.04,116.74 59.04,113.41V111.06C59.04,107.72 61.74,105.03 65.07,105.03H71.93C73.22,105.03 74.27,103.98 74.27,102.68V101.63V101.29H73.94H70.78C67.45,101.29 64.75,98.6 64.75,95.27V93.36C64.75,90.03 67.45,87.33 70.78,87.33H71.93C75.26,87.33 77.96,90.03 77.96,93.36V97.28V97.61H78.29H91.45H91.79V97.28V91.35V91.02H91.45H88.96C85.64,91.02 82.94,88.32 82.94,84.99V69.52H86.62V84.99C86.62,86.29 87.67,87.33 88.96,87.33H99.82C103.15,87.33 105.85,90.03 105.85,93.36V95.27C105.85,98.6 103.15,101.29 99.82,101.29H95.81ZM95.47,97.28V97.61H95.81H99.82C101.11,97.61 102.16,96.56 102.16,95.27V93.36C102.16,92.07 101.11,91.02 99.82,91.02H95.81H95.47V91.35V97.28ZM78.29,101.29H77.96V101.63V102.68C77.96,106.01 75.26,108.71 71.93,108.71H65.07C63.77,108.71 62.72,109.76 62.72,111.06V113.41C62.72,114.7 63.77,115.75 65.07,115.75H66.71C70.04,115.75 72.74,118.45 72.74,121.78V122.47C72.74,125.8 70.04,128.5 66.71,128.5H65.07C63.77,128.5 62.72,129.55 62.72,130.84V134.17C62.72,135.46 63.77,136.51 65.07,136.51H102.08C103.37,136.51 104.42,135.46 104.42,134.17V133.67C104.42,132.37 103.37,131.32 102.08,131.32H96.62C93.71,131.32 91.36,128.97 91.36,126.06C91.36,123.15 93.71,120.8 96.62,120.8H102.08C103.37,120.8 104.42,119.75 104.42,118.45V111.92C104.42,110.63 103.37,109.58 102.08,109.58H97.82C94.49,109.58 91.79,106.88 91.79,103.55V101.63V101.29H91.45H78.29ZM73.94,97.61H74.27V97.28V93.36C74.27,92.07 73.22,91.02 71.93,91.02H70.78C69.48,91.02 68.43,92.07 68.43,93.36V95.27C68.43,96.56 69.48,97.61 70.78,97.61H73.94Z" - android:strokeWidth="0.667939" - android:fillColor="#1F0333" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M34.54,77.93V70.95H38.9V77.93C38.9,81.44 36.05,84.29 32.54,84.29H15.98C14.88,84.29 13.97,85.19 13.97,86.31C13.97,87.43 14.88,88.33 15.98,88.33H40.34V86.3C40.34,82.79 43.19,79.94 46.7,79.94H52.25C55.77,79.94 58.61,82.8 58.61,86.31C58.61,89.82 55.77,92.68 52.25,92.68H44.69V103.56C44.69,105.04 43.72,106.31 42.37,106.74V108.34C42.37,111.54 39.78,114.13 36.57,114.13H31.36V119.35H36.01C39.52,119.35 42.37,122.19 42.37,125.71V134.1C42.37,137.61 39.52,140.46 36.01,140.46H33.37C29.86,140.46 27.01,137.61 27.01,134.1V123.7H26.97C23.46,123.7 20.61,120.85 20.61,117.34V116.14C20.61,112.63 23.46,109.78 26.97,109.78H27.01V102.52C27.01,99.01 29.86,96.16 33.37,96.16H40.34V92.68H15.98C12.46,92.68 9.62,89.82 9.62,86.31C9.62,82.8 12.46,79.94 15.98,79.94H32.54C33.65,79.94 34.54,79.04 34.54,77.93ZM40.34,100.51H33.37C32.26,100.51 31.36,101.41 31.36,102.52V109.78H36.57C37.37,109.78 38.02,109.14 38.02,108.34V105.88C38.02,104.39 38.99,103.13 40.34,102.7V100.51ZM27.01,114.13H26.97C25.86,114.13 24.96,115.03 24.96,116.14V117.34C24.96,118.45 25.86,119.35 26.97,119.35H27.01V114.13ZM31.36,123.7V134.1C31.36,135.21 32.26,136.11 33.37,136.11H36.01C37.12,136.11 38.02,135.21 38.02,134.1V125.71C38.02,124.6 37.12,123.7 36.01,123.7H31.36ZM44.69,88.33H52.25C53.35,88.33 54.26,87.43 54.26,86.31C54.26,85.19 53.35,84.29 52.25,84.29H46.7C45.59,84.29 44.69,85.19 44.69,86.3V88.33Z" - android:strokeWidth="0.667939" - android:fillColor="#F5F5F5" - android:fillType="evenOdd" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M36.45,78.04V71.13H40.81V78.04C40.81,81.55 37.96,84.4 34.44,84.4H17.89C16.79,84.4 15.88,85.3 15.88,86.42C15.88,87.54 16.79,88.44 17.89,88.44H42.25V86.41C42.25,82.89 45.1,80.05 48.61,80.05H54.16C57.68,80.05 60.52,82.91 60.52,86.42C60.52,89.93 57.68,92.79 54.16,92.79H46.6V103.66C46.6,105.15 45.63,106.41 44.28,106.84V108.44C44.28,111.65 41.69,114.24 38.48,114.24H33.27V119.45H37.92C41.43,119.45 44.28,122.3 44.28,125.82V134.21C44.28,137.72 41.43,140.57 37.92,140.57H35.28C31.77,140.57 28.92,137.72 28.92,134.21V123.81H28.88C25.37,123.81 22.52,120.96 22.52,117.44V116.25C22.52,112.74 25.37,109.89 28.88,109.89H28.92V102.63C28.92,99.11 31.77,96.26 35.28,96.26H42.25V92.79H17.89C14.37,92.79 11.53,89.93 11.53,86.42C11.53,82.91 14.37,80.05 17.89,80.05H34.44C35.55,80.05 36.45,79.15 36.45,78.04ZM42.25,100.62H35.28C34.17,100.62 33.27,101.52 33.27,102.63V109.89H38.48C39.28,109.89 39.93,109.24 39.93,108.44V105.99C39.93,104.5 40.9,103.24 42.25,102.81V100.62ZM28.92,114.24H28.88C27.77,114.24 26.87,115.14 26.87,116.25V117.44C26.87,118.55 27.77,119.45 28.88,119.45H28.92V114.24ZM33.27,123.81V134.21C33.27,135.32 34.17,136.22 35.28,136.22H37.92C39.03,136.22 39.93,135.32 39.93,134.21V125.82C39.93,124.71 39.03,123.81 37.92,123.81H33.27ZM46.6,88.44H54.16C55.26,88.44 56.17,87.54 56.17,86.42C56.17,85.3 55.26,84.4 54.16,84.4H48.61C47.5,84.4 46.6,85.3 46.6,86.41V88.44Z" - android:strokeWidth="0.667939" - android:fillColor="#1F0333" - android:fillType="evenOdd" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M146.05,19.25C146.05,19.53 146.28,19.75 146.56,19.75C146.84,19.75 147.07,19.53 147.07,19.25V14.35L148.52,12.9C148.56,12.87 148.59,12.83 148.61,12.79H153.53C153.81,12.79 154.04,12.56 154.04,12.28C154.04,12 153.81,11.78 153.53,11.78H148.35L147.07,10.49V5.32C147.07,5.04 146.84,4.81 146.56,4.81C146.28,4.81 146.05,5.04 146.05,5.32V10.49L144.77,11.78H139.6C139.32,11.78 139.09,12 139.09,12.28C139.09,12.56 139.32,12.79 139.6,12.79H144.51C144.54,12.83 144.57,12.87 144.6,12.9L146.05,14.35V19.25Z" - android:fillColor="#F9F9F9"/> - <path - android:strokeWidth="1" - android:pathData="M146.05,19.25C146.05,19.53 146.28,19.75 146.56,19.75C146.84,19.75 147.07,19.53 147.07,19.25V14.35L148.52,12.9C148.56,12.87 148.59,12.83 148.61,12.79H153.53C153.81,12.79 154.04,12.56 154.04,12.28C154.04,12 153.81,11.78 153.53,11.78H148.35L147.07,10.49V5.32C147.07,5.04 146.84,4.81 146.56,4.81C146.28,4.81 146.05,5.04 146.05,5.32V10.49L144.77,11.78H139.6C139.32,11.78 139.09,12 139.09,12.28C139.09,12.56 139.32,12.79 139.6,12.79H144.51C144.54,12.83 144.57,12.87 144.6,12.9L146.05,14.35V19.25Z" - android:fillColor="#00000000" - android:strokeColor="#F9F9F9"/> - <path - android:pathData="M145.15,5.5L146.3,4.89L146.42,5.9L145.15,5.5Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M153.3,13.66L152.89,12.42L153.97,12.53L153.3,13.66Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M146.33,20.63L145.92,19.39L147.01,19.49L146.33,20.63Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M138.22,12.44L139.39,11.82L139.51,12.83L138.22,12.44Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M145.29,21.35C144.81,21.35 144.42,20.96 144.42,20.48V15.74L143.07,14.39C143.07,14.39 143.07,14.39 143.07,14.39C143.07,14.39 143.07,14.39 143.07,14.38H138.33C137.85,14.38 137.46,13.99 137.46,13.51C137.46,13.03 137.85,12.64 138.33,12.64H143.35L144.42,11.57V6.55C144.42,6.07 144.81,5.68 145.29,5.68C145.77,5.68 146.16,6.07 146.16,6.55V11.57L147.24,12.64H152.26C152.74,12.64 153.13,13.03 153.13,13.51C153.13,13.99 152.74,14.38 152.26,14.38H147.51C147.51,14.39 147.51,14.39 147.51,14.39C147.51,14.39 147.51,14.39 147.51,14.39L146.16,15.74V20.48C146.16,20.96 145.77,21.35 145.29,21.35ZM145.8,15.59L147.25,14.13C147.29,14.1 147.32,14.06 147.34,14.02H152.26C152.54,14.02 152.76,13.79 152.76,13.51C152.76,13.23 152.54,13.01 152.26,13.01H147.08L145.8,11.72V6.55C145.8,6.27 145.57,6.04 145.29,6.04C145.01,6.04 144.79,6.27 144.79,6.55V11.72L143.5,13.01H138.33C138.05,13.01 137.82,13.23 137.82,13.51C137.82,13.79 138.05,14.02 138.33,14.02H143.24C143.27,14.06 143.3,14.1 143.33,14.13L144.79,15.59V20.48C144.79,20.76 145.01,20.98 145.29,20.98C145.57,20.98 145.8,20.76 145.8,20.48V15.59Z" - android:fillColor="#F9F9F9" - android:fillType="evenOdd"/> - <path - android:pathData="M144.45,20.48C144.45,20.94 144.83,21.32 145.29,21.32C145.76,21.32 146.13,20.94 146.13,20.48V15.72L147.49,14.37C147.49,14.37 147.49,14.37 147.49,14.37C147.49,14.36 147.5,14.36 147.5,14.35H152.26C152.72,14.35 153.1,13.98 153.1,13.51C153.1,13.05 152.72,12.67 152.26,12.67H147.22L146.13,11.58V6.55C146.13,6.08 145.76,5.71 145.29,5.71C144.83,5.71 144.45,6.08 144.45,6.55V11.58L143.36,12.67H138.33C137.86,12.67 137.49,13.05 137.49,13.51C137.49,13.98 137.86,14.35 138.33,14.35H143.08C143.09,14.36 143.09,14.36 143.1,14.37L144.45,15.72V20.48Z" - android:strokeWidth="0.666912" - android:fillColor="#FBBE22" - android:strokeColor="#1F0333"/> - <path - android:pathData="M154.02,30.2C154.02,30.44 154.22,30.64 154.46,30.64C154.71,30.64 154.9,30.44 154.9,30.2V25.93L156.17,24.67C156.2,24.64 156.23,24.6 156.25,24.57H160.53C160.78,24.57 160.98,24.37 160.98,24.13C160.98,23.88 160.78,23.68 160.53,23.68H156.02L154.9,22.57V18.06C154.9,17.81 154.71,17.61 154.46,17.61C154.22,17.61 154.02,17.81 154.02,18.06V22.57L152.9,23.68H148.39C148.15,23.68 147.95,23.88 147.95,24.13C147.95,24.37 148.15,24.57 148.39,24.57H152.68C152.7,24.6 152.72,24.64 152.75,24.67L154.02,25.93V30.2Z" - android:fillColor="#F9F9F9"/> - <path - android:strokeWidth="1" - android:pathData="M154.02,30.2C154.02,30.44 154.22,30.64 154.46,30.64C154.71,30.64 154.9,30.44 154.9,30.2V25.93L156.17,24.67C156.2,24.64 156.23,24.6 156.25,24.57H160.53C160.78,24.57 160.98,24.37 160.98,24.13C160.98,23.88 160.78,23.68 160.53,23.68H156.02L154.9,22.57V18.06C154.9,17.81 154.71,17.61 154.46,17.61C154.22,17.61 154.02,17.81 154.02,18.06V22.57L152.9,23.68H148.39C148.15,23.68 147.95,23.88 147.95,24.13C147.95,24.37 148.15,24.57 148.39,24.57H152.68C152.7,24.6 152.72,24.64 152.75,24.67L154.02,25.93V30.2Z" - android:fillColor="#00000000" - android:strokeColor="#F9F9F9"/> - <path - android:pathData="M153.23,18.21L154.23,17.69L154.34,18.57L153.23,18.21Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M160.33,25.33L159.98,24.25L160.92,24.34L160.33,25.33Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M154.26,31.4L153.91,30.32L154.85,30.41L154.26,31.4Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M147.19,24.27L148.21,23.72L148.32,24.6L147.19,24.27Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M153.35,32.03C152.93,32.03 152.6,31.69 152.6,31.27V27.14L151.42,25.96C151.42,25.96 151.42,25.96 151.42,25.96C151.42,25.96 151.42,25.96 151.42,25.96H147.29C146.87,25.96 146.52,25.62 146.52,25.2C146.52,24.78 146.87,24.44 147.29,24.44H151.66L152.6,23.51V19.13C152.6,18.71 152.93,18.37 153.35,18.37C153.77,18.37 154.11,18.71 154.11,19.13V23.51L155.05,24.44H159.43C159.85,24.44 160.18,24.78 160.18,25.2C160.18,25.62 159.85,25.96 159.43,25.96H155.29C155.29,25.96 155.29,25.96 155.29,25.96C155.29,25.96 155.29,25.96 155.29,25.96L154.11,27.14V31.27C154.11,31.69 153.77,32.03 153.35,32.03ZM153.8,27.01L155.06,25.74C155.09,25.71 155.12,25.68 155.14,25.64H159.43C159.67,25.64 159.87,25.44 159.87,25.2C159.87,24.96 159.67,24.76 159.43,24.76H154.92L153.8,23.64V19.13C153.8,18.89 153.6,18.69 153.35,18.69C153.11,18.69 152.91,18.89 152.91,19.13V23.64L151.79,24.76H147.29C147.04,24.76 146.84,24.96 146.84,25.2C146.84,25.44 147.04,25.64 147.29,25.64H151.57C151.59,25.68 151.62,25.71 151.65,25.74L152.91,27.01V31.27C152.91,31.51 153.11,31.71 153.35,31.71C153.6,31.71 153.8,31.51 153.8,31.27V27.01Z" - android:fillColor="#F9F9F9" - android:fillType="evenOdd"/> - <path - android:pathData="M152.58,31.27C152.58,31.7 152.93,32.04 153.35,32.04C153.78,32.04 154.13,31.7 154.13,31.27V27.14L155.3,25.97H159.43C159.85,25.97 160.2,25.63 160.2,25.2C160.2,24.77 159.85,24.42 159.43,24.42H155.05L154.13,23.5V19.13C154.13,18.7 153.78,18.35 153.35,18.35C152.93,18.35 152.58,18.7 152.58,19.13V23.5L151.65,24.42H147.29C146.86,24.42 146.51,24.77 146.51,25.2C146.51,25.63 146.86,25.97 147.29,25.97H151.41L152.58,27.14V31.27Z" - android:strokeWidth="0.666912" - android:fillColor="#FBBE22" - android:strokeColor="#1F0333"/> - <path - android:pathData="M11.76,48.84C11.76,49.09 11.57,49.28 11.32,49.28C11.08,49.28 10.88,49.09 10.88,48.84V44.58L9.61,43.31C9.58,43.28 9.56,43.25 9.53,43.21H5.25C5.01,43.21 4.81,43.02 4.81,42.77C4.81,42.53 5.01,42.33 5.25,42.33H9.76L10.88,41.21V36.7C10.88,36.46 11.08,36.26 11.32,36.26C11.57,36.26 11.76,36.46 11.76,36.7V41.21L12.88,42.33H17.39C17.64,42.33 17.83,42.53 17.83,42.77C17.83,43.02 17.64,43.21 17.39,43.21H13.11C13.09,43.25 13.06,43.28 13.03,43.31L11.76,44.58V48.84Z" - android:fillColor="#F9F9F9"/> - <path - android:strokeWidth="1" - android:pathData="M11.76,48.84C11.76,49.09 11.57,49.28 11.32,49.28C11.08,49.28 10.88,49.09 10.88,48.84V44.58L9.61,43.31C9.58,43.28 9.56,43.25 9.53,43.21H5.25C5.01,43.21 4.81,43.02 4.81,42.77C4.81,42.53 5.01,42.33 5.25,42.33H9.76L10.88,41.21V36.7C10.88,36.46 11.08,36.26 11.32,36.26C11.57,36.26 11.76,36.46 11.76,36.7V41.21L12.88,42.33H17.39C17.64,42.33 17.83,42.53 17.83,42.77C17.83,43.02 17.64,43.21 17.39,43.21H13.11C13.09,43.25 13.06,43.28 13.03,43.31L11.76,44.58V48.84Z" - android:fillColor="#00000000" - android:strokeColor="#F9F9F9"/> - <path - android:pathData="M12.56,36.86L11.55,36.33L11.45,37.21L12.56,36.86Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M5.45,43.97L5.81,42.89L4.86,42.98L5.45,43.97Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M11.52,50.04L11.88,48.96L10.94,49.05L11.52,50.04Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M18.59,42.91L17.57,42.37L17.46,43.25L18.59,42.91Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M12.43,50.67C12.85,50.67 13.19,50.33 13.19,49.91V45.78L14.36,44.61C14.36,44.61 14.36,44.61 14.36,44.61C14.37,44.61 14.37,44.61 14.37,44.6H18.5C18.92,44.6 19.26,44.26 19.26,43.84C19.26,43.42 18.92,43.08 18.5,43.08H14.12L13.19,42.15V37.77C13.19,37.35 12.85,37.01 12.43,37.01C12.01,37.01 11.67,37.35 11.67,37.77V42.15L10.74,43.08H6.36C5.94,43.08 5.6,43.42 5.6,43.84C5.6,44.26 5.94,44.6 6.36,44.6H10.49C10.49,44.61 10.49,44.61 10.5,44.61C10.5,44.61 10.5,44.61 10.5,44.61L11.67,45.78V49.91C11.67,50.33 12.01,50.67 12.43,50.67ZM11.99,45.65L10.72,44.38C10.69,44.35 10.66,44.32 10.64,44.29H6.36C6.12,44.29 5.92,44.09 5.92,43.84C5.92,43.6 6.12,43.4 6.36,43.4H10.87L11.99,42.28V37.77C11.99,37.53 12.19,37.33 12.43,37.33C12.67,37.33 12.87,37.53 12.87,37.77V42.28L13.99,43.4H18.5C18.74,43.4 18.94,43.6 18.94,43.84C18.94,44.09 18.74,44.29 18.5,44.29H14.22C14.2,44.32 14.17,44.35 14.14,44.38L12.87,45.65V49.91C12.87,50.16 12.67,50.36 12.43,50.36C12.19,50.36 11.99,50.16 11.99,49.91V45.65Z" - android:fillColor="#F9F9F9" - android:fillType="evenOdd"/> - <path - android:pathData="M13.21,49.91C13.21,50.34 12.86,50.69 12.43,50.69C12,50.69 11.65,50.34 11.65,49.91V45.79L10.49,44.62H6.36C5.93,44.62 5.58,44.27 5.58,43.84C5.58,43.42 5.93,43.07 6.36,43.07H10.73L11.65,42.14V37.77C11.65,37.35 12,37 12.43,37C12.86,37 13.21,37.35 13.21,37.77V42.14L14.13,43.07H18.5C18.93,43.07 19.28,43.42 19.28,43.84C19.28,44.27 18.93,44.62 18.5,44.62H14.37L13.21,45.79V49.91Z" - android:strokeWidth="0.666912" - android:fillColor="#FBBE22" - android:strokeColor="#1F0333"/> - <path - android:pathData="M82.61,121.73C82.61,121.98 82.8,122.17 83.05,122.17C83.29,122.17 83.49,121.98 83.49,121.73V117.47L84.76,116.2C84.79,116.17 84.81,116.14 84.84,116.1H89.12C89.36,116.1 89.56,115.91 89.56,115.66C89.56,115.42 89.36,115.22 89.12,115.22H84.61L83.49,114.1V109.59C83.49,109.35 83.29,109.15 83.05,109.15C82.8,109.15 82.61,109.35 82.61,109.59V114.1L81.49,115.22H76.98C76.73,115.22 76.54,115.42 76.54,115.66C76.54,115.91 76.73,116.1 76.98,116.1H81.26C81.28,116.14 81.31,116.17 81.34,116.2L82.61,117.47V121.73Z" - android:fillColor="#F9F9F9"/> - <path - android:strokeWidth="1" - android:pathData="M82.61,121.73C82.61,121.98 82.8,122.17 83.05,122.17C83.29,122.17 83.49,121.98 83.49,121.73V117.47L84.76,116.2C84.79,116.17 84.81,116.14 84.84,116.1H89.12C89.36,116.1 89.56,115.91 89.56,115.66C89.56,115.42 89.36,115.22 89.12,115.22H84.61L83.49,114.1V109.59C83.49,109.35 83.29,109.15 83.05,109.15C82.8,109.15 82.61,109.35 82.61,109.59V114.1L81.49,115.22H76.98C76.73,115.22 76.54,115.42 76.54,115.66C76.54,115.91 76.73,116.1 76.98,116.1H81.26C81.28,116.14 81.31,116.17 81.34,116.2L82.61,117.47V121.73Z" - android:fillColor="#00000000" - android:strokeColor="#F9F9F9"/> - <path - android:pathData="M81.81,109.75L82.82,109.22L82.92,110.1L81.81,109.75Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M88.92,116.86L88.56,115.78L89.51,115.87L88.92,116.86Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M82.85,122.93L82.49,121.85L83.43,121.94L82.85,122.93Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M75.78,115.8L76.8,115.26L76.91,116.14L75.78,115.8Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M81.94,123.56C81.52,123.56 81.18,123.22 81.18,122.81V118.67L80.01,117.5C80.01,117.5 80.01,117.5 80.01,117.5C80,117.5 80,117.5 80,117.49H75.87C75.45,117.49 75.11,117.15 75.11,116.74C75.11,116.32 75.45,115.97 75.87,115.97H80.25L81.18,115.04V110.66C81.18,110.25 81.52,109.9 81.94,109.9C82.36,109.9 82.7,110.25 82.7,110.66V115.04L83.63,115.97H88.01C88.43,115.97 88.77,116.32 88.77,116.74C88.77,117.15 88.43,117.49 88.01,117.49H83.88C83.88,117.5 83.88,117.5 83.87,117.5C83.87,117.5 83.87,117.5 83.87,117.5L82.7,118.67V122.81C82.7,123.22 82.36,123.56 81.94,123.56ZM82.38,118.54L83.65,117.27C83.68,117.24 83.71,117.21 83.73,117.18H88.01C88.25,117.18 88.45,116.98 88.45,116.74C88.45,116.49 88.25,116.29 88.01,116.29H83.5L82.38,115.17V110.66C82.38,110.42 82.18,110.22 81.94,110.22C81.7,110.22 81.5,110.42 81.5,110.66V115.17L80.38,116.29H75.87C75.63,116.29 75.43,116.49 75.43,116.74C75.43,116.98 75.63,117.18 75.87,117.18H80.15C80.17,117.21 80.2,117.24 80.23,117.27L81.5,118.54V122.81C81.5,123.05 81.7,123.25 81.94,123.25C82.18,123.25 82.38,123.05 82.38,122.81V118.54Z" - android:fillColor="#F9F9F9" - android:fillType="evenOdd"/> - <path - android:pathData="M81.16,122.81C81.16,123.23 81.51,123.58 81.94,123.58C82.37,123.58 82.72,123.23 82.72,122.81V118.68L83.88,117.51H88.01C88.44,117.51 88.79,117.16 88.79,116.74C88.79,116.31 88.44,115.96 88.01,115.96H83.64L82.72,115.04V110.66C82.72,110.24 82.37,109.89 81.94,109.89C81.51,109.89 81.16,110.24 81.16,110.66V115.04L80.24,115.96H75.87C75.44,115.96 75.09,116.31 75.09,116.74C75.09,117.16 75.44,117.51 75.87,117.51H80L81.16,118.68V122.81Z" - android:strokeWidth="0.666912" - android:fillColor="#FBBE22" - android:strokeColor="#1F0333"/> - <path - android:pathData="M84.51,36.84L84.84,36.89C84.86,36.75 84.8,36.62 84.68,36.55C84.57,36.48 84.42,36.49 84.32,36.57L84.51,36.84ZM83.78,37.36L83.58,37.09L83.58,37.09L83.78,37.36ZM83.62,37.31L83.94,37.21L83.94,37.21L83.62,37.31ZM84.55,23.09L84.5,23.43C84.52,23.43 84.53,23.43 84.55,23.43L84.55,23.09ZM85.33,28.82L85,28.8C84.99,28.98 85.12,29.13 85.29,29.15C85.47,29.17 85.63,29.06 85.66,28.88L85.33,28.82ZM90.05,20.62L90.2,20.32C90.19,20.32 90.18,20.31 90.16,20.31L90.05,20.62ZM88.55,29.32L88.24,29.19C88.18,29.33 88.22,29.49 88.34,29.58C88.47,29.67 88.63,29.67 88.75,29.58L88.55,29.32ZM91.5,28.25L91.56,27.92L91.56,27.92L91.5,28.25ZM91.65,29.17L91.41,28.93L91.41,28.93L91.65,29.17ZM86.94,38.3L86.6,38.29L86.6,38.29L86.94,38.3ZM84.38,38.29L84.05,38.28L84.05,38.28L84.38,38.29ZM84.32,36.57L83.58,37.09L83.97,37.63L84.7,37.11L84.32,36.57ZM83.58,37.09C83.71,37 83.89,37.06 83.94,37.21L83.3,37.4C83.38,37.69 83.73,37.81 83.97,37.63L83.58,37.09ZM83.94,37.21C82.92,33.77 82.63,30.2 82.85,27.52C82.96,26.18 83.2,25.09 83.53,24.36C83.69,24 83.87,23.74 84.04,23.59C84.2,23.45 84.35,23.41 84.5,23.43L84.59,22.76C84.21,22.71 83.88,22.85 83.6,23.09C83.32,23.33 83.1,23.67 82.92,24.09C82.55,24.91 82.3,26.09 82.18,27.46C81.95,30.22 82.25,33.89 83.3,37.4L83.94,37.21ZM84.55,23.43C84.58,23.43 84.67,23.44 84.78,23.69C84.89,23.94 84.97,24.33 85.01,24.85C85.11,25.87 85.07,27.28 85,28.8L85.67,28.83C85.73,27.32 85.78,25.87 85.68,24.79C85.63,24.25 85.55,23.78 85.4,23.43C85.25,23.08 84.98,22.76 84.55,22.76L84.55,23.43ZM85.66,28.88C86.1,26.6 86.73,24.4 87.51,22.87C87.9,22.1 88.32,21.53 88.73,21.2C89.14,20.88 89.53,20.79 89.94,20.94L90.16,20.31C89.49,20.07 88.86,20.24 88.32,20.67C87.79,21.09 87.32,21.76 86.92,22.56C86.1,24.18 85.45,26.45 85,28.76L85.66,28.88ZM89.91,20.92C90.16,21.05 90.33,21.31 90.39,21.79C90.44,22.27 90.37,22.92 90.18,23.69C89.82,25.24 89.05,27.19 88.24,29.19L88.86,29.44C89.67,27.45 90.46,25.45 90.84,23.85C91.03,23.04 91.12,22.31 91.05,21.71C90.98,21.11 90.74,20.59 90.2,20.32L89.91,20.92ZM88.75,29.58C89.76,28.79 90.72,28.46 91.45,28.58L91.56,27.92C90.56,27.76 89.41,28.21 88.34,29.05L88.75,29.58ZM91.45,28.58C91.49,28.59 91.5,28.6 91.5,28.61C91.51,28.61 91.52,28.63 91.52,28.66C91.53,28.73 91.5,28.84 91.41,28.93L91.88,29.41C92.11,29.18 92.22,28.87 92.19,28.58C92.15,28.27 91.94,27.98 91.56,27.92L91.45,28.58ZM91.41,28.93C90.16,30.14 88.98,31.9 88.1,33.63C87.23,35.36 86.63,37.1 86.6,38.29L87.27,38.3C87.3,37.27 87.84,35.64 88.7,33.94C89.56,32.25 90.7,30.55 91.88,29.41L91.41,28.93ZM86.6,38.29C86.6,38.16 86.71,38.06 86.83,38.06V38.73C87.07,38.73 87.26,38.55 87.27,38.3L86.6,38.29ZM86.83,38.06H84.48V38.73H86.83V38.06ZM84.48,38.06C84.62,38.06 84.72,38.17 84.72,38.3L84.05,38.28C84.04,38.53 84.23,38.73 84.48,38.73V38.06ZM84.72,38.3C84.73,37.82 84.77,37.35 84.84,36.89L84.18,36.79C84.11,37.27 84.06,37.77 84.05,38.28L84.72,38.3Z" - android:fillColor="#F5F5F5"/> - <path - android:pathData="M82.07,39C80.62,40.13 79.16,40.92 77.61,41.81C84.53,41.86 95.63,43.4 94.14,42.54C92.36,41.51 89.67,39.69 88.59,38.5C87.52,37.3 83.89,37.58 82.07,39Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M89.33,39.24C88.76,38.59 87.75,37.44 87.82,35.96C87.86,35.28 87.88,34.85 87.91,34.57C87.92,34.46 87.63,34.24 87.53,34.29C86.49,34.8 85.42,34.87 83.37,34.87C83.31,34.87 83.27,34.92 83.27,34.98C83.32,36.21 82.66,38.46 81.78,39.23C81.42,39.54 82.14,39.68 83.31,39.72C75.58,40.81 69.6,48.02 69.6,56.76C69.6,61.87 71.65,66.46 74.9,69.61C77.27,71.9 79.92,72.57 83.44,73.45C83.73,73.52 84.03,73.6 84.33,73.67C85,73.84 85.7,73.86 86.37,73.72C90.57,72.84 93.22,72.1 95.79,69.61C99.04,66.46 101.09,61.87 101.09,56.76C101.09,47.74 94.73,40.35 86.63,39.63C87.61,39.57 88.55,39.49 89.27,39.4C89.35,39.39 89.38,39.3 89.33,39.24Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M97.87,56.9C97.87,64.12 92.25,69.95 85.36,69.95C78.46,69.95 72.85,64.12 72.85,56.9C72.85,49.68 78.46,43.86 85.36,43.86C92.25,43.86 97.87,49.68 97.87,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M95.19,56.9C95.19,62.57 90.77,67.14 85.36,67.14C79.94,67.14 75.53,62.57 75.53,56.9C75.53,51.23 79.94,46.66 85.36,46.66C90.77,46.66 95.19,51.23 95.19,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M92.54,56.9C92.54,61.04 89.32,64.38 85.36,64.38C81.4,64.38 78.17,61.04 78.17,56.9C78.17,52.76 81.4,49.43 85.36,49.43C89.32,49.43 92.54,52.76 92.54,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M90.15,56.9C90.15,59.68 87.99,61.91 85.36,61.91C82.73,61.91 80.57,59.68 80.57,56.9C80.57,54.13 82.73,51.9 85.36,51.9C87.99,51.9 90.15,54.13 90.15,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M87.83,56.9C87.83,58.34 86.71,59.48 85.36,59.48C84.01,59.48 82.89,58.34 82.89,56.9C82.89,55.47 84.01,54.33 85.36,54.33C86.71,54.33 87.83,55.47 87.83,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M129.44,36.85L129.77,36.89C129.79,36.76 129.73,36.63 129.62,36.56C129.5,36.49 129.36,36.5 129.25,36.57L129.44,36.85ZM128.71,37.37L128.9,37.64L128.9,37.64L128.71,37.37ZM128.55,37.31L128.87,37.22L128.87,37.22L128.55,37.31ZM129.48,23.11L129.44,23.44C129.45,23.44 129.46,23.44 129.48,23.44L129.48,23.11ZM130.27,28.83L129.93,28.81C129.92,28.99 130.05,29.14 130.23,29.16C130.4,29.18 130.56,29.07 130.59,28.89L130.27,28.83ZM134.98,20.64L135.13,20.34C135.12,20.33 135.11,20.33 135.1,20.32L134.98,20.64ZM133.48,29.33L133.17,29.2C133.11,29.34 133.15,29.5 133.27,29.59C133.4,29.68 133.56,29.68 133.68,29.59L133.48,29.33ZM136.43,28.26L136.38,28.59L136.38,28.59L136.43,28.26ZM136.58,29.18L136.34,28.94L136.34,28.94L136.58,29.18ZM131.87,38.3L131.53,38.29L131.53,38.29L131.87,38.3ZM129.31,38.3L128.98,38.29L128.98,38.29L129.31,38.3ZM129.25,36.57L128.52,37.09L128.9,37.64L129.64,37.12L129.25,36.57ZM128.52,37.09C128.65,37 128.83,37.06 128.87,37.22L128.23,37.41C128.32,37.69 128.66,37.81 128.9,37.64L128.52,37.09ZM128.87,37.22C127.85,33.78 127.56,30.21 127.79,27.53C127.9,26.19 128.14,25.1 128.46,24.37C128.62,24.01 128.8,23.76 128.97,23.61C129.13,23.46 129.29,23.42 129.44,23.44L129.52,22.78C129.15,22.73 128.81,22.86 128.53,23.1C128.26,23.34 128.04,23.69 127.85,24.1C127.48,24.92 127.23,26.1 127.12,27.48C126.89,30.23 127.19,33.89 128.23,37.41L128.87,37.22ZM129.48,23.44C129.52,23.44 129.61,23.45 129.71,23.71C129.82,23.96 129.9,24.34 129.95,24.86C130.04,25.88 130,27.29 129.93,28.81L130.6,28.84C130.67,27.33 130.71,25.88 130.61,24.8C130.57,24.27 130.48,23.79 130.33,23.44C130.18,23.1 129.92,22.77 129.48,22.77L129.48,23.44ZM130.59,28.89C131.04,26.62 131.67,24.41 132.44,22.88C132.83,22.11 133.25,21.54 133.67,21.21C134.07,20.89 134.46,20.81 134.87,20.95L135.1,20.32C134.42,20.08 133.79,20.26 133.25,20.69C132.72,21.11 132.26,21.77 131.85,22.58C131.03,24.19 130.38,26.46 129.94,28.77L130.59,28.89ZM134.84,20.94C135.1,21.06 135.26,21.33 135.32,21.8C135.37,22.29 135.3,22.93 135.12,23.7C134.75,25.25 133.98,27.2 133.17,29.2L133.79,29.45C134.6,27.46 135.39,25.46 135.77,23.86C135.96,23.06 136.05,22.32 135.98,21.73C135.91,21.12 135.67,20.6 135.13,20.34L134.84,20.94ZM133.68,29.59C134.69,28.8 135.65,28.47 136.38,28.59L136.49,27.93C135.49,27.77 134.34,28.22 133.27,29.06L133.68,29.59ZM136.38,28.59C136.42,28.6 136.43,28.61 136.43,28.62C136.44,28.62 136.45,28.64 136.45,28.67C136.46,28.74 136.43,28.85 136.34,28.94L136.81,29.42C137.04,29.19 137.15,28.88 137.12,28.59C137.08,28.28 136.87,28 136.49,27.93L136.38,28.59ZM136.34,28.94C135.1,30.15 133.91,31.91 133.04,33.64C132.16,35.36 131.56,37.11 131.53,38.29L132.2,38.31C132.23,37.28 132.77,35.64 133.63,33.95C134.49,32.26 135.63,30.56 136.81,29.42L136.34,28.94ZM131.53,38.29C131.54,38.17 131.64,38.07 131.76,38.07V38.74C132,38.74 132.2,38.55 132.2,38.31L131.53,38.29ZM131.76,38.07H129.42V38.74H131.76V38.07ZM129.42,38.07C129.55,38.07 129.65,38.18 129.65,38.31L128.98,38.29C128.97,38.53 129.17,38.74 129.42,38.74V38.07ZM129.65,38.31C129.66,37.82 129.71,37.35 129.77,36.89L129.11,36.8C129.04,37.28 129,37.78 128.98,38.29L129.65,38.31Z" - android:fillColor="#F5F5F5"/> - <path - android:pathData="M126.82,40.36C125.38,41.49 121.93,43.73 120.39,44.62C127.26,44.67 139.3,43.87 137.82,43.01C134.87,41.3 134.36,41.05 133.29,39.86C132.23,38.68 128.62,38.95 126.82,40.36Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M134.02,40.6C133.46,39.96 132.45,38.88 132.53,37.34C132.56,36.66 132.59,36.24 132.61,35.96C132.62,35.85 132.34,35.63 132.24,35.68C131.2,36.19 130.14,36.26 128.11,36.26C128.05,36.26 128,36.31 128.01,36.37C127.83,39.13 127.83,39.5 126.53,40.59C126.18,40.89 126.86,41.03 127.97,41.07C118.96,43.94 114.44,48.52 114.44,56.32C114.44,60.9 116.47,65.01 119.7,67.83C122.05,69.89 124.68,70.48 128.18,71.27C128.49,71.34 128.82,71.42 129.16,71.49C129.76,71.63 130.38,71.65 130.99,71.53C135.21,70.73 137.87,70.08 140.44,67.83C143.67,65.01 145.7,60.9 145.7,56.32C145.7,48.26 139.4,41.64 131.39,40.99C132.34,40.93 133.26,40.84 133.96,40.76C134.04,40.75 134.08,40.66 134.02,40.6Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M142.58,55.93C142.58,62.58 136.99,68 130.08,68C123.16,68 117.57,62.58 117.57,55.93C117.57,49.27 123.16,43.86 130.08,43.86C136.99,43.86 142.58,49.27 142.58,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M139.9,55.93C139.9,61.15 135.51,65.4 130.08,65.4C124.64,65.4 120.25,61.15 120.25,55.93C120.25,50.71 124.64,46.46 130.08,46.46C135.51,46.46 139.9,50.71 139.9,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M137.26,55.93C137.26,59.73 134.05,62.84 130.08,62.84C126.1,62.84 122.89,59.73 122.89,55.93C122.89,52.13 126.1,49.02 130.08,49.02C134.05,49.02 137.26,52.13 137.26,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M134.87,55.93C134.87,58.47 132.73,60.54 130.08,60.54C127.42,60.54 125.29,58.47 125.29,55.93C125.29,53.39 127.42,51.31 130.08,51.31C132.73,51.31 134.87,53.39 134.87,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M132.54,55.93C132.54,57.22 131.45,58.29 130.08,58.29C128.7,58.29 127.61,57.22 127.61,55.93C127.61,54.64 128.7,53.57 130.08,53.57C131.45,53.57 132.54,54.64 132.54,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M133.71,35.21C133.23,35.77 132.63,36.59 132.55,37.92C130.66,42.59 129.83,48.47 129.83,54.62C129.83,60.77 130.95,66.47 132.85,71.14C131.95,71.36 131.02,71.51 130.06,71.57C121.13,71.24 114,64.55 114,56.35C114,50.58 117.53,45.56 122.74,42.97C124.91,41.77 127.56,40.29 127.65,38.85C127.74,37.37 127.33,36.27 126.95,35.46C126.79,35.13 127,34.72 127.35,34.69L133.32,34.25C133.71,34.22 133.97,34.66 133.8,35.02C133.77,35.08 133.74,35.14 133.71,35.21Z" - android:fillColor="#1F0333" - android:fillType="evenOdd"/> - <group> - <clip-path - android:pathData="M133.71,35.21C133.23,35.77 132.63,36.59 132.55,37.92C130.66,42.59 129.83,48.47 129.83,54.62C129.83,60.77 130.95,66.47 132.85,71.14C131.95,71.36 131.02,71.51 130.06,71.57C121.13,71.24 114,64.55 114,56.35C114,50.58 117.53,45.56 122.74,42.97C124.91,41.77 127.56,40.29 127.65,38.85C127.74,37.37 127.33,36.27 126.95,35.46C126.79,35.13 127,34.72 127.35,34.69L133.32,34.25C133.71,34.22 133.97,34.66 133.8,35.02C133.77,35.08 133.74,35.14 133.71,35.21Z" - android:fillType="evenOdd"/> - <path - android:pathData="M132.55,37.92L133.17,38.18L133.21,38.07L133.22,37.96L132.55,37.92ZM133.71,35.21L134.21,35.65L134.27,35.57L134.32,35.49L133.71,35.21ZM132.85,71.14L133.01,71.79L133.76,71.6L133.47,70.89L132.85,71.14ZM130.06,71.57L130.04,72.24L130.07,72.24L130.1,72.24L130.06,71.57ZM122.74,42.97L123.03,43.57L123.05,43.56L123.06,43.56L122.74,42.97ZM127.65,38.85L128.32,38.89L128.32,38.89L127.65,38.85ZM126.95,35.46L126.35,35.75L126.35,35.75L126.95,35.46ZM127.35,34.69L127.3,34.03L127.3,34.03L127.35,34.69ZM133.32,34.25L133.27,33.58L133.27,33.58L133.32,34.25ZM133.8,35.02L134.4,35.31L134.4,35.31L133.8,35.02ZM133.22,37.96C133.28,36.84 133.77,36.15 134.21,35.65L133.21,34.77C132.67,35.38 131.98,36.35 131.89,37.89L133.22,37.96ZM130.5,54.62C130.5,48.52 131.32,42.73 133.17,38.18L131.93,37.67C129.99,42.44 129.17,48.42 129.17,54.62H130.5ZM133.47,70.89C131.6,66.31 130.5,60.69 130.5,54.62H129.17C129.17,60.85 130.3,66.64 132.24,71.39L133.47,70.89ZM130.1,72.24C131.1,72.17 132.07,72.02 133.01,71.79L132.7,70.49C131.83,70.71 130.93,70.85 130.02,70.9L130.1,72.24ZM113.34,56.35C113.34,64.96 120.81,71.89 130.04,72.24L130.09,70.9C121.46,70.58 114.67,64.13 114.67,56.35H113.34ZM122.44,42.38C117.04,45.06 113.34,50.29 113.34,56.35H114.67C114.67,50.87 118.03,46.06 123.03,43.57L122.44,42.38ZM126.99,38.81C126.97,38.97 126.89,39.2 126.63,39.51C126.39,39.81 126.03,40.13 125.58,40.46C124.67,41.13 123.51,41.78 122.41,42.39L123.06,43.56C124.14,42.96 125.38,42.27 126.37,41.54C126.87,41.17 127.32,40.77 127.67,40.35C128.01,39.94 128.28,39.45 128.32,38.89L126.99,38.81ZM126.35,35.75C126.71,36.5 127.07,37.48 126.99,38.81L128.32,38.89C128.42,37.26 127.96,36.04 127.55,35.17L126.35,35.75ZM127.3,34.03C126.41,34.09 126.02,35.06 126.35,35.75L127.55,35.17C127.57,35.21 127.56,35.25 127.55,35.27C127.54,35.3 127.49,35.35 127.4,35.36L127.3,34.03ZM133.27,33.58L127.3,34.03L127.4,35.36L133.37,34.91L133.27,33.58ZM134.4,35.31C134.59,34.91 134.54,34.47 134.34,34.14C134.14,33.81 133.75,33.55 133.27,33.58L133.37,34.91C133.33,34.92 133.29,34.91 133.26,34.89C133.22,34.87 133.21,34.85 133.2,34.84C133.19,34.81 133.18,34.78 133.2,34.73L134.4,35.31ZM134.32,35.49C134.34,35.43 134.37,35.37 134.4,35.31L133.2,34.73C133.17,34.8 133.13,34.86 133.1,34.93L134.32,35.49Z" - android:fillColor="#B27AF4"/> - </group> - <path - android:pathData="M126.06,44.68C126.36,44.94 126.36,45.41 126.06,45.66L125.96,45.75C125.93,45.77 125.91,45.8 125.88,45.82L125.8,45.92C125.54,46.23 125.07,46.23 124.81,45.92L124.73,45.82C124.71,45.8 124.68,45.77 124.65,45.75L124.55,45.66C124.25,45.41 124.25,44.94 124.55,44.68L124.65,44.59C124.68,44.57 124.71,44.55 124.73,44.52L124.81,44.42C125.07,44.12 125.54,44.12 125.8,44.42L125.88,44.52C125.91,44.55 125.93,44.57 125.96,44.59L126.06,44.68Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M123.94,47.31C124.68,47.94 124.68,49.08 123.94,49.71L123.69,49.93C123.63,49.98 123.57,50.04 123.52,50.1L123.3,50.35C122.67,51.09 121.53,51.09 120.89,50.35L120.68,50.1C120.63,50.04 120.57,49.98 120.51,49.93L120.26,49.71C119.52,49.08 119.52,47.94 120.26,47.31L120.51,47.09C120.57,47.04 120.63,46.98 120.68,46.92L120.89,46.67C121.53,45.93 122.67,45.93 123.3,46.67L123.52,46.92C123.57,46.98 123.63,47.04 123.69,47.09L123.94,47.31Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M39.32,36.87L39.65,36.92C39.67,36.78 39.61,36.65 39.49,36.58C39.38,36.52 39.24,36.52 39.13,36.6L39.32,36.87ZM38.59,37.39L38.78,37.66L38.78,37.66L38.59,37.39ZM38.43,37.33L38.75,37.24L38.75,37.24L38.43,37.33ZM39.36,23.17L39.31,23.5C39.33,23.5 39.34,23.5 39.36,23.5L39.36,23.17ZM40.14,28.87L39.81,28.86C39.8,29.03 39.93,29.18 40.1,29.2C40.28,29.23 40.44,29.11 40.47,28.94L40.14,28.87ZM44.85,20.7L44.99,20.4C44.98,20.4 44.97,20.39 44.96,20.39L44.85,20.7ZM43.34,29.37L43.03,29.24C42.98,29.38 43.02,29.55 43.14,29.64C43.26,29.73 43.43,29.73 43.55,29.63L43.34,29.37ZM46.29,28.31L46.35,27.98L46.35,27.98L46.29,28.31ZM46.44,29.22L46.67,29.46L46.67,29.46L46.44,29.22ZM41.74,38.32L41.41,38.31L41.41,38.31L41.74,38.32ZM39.19,38.32L39.53,38.33L39.53,38.33L39.19,38.32ZM39.13,36.6L38.4,37.12L38.78,37.66L39.51,37.14L39.13,36.6ZM38.4,37.12C38.53,37.03 38.71,37.09 38.75,37.24L38.11,37.43C38.2,37.72 38.54,37.83 38.78,37.66L38.4,37.12ZM38.75,37.24C37.73,33.81 37.44,30.25 37.67,27.58C37.78,26.24 38.02,25.15 38.34,24.43C38.5,24.07 38.68,23.81 38.85,23.67C39.01,23.52 39.16,23.48 39.31,23.5L39.4,22.84C39.02,22.79 38.69,22.92 38.41,23.16C38.14,23.4 37.92,23.75 37.73,24.16C37.36,24.98 37.12,26.15 37,27.52C36.77,30.27 37.07,33.93 38.11,37.43L38.75,37.24ZM39.36,23.5C39.39,23.5 39.48,23.51 39.59,23.76C39.7,24.01 39.78,24.4 39.82,24.91C39.92,25.94 39.88,27.34 39.81,28.86L40.47,28.89C40.54,27.38 40.58,25.93 40.49,24.85C40.44,24.32 40.35,23.85 40.2,23.5C40.06,23.16 39.79,22.83 39.36,22.83L39.36,23.5ZM40.47,28.94C40.91,26.67 41.54,24.47 42.31,22.94C42.7,22.17 43.11,21.61 43.53,21.28C43.94,20.96 44.33,20.87 44.74,21.02L44.96,20.39C44.29,20.15 43.66,20.33 43.12,20.75C42.59,21.17 42.13,21.84 41.72,22.64C40.9,24.25 40.26,26.51 39.81,28.81L40.47,28.94ZM44.7,21C44.96,21.13 45.13,21.39 45.18,21.87C45.24,22.35 45.16,22.99 44.98,23.76C44.61,25.3 43.85,27.25 43.03,29.24L43.65,29.5C44.46,27.51 45.25,25.52 45.63,23.92C45.82,23.12 45.91,22.39 45.84,21.79C45.78,21.19 45.53,20.67 44.99,20.4L44.7,21ZM43.55,29.63C44.55,28.85 45.51,28.52 46.24,28.64L46.35,27.98C45.35,27.81 44.2,28.27 43.14,29.11L43.55,29.63ZM46.24,28.64C46.28,28.64 46.29,28.66 46.29,28.66C46.3,28.67 46.31,28.68 46.31,28.72C46.32,28.78 46.29,28.89 46.2,28.98L46.67,29.46C46.89,29.24 47.01,28.93 46.98,28.64C46.94,28.32 46.72,28.04 46.35,27.98L46.24,28.64ZM46.2,28.98C44.96,30.19 43.78,31.95 42.9,33.68C42.03,35.39 41.44,37.13 41.41,38.31L42.07,38.33C42.1,37.3 42.64,35.67 43.5,33.98C44.35,32.29 45.49,30.6 46.67,29.46L46.2,28.98ZM41.41,38.31C41.41,38.19 41.51,38.09 41.64,38.09V38.76C41.87,38.76 42.07,38.57 42.07,38.33L41.41,38.31ZM41.64,38.09H39.29V38.76H41.64V38.09ZM39.29,38.09C39.43,38.09 39.53,38.2 39.53,38.33L38.86,38.31C38.85,38.55 39.05,38.76 39.29,38.76V38.09ZM39.53,38.33C39.54,37.85 39.58,37.38 39.65,36.92L38.99,36.82C38.92,37.3 38.88,37.8 38.86,38.31L39.53,38.33Z" - android:fillColor="#F5F5F5"/> - <path - android:pathData="M36.46,40.58C35,41.63 31.5,43.57 29.93,44.4C36.88,44.41 49.4,43.73 47.91,43.1C45.51,42.09 43.92,41.2 43.01,39.96C41.99,38.57 38.29,39.25 36.46,40.58Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M36.22,40.71C36.85,40.01 38.08,38.64 38.01,37.22C37.96,36.31 37.84,35.68 37.71,35.27C37.68,35.16 37.88,34.98 37.98,35.04C39.02,35.74 40.04,36.41 42.09,36.43C42.15,36.43 42.27,36.85 42.27,36.91C42.22,38.2 42.8,40.01 43.68,40.78C44.13,41.17 42.88,41.29 41.2,41.27C49.88,41.91 56.71,48.56 56.71,56.67C56.71,65.2 49.15,72.12 39.83,72.12C30.51,72.12 22.95,65.2 22.95,56.67C22.95,48.2 30.4,41.32 39.63,41.22C38.39,41.16 37.12,41.06 36.21,40.95C36.13,40.94 36.1,40.85 36.15,40.79C36.18,40.76 36.2,40.74 36.22,40.71Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M53.82,56.44C53.82,63.36 47.73,69.02 40.17,69.02C32.6,69.02 26.51,63.36 26.51,56.44C26.51,49.52 32.6,43.87 40.17,43.87C47.73,43.87 53.82,49.52 53.82,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M50.9,56.44C50.9,61.87 46.12,66.31 40.17,66.31C34.21,66.31 29.43,61.87 29.43,56.44C29.43,51.02 34.21,46.57 40.17,46.57C46.12,46.57 50.9,51.02 50.9,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M48.02,56.44C48.02,60.39 44.53,63.65 40.17,63.65C35.8,63.65 32.31,60.39 32.31,56.44C32.31,52.49 35.8,49.24 40.17,49.24C44.53,49.24 48.02,52.49 48.02,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M45.42,56.44C45.42,59.08 43.09,61.26 40.17,61.26C37.24,61.26 34.92,59.08 34.92,56.44C34.92,53.81 37.24,51.62 40.17,51.62C43.09,51.62 45.42,53.81 45.42,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M42.89,56.44C42.89,57.78 41.7,58.92 40.17,58.92C38.64,58.92 37.45,57.78 37.45,56.44C37.45,55.1 38.64,53.97 40.17,53.97C41.7,53.97 42.89,55.1 42.89,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M42.34,38C42.29,38.01 42.24,38.03 42.19,38.04C40.18,42.83 39,48.68 39,54.99C39,61.32 40.19,67.17 42.2,71.97C41.24,72.2 40.25,72.35 39.23,72.42C29.76,72.07 22.2,65.2 22.2,56.78C22.2,50.85 25.95,45.69 31.47,43.03C33.77,41.79 36.98,39.92 36.89,38.55C36.82,37.38 36.35,36.14 35.94,35.31C35.77,34.97 35.99,34.55 36.37,34.52L42.7,34.07C43.11,34.04 43.39,34.49 43.21,34.86C42.75,35.78 42.28,37.02 42.34,38Z" - android:fillColor="#1F0333" - android:fillType="evenOdd"/> - <group> - <clip-path - android:pathData="M42.34,38C42.29,38.01 42.24,38.03 42.19,38.04C40.18,42.83 39,48.68 39,54.99C39,61.32 40.19,67.17 42.2,71.97C41.24,72.2 40.25,72.35 39.23,72.42C29.76,72.07 22.2,65.2 22.2,56.78C22.2,50.85 25.95,45.69 31.47,43.03C33.77,41.79 36.98,39.92 36.89,38.55C36.82,37.38 36.35,36.14 35.94,35.31C35.77,34.97 35.99,34.55 36.37,34.52L42.7,34.07C43.11,34.04 43.39,34.49 43.21,34.86C42.75,35.78 42.28,37.02 42.34,38Z" - android:fillType="evenOdd"/> - <path - android:pathData="M42.19,38.04L42,37.41L41.7,37.5L41.58,37.79L42.19,38.04ZM42.34,38L42.55,38.63L43.04,38.47L43.01,37.95L42.34,38ZM42.2,71.97L42.36,72.61L43.12,72.43L42.82,71.71L42.2,71.97ZM39.23,72.42L39.21,73.08L39.24,73.08L39.27,73.08L39.23,72.42ZM31.47,43.03L31.76,43.63L31.77,43.62L31.78,43.62L31.47,43.03ZM36.89,38.55L37.56,38.51L37.56,38.51L36.89,38.55ZM35.94,35.31L35.34,35.6L35.34,35.6L35.94,35.31ZM36.37,34.52L36.32,33.86L36.32,33.86L36.37,34.52ZM42.7,34.07L42.75,34.73L42.75,34.73L42.7,34.07ZM43.21,34.86L42.61,34.56L42.61,34.56L43.21,34.86ZM42.38,38.68C42.44,38.66 42.49,38.65 42.55,38.63L42.14,37.36C42.1,37.38 42.05,37.39 42,37.41L42.38,38.68ZM39.66,54.99C39.66,48.76 40.83,43 42.81,38.3L41.58,37.79C39.53,42.67 38.33,48.6 38.33,54.99H39.66ZM42.82,71.71C40.84,67 39.66,61.24 39.66,54.99H38.33C38.33,61.4 39.53,67.34 41.59,72.23L42.82,71.71ZM39.27,73.08C40.33,73.01 41.36,72.85 42.36,72.61L42.05,71.32C41.12,71.54 40.17,71.69 39.19,71.75L39.27,73.08ZM21.54,56.78C21.54,65.63 29.46,72.72 39.21,73.08L39.26,71.75C30.06,71.41 22.86,64.77 22.86,56.78H21.54ZM31.18,42.43C25.47,45.18 21.54,50.55 21.54,56.78H22.86C22.86,51.14 26.42,46.2 31.76,43.63L31.18,42.43ZM36.23,38.59C36.23,38.67 36.19,38.88 35.9,39.23C35.62,39.56 35.2,39.92 34.68,40.3C33.64,41.07 32.3,41.83 31.15,42.44L31.78,43.62C32.94,43 34.35,42.2 35.47,41.38C36.03,40.96 36.54,40.53 36.92,40.08C37.27,39.65 37.59,39.11 37.56,38.51L36.23,38.59ZM35.34,35.6C35.73,36.4 36.16,37.54 36.23,38.59L37.56,38.51C37.47,37.21 36.96,35.88 36.53,35.02L35.34,35.6ZM36.32,33.86C35.43,33.92 34.98,34.88 35.34,35.6L36.53,35.02C36.55,35.06 36.54,35.09 36.53,35.11C36.52,35.14 36.48,35.18 36.41,35.18L36.32,33.86ZM42.65,33.4L36.32,33.86L36.41,35.18L42.75,34.73L42.65,33.4ZM43.8,35.15C44.19,34.37 43.62,33.33 42.65,33.4L42.75,34.73C42.72,34.73 42.69,34.72 42.66,34.71C42.63,34.7 42.62,34.68 42.61,34.67C42.6,34.65 42.59,34.61 42.61,34.56L43.8,35.15ZM43.01,37.95C42.96,37.17 43.35,36.07 43.8,35.15L42.61,34.56C42.14,35.5 41.61,36.88 41.68,38.04L43.01,37.95Z" - android:fillColor="#B27AF4"/> - </group> - <path - android:pathData="M32.73,48.33C32.63,48.4 32.53,48.47 32.43,48.55C32.02,48.85 31.63,49.17 31.26,49.5C31.22,49.54 31.17,49.58 31.12,49.61C30.61,49.97 29.9,49.96 29.44,49.52C28.93,49.04 28.91,48.24 29.42,47.77C29.47,47.72 29.52,47.68 29.57,47.63C29.99,47.25 30.43,46.89 30.88,46.56C31.02,46.45 31.17,46.34 31.32,46.23C31.79,45.91 32.26,45.61 32.75,45.32C32.79,45.3 32.83,45.28 32.87,45.26C32.89,45.25 32.91,45.24 32.93,45.23C33.54,44.89 34.29,45.16 34.59,45.79C34.86,46.37 34.65,47.04 34.15,47.42C34.11,47.45 34.06,47.48 34.01,47.51C33.57,47.76 33.14,48.03 32.73,48.33Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M24.9,50.74a1.27,1.27 46.59,1 0,2.54 0.07a1.27,1.27 46.59,1 0,-2.54 -0.07z" - android:fillColor="#F9F9F9"/> -</vector> ===================================== fenix/app/src/main/res/font/roboto_bold.ttf deleted ===================================== Binary files a/fenix/app/src/main/res/font/roboto_bold.ttf and /dev/null differ ===================================== fenix/app/src/main/res/font/roboto_regular.ttf deleted ===================================== Binary files a/fenix/app/src/main/res/font/roboto_regular.ttf and /dev/null differ ===================================== fenix/app/src/main/res/layout/fragment_home.xml ===================================== @@ -107,168 +107,24 @@ </com.google.android.material.appbar.CollapsingToolbarLayout> - </com.google.android.material.appbar.AppBarLayout> - - <androidx.core.widget.NestedScrollView - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - android:paddingBottom="56dp">  - - <LinearLayout - android:id="@+id/yec_popup" - android:layout_width="match_parent" + <TextView + android:id="@+id/exploreprivately" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="20dp" - android:layout_marginStart="15dp" - android:layout_marginEnd="15dp" - android:paddingStart="30dp" - android:paddingEnd="30dp" - android:paddingTop="30dp" - android:paddingBottom="30dp" - android:layout_weight="1" - android:orientation="vertical" - style="@style/YecPopup" > - - <ImageView - android:id="@+id/yec_close" - android:layout_height="30dp" - android:layout_width="30dp" - android:layout_gravity="end" - app:srcCompat="@drawable/ic_close" - tools:ignore="ContentDescription" /> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="40dp" - android:layout_marginEnd="40dp" - android:paddingTop="10dp"> - -  - <ImageView - android:id="@+id/yec_illustration" - android:layout_width="0dp" - android:layout_height="wrap_content" - - app:layout_constraintWidth_min="40dp" - app:layout_constraintWidth_max="320dp" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - android:layout_gravity="center_horizontal" - - android:adjustViewBounds="true" - app:layout_scrollFlags="scroll" - app:srcCompat="@drawable/yec_illustration_android" - tools:ignore="ContentDescription" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - - <TextView - android:id="@+id/yec_matching_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:layout_marginTop="15dp" - android:text="@string/yec_2023_matched_donation" - android:textColor="#FFBD4F" - android:textSize="16sp" - android:lineSpacingExtra="5dp" - android:fontFamily="Roboto-Medium" - app:layout_scrollFlags="scroll" /> - - <TextView - android:id="@+id/yec_intro_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:layout_marginTop="15dp" - android:text="@string/yec_2023_introduction" - android:textColor="#FBFBFE" - android:textSize="18sp" - android:lineSpacingExtra="5dp" - android:fontFamily="Roboto-Bold" - android:textStyle="bold" - app:layout_scrollFlags="scroll" /> - - <TextView - android:id="@+id/yec_please_donate_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:layout_marginTop="15dp" - android:text="@string/yec_2023_please_donate" - android:textColor="#FBFBFE" - android:textSize="16sp" - android:lineSpacingExtra="5dp" - android:fontFamily="Roboto-Medium" - app:layout_scrollFlags="scroll" /> - - <Button - android:id="@+id/donate_now_button" - style="@style/TorDonateYecButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="30dp" - android:background="@drawable/tor_yec_donate_rounded_corners" - android:drawableEnd="@drawable/yec_heart" - android:drawablePadding="10dp" - android:paddingEnd="15dp" - android:paddingStart="15dp" - android:text="@string/yec_2023_donate_button" - android:textAllCaps="false" - android:textColor="#1F0333" - android:textSize="18sp" - android:textStyle="bold" - android:fontFamily="Roboto-Bold" - android:visibility="visible" - tools:ignore="ButtonStyleXmlDetector" /> - - <TextView - android:id="@+id/yec_free_to_use" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:layout_marginTop="30dp" - android:text="@string/yec_2023_free_to_use" - android:textColor="#FBFBFE" - android:textSize="16sp" - android:lineSpacingExtra="5dp" - android:fontFamily="Roboto-Medium" - app:layout_scrollFlags="scroll" /> - - </LinearLayout> - </androidx.core.widget.NestedScrollView> - - <TextView - android:id="@+id/exploreprivately" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center|center_vertical" - android:gravity="center_horizontal" - android:clickable="false" - android:ellipsize="end" - android:focusable="false" - android:importantForAccessibility="no" - android:text="@string/tor_explore_privately" - android:fontFamily="Roboto-Medium" - android:textColor="#DEFFFFFF" - android:textSize="40sp" - android:lineSpacingMultiplier="1.1" - app:layout_scrollFlags="scroll" /> + android:layout_gravity="center|center_vertical" + android:gravity="center_horizontal" + android:clickable="false" + android:ellipsize="end" + android:focusable="false" + android:importantForAccessibility="no" + android:text="@string/tor_explore_privately" + android:fontFamily="Roboto-Medium" + android:textColor="#DEFFFFFF" + android:textSize="40sp" + android:lineSpacingMultiplier="1.1" + app:layout_scrollFlags="scroll" /> + + </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView android:id="@+id/sessionControlRecyclerView" @@ -281,6 +137,7 @@ android:transitionGroup="false" android:importantForAccessibility="yes" android:overScrollMode="never" + tools:listitem="@layout/collection_home_list_row" tools:itemCount="3" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/> ===================================== fenix/app/src/main/res/values/colors.xml ===================================== @@ -274,7 +274,6 @@ <color name="onboarding_illustration_deselected_private_theme">#99FBFBFE</color> <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color> - <color name="tor_yec_home_background">#1F0333</color>  <color name="accent_normal_theme">@color/photonInk20</color> <color name="accent_high_contrast_normal_theme">@color/photonInk20</color> ===================================== fenix/app/src/main/res/values/styles.xml ===================================== @@ -336,17 +336,6 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> - <style name="PrivateEOYTheme" parent="PrivateThemeBase" > - <item name="android:windowBackground">@color/tor_yec_home_background</item> - <item name="homeBackground">@color/tor_yec_home_background</item> - </style> - - <style name="YecPopup" > - <item name="homeBackground">@color/tor_yec_home_background</item> - <item name="android:background">@drawable/tor_yec_popup_rounded_corners</item> - </style> - -  <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> @@ -386,21 +375,6 @@ <item name="android:textColor">?attr/textPrimary</item> </style> - <style name="TorDonateYecButton" parent="NeutralButton"> - <item name="android:background">@drawable/tor_yec_donate_rounded_corners</item> - <item name="backgroundTint">#FFBD4F</item> - <item name="android:textColor">#1F0333</item> - <item name="android:fontFamily">Roboto-Bold</item> - <item name="fontFamily">Roboto-Bold</item> - </style> - - <style name="TorDonateYecButtonText" parent="Base.TextAppearance.MaterialComponents.Badge"> - - <item name="android:textStyle">bold</item> - <item name="android:textColor">#000000</item> - </style> - - <style name="DestructiveButton" parent="NeutralButton"> <item name="iconTint">@color/fx_mobile_icon_color_warning_button</item> <item name="android:textColor">@color/fx_mobile_text_color_warning_button</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/f80… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/f80… 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! Bug 42074: YEC 2023 Android
by Dan Ballard (＠dan) 18 Jan '24

18 Jan '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 35408039 by Pier Angelo Vendrame at 2024-01-16T15:28:47+01:00 fixup! Bug 42074: YEC 2023 Android Revert "fixup! Bug 42074: YEC 2023 Android" This reverts commit 19ec8acc732943a2ddb154f735a3eab4d3fbda99. Revert "Bug 42074: YEC 2023 Android" This reverts commit 465ea2a837e49ba529605c0fa74e7130e93511ad. - - - - - 12 changed files: - fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt - − fenix/app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml - − fenix/app/src/main/res/drawable/tor_yec_popup_rounded_corners.xml - − fenix/app/src/main/res/drawable/yec_heart.xml - − fenix/app/src/main/res/drawable/yec_illustration_android.xml - − fenix/app/src/main/res/font/roboto_bold.ttf - − fenix/app/src/main/res/font/roboto_regular.ttf - fenix/app/src/main/res/layout/fragment_home.xml - fenix/app/src/main/res/values/colors.xml - fenix/app/src/main/res/values/styles.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -20,6 +20,8 @@ import android.widget.PopupWindow import androidx.annotation.VisibleForTesting import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat +import androidx.core.view.children +import androidx.core.view.doOnLayout import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.Fragment @@ -61,8 +63,6 @@ import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged -import mozilla.components.support.locale.LocaleManager -import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.GleanMetrics.HomeScreen import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcutCfr @@ -112,7 +112,6 @@ import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks import org.mozilla.fenix.perf.runBlockingIncrement import org.mozilla.fenix.search.toolbar.DefaultSearchSelectorController import org.mozilla.fenix.search.toolbar.SearchSelectorMenu -import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.tor.TorBootstrapFragmentDirections import org.mozilla.fenix.tor.TorBootstrapStatus @@ -121,8 +120,6 @@ import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHO import org.mozilla.fenix.utils.allowUndo import org.mozilla.fenix.wallpapers.Wallpaper import java.lang.ref.WeakReference -import java.text.NumberFormat -import java.util.Locale import kotlin.math.min @Suppress("TooManyFunctions", "LargeClass") @@ -139,8 +136,6 @@ class HomeFragment : Fragment() { private val homeViewModel: HomeScreenViewModel by activityViewModels() - private var hideYEC = false - private val snackbarAnchorView: View? get() = when (requireContext().settings().toolbarPosition) { ToolbarPosition.BOTTOM -> binding.toolbarLayout @@ -448,27 +443,6 @@ class HomeFragment : Fragment() { // FxNimbus.features.homescreen.recordExposure() - controlYECDisplay() - - binding.donateNowButton.setOnClickListener { - val country = LocaleManager.getSelectedLocale(requireContext()).country - var locale = LocaleManager.getSelectedLocale(requireContext()).language - if (country != "") { - locale = "${locale}-${country}" - } - val localeUrl = "https://www.torproject.org/donate/2023yec-${locale}-mobile" - activity.openToBrowserAndLoad( - searchTermOrURL = localeUrl, - newTab = true, - from = BrowserDirection.FromHome - ) - } - - binding.yecClose.setOnClickListener { - this.hideYEC = true - controlYECDisplay() - } - // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! requireComponents.core.engine.profiler?.addMarker( MarkersFragmentLifecycleCallbacks.MARKER_NAME, @@ -478,105 +452,6 @@ class HomeFragment : Fragment() { return binding.root } - fun controlYECDisplay() { - val yec23show = ((activity as? HomeActivity)?.themeManager?.isYECActive ?: false) && ! this.hideYEC - val yec23matchingShow = ((activity as? HomeActivity)?.themeManager?.isYECPhase2Active ?: false) && ! this.hideYEC - - // hude onion pattern during EOY event - binding.onionPatternImage.apply { - visibility = if (!yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide tor browser header EOY event - binding.exploreprivately.apply { - visibility = if (!yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide EOY header text before EOY event - binding.yecIntroText.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide EOY matching announcement before its time - binding.yecMatchingText.apply { - visibility = if (yec23matchingShow) { - View.VISIBLE - } else { - View.GONE - } - } - binding.yecMatchingText.text = binding.yecMatchingText.text.replace(Regex("%s"), NumberFormat.getNumberInstance(Locale.getDefault()).format(75000)) - - // Hide the EOY image before EOY event - binding.yecIllustration.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - binding.yecPleaseDonateText.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - binding.yecFreeToUse.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide the EOY donate button before EOY event - binding.donateNowButton.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - // Hide the EOY image before EOY event - binding.yecPopup.apply { - visibility = if (yec23show) { - View.VISIBLE - } else { - View.GONE - } - } - - binding.exploreprivately.apply { - visibility = if (yec23show) { - View.GONE - } else { - View.VISIBLE - } - } - - binding.homeAppBar.apply { - if (!yec23show){ - setExpanded(true, true) - } - } - - } - override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) ===================================== fenix/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -23,23 +23,11 @@ import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity -import java.util.Date abstract class ThemeManager { - // 1696118400000 // 2022 10 04 - testing - // 1697414400000 // 2023 10 16 - private val yec2023LaunchDate = Date(1697414400000) - // 1700614800000 // 2023 11 22 - private val yec2023Phase2 = Date(1700614800000) - // 1704067200000 // 2024 01 01 - private val yec2023EndDate = Date(1704067200000) - abstract var currentTheme: BrowsingMode - val isYECActive get() = Date().after(yec2023LaunchDate) && Date().before(yec2023EndDate) - val isYECPhase2Active get() = Date().after(yec2023Phase2) && Date().before(yec2023EndDate) - /** * Returns the style resource corresponding to the [currentTheme]. */ ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt ===================================== @@ -118,10 +118,6 @@ class TorBootstrapFragment : Fragment() { binding.toolbarLayout.apply { visibility = View.GONE } - - binding.yecPopup.apply { - visibility = View.GONE - } } // This function should be paired with adjustHomeFragmentView() ===================================== fenix/app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml deleted ===================================== @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - - - -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#FFBD4F" /> - <corners android:radius="10dp" /> -</shape> ===================================== fenix/app/src/main/res/drawable/tor_yec_popup_rounded_corners.xml deleted ===================================== @@ -1,5 +0,0 @@ -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#1F0333" /> - <corners android:radius="10dp" /> -</shape> ===================================== fenix/app/src/main/res/drawable/yec_heart.xml deleted ===================================== @@ -1,12 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="20dp" - android:height="20dp" - android:viewportWidth="16" - android:viewportHeight="16"> - <path - android:pathData="M8,6C8,6 8,2 11.5,2C15,2 15,5 15,6C15,10.5 8,15 8,15V6Z" - android:fillColor="#1C1B22"/> - <path - android:pathData="M8,6C8,6 8,2 4.5,2C1,2 1,5 1,6C1,10.5 8,15 8,15L9,9L8,6Z" - android:fillColor="#1C1B22"/> -</vector> ===================================== fenix/app/src/main/res/drawable/yec_illustration_android.xml deleted ===================================== @@ -1,294 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="166dp" - android:height="148dp" - android:viewportWidth="166" - android:viewportHeight="148"> - <path - android:pathData="M126.13,91.93L125.73,68.74L130.04,68.67L130.44,91.98H131.45C131.55,88.57 134.35,85.84 137.78,85.84H151.17C154.68,85.84 157.51,88.68 157.51,92.18V99.25C157.51,102.73 154.69,105.55 151.21,105.55C147.73,105.55 144.91,102.73 144.91,99.25V98.32C144.91,97.2 144,96.29 142.88,96.29H130.51L130.6,101.24H131.24C134.74,101.24 137.58,104.08 137.58,107.58V112.36C137.58,115.86 134.74,118.7 131.24,118.7H130.89L131.15,134.12C131.22,137.68 128.3,140.57 124.78,140.57C121.3,140.57 118.41,137.75 118.41,134.22V120.73C118.41,117.23 121.25,114.39 124.75,114.39H126.51L126.36,105.55H120.12C116.61,105.55 113.78,102.71 113.78,99.21V87.67C113.78,84.69 116.19,82.28 119.16,82.28C122.14,82.28 124.55,84.69 124.55,87.67V89.95C124.55,90.91 125.22,91.72 126.13,91.93ZM126.2,96.28C122.88,96.08 120.24,93.32 120.24,89.95V87.67C120.24,87.07 119.76,86.59 119.16,86.59C118.57,86.59 118.08,87.07 118.08,87.67V99.21C118.08,100.33 118.99,101.24 120.12,101.24H126.29L126.2,96.28ZM130.67,105.55L130.82,114.39H131.24C132.37,114.39 133.27,113.48 133.27,112.36V107.58C133.27,106.46 132.37,105.55 131.24,105.55H130.67ZM126.58,118.7H124.75C123.63,118.7 122.72,119.61 122.72,120.73V134.22C122.72,135.32 123.64,136.26 124.78,136.26C125.94,136.26 126.86,135.3 126.85,134.19L126.58,118.7ZM135.76,91.98H142.88C146.38,91.98 149.22,94.82 149.22,98.32V99.25C149.22,100.35 150.11,101.24 151.21,101.24C152.31,101.24 153.21,100.35 153.21,99.25V92.18C153.21,91.06 152.29,90.15 151.17,90.15H137.78C136.73,90.15 135.86,90.95 135.76,91.98Z" - android:strokeWidth="0.667939" - android:fillColor="#F5F5F5" - android:fillType="evenOdd" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M128.04,91.89L127.64,68.71L131.95,68.64L132.35,91.94H133.35C133.46,88.53 136.26,85.8 139.69,85.8H153.08C156.58,85.8 159.42,88.64 159.42,92.14V99.21C159.42,102.69 156.6,105.52 153.12,105.52C149.64,105.52 146.82,102.69 146.82,99.21V98.28C146.82,97.16 145.91,96.25 144.79,96.25H132.42L132.51,101.21H133.15C136.65,101.21 139.49,104.05 139.49,107.55V112.32C139.49,115.82 136.65,118.66 133.15,118.66H132.8L133.06,134.08C133.12,137.65 130.21,140.53 126.69,140.53C123.21,140.53 120.32,137.71 120.32,134.19V120.69C120.32,117.19 123.15,114.35 126.66,114.35H128.42L128.27,105.52H122.03C118.52,105.52 115.68,102.68 115.68,99.17V87.63C115.68,84.66 118.1,82.25 121.07,82.25C124.04,82.25 126.46,84.66 126.46,87.63V89.91C126.46,90.88 127.13,91.69 128.04,91.89ZM128.11,96.24C124.78,96.04 122.15,93.29 122.15,89.91V87.63C122.15,87.04 121.67,86.56 121.07,86.56C120.47,86.56 119.99,87.04 119.99,87.63V99.17C119.99,100.3 120.9,101.21 122.03,101.21H128.2L128.11,96.24ZM132.58,105.52L132.73,114.35H133.15C134.27,114.35 135.18,113.44 135.18,112.32V107.55C135.18,106.43 134.27,105.52 133.15,105.52H132.58ZM128.49,118.66H126.66C125.54,118.66 124.63,119.57 124.63,120.69V134.19C124.63,135.29 125.55,136.22 126.69,136.22C127.85,136.22 128.77,135.27 128.76,134.15L128.49,118.66ZM137.67,91.94H144.79C148.29,91.94 151.13,94.78 151.13,98.28V99.21C151.13,100.31 152.02,101.21 153.12,101.21C154.22,101.21 155.11,100.31 155.11,99.21V92.14C155.11,91.02 154.2,90.11 153.08,90.11H139.69C138.64,90.11 137.77,90.91 137.67,91.94Z" - android:strokeWidth="0.667939" - android:fillColor="#1F0333" - android:fillType="evenOdd" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M93.9,101.29H93.56V101.63V103.55C93.56,104.84 94.61,105.89 95.91,105.89H100.17C103.5,105.89 106.2,108.59 106.2,111.92V118.45C106.2,121.78 103.5,124.48 100.17,124.48H94.71C93.84,124.48 93.13,125.19 93.13,126.06C93.13,126.93 93.84,127.64 94.71,127.64H100.17C103.5,127.64 106.2,130.34 106.2,133.67V134.17C106.2,137.5 103.5,140.2 100.17,140.2H63.16C59.83,140.2 57.13,137.5 57.13,134.17V130.84C57.13,127.51 59.83,124.82 63.16,124.82H64.81C66.1,124.82 67.15,123.77 67.15,122.47V121.78C67.15,120.49 66.1,119.44 64.81,119.44H63.16C59.83,119.44 57.13,116.74 57.13,113.41V111.06C57.13,107.72 59.83,105.03 63.16,105.03H70.02C71.31,105.03 72.36,103.98 72.36,102.68V101.63V101.29H72.03H68.87C65.54,101.29 62.84,98.6 62.84,95.27V93.36C62.84,90.03 65.54,87.33 68.87,87.33H70.02C73.35,87.33 76.05,90.03 76.05,93.36V97.28V97.61H76.38H89.55H89.88V97.28V91.35V91.02H89.55H87.06C83.73,91.02 81.03,88.32 81.03,84.99V69.52H84.71V84.99C84.71,86.29 85.76,87.33 87.06,87.33H97.91C101.24,87.33 103.94,90.03 103.94,93.36V95.27C103.94,98.6 101.24,101.29 97.91,101.29H93.9ZM93.56,97.28V97.61H93.9H97.91C99.2,97.61 100.25,96.56 100.25,95.27V93.36C100.25,92.07 99.2,91.02 97.91,91.02H93.9H93.56V91.35V97.28ZM76.38,101.29H76.05V101.63V102.68C76.05,106.01 73.35,108.71 70.02,108.71H63.16C61.86,108.71 60.81,109.76 60.81,111.06V113.41C60.81,114.7 61.86,115.75 63.16,115.75H64.81C68.13,115.75 70.83,118.45 70.83,121.78V122.47C70.83,125.8 68.13,128.5 64.81,128.5H63.16C61.86,128.5 60.81,129.55 60.81,130.84V134.17C60.81,135.46 61.86,136.51 63.16,136.51H100.17C101.47,136.51 102.51,135.46 102.51,134.17V133.67C102.51,132.37 101.47,131.32 100.17,131.32H94.71C91.81,131.32 89.45,128.97 89.45,126.06C89.45,123.15 91.81,120.8 94.71,120.8H100.17C101.47,120.8 102.51,119.75 102.51,118.45V111.92C102.51,110.63 101.47,109.58 100.17,109.58H95.91C92.58,109.58 89.88,106.88 89.88,103.55V101.63V101.29H89.55H76.38ZM72.03,97.61H72.36V97.28V93.36C72.36,92.07 71.31,91.02 70.02,91.02H68.87C67.57,91.02 66.52,92.07 66.52,93.36V95.27C66.52,96.56 67.57,97.61 68.87,97.61H72.03Z" - android:strokeWidth="0.667939" - android:fillColor="#F5F5F5" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M95.81,101.29H95.47V101.63V103.55C95.47,104.84 96.52,105.89 97.82,105.89H102.08C105.41,105.89 108.11,108.59 108.11,111.92V118.45C108.11,121.78 105.41,124.48 102.08,124.48H96.62C95.75,124.48 95.04,125.19 95.04,126.06C95.04,126.93 95.75,127.64 96.62,127.64H102.08C105.41,127.64 108.11,130.34 108.11,133.67V134.17C108.11,137.5 105.41,140.2 102.08,140.2H65.07C61.74,140.2 59.04,137.5 59.04,134.17V130.84C59.04,127.51 61.74,124.82 65.07,124.82H66.71C68.01,124.82 69.06,123.77 69.06,122.47V121.78C69.06,120.49 68.01,119.44 66.71,119.44H65.07C61.74,119.44 59.04,116.74 59.04,113.41V111.06C59.04,107.72 61.74,105.03 65.07,105.03H71.93C73.22,105.03 74.27,103.98 74.27,102.68V101.63V101.29H73.94H70.78C67.45,101.29 64.75,98.6 64.75,95.27V93.36C64.75,90.03 67.45,87.33 70.78,87.33H71.93C75.26,87.33 77.96,90.03 77.96,93.36V97.28V97.61H78.29H91.45H91.79V97.28V91.35V91.02H91.45H88.96C85.64,91.02 82.94,88.32 82.94,84.99V69.52H86.62V84.99C86.62,86.29 87.67,87.33 88.96,87.33H99.82C103.15,87.33 105.85,90.03 105.85,93.36V95.27C105.85,98.6 103.15,101.29 99.82,101.29H95.81ZM95.47,97.28V97.61H95.81H99.82C101.11,97.61 102.16,96.56 102.16,95.27V93.36C102.16,92.07 101.11,91.02 99.82,91.02H95.81H95.47V91.35V97.28ZM78.29,101.29H77.96V101.63V102.68C77.96,106.01 75.26,108.71 71.93,108.71H65.07C63.77,108.71 62.72,109.76 62.72,111.06V113.41C62.72,114.7 63.77,115.75 65.07,115.75H66.71C70.04,115.75 72.74,118.45 72.74,121.78V122.47C72.74,125.8 70.04,128.5 66.71,128.5H65.07C63.77,128.5 62.72,129.55 62.72,130.84V134.17C62.72,135.46 63.77,136.51 65.07,136.51H102.08C103.37,136.51 104.42,135.46 104.42,134.17V133.67C104.42,132.37 103.37,131.32 102.08,131.32H96.62C93.71,131.32 91.36,128.97 91.36,126.06C91.36,123.15 93.71,120.8 96.62,120.8H102.08C103.37,120.8 104.42,119.75 104.42,118.45V111.92C104.42,110.63 103.37,109.58 102.08,109.58H97.82C94.49,109.58 91.79,106.88 91.79,103.55V101.63V101.29H91.45H78.29ZM73.94,97.61H74.27V97.28V93.36C74.27,92.07 73.22,91.02 71.93,91.02H70.78C69.48,91.02 68.43,92.07 68.43,93.36V95.27C68.43,96.56 69.48,97.61 70.78,97.61H73.94Z" - android:strokeWidth="0.667939" - android:fillColor="#1F0333" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M34.54,77.93V70.95H38.9V77.93C38.9,81.44 36.05,84.29 32.54,84.29H15.98C14.88,84.29 13.97,85.19 13.97,86.31C13.97,87.43 14.88,88.33 15.98,88.33H40.34V86.3C40.34,82.79 43.19,79.94 46.7,79.94H52.25C55.77,79.94 58.61,82.8 58.61,86.31C58.61,89.82 55.77,92.68 52.25,92.68H44.69V103.56C44.69,105.04 43.72,106.31 42.37,106.74V108.34C42.37,111.54 39.78,114.13 36.57,114.13H31.36V119.35H36.01C39.52,119.35 42.37,122.19 42.37,125.71V134.1C42.37,137.61 39.52,140.46 36.01,140.46H33.37C29.86,140.46 27.01,137.61 27.01,134.1V123.7H26.97C23.46,123.7 20.61,120.85 20.61,117.34V116.14C20.61,112.63 23.46,109.78 26.97,109.78H27.01V102.52C27.01,99.01 29.86,96.16 33.37,96.16H40.34V92.68H15.98C12.46,92.68 9.62,89.82 9.62,86.31C9.62,82.8 12.46,79.94 15.98,79.94H32.54C33.65,79.94 34.54,79.04 34.54,77.93ZM40.34,100.51H33.37C32.26,100.51 31.36,101.41 31.36,102.52V109.78H36.57C37.37,109.78 38.02,109.14 38.02,108.34V105.88C38.02,104.39 38.99,103.13 40.34,102.7V100.51ZM27.01,114.13H26.97C25.86,114.13 24.96,115.03 24.96,116.14V117.34C24.96,118.45 25.86,119.35 26.97,119.35H27.01V114.13ZM31.36,123.7V134.1C31.36,135.21 32.26,136.11 33.37,136.11H36.01C37.12,136.11 38.02,135.21 38.02,134.1V125.71C38.02,124.6 37.12,123.7 36.01,123.7H31.36ZM44.69,88.33H52.25C53.35,88.33 54.26,87.43 54.26,86.31C54.26,85.19 53.35,84.29 52.25,84.29H46.7C45.59,84.29 44.69,85.19 44.69,86.3V88.33Z" - android:strokeWidth="0.667939" - android:fillColor="#F5F5F5" - android:fillType="evenOdd" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M36.45,78.04V71.13H40.81V78.04C40.81,81.55 37.96,84.4 34.44,84.4H17.89C16.79,84.4 15.88,85.3 15.88,86.42C15.88,87.54 16.79,88.44 17.89,88.44H42.25V86.41C42.25,82.89 45.1,80.05 48.61,80.05H54.16C57.68,80.05 60.52,82.91 60.52,86.42C60.52,89.93 57.68,92.79 54.16,92.79H46.6V103.66C46.6,105.15 45.63,106.41 44.28,106.84V108.44C44.28,111.65 41.69,114.24 38.48,114.24H33.27V119.45H37.92C41.43,119.45 44.28,122.3 44.28,125.82V134.21C44.28,137.72 41.43,140.57 37.92,140.57H35.28C31.77,140.57 28.92,137.72 28.92,134.21V123.81H28.88C25.37,123.81 22.52,120.96 22.52,117.44V116.25C22.52,112.74 25.37,109.89 28.88,109.89H28.92V102.63C28.92,99.11 31.77,96.26 35.28,96.26H42.25V92.79H17.89C14.37,92.79 11.53,89.93 11.53,86.42C11.53,82.91 14.37,80.05 17.89,80.05H34.44C35.55,80.05 36.45,79.15 36.45,78.04ZM42.25,100.62H35.28C34.17,100.62 33.27,101.52 33.27,102.63V109.89H38.48C39.28,109.89 39.93,109.24 39.93,108.44V105.99C39.93,104.5 40.9,103.24 42.25,102.81V100.62ZM28.92,114.24H28.88C27.77,114.24 26.87,115.14 26.87,116.25V117.44C26.87,118.55 27.77,119.45 28.88,119.45H28.92V114.24ZM33.27,123.81V134.21C33.27,135.32 34.17,136.22 35.28,136.22H37.92C39.03,136.22 39.93,135.32 39.93,134.21V125.82C39.93,124.71 39.03,123.81 37.92,123.81H33.27ZM46.6,88.44H54.16C55.26,88.44 56.17,87.54 56.17,86.42C56.17,85.3 55.26,84.4 54.16,84.4H48.61C47.5,84.4 46.6,85.3 46.6,86.41V88.44Z" - android:strokeWidth="0.667939" - android:fillColor="#1F0333" - android:fillType="evenOdd" - android:strokeColor="#F5F5F5"/> - <path - android:pathData="M146.05,19.25C146.05,19.53 146.28,19.75 146.56,19.75C146.84,19.75 147.07,19.53 147.07,19.25V14.35L148.52,12.9C148.56,12.87 148.59,12.83 148.61,12.79H153.53C153.81,12.79 154.04,12.56 154.04,12.28C154.04,12 153.81,11.78 153.53,11.78H148.35L147.07,10.49V5.32C147.07,5.04 146.84,4.81 146.56,4.81C146.28,4.81 146.05,5.04 146.05,5.32V10.49L144.77,11.78H139.6C139.32,11.78 139.09,12 139.09,12.28C139.09,12.56 139.32,12.79 139.6,12.79H144.51C144.54,12.83 144.57,12.87 144.6,12.9L146.05,14.35V19.25Z" - android:fillColor="#F9F9F9"/> - <path - android:strokeWidth="1" - android:pathData="M146.05,19.25C146.05,19.53 146.28,19.75 146.56,19.75C146.84,19.75 147.07,19.53 147.07,19.25V14.35L148.52,12.9C148.56,12.87 148.59,12.83 148.61,12.79H153.53C153.81,12.79 154.04,12.56 154.04,12.28C154.04,12 153.81,11.78 153.53,11.78H148.35L147.07,10.49V5.32C147.07,5.04 146.84,4.81 146.56,4.81C146.28,4.81 146.05,5.04 146.05,5.32V10.49L144.77,11.78H139.6C139.32,11.78 139.09,12 139.09,12.28C139.09,12.56 139.32,12.79 139.6,12.79H144.51C144.54,12.83 144.57,12.87 144.6,12.9L146.05,14.35V19.25Z" - android:fillColor="#00000000" - android:strokeColor="#F9F9F9"/> - <path - android:pathData="M145.15,5.5L146.3,4.89L146.42,5.9L145.15,5.5Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M153.3,13.66L152.89,12.42L153.97,12.53L153.3,13.66Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M146.33,20.63L145.92,19.39L147.01,19.49L146.33,20.63Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M138.22,12.44L139.39,11.82L139.51,12.83L138.22,12.44Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M145.29,21.35C144.81,21.35 144.42,20.96 144.42,20.48V15.74L143.07,14.39C143.07,14.39 143.07,14.39 143.07,14.39C143.07,14.39 143.07,14.39 143.07,14.38H138.33C137.85,14.38 137.46,13.99 137.46,13.51C137.46,13.03 137.85,12.64 138.33,12.64H143.35L144.42,11.57V6.55C144.42,6.07 144.81,5.68 145.29,5.68C145.77,5.68 146.16,6.07 146.16,6.55V11.57L147.24,12.64H152.26C152.74,12.64 153.13,13.03 153.13,13.51C153.13,13.99 152.74,14.38 152.26,14.38H147.51C147.51,14.39 147.51,14.39 147.51,14.39C147.51,14.39 147.51,14.39 147.51,14.39L146.16,15.74V20.48C146.16,20.96 145.77,21.35 145.29,21.35ZM145.8,15.59L147.25,14.13C147.29,14.1 147.32,14.06 147.34,14.02H152.26C152.54,14.02 152.76,13.79 152.76,13.51C152.76,13.23 152.54,13.01 152.26,13.01H147.08L145.8,11.72V6.55C145.8,6.27 145.57,6.04 145.29,6.04C145.01,6.04 144.79,6.27 144.79,6.55V11.72L143.5,13.01H138.33C138.05,13.01 137.82,13.23 137.82,13.51C137.82,13.79 138.05,14.02 138.33,14.02H143.24C143.27,14.06 143.3,14.1 143.33,14.13L144.79,15.59V20.48C144.79,20.76 145.01,20.98 145.29,20.98C145.57,20.98 145.8,20.76 145.8,20.48V15.59Z" - android:fillColor="#F9F9F9" - android:fillType="evenOdd"/> - <path - android:pathData="M144.45,20.48C144.45,20.94 144.83,21.32 145.29,21.32C145.76,21.32 146.13,20.94 146.13,20.48V15.72L147.49,14.37C147.49,14.37 147.49,14.37 147.49,14.37C147.49,14.36 147.5,14.36 147.5,14.35H152.26C152.72,14.35 153.1,13.98 153.1,13.51C153.1,13.05 152.72,12.67 152.26,12.67H147.22L146.13,11.58V6.55C146.13,6.08 145.76,5.71 145.29,5.71C144.83,5.71 144.45,6.08 144.45,6.55V11.58L143.36,12.67H138.33C137.86,12.67 137.49,13.05 137.49,13.51C137.49,13.98 137.86,14.35 138.33,14.35H143.08C143.09,14.36 143.09,14.36 143.1,14.37L144.45,15.72V20.48Z" - android:strokeWidth="0.666912" - android:fillColor="#FBBE22" - android:strokeColor="#1F0333"/> - <path - android:pathData="M154.02,30.2C154.02,30.44 154.22,30.64 154.46,30.64C154.71,30.64 154.9,30.44 154.9,30.2V25.93L156.17,24.67C156.2,24.64 156.23,24.6 156.25,24.57H160.53C160.78,24.57 160.98,24.37 160.98,24.13C160.98,23.88 160.78,23.68 160.53,23.68H156.02L154.9,22.57V18.06C154.9,17.81 154.71,17.61 154.46,17.61C154.22,17.61 154.02,17.81 154.02,18.06V22.57L152.9,23.68H148.39C148.15,23.68 147.95,23.88 147.95,24.13C147.95,24.37 148.15,24.57 148.39,24.57H152.68C152.7,24.6 152.72,24.64 152.75,24.67L154.02,25.93V30.2Z" - android:fillColor="#F9F9F9"/> - <path - android:strokeWidth="1" - android:pathData="M154.02,30.2C154.02,30.44 154.22,30.64 154.46,30.64C154.71,30.64 154.9,30.44 154.9,30.2V25.93L156.17,24.67C156.2,24.64 156.23,24.6 156.25,24.57H160.53C160.78,24.57 160.98,24.37 160.98,24.13C160.98,23.88 160.78,23.68 160.53,23.68H156.02L154.9,22.57V18.06C154.9,17.81 154.71,17.61 154.46,17.61C154.22,17.61 154.02,17.81 154.02,18.06V22.57L152.9,23.68H148.39C148.15,23.68 147.95,23.88 147.95,24.13C147.95,24.37 148.15,24.57 148.39,24.57H152.68C152.7,24.6 152.72,24.64 152.75,24.67L154.02,25.93V30.2Z" - android:fillColor="#00000000" - android:strokeColor="#F9F9F9"/> - <path - android:pathData="M153.23,18.21L154.23,17.69L154.34,18.57L153.23,18.21Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M160.33,25.33L159.98,24.25L160.92,24.34L160.33,25.33Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M154.26,31.4L153.91,30.32L154.85,30.41L154.26,31.4Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M147.19,24.27L148.21,23.72L148.32,24.6L147.19,24.27Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M153.35,32.03C152.93,32.03 152.6,31.69 152.6,31.27V27.14L151.42,25.96C151.42,25.96 151.42,25.96 151.42,25.96C151.42,25.96 151.42,25.96 151.42,25.96H147.29C146.87,25.96 146.52,25.62 146.52,25.2C146.52,24.78 146.87,24.44 147.29,24.44H151.66L152.6,23.51V19.13C152.6,18.71 152.93,18.37 153.35,18.37C153.77,18.37 154.11,18.71 154.11,19.13V23.51L155.05,24.44H159.43C159.85,24.44 160.18,24.78 160.18,25.2C160.18,25.62 159.85,25.96 159.43,25.96H155.29C155.29,25.96 155.29,25.96 155.29,25.96C155.29,25.96 155.29,25.96 155.29,25.96L154.11,27.14V31.27C154.11,31.69 153.77,32.03 153.35,32.03ZM153.8,27.01L155.06,25.74C155.09,25.71 155.12,25.68 155.14,25.64H159.43C159.67,25.64 159.87,25.44 159.87,25.2C159.87,24.96 159.67,24.76 159.43,24.76H154.92L153.8,23.64V19.13C153.8,18.89 153.6,18.69 153.35,18.69C153.11,18.69 152.91,18.89 152.91,19.13V23.64L151.79,24.76H147.29C147.04,24.76 146.84,24.96 146.84,25.2C146.84,25.44 147.04,25.64 147.29,25.64H151.57C151.59,25.68 151.62,25.71 151.65,25.74L152.91,27.01V31.27C152.91,31.51 153.11,31.71 153.35,31.71C153.6,31.71 153.8,31.51 153.8,31.27V27.01Z" - android:fillColor="#F9F9F9" - android:fillType="evenOdd"/> - <path - android:pathData="M152.58,31.27C152.58,31.7 152.93,32.04 153.35,32.04C153.78,32.04 154.13,31.7 154.13,31.27V27.14L155.3,25.97H159.43C159.85,25.97 160.2,25.63 160.2,25.2C160.2,24.77 159.85,24.42 159.43,24.42H155.05L154.13,23.5V19.13C154.13,18.7 153.78,18.35 153.35,18.35C152.93,18.35 152.58,18.7 152.58,19.13V23.5L151.65,24.42H147.29C146.86,24.42 146.51,24.77 146.51,25.2C146.51,25.63 146.86,25.97 147.29,25.97H151.41L152.58,27.14V31.27Z" - android:strokeWidth="0.666912" - android:fillColor="#FBBE22" - android:strokeColor="#1F0333"/> - <path - android:pathData="M11.76,48.84C11.76,49.09 11.57,49.28 11.32,49.28C11.08,49.28 10.88,49.09 10.88,48.84V44.58L9.61,43.31C9.58,43.28 9.56,43.25 9.53,43.21H5.25C5.01,43.21 4.81,43.02 4.81,42.77C4.81,42.53 5.01,42.33 5.25,42.33H9.76L10.88,41.21V36.7C10.88,36.46 11.08,36.26 11.32,36.26C11.57,36.26 11.76,36.46 11.76,36.7V41.21L12.88,42.33H17.39C17.64,42.33 17.83,42.53 17.83,42.77C17.83,43.02 17.64,43.21 17.39,43.21H13.11C13.09,43.25 13.06,43.28 13.03,43.31L11.76,44.58V48.84Z" - android:fillColor="#F9F9F9"/> - <path - android:strokeWidth="1" - android:pathData="M11.76,48.84C11.76,49.09 11.57,49.28 11.32,49.28C11.08,49.28 10.88,49.09 10.88,48.84V44.58L9.61,43.31C9.58,43.28 9.56,43.25 9.53,43.21H5.25C5.01,43.21 4.81,43.02 4.81,42.77C4.81,42.53 5.01,42.33 5.25,42.33H9.76L10.88,41.21V36.7C10.88,36.46 11.08,36.26 11.32,36.26C11.57,36.26 11.76,36.46 11.76,36.7V41.21L12.88,42.33H17.39C17.64,42.33 17.83,42.53 17.83,42.77C17.83,43.02 17.64,43.21 17.39,43.21H13.11C13.09,43.25 13.06,43.28 13.03,43.31L11.76,44.58V48.84Z" - android:fillColor="#00000000" - android:strokeColor="#F9F9F9"/> - <path - android:pathData="M12.56,36.86L11.55,36.33L11.45,37.21L12.56,36.86Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M5.45,43.97L5.81,42.89L4.86,42.98L5.45,43.97Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M11.52,50.04L11.88,48.96L10.94,49.05L11.52,50.04Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M18.59,42.91L17.57,42.37L17.46,43.25L18.59,42.91Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M12.43,50.67C12.85,50.67 13.19,50.33 13.19,49.91V45.78L14.36,44.61C14.36,44.61 14.36,44.61 14.36,44.61C14.37,44.61 14.37,44.61 14.37,44.6H18.5C18.92,44.6 19.26,44.26 19.26,43.84C19.26,43.42 18.92,43.08 18.5,43.08H14.12L13.19,42.15V37.77C13.19,37.35 12.85,37.01 12.43,37.01C12.01,37.01 11.67,37.35 11.67,37.77V42.15L10.74,43.08H6.36C5.94,43.08 5.6,43.42 5.6,43.84C5.6,44.26 5.94,44.6 6.36,44.6H10.49C10.49,44.61 10.49,44.61 10.5,44.61C10.5,44.61 10.5,44.61 10.5,44.61L11.67,45.78V49.91C11.67,50.33 12.01,50.67 12.43,50.67ZM11.99,45.65L10.72,44.38C10.69,44.35 10.66,44.32 10.64,44.29H6.36C6.12,44.29 5.92,44.09 5.92,43.84C5.92,43.6 6.12,43.4 6.36,43.4H10.87L11.99,42.28V37.77C11.99,37.53 12.19,37.33 12.43,37.33C12.67,37.33 12.87,37.53 12.87,37.77V42.28L13.99,43.4H18.5C18.74,43.4 18.94,43.6 18.94,43.84C18.94,44.09 18.74,44.29 18.5,44.29H14.22C14.2,44.32 14.17,44.35 14.14,44.38L12.87,45.65V49.91C12.87,50.16 12.67,50.36 12.43,50.36C12.19,50.36 11.99,50.16 11.99,49.91V45.65Z" - android:fillColor="#F9F9F9" - android:fillType="evenOdd"/> - <path - android:pathData="M13.21,49.91C13.21,50.34 12.86,50.69 12.43,50.69C12,50.69 11.65,50.34 11.65,49.91V45.79L10.49,44.62H6.36C5.93,44.62 5.58,44.27 5.58,43.84C5.58,43.42 5.93,43.07 6.36,43.07H10.73L11.65,42.14V37.77C11.65,37.35 12,37 12.43,37C12.86,37 13.21,37.35 13.21,37.77V42.14L14.13,43.07H18.5C18.93,43.07 19.28,43.42 19.28,43.84C19.28,44.27 18.93,44.62 18.5,44.62H14.37L13.21,45.79V49.91Z" - android:strokeWidth="0.666912" - android:fillColor="#FBBE22" - android:strokeColor="#1F0333"/> - <path - android:pathData="M82.61,121.73C82.61,121.98 82.8,122.17 83.05,122.17C83.29,122.17 83.49,121.98 83.49,121.73V117.47L84.76,116.2C84.79,116.17 84.81,116.14 84.84,116.1H89.12C89.36,116.1 89.56,115.91 89.56,115.66C89.56,115.42 89.36,115.22 89.12,115.22H84.61L83.49,114.1V109.59C83.49,109.35 83.29,109.15 83.05,109.15C82.8,109.15 82.61,109.35 82.61,109.59V114.1L81.49,115.22H76.98C76.73,115.22 76.54,115.42 76.54,115.66C76.54,115.91 76.73,116.1 76.98,116.1H81.26C81.28,116.14 81.31,116.17 81.34,116.2L82.61,117.47V121.73Z" - android:fillColor="#F9F9F9"/> - <path - android:strokeWidth="1" - android:pathData="M82.61,121.73C82.61,121.98 82.8,122.17 83.05,122.17C83.29,122.17 83.49,121.98 83.49,121.73V117.47L84.76,116.2C84.79,116.17 84.81,116.14 84.84,116.1H89.12C89.36,116.1 89.56,115.91 89.56,115.66C89.56,115.42 89.36,115.22 89.12,115.22H84.61L83.49,114.1V109.59C83.49,109.35 83.29,109.15 83.05,109.15C82.8,109.15 82.61,109.35 82.61,109.59V114.1L81.49,115.22H76.98C76.73,115.22 76.54,115.42 76.54,115.66C76.54,115.91 76.73,116.1 76.98,116.1H81.26C81.28,116.14 81.31,116.17 81.34,116.2L82.61,117.47V121.73Z" - android:fillColor="#00000000" - android:strokeColor="#F9F9F9"/> - <path - android:pathData="M81.81,109.75L82.82,109.22L82.92,110.1L81.81,109.75Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M88.92,116.86L88.56,115.78L89.51,115.87L88.92,116.86Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M82.85,122.93L82.49,121.85L83.43,121.94L82.85,122.93Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M75.78,115.8L76.8,115.26L76.91,116.14L75.78,115.8Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M81.94,123.56C81.52,123.56 81.18,123.22 81.18,122.81V118.67L80.01,117.5C80.01,117.5 80.01,117.5 80.01,117.5C80,117.5 80,117.5 80,117.49H75.87C75.45,117.49 75.11,117.15 75.11,116.74C75.11,116.32 75.45,115.97 75.87,115.97H80.25L81.18,115.04V110.66C81.18,110.25 81.52,109.9 81.94,109.9C82.36,109.9 82.7,110.25 82.7,110.66V115.04L83.63,115.97H88.01C88.43,115.97 88.77,116.32 88.77,116.74C88.77,117.15 88.43,117.49 88.01,117.49H83.88C83.88,117.5 83.88,117.5 83.87,117.5C83.87,117.5 83.87,117.5 83.87,117.5L82.7,118.67V122.81C82.7,123.22 82.36,123.56 81.94,123.56ZM82.38,118.54L83.65,117.27C83.68,117.24 83.71,117.21 83.73,117.18H88.01C88.25,117.18 88.45,116.98 88.45,116.74C88.45,116.49 88.25,116.29 88.01,116.29H83.5L82.38,115.17V110.66C82.38,110.42 82.18,110.22 81.94,110.22C81.7,110.22 81.5,110.42 81.5,110.66V115.17L80.38,116.29H75.87C75.63,116.29 75.43,116.49 75.43,116.74C75.43,116.98 75.63,117.18 75.87,117.18H80.15C80.17,117.21 80.2,117.24 80.23,117.27L81.5,118.54V122.81C81.5,123.05 81.7,123.25 81.94,123.25C82.18,123.25 82.38,123.05 82.38,122.81V118.54Z" - android:fillColor="#F9F9F9" - android:fillType="evenOdd"/> - <path - android:pathData="M81.16,122.81C81.16,123.23 81.51,123.58 81.94,123.58C82.37,123.58 82.72,123.23 82.72,122.81V118.68L83.88,117.51H88.01C88.44,117.51 88.79,117.16 88.79,116.74C88.79,116.31 88.44,115.96 88.01,115.96H83.64L82.72,115.04V110.66C82.72,110.24 82.37,109.89 81.94,109.89C81.51,109.89 81.16,110.24 81.16,110.66V115.04L80.24,115.96H75.87C75.44,115.96 75.09,116.31 75.09,116.74C75.09,117.16 75.44,117.51 75.87,117.51H80L81.16,118.68V122.81Z" - android:strokeWidth="0.666912" - android:fillColor="#FBBE22" - android:strokeColor="#1F0333"/> - <path - android:pathData="M84.51,36.84L84.84,36.89C84.86,36.75 84.8,36.62 84.68,36.55C84.57,36.48 84.42,36.49 84.32,36.57L84.51,36.84ZM83.78,37.36L83.58,37.09L83.58,37.09L83.78,37.36ZM83.62,37.31L83.94,37.21L83.94,37.21L83.62,37.31ZM84.55,23.09L84.5,23.43C84.52,23.43 84.53,23.43 84.55,23.43L84.55,23.09ZM85.33,28.82L85,28.8C84.99,28.98 85.12,29.13 85.29,29.15C85.47,29.17 85.63,29.06 85.66,28.88L85.33,28.82ZM90.05,20.62L90.2,20.32C90.19,20.32 90.18,20.31 90.16,20.31L90.05,20.62ZM88.55,29.32L88.24,29.19C88.18,29.33 88.22,29.49 88.34,29.58C88.47,29.67 88.63,29.67 88.75,29.58L88.55,29.32ZM91.5,28.25L91.56,27.92L91.56,27.92L91.5,28.25ZM91.65,29.17L91.41,28.93L91.41,28.93L91.65,29.17ZM86.94,38.3L86.6,38.29L86.6,38.29L86.94,38.3ZM84.38,38.29L84.05,38.28L84.05,38.28L84.38,38.29ZM84.32,36.57L83.58,37.09L83.97,37.63L84.7,37.11L84.32,36.57ZM83.58,37.09C83.71,37 83.89,37.06 83.94,37.21L83.3,37.4C83.38,37.69 83.73,37.81 83.97,37.63L83.58,37.09ZM83.94,37.21C82.92,33.77 82.63,30.2 82.85,27.52C82.96,26.18 83.2,25.09 83.53,24.36C83.69,24 83.87,23.74 84.04,23.59C84.2,23.45 84.35,23.41 84.5,23.43L84.59,22.76C84.21,22.71 83.88,22.85 83.6,23.09C83.32,23.33 83.1,23.67 82.92,24.09C82.55,24.91 82.3,26.09 82.18,27.46C81.95,30.22 82.25,33.89 83.3,37.4L83.94,37.21ZM84.55,23.43C84.58,23.43 84.67,23.44 84.78,23.69C84.89,23.94 84.97,24.33 85.01,24.85C85.11,25.87 85.07,27.28 85,28.8L85.67,28.83C85.73,27.32 85.78,25.87 85.68,24.79C85.63,24.25 85.55,23.78 85.4,23.43C85.25,23.08 84.98,22.76 84.55,22.76L84.55,23.43ZM85.66,28.88C86.1,26.6 86.73,24.4 87.51,22.87C87.9,22.1 88.32,21.53 88.73,21.2C89.14,20.88 89.53,20.79 89.94,20.94L90.16,20.31C89.49,20.07 88.86,20.24 88.32,20.67C87.79,21.09 87.32,21.76 86.92,22.56C86.1,24.18 85.45,26.45 85,28.76L85.66,28.88ZM89.91,20.92C90.16,21.05 90.33,21.31 90.39,21.79C90.44,22.27 90.37,22.92 90.18,23.69C89.82,25.24 89.05,27.19 88.24,29.19L88.86,29.44C89.67,27.45 90.46,25.45 90.84,23.85C91.03,23.04 91.12,22.31 91.05,21.71C90.98,21.11 90.74,20.59 90.2,20.32L89.91,20.92ZM88.75,29.58C89.76,28.79 90.72,28.46 91.45,28.58L91.56,27.92C90.56,27.76 89.41,28.21 88.34,29.05L88.75,29.58ZM91.45,28.58C91.49,28.59 91.5,28.6 91.5,28.61C91.51,28.61 91.52,28.63 91.52,28.66C91.53,28.73 91.5,28.84 91.41,28.93L91.88,29.41C92.11,29.18 92.22,28.87 92.19,28.58C92.15,28.27 91.94,27.98 91.56,27.92L91.45,28.58ZM91.41,28.93C90.16,30.14 88.98,31.9 88.1,33.63C87.23,35.36 86.63,37.1 86.6,38.29L87.27,38.3C87.3,37.27 87.84,35.64 88.7,33.94C89.56,32.25 90.7,30.55 91.88,29.41L91.41,28.93ZM86.6,38.29C86.6,38.16 86.71,38.06 86.83,38.06V38.73C87.07,38.73 87.26,38.55 87.27,38.3L86.6,38.29ZM86.83,38.06H84.48V38.73H86.83V38.06ZM84.48,38.06C84.62,38.06 84.72,38.17 84.72,38.3L84.05,38.28C84.04,38.53 84.23,38.73 84.48,38.73V38.06ZM84.72,38.3C84.73,37.82 84.77,37.35 84.84,36.89L84.18,36.79C84.11,37.27 84.06,37.77 84.05,38.28L84.72,38.3Z" - android:fillColor="#F5F5F5"/> - <path - android:pathData="M82.07,39C80.62,40.13 79.16,40.92 77.61,41.81C84.53,41.86 95.63,43.4 94.14,42.54C92.36,41.51 89.67,39.69 88.59,38.5C87.52,37.3 83.89,37.58 82.07,39Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M89.33,39.24C88.76,38.59 87.75,37.44 87.82,35.96C87.86,35.28 87.88,34.85 87.91,34.57C87.92,34.46 87.63,34.24 87.53,34.29C86.49,34.8 85.42,34.87 83.37,34.87C83.31,34.87 83.27,34.92 83.27,34.98C83.32,36.21 82.66,38.46 81.78,39.23C81.42,39.54 82.14,39.68 83.31,39.72C75.58,40.81 69.6,48.02 69.6,56.76C69.6,61.87 71.65,66.46 74.9,69.61C77.27,71.9 79.92,72.57 83.44,73.45C83.73,73.52 84.03,73.6 84.33,73.67C85,73.84 85.7,73.86 86.37,73.72C90.57,72.84 93.22,72.1 95.79,69.61C99.04,66.46 101.09,61.87 101.09,56.76C101.09,47.74 94.73,40.35 86.63,39.63C87.61,39.57 88.55,39.49 89.27,39.4C89.35,39.39 89.38,39.3 89.33,39.24Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M97.87,56.9C97.87,64.12 92.25,69.95 85.36,69.95C78.46,69.95 72.85,64.12 72.85,56.9C72.85,49.68 78.46,43.86 85.36,43.86C92.25,43.86 97.87,49.68 97.87,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M95.19,56.9C95.19,62.57 90.77,67.14 85.36,67.14C79.94,67.14 75.53,62.57 75.53,56.9C75.53,51.23 79.94,46.66 85.36,46.66C90.77,46.66 95.19,51.23 95.19,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M92.54,56.9C92.54,61.04 89.32,64.38 85.36,64.38C81.4,64.38 78.17,61.04 78.17,56.9C78.17,52.76 81.4,49.43 85.36,49.43C89.32,49.43 92.54,52.76 92.54,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M90.15,56.9C90.15,59.68 87.99,61.91 85.36,61.91C82.73,61.91 80.57,59.68 80.57,56.9C80.57,54.13 82.73,51.9 85.36,51.9C87.99,51.9 90.15,54.13 90.15,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M87.83,56.9C87.83,58.34 86.71,59.48 85.36,59.48C84.01,59.48 82.89,58.34 82.89,56.9C82.89,55.47 84.01,54.33 85.36,54.33C86.71,54.33 87.83,55.47 87.83,56.9Z" - android:strokeWidth="0.669091" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M129.44,36.85L129.77,36.89C129.79,36.76 129.73,36.63 129.62,36.56C129.5,36.49 129.36,36.5 129.25,36.57L129.44,36.85ZM128.71,37.37L128.9,37.64L128.9,37.64L128.71,37.37ZM128.55,37.31L128.87,37.22L128.87,37.22L128.55,37.31ZM129.48,23.11L129.44,23.44C129.45,23.44 129.46,23.44 129.48,23.44L129.48,23.11ZM130.27,28.83L129.93,28.81C129.92,28.99 130.05,29.14 130.23,29.16C130.4,29.18 130.56,29.07 130.59,28.89L130.27,28.83ZM134.98,20.64L135.13,20.34C135.12,20.33 135.11,20.33 135.1,20.32L134.98,20.64ZM133.48,29.33L133.17,29.2C133.11,29.34 133.15,29.5 133.27,29.59C133.4,29.68 133.56,29.68 133.68,29.59L133.48,29.33ZM136.43,28.26L136.38,28.59L136.38,28.59L136.43,28.26ZM136.58,29.18L136.34,28.94L136.34,28.94L136.58,29.18ZM131.87,38.3L131.53,38.29L131.53,38.29L131.87,38.3ZM129.31,38.3L128.98,38.29L128.98,38.29L129.31,38.3ZM129.25,36.57L128.52,37.09L128.9,37.64L129.64,37.12L129.25,36.57ZM128.52,37.09C128.65,37 128.83,37.06 128.87,37.22L128.23,37.41C128.32,37.69 128.66,37.81 128.9,37.64L128.52,37.09ZM128.87,37.22C127.85,33.78 127.56,30.21 127.79,27.53C127.9,26.19 128.14,25.1 128.46,24.37C128.62,24.01 128.8,23.76 128.97,23.61C129.13,23.46 129.29,23.42 129.44,23.44L129.52,22.78C129.15,22.73 128.81,22.86 128.53,23.1C128.26,23.34 128.04,23.69 127.85,24.1C127.48,24.92 127.23,26.1 127.12,27.48C126.89,30.23 127.19,33.89 128.23,37.41L128.87,37.22ZM129.48,23.44C129.52,23.44 129.61,23.45 129.71,23.71C129.82,23.96 129.9,24.34 129.95,24.86C130.04,25.88 130,27.29 129.93,28.81L130.6,28.84C130.67,27.33 130.71,25.88 130.61,24.8C130.57,24.27 130.48,23.79 130.33,23.44C130.18,23.1 129.92,22.77 129.48,22.77L129.48,23.44ZM130.59,28.89C131.04,26.62 131.67,24.41 132.44,22.88C132.83,22.11 133.25,21.54 133.67,21.21C134.07,20.89 134.46,20.81 134.87,20.95L135.1,20.32C134.42,20.08 133.79,20.26 133.25,20.69C132.72,21.11 132.26,21.77 131.85,22.58C131.03,24.19 130.38,26.46 129.94,28.77L130.59,28.89ZM134.84,20.94C135.1,21.06 135.26,21.33 135.32,21.8C135.37,22.29 135.3,22.93 135.12,23.7C134.75,25.25 133.98,27.2 133.17,29.2L133.79,29.45C134.6,27.46 135.39,25.46 135.77,23.86C135.96,23.06 136.05,22.32 135.98,21.73C135.91,21.12 135.67,20.6 135.13,20.34L134.84,20.94ZM133.68,29.59C134.69,28.8 135.65,28.47 136.38,28.59L136.49,27.93C135.49,27.77 134.34,28.22 133.27,29.06L133.68,29.59ZM136.38,28.59C136.42,28.6 136.43,28.61 136.43,28.62C136.44,28.62 136.45,28.64 136.45,28.67C136.46,28.74 136.43,28.85 136.34,28.94L136.81,29.42C137.04,29.19 137.15,28.88 137.12,28.59C137.08,28.28 136.87,28 136.49,27.93L136.38,28.59ZM136.34,28.94C135.1,30.15 133.91,31.91 133.04,33.64C132.16,35.36 131.56,37.11 131.53,38.29L132.2,38.31C132.23,37.28 132.77,35.64 133.63,33.95C134.49,32.26 135.63,30.56 136.81,29.42L136.34,28.94ZM131.53,38.29C131.54,38.17 131.64,38.07 131.76,38.07V38.74C132,38.74 132.2,38.55 132.2,38.31L131.53,38.29ZM131.76,38.07H129.42V38.74H131.76V38.07ZM129.42,38.07C129.55,38.07 129.65,38.18 129.65,38.31L128.98,38.29C128.97,38.53 129.17,38.74 129.42,38.74V38.07ZM129.65,38.31C129.66,37.82 129.71,37.35 129.77,36.89L129.11,36.8C129.04,37.28 129,37.78 128.98,38.29L129.65,38.31Z" - android:fillColor="#F5F5F5"/> - <path - android:pathData="M126.82,40.36C125.38,41.49 121.93,43.73 120.39,44.62C127.26,44.67 139.3,43.87 137.82,43.01C134.87,41.3 134.36,41.05 133.29,39.86C132.23,38.68 128.62,38.95 126.82,40.36Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M134.02,40.6C133.46,39.96 132.45,38.88 132.53,37.34C132.56,36.66 132.59,36.24 132.61,35.96C132.62,35.85 132.34,35.63 132.24,35.68C131.2,36.19 130.14,36.26 128.11,36.26C128.05,36.26 128,36.31 128.01,36.37C127.83,39.13 127.83,39.5 126.53,40.59C126.18,40.89 126.86,41.03 127.97,41.07C118.96,43.94 114.44,48.52 114.44,56.32C114.44,60.9 116.47,65.01 119.7,67.83C122.05,69.89 124.68,70.48 128.18,71.27C128.49,71.34 128.82,71.42 129.16,71.49C129.76,71.63 130.38,71.65 130.99,71.53C135.21,70.73 137.87,70.08 140.44,67.83C143.67,65.01 145.7,60.9 145.7,56.32C145.7,48.26 139.4,41.64 131.39,40.99C132.34,40.93 133.26,40.84 133.96,40.76C134.04,40.75 134.08,40.66 134.02,40.6Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M142.58,55.93C142.58,62.58 136.99,68 130.08,68C123.16,68 117.57,62.58 117.57,55.93C117.57,49.27 123.16,43.86 130.08,43.86C136.99,43.86 142.58,49.27 142.58,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M139.9,55.93C139.9,61.15 135.51,65.4 130.08,65.4C124.64,65.4 120.25,61.15 120.25,55.93C120.25,50.71 124.64,46.46 130.08,46.46C135.51,46.46 139.9,50.71 139.9,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M137.26,55.93C137.26,59.73 134.05,62.84 130.08,62.84C126.1,62.84 122.89,59.73 122.89,55.93C122.89,52.13 126.1,49.02 130.08,49.02C134.05,49.02 137.26,52.13 137.26,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M134.87,55.93C134.87,58.47 132.73,60.54 130.08,60.54C127.42,60.54 125.29,58.47 125.29,55.93C125.29,53.39 127.42,51.31 130.08,51.31C132.73,51.31 134.87,53.39 134.87,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M132.54,55.93C132.54,57.22 131.45,58.29 130.08,58.29C128.7,58.29 127.61,57.22 127.61,55.93C127.61,54.64 128.7,53.57 130.08,53.57C131.45,53.57 132.54,54.64 132.54,55.93Z" - android:strokeWidth="0.668769" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M133.71,35.21C133.23,35.77 132.63,36.59 132.55,37.92C130.66,42.59 129.83,48.47 129.83,54.62C129.83,60.77 130.95,66.47 132.85,71.14C131.95,71.36 131.02,71.51 130.06,71.57C121.13,71.24 114,64.55 114,56.35C114,50.58 117.53,45.56 122.74,42.97C124.91,41.77 127.56,40.29 127.65,38.85C127.74,37.37 127.33,36.27 126.95,35.46C126.79,35.13 127,34.72 127.35,34.69L133.32,34.25C133.71,34.22 133.97,34.66 133.8,35.02C133.77,35.08 133.74,35.14 133.71,35.21Z" - android:fillColor="#1F0333" - android:fillType="evenOdd"/> - <group> - <clip-path - android:pathData="M133.71,35.21C133.23,35.77 132.63,36.59 132.55,37.92C130.66,42.59 129.83,48.47 129.83,54.62C129.83,60.77 130.95,66.47 132.85,71.14C131.95,71.36 131.02,71.51 130.06,71.57C121.13,71.24 114,64.55 114,56.35C114,50.58 117.53,45.56 122.74,42.97C124.91,41.77 127.56,40.29 127.65,38.85C127.74,37.37 127.33,36.27 126.95,35.46C126.79,35.13 127,34.72 127.35,34.69L133.32,34.25C133.71,34.22 133.97,34.66 133.8,35.02C133.77,35.08 133.74,35.14 133.71,35.21Z" - android:fillType="evenOdd"/> - <path - android:pathData="M132.55,37.92L133.17,38.18L133.21,38.07L133.22,37.96L132.55,37.92ZM133.71,35.21L134.21,35.65L134.27,35.57L134.32,35.49L133.71,35.21ZM132.85,71.14L133.01,71.79L133.76,71.6L133.47,70.89L132.85,71.14ZM130.06,71.57L130.04,72.24L130.07,72.24L130.1,72.24L130.06,71.57ZM122.74,42.97L123.03,43.57L123.05,43.56L123.06,43.56L122.74,42.97ZM127.65,38.85L128.32,38.89L128.32,38.89L127.65,38.85ZM126.95,35.46L126.35,35.75L126.35,35.75L126.95,35.46ZM127.35,34.69L127.3,34.03L127.3,34.03L127.35,34.69ZM133.32,34.25L133.27,33.58L133.27,33.58L133.32,34.25ZM133.8,35.02L134.4,35.31L134.4,35.31L133.8,35.02ZM133.22,37.96C133.28,36.84 133.77,36.15 134.21,35.65L133.21,34.77C132.67,35.38 131.98,36.35 131.89,37.89L133.22,37.96ZM130.5,54.62C130.5,48.52 131.32,42.73 133.17,38.18L131.93,37.67C129.99,42.44 129.17,48.42 129.17,54.62H130.5ZM133.47,70.89C131.6,66.31 130.5,60.69 130.5,54.62H129.17C129.17,60.85 130.3,66.64 132.24,71.39L133.47,70.89ZM130.1,72.24C131.1,72.17 132.07,72.02 133.01,71.79L132.7,70.49C131.83,70.71 130.93,70.85 130.02,70.9L130.1,72.24ZM113.34,56.35C113.34,64.96 120.81,71.89 130.04,72.24L130.09,70.9C121.46,70.58 114.67,64.13 114.67,56.35H113.34ZM122.44,42.38C117.04,45.06 113.34,50.29 113.34,56.35H114.67C114.67,50.87 118.03,46.06 123.03,43.57L122.44,42.38ZM126.99,38.81C126.97,38.97 126.89,39.2 126.63,39.51C126.39,39.81 126.03,40.13 125.58,40.46C124.67,41.13 123.51,41.78 122.41,42.39L123.06,43.56C124.14,42.96 125.38,42.27 126.37,41.54C126.87,41.17 127.32,40.77 127.67,40.35C128.01,39.94 128.28,39.45 128.32,38.89L126.99,38.81ZM126.35,35.75C126.71,36.5 127.07,37.48 126.99,38.81L128.32,38.89C128.42,37.26 127.96,36.04 127.55,35.17L126.35,35.75ZM127.3,34.03C126.41,34.09 126.02,35.06 126.35,35.75L127.55,35.17C127.57,35.21 127.56,35.25 127.55,35.27C127.54,35.3 127.49,35.35 127.4,35.36L127.3,34.03ZM133.27,33.58L127.3,34.03L127.4,35.36L133.37,34.91L133.27,33.58ZM134.4,35.31C134.59,34.91 134.54,34.47 134.34,34.14C134.14,33.81 133.75,33.55 133.27,33.58L133.37,34.91C133.33,34.92 133.29,34.91 133.26,34.89C133.22,34.87 133.21,34.85 133.2,34.84C133.19,34.81 133.18,34.78 133.2,34.73L134.4,35.31ZM134.32,35.49C134.34,35.43 134.37,35.37 134.4,35.31L133.2,34.73C133.17,34.8 133.13,34.86 133.1,34.93L134.32,35.49Z" - android:fillColor="#B27AF4"/> - </group> - <path - android:pathData="M126.06,44.68C126.36,44.94 126.36,45.41 126.06,45.66L125.96,45.75C125.93,45.77 125.91,45.8 125.88,45.82L125.8,45.92C125.54,46.23 125.07,46.23 124.81,45.92L124.73,45.82C124.71,45.8 124.68,45.77 124.65,45.75L124.55,45.66C124.25,45.41 124.25,44.94 124.55,44.68L124.65,44.59C124.68,44.57 124.71,44.55 124.73,44.52L124.81,44.42C125.07,44.12 125.54,44.12 125.8,44.42L125.88,44.52C125.91,44.55 125.93,44.57 125.96,44.59L126.06,44.68Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M123.94,47.31C124.68,47.94 124.68,49.08 123.94,49.71L123.69,49.93C123.63,49.98 123.57,50.04 123.52,50.1L123.3,50.35C122.67,51.09 121.53,51.09 120.89,50.35L120.68,50.1C120.63,50.04 120.57,49.98 120.51,49.93L120.26,49.71C119.52,49.08 119.52,47.94 120.26,47.31L120.51,47.09C120.57,47.04 120.63,46.98 120.68,46.92L120.89,46.67C121.53,45.93 122.67,45.93 123.3,46.67L123.52,46.92C123.57,46.98 123.63,47.04 123.69,47.09L123.94,47.31Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M39.32,36.87L39.65,36.92C39.67,36.78 39.61,36.65 39.49,36.58C39.38,36.52 39.24,36.52 39.13,36.6L39.32,36.87ZM38.59,37.39L38.78,37.66L38.78,37.66L38.59,37.39ZM38.43,37.33L38.75,37.24L38.75,37.24L38.43,37.33ZM39.36,23.17L39.31,23.5C39.33,23.5 39.34,23.5 39.36,23.5L39.36,23.17ZM40.14,28.87L39.81,28.86C39.8,29.03 39.93,29.18 40.1,29.2C40.28,29.23 40.44,29.11 40.47,28.94L40.14,28.87ZM44.85,20.7L44.99,20.4C44.98,20.4 44.97,20.39 44.96,20.39L44.85,20.7ZM43.34,29.37L43.03,29.24C42.98,29.38 43.02,29.55 43.14,29.64C43.26,29.73 43.43,29.73 43.55,29.63L43.34,29.37ZM46.29,28.31L46.35,27.98L46.35,27.98L46.29,28.31ZM46.44,29.22L46.67,29.46L46.67,29.46L46.44,29.22ZM41.74,38.32L41.41,38.31L41.41,38.31L41.74,38.32ZM39.19,38.32L39.53,38.33L39.53,38.33L39.19,38.32ZM39.13,36.6L38.4,37.12L38.78,37.66L39.51,37.14L39.13,36.6ZM38.4,37.12C38.53,37.03 38.71,37.09 38.75,37.24L38.11,37.43C38.2,37.72 38.54,37.83 38.78,37.66L38.4,37.12ZM38.75,37.24C37.73,33.81 37.44,30.25 37.67,27.58C37.78,26.24 38.02,25.15 38.34,24.43C38.5,24.07 38.68,23.81 38.85,23.67C39.01,23.52 39.16,23.48 39.31,23.5L39.4,22.84C39.02,22.79 38.69,22.92 38.41,23.16C38.14,23.4 37.92,23.75 37.73,24.16C37.36,24.98 37.12,26.15 37,27.52C36.77,30.27 37.07,33.93 38.11,37.43L38.75,37.24ZM39.36,23.5C39.39,23.5 39.48,23.51 39.59,23.76C39.7,24.01 39.78,24.4 39.82,24.91C39.92,25.94 39.88,27.34 39.81,28.86L40.47,28.89C40.54,27.38 40.58,25.93 40.49,24.85C40.44,24.32 40.35,23.85 40.2,23.5C40.06,23.16 39.79,22.83 39.36,22.83L39.36,23.5ZM40.47,28.94C40.91,26.67 41.54,24.47 42.31,22.94C42.7,22.17 43.11,21.61 43.53,21.28C43.94,20.96 44.33,20.87 44.74,21.02L44.96,20.39C44.29,20.15 43.66,20.33 43.12,20.75C42.59,21.17 42.13,21.84 41.72,22.64C40.9,24.25 40.26,26.51 39.81,28.81L40.47,28.94ZM44.7,21C44.96,21.13 45.13,21.39 45.18,21.87C45.24,22.35 45.16,22.99 44.98,23.76C44.61,25.3 43.85,27.25 43.03,29.24L43.65,29.5C44.46,27.51 45.25,25.52 45.63,23.92C45.82,23.12 45.91,22.39 45.84,21.79C45.78,21.19 45.53,20.67 44.99,20.4L44.7,21ZM43.55,29.63C44.55,28.85 45.51,28.52 46.24,28.64L46.35,27.98C45.35,27.81 44.2,28.27 43.14,29.11L43.55,29.63ZM46.24,28.64C46.28,28.64 46.29,28.66 46.29,28.66C46.3,28.67 46.31,28.68 46.31,28.72C46.32,28.78 46.29,28.89 46.2,28.98L46.67,29.46C46.89,29.24 47.01,28.93 46.98,28.64C46.94,28.32 46.72,28.04 46.35,27.98L46.24,28.64ZM46.2,28.98C44.96,30.19 43.78,31.95 42.9,33.68C42.03,35.39 41.44,37.13 41.41,38.31L42.07,38.33C42.1,37.3 42.64,35.67 43.5,33.98C44.35,32.29 45.49,30.6 46.67,29.46L46.2,28.98ZM41.41,38.31C41.41,38.19 41.51,38.09 41.64,38.09V38.76C41.87,38.76 42.07,38.57 42.07,38.33L41.41,38.31ZM41.64,38.09H39.29V38.76H41.64V38.09ZM39.29,38.09C39.43,38.09 39.53,38.2 39.53,38.33L38.86,38.31C38.85,38.55 39.05,38.76 39.29,38.76V38.09ZM39.53,38.33C39.54,37.85 39.58,37.38 39.65,36.92L38.99,36.82C38.92,37.3 38.88,37.8 38.86,38.31L39.53,38.33Z" - android:fillColor="#F5F5F5"/> - <path - android:pathData="M36.46,40.58C35,41.63 31.5,43.57 29.93,44.4C36.88,44.41 49.4,43.73 47.91,43.1C45.51,42.09 43.92,41.2 43.01,39.96C41.99,38.57 38.29,39.25 36.46,40.58Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M36.22,40.71C36.85,40.01 38.08,38.64 38.01,37.22C37.96,36.31 37.84,35.68 37.71,35.27C37.68,35.16 37.88,34.98 37.98,35.04C39.02,35.74 40.04,36.41 42.09,36.43C42.15,36.43 42.27,36.85 42.27,36.91C42.22,38.2 42.8,40.01 43.68,40.78C44.13,41.17 42.88,41.29 41.2,41.27C49.88,41.91 56.71,48.56 56.71,56.67C56.71,65.2 49.15,72.12 39.83,72.12C30.51,72.12 22.95,65.2 22.95,56.67C22.95,48.2 30.4,41.32 39.63,41.22C38.39,41.16 37.12,41.06 36.21,40.95C36.13,40.94 36.1,40.85 36.15,40.79C36.18,40.76 36.2,40.74 36.22,40.71Z" - android:fillColor="#B27AF4"/> - <path - android:pathData="M53.82,56.44C53.82,63.36 47.73,69.02 40.17,69.02C32.6,69.02 26.51,63.36 26.51,56.44C26.51,49.52 32.6,43.87 40.17,43.87C47.73,43.87 53.82,49.52 53.82,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M50.9,56.44C50.9,61.87 46.12,66.31 40.17,66.31C34.21,66.31 29.43,61.87 29.43,56.44C29.43,51.02 34.21,46.57 40.17,46.57C46.12,46.57 50.9,51.02 50.9,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M48.02,56.44C48.02,60.39 44.53,63.65 40.17,63.65C35.8,63.65 32.31,60.39 32.31,56.44C32.31,52.49 35.8,49.24 40.17,49.24C44.53,49.24 48.02,52.49 48.02,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M45.42,56.44C45.42,59.08 43.09,61.26 40.17,61.26C37.24,61.26 34.92,59.08 34.92,56.44C34.92,53.81 37.24,51.62 40.17,51.62C43.09,51.62 45.42,53.81 45.42,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M42.89,56.44C42.89,57.78 41.7,58.92 40.17,58.92C38.64,58.92 37.45,57.78 37.45,56.44C37.45,55.1 38.64,53.97 40.17,53.97C41.7,53.97 42.89,55.1 42.89,56.44Z" - android:strokeWidth="0.667046" - android:fillColor="#00000000" - android:strokeColor="#1F0333"/> - <path - android:pathData="M42.34,38C42.29,38.01 42.24,38.03 42.19,38.04C40.18,42.83 39,48.68 39,54.99C39,61.32 40.19,67.17 42.2,71.97C41.24,72.2 40.25,72.35 39.23,72.42C29.76,72.07 22.2,65.2 22.2,56.78C22.2,50.85 25.95,45.69 31.47,43.03C33.77,41.79 36.98,39.92 36.89,38.55C36.82,37.38 36.35,36.14 35.94,35.31C35.77,34.97 35.99,34.55 36.37,34.52L42.7,34.07C43.11,34.04 43.39,34.49 43.21,34.86C42.75,35.78 42.28,37.02 42.34,38Z" - android:fillColor="#1F0333" - android:fillType="evenOdd"/> - <group> - <clip-path - android:pathData="M42.34,38C42.29,38.01 42.24,38.03 42.19,38.04C40.18,42.83 39,48.68 39,54.99C39,61.32 40.19,67.17 42.2,71.97C41.24,72.2 40.25,72.35 39.23,72.42C29.76,72.07 22.2,65.2 22.2,56.78C22.2,50.85 25.95,45.69 31.47,43.03C33.77,41.79 36.98,39.92 36.89,38.55C36.82,37.38 36.35,36.14 35.94,35.31C35.77,34.97 35.99,34.55 36.37,34.52L42.7,34.07C43.11,34.04 43.39,34.49 43.21,34.86C42.75,35.78 42.28,37.02 42.34,38Z" - android:fillType="evenOdd"/> - <path - android:pathData="M42.19,38.04L42,37.41L41.7,37.5L41.58,37.79L42.19,38.04ZM42.34,38L42.55,38.63L43.04,38.47L43.01,37.95L42.34,38ZM42.2,71.97L42.36,72.61L43.12,72.43L42.82,71.71L42.2,71.97ZM39.23,72.42L39.21,73.08L39.24,73.08L39.27,73.08L39.23,72.42ZM31.47,43.03L31.76,43.63L31.77,43.62L31.78,43.62L31.47,43.03ZM36.89,38.55L37.56,38.51L37.56,38.51L36.89,38.55ZM35.94,35.31L35.34,35.6L35.34,35.6L35.94,35.31ZM36.37,34.52L36.32,33.86L36.32,33.86L36.37,34.52ZM42.7,34.07L42.75,34.73L42.75,34.73L42.7,34.07ZM43.21,34.86L42.61,34.56L42.61,34.56L43.21,34.86ZM42.38,38.68C42.44,38.66 42.49,38.65 42.55,38.63L42.14,37.36C42.1,37.38 42.05,37.39 42,37.41L42.38,38.68ZM39.66,54.99C39.66,48.76 40.83,43 42.81,38.3L41.58,37.79C39.53,42.67 38.33,48.6 38.33,54.99H39.66ZM42.82,71.71C40.84,67 39.66,61.24 39.66,54.99H38.33C38.33,61.4 39.53,67.34 41.59,72.23L42.82,71.71ZM39.27,73.08C40.33,73.01 41.36,72.85 42.36,72.61L42.05,71.32C41.12,71.54 40.17,71.69 39.19,71.75L39.27,73.08ZM21.54,56.78C21.54,65.63 29.46,72.72 39.21,73.08L39.26,71.75C30.06,71.41 22.86,64.77 22.86,56.78H21.54ZM31.18,42.43C25.47,45.18 21.54,50.55 21.54,56.78H22.86C22.86,51.14 26.42,46.2 31.76,43.63L31.18,42.43ZM36.23,38.59C36.23,38.67 36.19,38.88 35.9,39.23C35.62,39.56 35.2,39.92 34.68,40.3C33.64,41.07 32.3,41.83 31.15,42.44L31.78,43.62C32.94,43 34.35,42.2 35.47,41.38C36.03,40.96 36.54,40.53 36.92,40.08C37.27,39.65 37.59,39.11 37.56,38.51L36.23,38.59ZM35.34,35.6C35.73,36.4 36.16,37.54 36.23,38.59L37.56,38.51C37.47,37.21 36.96,35.88 36.53,35.02L35.34,35.6ZM36.32,33.86C35.43,33.92 34.98,34.88 35.34,35.6L36.53,35.02C36.55,35.06 36.54,35.09 36.53,35.11C36.52,35.14 36.48,35.18 36.41,35.18L36.32,33.86ZM42.65,33.4L36.32,33.86L36.41,35.18L42.75,34.73L42.65,33.4ZM43.8,35.15C44.19,34.37 43.62,33.33 42.65,33.4L42.75,34.73C42.72,34.73 42.69,34.72 42.66,34.71C42.63,34.7 42.62,34.68 42.61,34.67C42.6,34.65 42.59,34.61 42.61,34.56L43.8,35.15ZM43.01,37.95C42.96,37.17 43.35,36.07 43.8,35.15L42.61,34.56C42.14,35.5 41.61,36.88 41.68,38.04L43.01,37.95Z" - android:fillColor="#B27AF4"/> - </group> - <path - android:pathData="M32.73,48.33C32.63,48.4 32.53,48.47 32.43,48.55C32.02,48.85 31.63,49.17 31.26,49.5C31.22,49.54 31.17,49.58 31.12,49.61C30.61,49.97 29.9,49.96 29.44,49.52C28.93,49.04 28.91,48.24 29.42,47.77C29.47,47.72 29.52,47.68 29.57,47.63C29.99,47.25 30.43,46.89 30.88,46.56C31.02,46.45 31.17,46.34 31.32,46.23C31.79,45.91 32.26,45.61 32.75,45.32C32.79,45.3 32.83,45.28 32.87,45.26C32.89,45.25 32.91,45.24 32.93,45.23C33.54,44.89 34.29,45.16 34.59,45.79C34.86,46.37 34.65,47.04 34.15,47.42C34.11,47.45 34.06,47.48 34.01,47.51C33.57,47.76 33.14,48.03 32.73,48.33Z" - android:fillColor="#F9F9F9"/> - <path - android:pathData="M24.9,50.74a1.27,1.27 46.59,1 0,2.54 0.07a1.27,1.27 46.59,1 0,-2.54 -0.07z" - android:fillColor="#F9F9F9"/> -</vector> ===================================== fenix/app/src/main/res/font/roboto_bold.ttf deleted ===================================== Binary files a/fenix/app/src/main/res/font/roboto_bold.ttf and /dev/null differ ===================================== fenix/app/src/main/res/font/roboto_regular.ttf deleted ===================================== Binary files a/fenix/app/src/main/res/font/roboto_regular.ttf and /dev/null differ ===================================== fenix/app/src/main/res/layout/fragment_home.xml ===================================== @@ -109,168 +109,24 @@ </com.google.android.material.appbar.CollapsingToolbarLayout> - </com.google.android.material.appbar.AppBarLayout> - - <androidx.core.widget.NestedScrollView - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - android:paddingBottom="56dp">  - - <LinearLayout - android:id="@+id/yec_popup" - android:layout_width="match_parent" + <TextView + android:id="@+id/exploreprivately" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="20dp" - android:layout_marginStart="15dp" - android:layout_marginEnd="15dp" - android:paddingStart="30dp" - android:paddingEnd="30dp" - android:paddingTop="30dp" - android:paddingBottom="30dp" - android:layout_weight="1" - android:orientation="vertical" - style="@style/YecPopup" > - - <ImageView - android:id="@+id/yec_close" - android:layout_height="30dp" - android:layout_width="30dp" - android:layout_gravity="end" - app:srcCompat="@drawable/ic_close" - tools:ignore="ContentDescription" /> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="40dp" - android:layout_marginEnd="40dp" - android:paddingTop="10dp"> - -  - <ImageView - android:id="@+id/yec_illustration" - android:layout_width="0dp" - android:layout_height="wrap_content" - - app:layout_constraintWidth_min="40dp" - app:layout_constraintWidth_max="320dp" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - android:layout_gravity="center_horizontal" - - android:adjustViewBounds="true" - app:layout_scrollFlags="scroll" - app:srcCompat="@drawable/yec_illustration_android" - tools:ignore="ContentDescription" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - - <TextView - android:id="@+id/yec_matching_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:layout_marginTop="15dp" - android:text="@string/yec_2023_matched_donation" - android:textColor="#FFBD4F" - android:textSize="16sp" - android:lineSpacingExtra="5dp" - android:fontFamily="Roboto-Medium" - app:layout_scrollFlags="scroll" /> - - <TextView - android:id="@+id/yec_intro_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:layout_marginTop="15dp" - android:text="@string/yec_2023_introduction" - android:textColor="#FBFBFE" - android:textSize="18sp" - android:lineSpacingExtra="5dp" - android:fontFamily="Roboto-Bold" - android:textStyle="bold" - app:layout_scrollFlags="scroll" /> - - <TextView - android:id="@+id/yec_please_donate_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:layout_marginTop="15dp" - android:text="@string/yec_2023_please_donate" - android:textColor="#FBFBFE" - android:textSize="16sp" - android:lineSpacingExtra="5dp" - android:fontFamily="Roboto-Medium" - app:layout_scrollFlags="scroll" /> - - <Button - android:id="@+id/donate_now_button" - style="@style/TorDonateYecButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="30dp" - android:background="@drawable/tor_yec_donate_rounded_corners" - android:drawableEnd="@drawable/yec_heart" - android:drawablePadding="10dp" - android:paddingEnd="15dp" - android:paddingStart="15dp" - android:text="@string/yec_2023_donate_button" - android:textAllCaps="false" - android:textColor="#1F0333" - android:textSize="18sp" - android:textStyle="bold" - android:fontFamily="Roboto-Bold" - android:visibility="visible" - tools:ignore="ButtonStyleXmlDetector" /> - - <TextView - android:id="@+id/yec_free_to_use" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:layout_marginTop="30dp" - android:text="@string/yec_2023_free_to_use" - android:textColor="#FBFBFE" - android:textSize="16sp" - android:lineSpacingExtra="5dp" - android:fontFamily="Roboto-Medium" - app:layout_scrollFlags="scroll" /> - - </LinearLayout> - </androidx.core.widget.NestedScrollView> - - <TextView - android:id="@+id/exploreprivately" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center|center_vertical" - android:gravity="center_horizontal" - android:clickable="false" - android:ellipsize="end" - android:focusable="false" - android:importantForAccessibility="no" - android:text="@string/tor_explore_privately" - android:fontFamily="Roboto-Medium" - android:textColor="#DEFFFFFF" - android:textSize="40sp" - android:lineSpacingMultiplier="1.1" - app:layout_scrollFlags="scroll" /> + android:layout_gravity="center|center_vertical" + android:gravity="center_horizontal" + android:clickable="false" + android:ellipsize="end" + android:focusable="false" + android:importantForAccessibility="no" + android:text="@string/tor_explore_privately" + android:fontFamily="Roboto-Medium" + android:textColor="#DEFFFFFF" + android:textSize="40sp" + android:lineSpacingMultiplier="1.1" + app:layout_scrollFlags="scroll" /> + + </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView android:id="@+id/sessionControlRecyclerView" @@ -283,6 +139,7 @@ android:transitionGroup="false" android:importantForAccessibility="yes" android:overScrollMode="never" + tools:listitem="@layout/collection_home_list_row" tools:itemCount="3" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/> ===================================== fenix/app/src/main/res/values/colors.xml ===================================== @@ -274,7 +274,6 @@ <color name="onboarding_illustration_deselected_private_theme">#99FBFBFE</color> <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color> - <color name="tor_yec_home_background">#1F0333</color>  <color name="accent_normal_theme">@color/photonInk20</color> <color name="accent_high_contrast_normal_theme">@color/photonInk20</color> ===================================== fenix/app/src/main/res/values/styles.xml ===================================== @@ -336,17 +336,6 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> - <style name="PrivateEOYTheme" parent="PrivateThemeBase" > - <item name="android:windowBackground">@color/tor_yec_home_background</item> - <item name="homeBackground">@color/tor_yec_home_background</item> - </style> - - <style name="YecPopup" > - <item name="homeBackground">@color/tor_yec_home_background</item> - <item name="android:background">@drawable/tor_yec_popup_rounded_corners</item> - </style> - -  <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> @@ -386,21 +375,6 @@ <item name="android:textColor">?attr/textPrimary</item> </style> - <style name="TorDonateYecButton" parent="NeutralButton"> - <item name="android:background">@drawable/tor_yec_donate_rounded_corners</item> - <item name="backgroundTint">#FFBD4F</item> - <item name="android:textColor">#1F0333</item> - <item name="android:fontFamily">Roboto-Bold</item> - <item name="fontFamily">Roboto-Bold</item> - </style> - - <style name="TorDonateYecButtonText" parent="Base.TextAppearance.MaterialComponents.Badge"> - - <item name="android:textStyle">bold</item> - <item name="android:textColor">#000000</item> - </style> - - <style name="DestructiveButton" parent="NeutralButton"> <item name="iconTint">@color/fx_mobile_icon_color_warning_button</item> <item name="android:textColor">@color/fx_mobile_text_color_warning_button</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/354… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/354… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.7.0esr-13.5-1] Bug 42374: Check for spoof English in number conversions
by Pier Angelo Vendrame (＠pierov) 18 Jan '24

18 Jan '24

Pier Angelo Vendrame pushed to branch base-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 248a7e5f by Pier Angelo Vendrame at 2024-01-18T14:21:21+01:00 Bug 42374: Check for spoof English in number conversions Some of the code that converts numbers to strings for inputs uses ICU functions to localize numbers, but it does not check for spoof English. Also, not all functions where consistent in the conversion, so this commit addresses also this. - - - - - 2 changed files: - dom/html/input/NumericInputTypes.cpp - intl/unicharutil/util/ICUUtils.cpp Changes: ===================================== dom/html/input/NumericInputTypes.cpp ===================================== @@ -52,11 +52,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { MOZ_ASSERT(!maximum.isNaN()); nsAutoString maxStr; - char buf[32]; - DebugOnly<bool> ok = maximum.toString(buf, ArrayLength(buf)); - maxStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(maximum, maxStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", mInputElement->OwnerDoc(), maxStr); @@ -67,11 +63,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { MOZ_ASSERT(!minimum.isNaN()); nsAutoString minStr; - char buf[32]; - DebugOnly<bool> ok = minimum.toString(buf, ArrayLength(buf)); - minStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(minimum, minStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", mInputElement->OwnerDoc(), minStr); ===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -49,6 +49,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) { mCurrentFallbackIndex = 2; // Else take the app's locale: + const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && + !mContent->OwnerDoc()->AllowsL10n(); + if (spoofLocale) { + aBCP47LangTag.AssignLiteral("en-US"); + return; + } + nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/248a7e5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/248a7e5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.7.0esr-13.5-1] Bug 42374: Check for spoof English in number conversions
by Pier Angelo Vendrame (＠pierov) 18 Jan '24

18 Jan '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 839022b4 by Pier Angelo Vendrame at 2024-01-18T14:20:49+01:00 Bug 42374: Check for spoof English in number conversions Some of the code that converts numbers to strings for inputs uses ICU functions to localize numbers, but it does not check for spoof English. Also, not all functions where consistent in the conversion, so this commit addresses also this. - - - - - 2 changed files: - dom/html/input/NumericInputTypes.cpp - intl/unicharutil/util/ICUUtils.cpp Changes: ===================================== dom/html/input/NumericInputTypes.cpp ===================================== @@ -52,11 +52,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { MOZ_ASSERT(!maximum.isNaN()); nsAutoString maxStr; - char buf[32]; - DebugOnly<bool> ok = maximum.toString(buf, ArrayLength(buf)); - maxStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(maximum, maxStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", mInputElement->OwnerDoc(), maxStr); @@ -67,11 +63,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { MOZ_ASSERT(!minimum.isNaN()); nsAutoString minStr; - char buf[32]; - DebugOnly<bool> ok = minimum.toString(buf, ArrayLength(buf)); - minStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(minimum, minStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", mInputElement->OwnerDoc(), minStr); ===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -49,6 +49,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) { mCurrentFallbackIndex = 2; // Else take the app's locale: + const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && + !mContent->OwnerDoc()->AllowsL10n(); + if (spoofLocale) { + aBCP47LangTag.AssignLiteral("en-US"); + return; + } + nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/839… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/839… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.5-1] Bug 42374: Check for spoof English in number conversions
by Pier Angelo Vendrame (＠pierov) 18 Jan '24

18 Jan '24

Pier Angelo Vendrame pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: a7932fac by Pier Angelo Vendrame at 2024-01-18T11:10:48+01:00 Bug 42374: Check for spoof English in number conversions Some of the code that converts numbers to strings for inputs uses ICU functions to localize numbers, but it does not check for spoof English. Also, not all functions where consistent in the conversion, so this commit addresses also this. - - - - - 2 changed files: - dom/html/input/NumericInputTypes.cpp - intl/unicharutil/util/ICUUtils.cpp Changes: ===================================== dom/html/input/NumericInputTypes.cpp ===================================== @@ -52,11 +52,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { MOZ_ASSERT(!maximum.isNaN()); nsAutoString maxStr; - char buf[32]; - DebugOnly<bool> ok = maximum.toString(buf, ArrayLength(buf)); - maxStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(maximum, maxStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", mInputElement->OwnerDoc(), maxStr); @@ -67,11 +63,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { MOZ_ASSERT(!minimum.isNaN()); nsAutoString minStr; - char buf[32]; - DebugOnly<bool> ok = minimum.toString(buf, ArrayLength(buf)); - minStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(minimum, minStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", mInputElement->OwnerDoc(), minStr); ===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -49,6 +49,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) { mCurrentFallbackIndex = 2; // Else take the app's locale: + const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && + !mContent->OwnerDoc()->AllowsL10n(); + if (spoofLocale) { + aBCP47LangTag.AssignLiteral("en-US"); + return; + } + nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a7932fa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a7932fa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 41037: Set time on signing machine before starting signing
by richard (＠richard) 18 Jan '24

18 Jan '24

richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: c12f1511 by Nicolas Vigier at 2024-01-18T10:33:05+00:00 Bug 41037: Set time on signing machine before starting signing After a reboot, the time on our signing machine is incorrect. To avoid signing a release with incorrect timestamps, we set the time on the signing machine at the beginning of the signing process. (cherry picked from commit de4e1feba72e8357c9f40ec3c555aa0dce5e0df2) - - - - - 3 changed files: - tools/signing/do-all-signing - tools/signing/machines-setup/setup-signing-machine - + tools/signing/machines-setup/sudoers.d/set-date Changes: ===================================== tools/signing/do-all-signing ===================================== @@ -29,6 +29,11 @@ test -f "$steps_dir/linux-signer-gpg-sign.done" || read -sp "Enter gpg passphrase: " GPG_PASS echo +function set-time-on-signing-machine { + local current_time=$(date -u) + ssh "$ssh_host_linux_signer" sudo /usr/bin/date -s "'$current_time'" +} + function wait-for-finished-build { "$script_dir/wait-for-finished-build" } @@ -171,6 +176,7 @@ function do_step { export SIGNING_PROJECTNAME +do_step set-time-on-signing-machine do_step wait-for-finished-build do_step sync-builder-unsigned-to-local-signed do_step sync-scripts-to-linux-signer ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -91,6 +91,7 @@ sudoers_file sign-mar sudoers_file sign-exe sudoers_file sign-apk sudoers_file sign-rcodesign +sudoers_file set-date authorized_keys boklm boklm-tb-release.pub boklm-yk1.pub create_user richard signing ===================================== tools/signing/machines-setup/sudoers.d/set-date ===================================== @@ -0,0 +1 @@ +%signing ALL = NOPASSWD: /usr/bin/date -s * View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- 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 41037: Set time on signing machine before starting signing
by richard (＠richard) 18 Jan '24

18 Jan '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: de4e1feb by Nicolas Vigier at 2024-01-18T09:50:25+01:00 Bug 41037: Set time on signing machine before starting signing After a reboot, the time on our signing machine is incorrect. To avoid signing a release with incorrect timestamps, we set the time on the signing machine at the beginning of the signing process. - - - - - 3 changed files: - tools/signing/do-all-signing - tools/signing/machines-setup/setup-signing-machine - + tools/signing/machines-setup/sudoers.d/set-date Changes: ===================================== tools/signing/do-all-signing ===================================== @@ -29,6 +29,11 @@ test -f "$steps_dir/linux-signer-gpg-sign.done" || read -sp "Enter gpg passphrase: " GPG_PASS echo +function set-time-on-signing-machine { + local current_time=$(date -u) + ssh "$ssh_host_linux_signer" sudo /usr/bin/date -s "'$current_time'" +} + function wait-for-finished-build { "$script_dir/wait-for-finished-build" } @@ -171,6 +176,7 @@ function do_step { export SIGNING_PROJECTNAME +do_step set-time-on-signing-machine do_step wait-for-finished-build do_step sync-builder-unsigned-to-local-signed do_step sync-scripts-to-linux-signer ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -91,6 +91,7 @@ sudoers_file sign-mar sudoers_file sign-exe sudoers_file sign-apk sudoers_file sign-rcodesign +sudoers_file set-date authorized_keys boklm boklm-tb-release.pub boklm-yk1.pub create_user richard signing ===================================== tools/signing/machines-setup/sudoers.d/set-date ===================================== @@ -0,0 +1 @@ +%signing ALL = NOPASSWD: /usr/bin/date -s * View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… 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.7.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Jan '24

17 Jan '24

Pier Angelo Vendrame pushed new tag mullvad-browser-115.7.0esr-13.5-1-build1 at The Tor Project / Applications / Mullvad Browser -- 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/mullvad-browser][mullvad-browser-115.7.0esr-13.5-1] 19 commits: MB 38: Mullvad Browser configuration
by Pier Angelo Vendrame (＠pierov) 17 Jan '24

17 Jan '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: a4286e22 by Pier Angelo Vendrame at 2024-01-15T19:41:34+01:00 MB 38: Mullvad Browser configuration - - - - - 6323523b by Pier Angelo Vendrame at 2024-01-15T19:41:36+01:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - 48351652 by Pier Angelo Vendrame at 2024-01-15T19:41:36+01:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 306635f6 by Pier Angelo Vendrame at 2024-01-15T19:41:36+01:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 1026aa85 by Pier Angelo Vendrame at 2024-01-15T19:41:37+01:00 MB 37: Customization for the about dialog - - - - - b7b874db by Henry Wilkes at 2024-01-15T19:41:37+01:00 MB 39: Add home page about:mullvad-browser - - - - - d5de1c25 by hackademix at 2024-01-15T19:41:37+01:00 MB 97: Remove UI cues to install new extensions. - - - - - 5defc607 by hackademix at 2024-01-15T19:41:37+01:00 MB 47: uBlock Origin customization - - - - - e61d7a1b by Pier Angelo Vendrame at 2024-01-15T19:41:38+01:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - bd64d5f0 by Pier Angelo Vendrame at 2024-01-15T19:41:38+01:00 MB 87: Disable the default browser box on Windows and Linux Windows and Linux will be distributed only as portable apps at the beginning, so they should not be settable as default browsers. We will need to improve the logic once we decide to ship system-wide installers, too. - - - - - ca4556bb by Pier Angelo Vendrame at 2024-01-15T19:41:38+01:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - a941cc0c by Nicolas Vigier at 2024-01-15T19:41:39+01:00 MB 79: Add Mullvad Browser MAR signing keys - - - - - f0e54b46 by Nicolas Vigier at 2024-01-15T19:41:50+01:00 squash! MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - facc272b by Pier Angelo Vendrame at 2024-01-15T19:42:09+01:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - a91fca82 by Pier Angelo Vendrame at 2024-01-15T19:42:10+01:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - 271fd4b4 by hackademix at 2024-01-15T19:42:10+01:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - 93dc7201 by Richard Pospesel at 2024-01-15T19:42:11+01:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - d3db3643 by rui hildt at 2024-01-15T19:42:11+01:00 MB 213: Customize the search engines list - - - - - 7c7c3bcb by hackademix at 2024-01-15T19:42:11+01:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 30 changed files: - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.js - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] release: new version, 13.0.9
by boklm (＠boklm) 17 Jan '24

17 Jan '24

boklm pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: cbfde1fc by Nicolas Vigier at 2024-01-17T19:55:53+01:00 release: new version, 13.0.9 - - - - - 29 changed files: - update_1/release/.htaccess - − update_1/release/13.0-13.0.7-linux-x86_64-ALL.xml - − update_1/release/13.0-13.0.7-macos-ALL.xml - − update_1/release/13.0-13.0.7-windows-x86_64-ALL.xml - − update_1/release/13.0.1-13.0.7-linux-x86_64-ALL.xml - − update_1/release/13.0.1-13.0.7-macos-ALL.xml - − update_1/release/13.0.1-13.0.7-windows-x86_64-ALL.xml - − update_1/release/13.0.4-13.0.7-linux-x86_64-ALL.xml - − update_1/release/13.0.4-13.0.7-macos-ALL.xml - − update_1/release/13.0.4-13.0.7-windows-x86_64-ALL.xml - + update_1/release/13.0.4-13.0.9-linux-x86_64-ALL.xml - + update_1/release/13.0.4-13.0.9-macos-ALL.xml - + update_1/release/13.0.4-13.0.9-windows-x86_64-ALL.xml - + update_1/release/13.0.6-13.0.9-linux-x86_64-ALL.xml - + update_1/release/13.0.6-13.0.9-macos-ALL.xml - + update_1/release/13.0.6-13.0.9-windows-x86_64-ALL.xml - + update_1/release/13.0.7-13.0.9-linux-x86_64-ALL.xml - + update_1/release/13.0.7-13.0.9-macos-ALL.xml - + update_1/release/13.0.7-13.0.9-windows-x86_64-ALL.xml - − update_1/release/13.0.7-linux-x86_64-ALL.xml - − update_1/release/13.0.7-macos-ALL.xml - − update_1/release/13.0.7-windows-x86_64-ALL.xml - + update_1/release/13.0.9-linux-x86_64-ALL.xml - + update_1/release/13.0.9-macos-ALL.xml - + update_1/release/13.0.9-windows-x86_64-ALL.xml - update_1/release/download-linux-x86_64.json - update_1/release/download-macos.json - update_1/release/download-windows-x86_64.json - update_1/release/downloads.json Changes: ===================================== update_1/release/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/13.0.7/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0/ALL 13.0-13.0.7-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0.1/ALL 13.0.1-13.0.7-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0.4/ALL 13.0.4-13.0.7-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.0.7-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 13.0.7-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0/ALL 13.0-13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0.1/ALL 13.0.1-13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0.4/ALL 13.0.4-13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0/ALL 13.0-13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0.1/ALL 13.0.1-13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0.4/ALL 13.0.4-13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.0.7-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 13.0.7-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0/ALL 13.0-13.0.7-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.1/ALL 13.0.1-13.0.7-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.4/ALL 13.0.4-13.0.7-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.0.7-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.0.7-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/13.0.9/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.0.4/ALL 13.0.4-13.0.9-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.0.6/ALL 13.0.6-13.0.9-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.0.7/ALL 13.0.7-13.0.9-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.0.9-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.0.9-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.0.4/ALL 13.0.4-13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.0.6/ALL 13.0.6-13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.0.7/ALL 13.0.7-13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.0.4/ALL 13.0.4-13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.0.6/ALL 13.0.6-13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.0.7/ALL 13.0.7-13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.0.9-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.0.9-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.4/ALL 13.0.4-13.0.9-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.6/ALL 13.0.6-13.0.9-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.7/ALL 13.0.7-13.0.9-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.0.9-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.0.9-windows-x86_64-ALL.xml [last] ===================================== update_1/release/13.0-13.0.7-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64-13.0.7_…" hashFunction="SHA512" hashValue="0049ea6b49e9e234bd22bb1b8f32dcf1df589af559191fba9339b8e9a99c1f4cc032fe3ebb1afa5d24597944339bcc72a279ca6a39834484093225273fcc4227" size="106772786" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64--13.0-1…" hashFunction="SHA512" hashValue="cdde836ca522b8c15e02e87a2cdf13a83c262dd7b80da4a075919dadb223e165834b747b51dcf8bf7a5c7aa6f0882fd24129d8e0d2a202cc851810497c00555b" size="8747852" type="partial"></patch></update></updates> ===================================== update_1/release/13.0-13.0.7-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos-13.0.7_ALL.mar" hashFunction="SHA512" hashValue="ade433141e238b542ad77e701cd7e83998d292a89d32106a354c9e5372fbac83883a6bc480324d4e8e595cdcf8b54690588feff9ca479629af6c90ba425d5275" size="114807843" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos--13.0-13.0.7_A…" hashFunction="SHA512" hashValue="663eabb5c5f632ba2aff1b6babcb43deab581b47ddc10e6ab9cb1a97aa472c72be1cb5a7aa1946f10227f7566765b94072391bfb94e98435ce02ccafbfe5272a" size="13850477" type="partial"></patch></update></updates> ===================================== update_1/release/13.0-13.0.7-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64-13.0.…" hashFunction="SHA512" hashValue="042620fe4e03d22528ec349297ef7c98ad51cd9d12e705233c41046dcf53052f7b524631541a5cb61cb70d9390b05a23f41d7f79bbe79015501ee54db782d2ec" size="88745215" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64--13.0…" hashFunction="SHA512" hashValue="9adfc6c76d0d365cd4db151f6f2cf608a27a6af84cc6894fe65999bad9e0323f8823962af24d97f2cee22f906db395391b5a59d5916c61cde6fd48f14ceee9e3" size="9175064" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.1-13.0.7-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64-13.0.7_…" hashFunction="SHA512" hashValue="0049ea6b49e9e234bd22bb1b8f32dcf1df589af559191fba9339b8e9a99c1f4cc032fe3ebb1afa5d24597944339bcc72a279ca6a39834484093225273fcc4227" size="106772786" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64--13.0.1…" hashFunction="SHA512" hashValue="4fda0525f4b86f91f9d16da5efb7face01f1a7040cc7eac5e5272ec71b984e5419f44eefa3ccb8a221c52895fc6f1915fd06d7851e5b1704b71429a7ac9b9aae" size="8401564" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.1-13.0.7-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos-13.0.7_ALL.mar" hashFunction="SHA512" hashValue="ade433141e238b542ad77e701cd7e83998d292a89d32106a354c9e5372fbac83883a6bc480324d4e8e595cdcf8b54690588feff9ca479629af6c90ba425d5275" size="114807843" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos--13.0.1-13.0.7…" hashFunction="SHA512" hashValue="a37aeb6b61fd22c9633615bd3f22ae29ee1eed5d1ad8f8b45e65d09ab4e6f32b57d54ecdea23a5b1cad89b30d5b2d57aa581d979d5aec2b3c014c2965b25f114" size="13507245" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.1-13.0.7-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64-13.0.…" hashFunction="SHA512" hashValue="042620fe4e03d22528ec349297ef7c98ad51cd9d12e705233c41046dcf53052f7b524631541a5cb61cb70d9390b05a23f41d7f79bbe79015501ee54db782d2ec" size="88745215" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64--13.0…" hashFunction="SHA512" hashValue="2b98e21672025ece7104976f33f6e201c2dc565cb6bee38720dfac56191a06a336c71bbd18b65ea1173e58e10b309f5be0d5e8a35b08736c0283c85eadfd8235" size="8927108" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.4-13.0.7-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64-13.0.7_…" hashFunction="SHA512" hashValue="0049ea6b49e9e234bd22bb1b8f32dcf1df589af559191fba9339b8e9a99c1f4cc032fe3ebb1afa5d24597944339bcc72a279ca6a39834484093225273fcc4227" size="106772786" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64--13.0.4…" hashFunction="SHA512" hashValue="4b7b09215582a552b2af7be4e7623c5e4955257fabd2b6093dd3fd7e4b6330d4c0b9005cc89978a73b4bea6ce8d1b516040c35d0fdd81f1a15a17e9682f55e77" size="7542432" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.4-13.0.7-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos-13.0.7_ALL.mar" hashFunction="SHA512" hashValue="ade433141e238b542ad77e701cd7e83998d292a89d32106a354c9e5372fbac83883a6bc480324d4e8e595cdcf8b54690588feff9ca479629af6c90ba425d5275" size="114807843" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos--13.0.4-13.0.7…" hashFunction="SHA512" hashValue="8754855c6288751b5141557ff824e507f01f05bfc5e4566d35f734289568b2e680256e72ba5abae1254906e98f39587bb69f25f29d29771b5b62daabeb173d70" size="12411977" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.4-13.0.7-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64-13.0.…" hashFunction="SHA512" hashValue="042620fe4e03d22528ec349297ef7c98ad51cd9d12e705233c41046dcf53052f7b524631541a5cb61cb70d9390b05a23f41d7f79bbe79015501ee54db782d2ec" size="88745215" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64--13.0…" hashFunction="SHA512" hashValue="127e47f252e9508046433d425b6a3a6eba645449cb88b97b0ac8bc0382b553b25dd56da9eba741c35c8b6eb1a97e306bbe5ad146f8bd52c30de7ee34c9546789" size="7986156" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.4-13.0.9-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64-13.0.9_…" hashFunction="SHA512" hashValue="18fdf0900b6e5e58f833828e2a854b44e997dd6a752a1fa38d29acf69ca6d88e39e5e8f1811ffb9a0ea5240afa32efa8459c25ddd1d7e57090b8ffdfa7a112ad" size="107222791" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64--13.0.4…" hashFunction="SHA512" hashValue="a93457c9f91ac3277f0120e88cfe99f133b45f4db6d5d8bebb3a63f9fa3980afcb9dc995374574db32a47b46fa32be2c416d20f758b392880700bc6d147c60a8" size="11307785" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.4-13.0.9-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos-13.0.9_ALL.mar" hashFunction="SHA512" hashValue="2f2fb000e87b425a8df5b25160354eab158a86d7b20b0cb957a9e6f33e9d54a02873b118bc4ad007886e3361ed85a3c3b3f397a36ebe748b91abaf9d72a28887" size="115259351" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos--13.0.4-13.0.9…" hashFunction="SHA512" hashValue="fabe36cb82c4393ad2cbe7d28315c4d75667aa4cc5f073d9da5b61d109d54cd9721309e2f5a9109b5dca57eb3af31271daee0caf28c80aa268b1b815f5b4efda" size="76833715" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.4-13.0.9-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64-13.0.…" hashFunction="SHA512" hashValue="6b955bb9b9f28f34b0199eaad15dcbc7bc28a62ed318ae95b2f162dba2f45a4ca877a47c86d892f2ef859a69f7188a1ab2c08ec9861b7682b214214014369282" size="89196812" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64--13.0…" hashFunction="SHA512" hashValue="43e8d970e16f216c7e7cd2094d23ccde0ac5af397973c0a15d33a45c5602f9893f43ee42f5a6204f4c2582b1ddfbc1fe858dba5ee18b49d1d929946972753ac3" size="11833733" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.6-13.0.9-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64-13.0.9_…" hashFunction="SHA512" hashValue="18fdf0900b6e5e58f833828e2a854b44e997dd6a752a1fa38d29acf69ca6d88e39e5e8f1811ffb9a0ea5240afa32efa8459c25ddd1d7e57090b8ffdfa7a112ad" size="107222791" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64--13.0.6…" hashFunction="SHA512" hashValue="f2cb0404a1af1a097bc7715497efc5f8dd8d60af9e09408fbcd781b3bf0123102b08b26d35643f4ed865a2fa09d9828e1503efd44b8e218eee7948bd22830e6c" size="11023938" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.6-13.0.9-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos-13.0.9_ALL.mar" hashFunction="SHA512" hashValue="2f2fb000e87b425a8df5b25160354eab158a86d7b20b0cb957a9e6f33e9d54a02873b118bc4ad007886e3361ed85a3c3b3f397a36ebe748b91abaf9d72a28887" size="115259351" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos--13.0.6-13.0.9…" hashFunction="SHA512" hashValue="ae9748ea2851ddfdb076c71cc71eddd3cd8ea6a336ca1a1759b975256223fd51951407793953157a3dfeec229d1875bfcf391417f1b0f3b58a0ba4fe9ae41287" size="76593879" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.6-13.0.9-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64-13.0.…" hashFunction="SHA512" hashValue="6b955bb9b9f28f34b0199eaad15dcbc7bc28a62ed318ae95b2f162dba2f45a4ca877a47c86d892f2ef859a69f7188a1ab2c08ec9861b7682b214214014369282" size="89196812" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64--13.0…" hashFunction="SHA512" hashValue="4de8e6b0fdeb35371d9c051e9ebbfa2878487cd1ad4dc7e22583e3f9cedadd8a9867d77073ec22ae950bcb5fbabd5858d9a3e0d2f357dd69e3783b39aa71b12c" size="11587701" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.7-13.0.9-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64-13.0.9_…" hashFunction="SHA512" hashValue="18fdf0900b6e5e58f833828e2a854b44e997dd6a752a1fa38d29acf69ca6d88e39e5e8f1811ffb9a0ea5240afa32efa8459c25ddd1d7e57090b8ffdfa7a112ad" size="107222791" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64--13.0.7…" hashFunction="SHA512" hashValue="d580164e63cf556cbeec1115289534762337ff00b8eb1f9404f181a6d7cd6200133026c89764212b1dd558949e8b9e8c5aa161de935824803ce82afef1aa6556" size="9720353" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.7-13.0.9-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos-13.0.9_ALL.mar" hashFunction="SHA512" hashValue="2f2fb000e87b425a8df5b25160354eab158a86d7b20b0cb957a9e6f33e9d54a02873b118bc4ad007886e3361ed85a3c3b3f397a36ebe748b91abaf9d72a28887" size="115259351" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos--13.0.7-13.0.9…" hashFunction="SHA512" hashValue="d77ea66fd5ed38912332c4fdb9b3b50212f6f10cfea9276e73b4cd5e53d6e70b2c581e0d887073fda0313ebc6d179866d359c54b178d703944f55da4cb50104e" size="76133103" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.7-13.0.9-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64-13.0.…" hashFunction="SHA512" hashValue="6b955bb9b9f28f34b0199eaad15dcbc7bc28a62ed318ae95b2f162dba2f45a4ca877a47c86d892f2ef859a69f7188a1ab2c08ec9861b7682b214214014369282" size="89196812" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64--13.0…" hashFunction="SHA512" hashValue="20e5cfca2e945dc4f3bfa3ebe1885de2a9764ba55e7a2e8436a55dc8c6d3de196c3d081e9510a7d1ef130cdac8d1564127ed9c1445c2ed7d3c398b8142c42b6b" size="9629252" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.7-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64-13.0.7_…" hashFunction="SHA512" hashValue="0049ea6b49e9e234bd22bb1b8f32dcf1df589af559191fba9339b8e9a99c1f4cc032fe3ebb1afa5d24597944339bcc72a279ca6a39834484093225273fcc4227" size="106772786" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.7-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos-13.0.7_ALL.mar" hashFunction="SHA512" hashValue="ade433141e238b542ad77e701cd7e83998d292a89d32106a354c9e5372fbac83883a6bc480324d4e8e595cdcf8b54690588feff9ca479629af6c90ba425d5275" size="114807843" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.7-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.7" appVersion="13.0.7" platformVersion="115.6.0" buildID="20231212135313" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64-13.0.…" hashFunction="SHA512" hashValue="042620fe4e03d22528ec349297ef7c98ad51cd9d12e705233c41046dcf53052f7b524631541a5cb61cb70d9390b05a23f41d7f79bbe79015501ee54db782d2ec" size="88745215" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.9-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64-13.0.9_…" hashFunction="SHA512" hashValue="18fdf0900b6e5e58f833828e2a854b44e997dd6a752a1fa38d29acf69ca6d88e39e5e8f1811ffb9a0ea5240afa32efa8459c25ddd1d7e57090b8ffdfa7a112ad" size="107222791" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.9-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos-13.0.9_ALL.mar" hashFunction="SHA512" hashValue="2f2fb000e87b425a8df5b25160354eab158a86d7b20b0cb957a9e6f33e9d54a02873b118bc4ad007886e3361ed85a3c3b3f397a36ebe748b91abaf9d72a28887" size="115259351" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.9-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.9" appVersion="13.0.9" platformVersion="115.7.0" buildID="20240115174108" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.9" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64-13.0.…" hashFunction="SHA512" hashValue="6b955bb9b9f28f34b0199eaad15dcbc7bc28a62ed318ae95b2f162dba2f45a4ca877a47c86d892f2ef859a69f7188a1ab2c08ec9861b7682b214214014369282" size="89196812" type="complete"></patch></update></updates> ===================================== update_1/release/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64-13.0.7.…","git_tag":"mb-13.0.7-build1","sig":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64-13.0.7.…","version":"13.0.7"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64-13.0.9.…","git_tag":"mb-13.0.9-build1","sig":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64-13.0.9.…","version":"13.0.9"} \ No newline at end of file ===================================== update_1/release/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos-13.0.7.dmg","git_tag":"mb-13.0.7-build1","sig":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos-13.0.7.dmg.asc","version":"13.0.7"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos-13.0.9.dmg","git_tag":"mb-13.0.9-build1","sig":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos-13.0.9.dmg.asc","version":"13.0.9"} \ No newline at end of file ===================================== update_1/release/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.0.7-build1","sig":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64-porta…","version":"13.0.7"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.0.9-build1","sig":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64-porta…","version":"13.0.9"} \ No newline at end of file ===================================== update_1/release/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64-13.0.7.…","sig":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-linux-x86_64-13.0.7.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos-13.0.7.dmg","sig":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-macos-13.0.7.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.0.7/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.0.7-build1","version":"13.0.7"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64-13.0.9.…","sig":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-linux-x86_64-13.0.9.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos-13.0.9.dmg","sig":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-macos-13.0.9.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.0.9/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.0.9-build1","version":"13.0.9"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- 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/torbrowser-launcher] Deleted branch asciiwolf-readme-update
by asciiwolf (＠asciiwolf) 17 Jan '24

17 Jan '24

asciiwolf deleted branch asciiwolf-readme-update at The Tor Project / Applications / torbrowser-launcher -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] Update the Flatpak name
by boklm (＠boklm) 17 Jan '24

17 Jan '24

boklm pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 96594666 by asciiwolf at 2024-01-17T13:22:42+00:00 Update the Flatpak name - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -27,11 +27,11 @@ Install Flatpak using these [instructions](https://flatpak.org/setup/). Then install `torbrowser-launcher` like this: ``` -flatpak install flathub com.github.micahflee.torbrowser-launcher -y +flatpak install flathub org.torproject.torbrowser-launcher -y ``` Run `torbrowser-launcher` either by using the GUI desktop launcher, or by running: ``` -flatpak run com.github.micahflee.torbrowser-launcher +flatpak run org.torproject.torbrowser-launcher ``` View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch asciiwolf-readme-update
by asciiwolf (＠asciiwolf) 17 Jan '24

17 Jan '24

asciiwolf pushed new branch asciiwolf-readme-update at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/a… 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.0.9-build1
by Pier Angelo Vendrame (＠pierov) 16 Jan '24

16 Jan '24

Pier Angelo Vendrame pushed new tag mb-13.0.9-build1 at The Tor Project / Applications / tor-browser-build -- 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][maint-13.0] Bug 41034&41055: Prepare Tor Browser and Mullvad Browser 13.0.9
by Pier Angelo Vendrame (＠pierov) 16 Jan '24

16 Jan '24

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 8e8cfea2 by Pier Angelo Vendrame at 2024-01-16T14:08:27+01:00 Bug 41034&41055: Prepare Tor Browser and Mullvad Browser 13.0.9 - - - - - 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/browser/config - projects/firefox-android/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,57 @@ +Mullvad Browser 13.0.9 - January 23 2024 + * All Platforms + * Updated Firefox to 115.7.0esr + * Updated uBlock Origin to 1.55.0 + * Bug 249: BrowserHost has null mRoot when applying initial window size in debug [mullvad-browser] + * Bug 260: Rebase Mullvad Browser Stable onto Firefox 115.7.0esr [mullvad-browser] + * Bug 42189: Assertion failure: the value of mPrivateBrowsingId in the loadContext and in the loadInfo are not the same! [tor-browser] + * Bug 41044: Add tbb_version.json-like file for Mullvad Browser [tor-browser-build] + * Linux + * Bug 41050: Improve the disk leak sanitization on start-$browser [tor-browser-build] + * Build System + * All Platforms + * Bug 41042: Add options to include updates in the changelog scripts [tor-browser-build] + * Bug 41043: Create script to push build requests to Mullvad build servers [tor-browser-build] + * Bug 41056: Make it possible to use templates in var/torbrowser_incremental_from [tor-browser-build] + * Bug 41059: Update keyring/torbrowser.gpg with updated key [tor-browser-build] + * Windows + macOS + * Bug 41016: Switch from bullseye to bookworm for desktop platforms [tor-browser-build] + * Windows + * Bug 41015: Enable std::filesystem on libc++ on Windows [tor-browser-build] + +Mullvad Browser 13.5a3 - December 20 2023 + * All Platforms + * Updated Firefox to 115.6.0esr + * Updated NoScript to 11.4.29 + * Bug 249: BrowserHost has null mRoot when applying initial window size in debug [mullvad-browser] + * Bug 256: Update nightly mar signing key [mullvad-browser] + * Bug 258: Rebase Mullvad Browser alpha onto 115.6.0esr [mullvad-browser] + * Bug 42042: view-source:http://ip-address does not work because of HTTPS Only [tor-browser] + * Bug 42189: Assertion failure: the value of mPrivateBrowsingId in the loadContext and in the loadInfo are not the same! [tor-browser] + * Bug 42335: Do not localize the order of locales for app lang [tor-browser] + * Bug 41044: Add tbb_version.json-like file for Mullvad Browser [tor-browser-build] + * Windows + * Bug 42163: Make the 3rd party DLL blocklist obey portable mode [tor-browser] + * Linux + * Bug 41050: Improve disk leak sanitization on startup [tor-browser] + * Build System + * All Platforms + * Bug 40995: Use cdn.stagemole.eu instead of cdn.devmole.eu in download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Bug 41026: Do not use ~ when uploading the signed hashes [tor-browser-build] + * Bug 41027: Remove tb-build-04 and tb-build-05 from tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Bug 41031: Add command to unsign .mar files and compare with sha256sums-unsigned-build.txt [tor-browser-build] + * Bug 41039: Update tools/signing/upload-update_responses-to-staticiforme to keep download-*json files from previous release when new release does not include them [tor-browser-build] + * Bug 41041: Sign mullvad-browser nightly updates [tor-browser-build] + * Bug 41042: Add options to include updates in the changelog scripts [tor-browser-build] + * Bug 41043: Create script to push build requests to Mullvad build servers [tor-browser-build] + * Windows + macOS + * Bug 41016: Switch from bullseye to bookworm for desktop platforms [tor-browser-build] + * Windows + * Bug 41015: Enable std::filesystem on libc++ on Windows [tor-browser-build] + * Bug 41030: Add command to unsign .exe files and compare with sha256sums-unsigned-build.txt [tor-browser-build] + * macOS + * Bug 40990: Remove old macos signing scripts [tor-browser-build] + Mullvad Browser 13.0.7 - December 19 2023 * All Platforms * Updated Firefox to 115.6.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,94 @@ +Tor Browser 13.0.9 - January 23 2024 + * All Platforms + * Updated Snowflake to 2.8.1 + * Bug 42363: Tab thumbnails enhancements [tor-browser] + * Bug 42365: Rebase Tor Browser Stable onto Firefox 115.7.0esr [tor-browser] + * Bug 42367: Backport Android seucirty fixes from Firefox 122 [tor-browser] + * Bug 41058: Update Snowflake to 2.8.1 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.7.0esr + * Bug 42099: Blind cross-origin requests to .tor.onion domains [tor-browser] + * Bug 42189: Assertion failure: the value of mPrivateBrowsingId in the loadContext and in the loadInfo are not the same! [tor-browser] + * Android + * Updated GeckoView to 115.7.0esr + * Bug 42313: Enable One UI Sans KR as a possible font for Korean (MozBug 1865238) [tor-browser] + * Bug 42324: Onion Location on Android is ignored [tor-browser] + * Bug 42346: Crash in firefox-android originating in backported FullScreenNotificationDialog patch [tor-browser] + * Bug 42353: Fix Android NoScript automatic updates [tor-browser] + * Bug 42355: Fullscreen on Android doesn't hide system bars [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.20.13 and 1.21.6 + * Bug 41059: Update keyring/torbrowser.gpg with updated key [tor-browser-build] + * Bug 41063: Run "file $keyring" in tools/keyring/list-all-keyrings [tor-browser-build] + * Windows + macOS + Linux + * Bug 41056: Make it possible to use templates in var/torbrowser_incremental_from [tor-browser-build] + * Windows + macOS + * Bug 41016: Switch from bullseye to bookworm for desktop platforms [tor-browser-build] + * Windows + * Bug 41015: Enable std::filesystem on libc++ on Windows [tor-browser-build] + +Tor Browser 13.5a3 - December 22 2023 + * All Platforms + * Updated Tor to 0.4.8.10 + * Updated NoScript to 11.4.29 + * Bug 42042: view-source:http://ip-address does not work because of HTTPS Only [tor-browser] + * Bug 42308: Update README for tor browser [tor-browser] + * Bug 42332: Rebase Tor Browser alpha onto 115.6.0esr [tor-browser] + * Bug 42334: Keep returning ERROR_ONION_WITH_SELF_SIGNED_CERT only for .onion sites whose cert throws ERROR_UNKNOWN_ISSUER [tor-browser] + * Bug 42335: Do not localize the order of locales for app lang [tor-browser] + * Bug 42340: TorBridgeChanged notification sends out "[object Object]" as its data. [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.6.0esr + * Bug 40856: Add a default for preferences in TorSettings [tor-browser] + * Bug 42099: Blind cross-origin requests to .tor.onion domains [tor-browser] + * Bug 42189: Assertion failure: the value of mPrivateBrowsingId in the loadContext and in the loadInfo are not the same! [tor-browser] + * Bug 42283: Tor Browser shouldn't ship blockchair by default [tor-browser] + * Bug 42299: After adding incorrect bridge addres on user cannot go back to the Connection page [tor-browser] + * Bug 42303: Remove unused "help" button logic in tor dialogs [tor-browser] + * Bug 42319: Make all the wordmark of the same size [tor-browser] + * Windows + * Bug 42163: Make the 3rd party DLL blocklist obey portable mode [tor-browser] + * Bug 42179: PTs on Tor Browser 13 do not work with Windows 7 [tor-browser] + * Linux + * Bug 41050: Improve the disk leak sanitization on start-$browser [tor-browser-build] + * Android + * Updated GeckoView to 115.6.0esr + * Bug 42248: Allow GeckoView to launch tor [tor-browser] + * Bug 42249: Allow GeckoView to launch lyrebird [tor-browser] + * Bug 42250: Allow Moat.sys.mjs to invoke lyrebird on Android [tor-browser] + * Bug 42301: Make TorSettings interact with the old Android Settings [tor-browser] + * Bug 42313: Enable One UI Sans KR as a possible font for Korean (MozBug 1865238) [tor-browser] + * Bug 42323: Add a checkbox to enable the connect assist experiments on alpha [tor-browser] + * Bug 42324: Onion Location on Android is ignored [tor-browser] + * Bug 42339: Backport Android security fixes from Firefox 121 to 115.6 - based Tor Browser [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.21.5 + * Bug 42331: tb-dev fetch command is missing repository argument [tor-browser] + * Bug 40995: Use cdn.stagemole.eu instead of cdn.devmole.eu in download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Bug 41026: Do not use ~ when uploading the signed hashes [tor-browser-build] + * Bug 41027: Remove tb-build-04 and tb-build-05 from tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Bug 41036: Remove go_vendor-lyrebird-nightly makefile target, and rename go_vendor-$project-alpha makefile targets to go_vendor-$project [tor-browser-build] + * Bug 41039: Update tools/signing/upload-update_responses-to-staticiforme to keep download-*json files from previous release when new release does not include them [tor-browser-build] + * Bug 41042: Add options to include updates in the changelog scripts [tor-browser-build] + * Bug 41043: Create script to push build requests to Mullvad build servers [tor-browser-build] + * Bug 41045: Dump more information about build times on Firefox [tor-browser-build] + * Bug 41048: Drop the kcp-go project [tor-browser-build] + * Windows + macOS + Linux + * Bug 41031: Add command to unsign .mar files and compare with sha256sums-unsigned-build.txt [tor-browser-build] + * Bug 41056: Make it possible to use templates in var/torbrowser_incremental_from [tor-browser-build] + * Bug 41057: make fetch is not fetching mullvad repo [tor-browser-build] + * Windows + macOS + * Bug 41016: Switch from bullseye to bookworm for desktop platforms [tor-browser-build] + * Windows + * Bug 41015: Enable std::filesystem on libc++ on Windows [tor-browser-build] + * Bug 41030: Add command to unsign .exe files and compare with sha256sums-unsigned-build.txt [tor-browser-build] + * macOS + * Bug 40990: Remove old macos signing scripts [tor-browser-build] + * Linux + * Bug 41046: Use the final path for Linux debug symbols [tor-browser-build] + Tor Browser 13.0.8 - December 20 2023 * Windows * Bug 41053: All PT's crash instantly in 13.0.7 [tor-browser-build] ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 1111341, + "average_daily_users": 1132322, "categories": { "firefox": [ "web-development", @@ -28,7 +28,7 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5661222, + "id": 5672334, "compatibility": { "firefox": { "min": "54.0", @@ -39,7 +39,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56612…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56723…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -50,22 +50,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- Improved subdomain handling in Site List.\n- Improved dark theme detection.\n- Fixed page crashes (Slack issue).\n- Fixed Site List migration.\n- Reduced image analysis memory usage.\n- Users' fixes for websites." + "en-US": "- Improved image analysis performance.\n- Improved dark theme detection.\n- Fixed 404 errors when loading images with relative paths.\n- v5 Preview: Moved settings into a separate page.\n- Users' fixes for websites." }, - "reviewed": "2023-12-08T12:55:44Z", - "version": "4.9.73", + "reviewed": "2024-01-08T08:34:10Z", + "version": "4.9.74", "files": [ { - "id": 4205543, - "created": "2023-12-06T15:41:16Z", - "hash": "sha256:7c399ff32561886bb80dad0cafaf8f629792b0b71ff1efcf12667e05a2b38f1a", + "id": 4216652, + "created": "2024-01-03T21:18:58Z", + "hash": "sha256:140a72b36750ba68a9da30d0f0df3ff192f58160b711b86c3d4f674e5be2bb2c", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 682962, + "size": 716574, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4205543/darkreader-4.9.73…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4216652/darkreader-4.9.74…", "permissions": [ "alarms", "contextMenus", @@ -143,7 +143,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-12-08T12:55:44Z", + "last_updated": "2024-01-08T08:34:10Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -218,10 +218,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5516, - "bayesian_average": 4.550475504261017, - "count": 5303, - "text_count": 1667 + "average": 4.5486, + "bayesian_average": 4.547482095849253, + "count": 5355, + "text_count": 1679 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -318,7 +318,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 41426 + "weekly_downloads": 26881 }, "notes": null }, @@ -334,7 +334,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 264619, + "average_daily_users": 264469, "categories": { "firefox": [ "privacy-security" @@ -547,10 +547,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8036, - "bayesian_average": 4.7989944298239395, - "count": 1380, - "text_count": 245 + "average": 4.8027, + "bayesian_average": 4.798136425398132, + "count": 1399, + "text_count": 250 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -635,7 +635,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3583 + "weekly_downloads": 4097 }, "notes": null }, @@ -651,7 +651,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1200452, + "average_daily_users": 1200897, "categories": { "firefox": [ "privacy-security" @@ -1170,10 +1170,10 @@ "category": "recommended" }, "ratings": { - "average": 4.799, - "bayesian_average": 4.79629496440493, - "count": 2348, - "text_count": 444 + "average": 4.7958, + "bayesian_average": 4.793109511550156, + "count": 2370, + "text_count": 449 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1197,7 +1197,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 24321 + "weekly_downloads": 23541 }, "notes": null }, @@ -1213,7 +1213,7 @@ "picture_url": null } ], - "average_daily_users": 7388167, + "average_daily_users": 7460988, "categories": { "firefox": [ "privacy-security" @@ -1222,7 +1222,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5654508, + "id": 5672315, "compatibility": { "firefox": { "min": "78.0", @@ -1233,7 +1233,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/56…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/56…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1244,23 +1244,24 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4c736806dc9702f9496c1c…" rel=\"nofollow\">1.54.0</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/30ee045a42c04a557ec92d…" rel=\"nofollow\">Enable path for native <code>has()</code> selector in Firefox</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/26aaa3263afd1e6e450a7f…" rel=\"nofollow\">Allow scriptlets to be injected in <code>about:blank</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5967388a2432967ee63e77…" rel=\"nofollow\">Fix faulty <code>as</code> vararg in <code>set-constant</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/b9a3ce2fd67895cc3fd06f…" rel=\"nofollow\">Add support to redirect to <code>noop.json</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/1a7fcce826cb83449490e3…" rel=\"nofollow\">More improvements to the <code>google-ima</code> shim script</a> (by @kzar)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/56d921f7e251fb313a4be0…" rel=\"nofollow\">All exceptions filters are exempt from requiring a trusted source</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/b3b9c520dd7fef26a4f129…" rel=\"nofollow\">Add <code>trusted-set-session-storage-item</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5f347a4a217555ac7ff920…" rel=\"nofollow\">Allow the use of quotes in <code>set-cookie</code> scriptlet </a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/fe9490248b43262e2613b2…" rel=\"nofollow\">Allow the use of quotes in <code>set-(local|session)-storage-item</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/92d58a934e2392a346a587…" rel=\"nofollow\">Add ability to trigger cookie removal on specific events</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/23e952e408915752c90dc3…" rel=\"nofollow\">Ensure CSSTree does not hold a reference onto last parsed string</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/302676f334820cdfe567f7…" rel=\"nofollow\">Lower minimum Expires value to 4h</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/03ac48dee7ecbf33ac2dd4…" rel=\"nofollow\">Properly reset needle length in unserialized buffer</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d4babab0e0c4b624992f8f…" rel=\"nofollow\">Add additional flags to regional lists</a> (by @DandelionSprout)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a09bd04e017892dd0b0d12…" rel=\"nofollow\">Harden scriptlets which need to serialize function code into string</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/1a5be5c8aa0baa49879f92…" rel=\"nofollow\">Reset <code>g</code> regexes before use in <code>rmnt</code>/<code>rpnt</code> scriptlets</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f2e3dd373c3a474ca27bad…" rel=\"nofollow\">Apply response filtering according to mime type</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/12cfcbade6a208e02352fd…" rel=\"nofollow\">Add t/f to set-cookie</a> (by @ryanbr)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/7856310df6fe39bff4e1b0…" rel=\"nofollow\">Have <code>urltransform=</code> use the same syntax as <code>replace=</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/520b2f8c295d638b0c72f5…" rel=\"nofollow\">Implement network filter option <code>replace=</code></a></li><li>...</li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3f4f5634b3bdd26c8e335f…" rel=\"nofollow\">Commits history since last version</a>" + "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/514b85ddd154153a63fe9c…" rel=\"nofollow\">1.55.0</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/1e03af965f6b7a76aa94f6…" rel=\"nofollow\">Mind drop events in filter expression field of logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e018352ca30c61b4a80c2a…" rel=\"nofollow\">Improve <code>xml-prune</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ec6b213ac8c38077b676e1…" rel=\"nofollow\">Fix message entries overflowing in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a6311ada7aec5e36a802c2…" rel=\"nofollow\">Add support for <code>application/x-javascript</code> in <code>replace=</code> option</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8b0f4ac6d1a68a10f0736a…" rel=\"nofollow\">Extend support for differential updates to imported lists</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5e2218ad38a67bad16b5a2…" rel=\"nofollow\">Add detection of mismatched <code>!#if</code>-<code>!#endif</code> in linter</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d3d5708132bbca2b9b3232…" rel=\"nofollow\">Support links to update lists which are differential update-friendly</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5da8dae3bfc5fd15895013…" rel=\"nofollow\">Remove \"Purge all caches\" button from \"Filter lists\" pane</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f9bd0d08194525f2457cf5…" rel=\"nofollow\">Add support for <code>all</code> list token in updater-link feature</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f266c7ca3a6228a20999be…" rel=\"nofollow\">Fix logging of broad exception filter <code>#@#+js()</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/444dcf1f11a8dacef0553e…" rel=\"nofollow\">Improve <code>no-xhr-if</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5f699ca11537ba17c330a8…" rel=\"nofollow\">Ensure cache storage backend is selected before access</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/983fbc3b50419c274040d9…" rel=\"nofollow\">Fix popup panel rendering when embedded in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/2f972ff52f4edc3dc99084…" rel=\"nofollow\">Add visual hint in support information re. differential update</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/75541b4012443bd5602cc0…" rel=\"nofollow\">Remove obsolete web accessible resources</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8eb76fbc2577032e63698e…" rel=\"nofollow\">Rename <code>urltransform</code> to <code>uritransform</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/43e266ca8d07228388c2a6…" rel=\"nofollow\">Vertically expand/collapse in steps in dom inspector</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d1f0669c5cf9357a9528d8…" rel=\"nofollow\">Reset the DOM inspector when URL in top context changes</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d2f70a310ccc2ce2b2c97c…" rel=\"nofollow\">Support shadow-piercing combinator <code>>>></code> in <code>trusted-click-element</code></a></li><li>[...]</li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/7d13ab8046ad75d1230ea5…" rel=\"nofollow\">Commits history since last version</a>" }, - "reviewed": "2023-11-27T08:08:01Z", - "version": "1.54.0", + "reviewed": "2024-01-08T10:26:54Z", + "version": "1.55.0", "files": [ { - "id": 4198829, - "created": "2023-11-22T16:24:35Z", - "hash": "sha256:9797160908191710ff0858536ba6dc29ecad9923c30b2ad6d3e5e371d759e44d", + "id": 4216633, + "created": "2024-01-03T20:24:50Z", + "hash": "sha256:a02ca1d32737c3437f97553e5caaead6479a66ac1f8ff3b84a06cfa6bb0c7647", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3630690, + "size": 3647341, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.5…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4216633/ublock_origin-1.5…", "permissions": [ + "alarms", "dns", "menus", "privacy", @@ -1378,7 +1379,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-12-14T22:05:25Z", + "last_updated": "2024-01-14T18:40:19Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1523,10 +1524,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7863, - "bayesian_average": 4.7859243673114, - "count": 16865, - "text_count": 4397 + "average": 4.7862, + "bayesian_average": 4.7858262322479135, + "count": 17029, + "text_count": 4446 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1589,7 +1590,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 205700 + "weekly_downloads": 195010 }, "notes": null }, @@ -1605,7 +1606,7 @@ "picture_url": null } ], - "average_daily_users": 175062, + "average_daily_users": 177316, "categories": { "firefox": [ "photos-music-videos", @@ -1701,10 +1702,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4845, - "bayesian_average": 4.479449733868465, - "count": 1158, - "text_count": 434 + "average": 4.4774, + "bayesian_average": 4.472406681309426, + "count": 1175, + "text_count": 443 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1726,7 +1727,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 374 + "weekly_downloads": 428 }, "notes": null }, @@ -1742,7 +1743,7 @@ "picture_url": null } ], - "average_daily_users": 86192, + "average_daily_users": 81759, "categories": { "firefox": [ "privacy-security", @@ -1852,10 +1853,10 @@ ], "promoted": null, "ratings": { - "average": 4.3766, - "bayesian_average": 4.362648333186986, - "count": 401, - "text_count": 112 + "average": 4.3802, + "bayesian_average": 4.366169675126323, + "count": 405, + "text_count": 113 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, @@ -1877,7 +1878,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1054 + "weekly_downloads": 1270 }, "notes": null }, @@ -1893,7 +1894,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 288741, + "average_daily_users": 294389, "categories": { "firefox": [ "search-tools", @@ -1904,7 +1905,7 @@ "contributions_url": "https://www.paypal.com/donate?hosted_button_id=GLL4UNSNU6SQN&utm_content=pr…", "created": "2017-06-17T15:23:33Z", "current_version": { - "id": 5645237, + "id": 5665608, "compatibility": { "firefox": { "min": "115.0", @@ -1915,7 +1916,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/search_by_image/versions/…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/search_by_image/versions/…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1928,20 +1929,20 @@ "release_notes": { "en-US": "Learn more about this release from the <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d50855f24f77fa6f2614b9…" rel=\"nofollow\">changelog</a>." }, - "reviewed": "2023-11-07T07:33:21Z", - "version": "6.1.0", + "reviewed": "2023-12-19T14:03:13Z", + "version": "6.1.1", "files": [ { - "id": 4189577, - "created": "2023-11-02T18:15:34Z", - "hash": "sha256:1de51c7522b8bf3aca5c2bc4fbd94f5fb092d4418ea8fe4583c8dff2b71b4209", + "id": 4209928, + "created": "2023-12-17T01:28:51Z", + "hash": "sha256:254d78084e332190a2b6ccb1959a42257bdc287addc0685419fcde7df1a52e76", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1156452, + "size": 1165289, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4189577/search_by_image-6…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4209928/search_by_image-6…", "permissions": [ "alarms", "contextMenus", @@ -1984,7 +1985,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-11-07T07:33:21Z", + "last_updated": "2023-12-19T14:03:13Z", "name": { "en-US": "Search by Image" }, @@ -2110,10 +2111,10 @@ "category": "recommended" }, "ratings": { - "average": 4.65, - "bayesian_average": 4.645504940520216, - "count": 1360, - "text_count": 265 + "average": 4.6435, + "bayesian_average": 4.6390566621044025, + "count": 1380, + "text_count": 266 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2134,7 +2135,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 6343 + "weekly_downloads": 6351 }, "notes": null }, @@ -2157,7 +2158,7 @@ "picture_url": null } ], - "average_daily_users": 118713, + "average_daily_users": 123429, "categories": { "firefox": [ "search-tools", @@ -2438,10 +2439,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3699, - "bayesian_average": 4.36549570183314, - "count": 1287, - "text_count": 364 + "average": 4.3747, + "bayesian_average": 4.370328322743152, + "count": 1305, + "text_count": 369 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2461,7 +2462,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 81 + "weekly_downloads": 58 }, "notes": null }, @@ -2477,7 +2478,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 313680, + "average_daily_users": 311129, "categories": { "firefox": [ "web-development", @@ -2664,10 +2665,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3984, - "bayesian_average": 4.395742595786679, - "count": 2151, - "text_count": 830 + "average": 4.397, + "bayesian_average": 4.394353096936605, + "count": 2166, + "text_count": 835 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2711,7 +2712,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 8167 + "weekly_downloads": 7835 }, "notes": null }, @@ -2727,7 +2728,7 @@ "picture_url": null } ], - "average_daily_users": 158779, + "average_daily_users": 161130, "categories": { "firefox": [ "photos-music-videos", @@ -2836,10 +2837,10 @@ "category": "recommended" }, "ratings": { - "average": 3.8682, - "bayesian_average": 3.864132502143421, - "count": 1199, - "text_count": 434 + "average": 3.8698, + "bayesian_average": 3.865733920025514, + "count": 1206, + "text_count": 437 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2858,7 +2859,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 2542 + "weekly_downloads": 3356 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -93,9 +93,9 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.… name: noscript sha256sum: 05b98840b05ef2acbac333543e4b7c3d40fee2ce5fb4e29260b05e2ff6fe24cd - - URL: https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.5… + - URL: https://addons.mozilla.org/firefox/downloads/file/4216633/ublock_origin-1.5… name: ublock-origin - sha256sum: 9797160908191710ff0858536ba6dc29ecad9923c30b2ad6d3e5e371d759e44d + sha256sum: a02ca1d32737c3437f97553e5caaead6479a66ac1f8ff3b84a06cfa6bb0c7647 enable: '[% c("var/mullvad-browser") %]' - URL: https://cdn.mullvad.net/browser-extension/0.8.4/mullvad-browser-extension-0… name: mullvad-extension ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.0-1 - browser_build: 11 + browser_build: 12 variant: Beta # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 1 ===================================== projects/firefox/config ===================================== @@ -14,11 +14,11 @@ container: use_container: 1 var: - firefox_platform_version: 115.6.0 + firefox_platform_version: 115.7.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.0' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 2 + browser_build: 1 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 ===================================== @@ -14,9 +14,9 @@ container: use_container: 1 var: - geckoview_version: 115.6.0esr + geckoview_version: 115.7.0esr browser_branch: 13.0-1 - browser_build: 2 + browser_build: 1 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 ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '[% IF c("var/use_go_1_20") %]1.20.12[% ELSE %]1.21.5[% END %]' +version: '[% IF c("var/use_go_1_20") %]1.20.13[% ELSE %]1.21.6[% END %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -121,11 +121,11 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19 + sha256sum: 124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248 enable: '[% !c("var/use_go_1_20") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: c5bf934751d31c315c1d0bb5fb02296545fa6d08923566f7a5afec81f2ed27d6 + sha256sum: 0fe745c530f2f1d67193af3c5ea25246be077989ec5178df266e975f3532449e enable: '[% c("var/use_go_1_20") %]' - project: go-bootstrap name: go-bootstrap ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 5490489a8d356a44d792300b4dfddba792d10f2e + git_hash: cbd9b6c415ec2edb99237ef67ccd4f033a7b9c2a targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 273592eca488ca3bf535d3789b1130fd1970f09a + git_hash: 767ab5111f065b82151275775af5ecf7a529ef48 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: 2fbc645d4efb7ccb2de92394d59e99a32ecfa3ba + git_hash: 8eab0d483cdba2a9628f8b534c802bbc910171d4 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -81,12 +81,13 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.0.8' + torbrowser_version: '13.0.9' torbrowser_build: 'build1' torbrowser_incremental_from: + - '[% IF c("var/tor-browser") %]13.0.8[% END %]' - '13.0.7' - '13.0.6' - - '13.0.[% IF c("var/tor-browser") %]5[% ELSE %]4[% END %]' + - '[% IF c("var/mullvad-browser") %]13.0.4[% END %]' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- 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.7.0esr-13.5-1] 101 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by Pier Angelo Vendrame (＠pierov) 16 Jan '24

16 Jan '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: dc27077f by Eitan Isaacson at 2024-01-15T18:24:38+01:00 Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie Differential Revision: https://phabricator.services.mozilla.com/D179737 - - - - - 9c94ccb6 by Pier Angelo Vendrame at 2024-01-15T18:24:39+01:00 Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized Allow using NSS for checking MAR signatures also in platforms where OS-native APIs are used by default, i.e., macOS and Windows. Differential Revision: https://phabricator.services.mozilla.com/D177743 - - - - - 6739f4ed by Pier Angelo Vendrame at 2024-01-15T18:24:40+01:00 Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D186456 - - - - - 7dfe1f10 by Emilio Cobos Álvarez at 2024-01-15T18:24:40+01:00 Bug 1853731 - Use html:img for message-bar-icon. r=Gijs,dao,settings-reviewers,desktop-theme-reviewers,sfoster Differential Revision: https://phabricator.services.mozilla.com/D188521 - - - - - e99cf66e by Pier Angelo Vendrame at 2024-01-15T18:24:41+01:00 Bug 1854117 - Sort the DLL blocklist flags. r=mossop,win-reviewers,gstoll Differential Revision: https://phabricator.services.mozilla.com/D188716 - - - - - 87492bc5 by Eden Chuang at 2024-01-15T18:24:41+01:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - 0221332a by edgul at 2024-01-15T18:24:42+01:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 71bca736 by Kelsey Gilbert at 2024-01-15T18:24:42+01:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - 6b80d5b5 by Mark Banner at 2024-01-15T18:24:43+01:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - ab369a84 by Pier Angelo Vendrame at 2024-01-15T18:24:43+01:00 Bug 1849186 - Add a preference not to expose the content title in the window title. r=Gijs,tabbrowser-reviewers,dao Differential Revision: https://phabricator.services.mozilla.com/D190496 - - - - - 8b3be202 by Bob Owen at 2024-01-15T18:24:44+01:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - 428e7b54 by Malte Juergens at 2024-01-15T18:24:44+01:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - 7f20a8c0 by Andreas Pehrson at 2024-01-15T18:24:45+01:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - 50100cc8 by Pier Angelo Vendrame at 2024-01-15T18:24:45+01:00 Bug 1860020 - Remove the assertion on the value of toolkit.telemetry.enabled. r=KrisWright,chutten Bug 1444275 introduced an assertion on the parent process to check that the value of toolkit.telemetry.enabled is the expected one. However, this expected value could be different from the one set and locked e.g. in some forks. Therefore, the assertion prevented debug builds from working in these cases. Differential Revision: https://phabricator.services.mozilla.com/D195080 - - - - - 31018d1b by Kagami Sascha Rosylight at 2024-01-15T18:24:46+01:00 Bug 1865238 - Use One UI Sans KR VF for Korean sans-serif font on Android r=jfkthame Per /etc/fonts.xml, there are now only two `<family lang="ko">` nodes there: * OneUISansKRVF series * SECCJK series (but no KR postfix anymore?) This patch uses One UI Sans KR VF as the replacement as this is newer and is a variable font (tested with https://codepen.io/SaschaNaz/pen/ExrdYXJ) Differential Revision: https://phabricator.services.mozilla.com/D195078 - - - - - b5b6d436 by Tom Ritter at 2024-01-15T18:24:57+01:00 Bug 1873526: Refactor the restriction override list from a big if statement to a list r=KrisWright Differential Revision: https://phabricator.services.mozilla.com/D198081 - - - - - 965577ea by Henry Wilkes at 2024-01-15T18:25:40+01:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - d2feaf69 by hackademix at 2024-01-15T18:25:41+01:00 Bug 42194: Fix blank net error page on failed DNS resolution with active proxy. - - - - - f5e4d72b by Henry Wilkes at 2024-01-15T18:25:42+01:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 25e023ad by Pier Angelo Vendrame at 2024-01-15T18:25:42+01:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - cb7998a4 by Marco Simonelli at 2024-01-15T18:25:43+01:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - aca4ae38 by Marco Simonelli at 2024-01-15T18:25:43+01:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 1fb3755a by Marco Simonelli at 2024-01-15T18:25:44+01:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 23a327f2 by Marco Simonelli at 2024-01-15T18:25:44+01:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - adb3f4bb by Marco Simonelli at 2024-01-15T18:25:44+01:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 5836b6b8 by Marco Simonelli at 2024-01-15T18:25:45+01:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 8b8b900d by hackademix at 2024-01-15T18:25:45+01:00 Bug 41854: Allow overriding download spam protection. - - - - - 954fb272 by Gaba at 2024-01-15T18:27:27+01:00 Adding issue and merge request templates - - - - - b197d888 by Pier Angelo Vendrame at 2024-01-15T18:27:28+01:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - 908ffb5d by Pier Angelo Vendrame at 2024-01-15T18:42:38+01:00 fixup! Base Browser's .mozconfigs. Bug 42337: Enable GeckoDriver for all desktop platforms - - - - - d1ddf52b by Pier Angelo Vendrame at 2024-01-15T18:42:40+01:00 fixup! Base Browser's .mozconfigs. Bug 42146: Use LLD on Linux. This should allow us to restore debug symbols on Linux i686. - - - - - f473cb50 by Pier Angelo Vendrame at 2024-01-15T18:42:40+01:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 2d34dea1 by Pier Angelo Vendrame at 2024-01-15T18:42:40+01:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 3b772262 by Dan Ballard at 2024-01-15T18:42:41+01:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - e5635e74 by Matthew Finkel at 2024-01-15T18:42:41+01:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 1d581684 by Matthew Finkel at 2024-01-15T18:42:41+01:00 Bug 28125: Prevent non-Necko network connections - - - - - 342c65b3 by Mike Perry at 2024-01-15T18:42:42+01:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - b0bd0532 by Alex Catarineu at 2024-01-15T18:42:42+01:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - aa45056d by Georg Koppen at 2024-01-15T18:42:42+01:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 7bc58484 by Kathy Brade at 2024-01-15T18:42:43+01:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 25da3cca by Kathy Brade at 2024-01-15T18:42:43+01:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - c6aad3d2 by Alex Catarineu at 2024-01-15T18:42:43+01:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - bdfccba2 by Kathy Brade at 2024-01-15T18:42:44+01:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - b485e748 by Arthur Edelstein at 2024-01-15T18:42:44+01:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - f60d239a by Alex Catarineu at 2024-01-15T18:42:44+01:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 740d6463 by cypherpunks1 at 2024-01-15T18:42:45+01:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 4ba5cb9a by Pier Angelo Vendrame at 2024-01-15T18:42:45+01:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - f659d493 by Georg Koppen at 2024-01-15T18:42:45+01:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 777ac5bc by Alex Catarineu at 2024-01-15T18:42:46+01:00 Bug 28369: Stop shipping pingsender executable - - - - - 073dee20 by cypherpunks1 at 2024-01-15T18:42:46+01:00 Bug 41568: Disable LaterRun - - - - - f1048f07 by cypherpunks1 at 2024-01-15T18:42:46+01:00 Bug 40717: Hide Windows SSO in settings - - - - - 6bc20ba1 by Pier Angelo Vendrame at 2024-01-15T18:42:47+01:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 679f44da by cypherpunks1 at 2024-01-15T18:42:47+01:00 Bug 40175: Add origin attributes to about:reader top-level requests - - - - - f44a0bbc by Richard Pospesel at 2024-01-15T18:42:47+01:00 Bug 41327: Disable UrlbarProviderInterventions - - - - - 58cbfed6 by Richard Pospesel at 2024-01-15T18:42:48+01:00 Bug 42037: Disable about:firefoxview page - - - - - 57b2f41b by Mike Perry at 2024-01-15T18:42:48+01:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 495160f1 by Richard Pospesel at 2024-01-15T18:42:48+01:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 88cfa4ac by Pier Angelo Vendrame at 2024-01-15T18:42:49+01:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - d1de7b16 by Alex Catarineu at 2024-01-15T18:42:49+01:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 9c83cabc by Alex Catarineu at 2024-01-15T18:42:49+01:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 69a13114 by Alex Catarineu at 2024-01-15T18:42:50+01:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 32771fa2 by Alex Catarineu at 2024-01-15T18:42:50+01:00 Bug 26345: Hide tracking protection UI - - - - - ceba9fe5 by Pier Angelo Vendrame at 2024-01-15T18:43:04+01:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 72d6867a by Alex Catarineu at 2024-01-15T18:43:06+01:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - c23fcced by Mike Perry at 2024-01-15T18:43:06+01:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - ad261a23 by Igor Oliveira at 2024-01-15T18:43:06+01:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height. - - - - - ef7e55e7 by Pier Angelo Vendrame at 2024-01-15T18:43:07+01:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 4199fb02 by Matthew Finkel at 2024-01-15T18:43:07+01:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 138c5203 by cypherpunks1 at 2024-01-15T18:43:07+01:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - c98b31aa by cypherpunks1 at 2024-01-15T18:43:08+01:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 6d3c146f by hackademix at 2024-01-15T18:43:08+01:00 Bug 42288: Allow language spoofing in status messages. - - - - - 5eacbc20 by Pier Angelo Vendrame at 2024-01-15T18:43:08+01:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 8e545b54 by hackademix at 2024-01-15T18:43:09+01:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 56f8b4a0 by hackademix at 2024-01-15T18:43:09+01:00 Bug 41434: Letterboxing, improve logging. - - - - - 25d651a5 by hackademix at 2024-01-15T18:43:09+01:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - de7fe120 by hackademix at 2024-01-15T18:43:10+01:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 38734867 by hackademix at 2024-01-15T18:43:10+01:00 Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - c94558ad by hackademix at 2024-01-15T18:43:10+01:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 42292d23 by Pier Angelo Vendrame at 2024-01-15T18:43:11+01:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 58588cd3 by p13dz at 2024-01-15T18:43:11+01:00 Bug 40283: Workaround for the file upload bug - - - - - f5c3a949 by Arthur Edelstein at 2024-01-15T18:43:11+01:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - b38853f6 by cypherpunks1 at 2024-01-15T18:43:12+01:00 Bug 41740: Change the RFP value of devicePixelRatio to 2 - - - - - 9995b517 by Pier Angelo Vendrame at 2024-01-15T18:43:12+01:00 Bug 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - 1d13480a by cypherpunks1 at 2024-01-15T18:43:12+01:00 Bug 41881: Don't persist custom network requests on private windows - - - - - 13049d69 by hackademix at 2024-01-15T18:43:13+01:00 Bug 42019: Empty browser's clipboard on browser shutdown - - - - - f1230a87 by hackademix at 2024-01-15T18:43:13+01:00 Bug 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - 8f46449f by Pier Angelo Vendrame at 2024-01-15T18:43:13+01:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 27c6eeb0 by Henry Wilkes at 2024-01-15T18:43:14+01:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 3dd6e7f4 by Kathy Brade at 2024-01-15T18:43:14+01:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 5be7eae4 by Pier Angelo Vendrame at 2024-01-15T18:43:14+01:00 Bug 42061: Create an alpha update channel. - - - - - 3c95e0b0 by Nicolas Vigier at 2024-01-15T18:43:15+01:00 Bug 41682: Add base-browser nightly mar signing key - - - - - afcc8ed2 by hackademix at 2024-01-15T18:43:15+01:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 3dff65ae by Pier Angelo Vendrame at 2024-01-15T18:43:15+01:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 3bc3833a by Alex Catarineu at 2024-01-15T18:43:16+01:00 Bug 40069: Add helpers for message passing with extensions - - - - - 86119631 by Matthew Finkel at 2024-01-15T18:43:16+01:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 9abf802b by Henry Wilkes at 2024-01-15T18:43:16+01:00 Bug 41736: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - 5b88db98 by hackademix at 2024-01-15T18:43:17+01:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 5a4d96db by Pier Angelo Vendrame at 2024-01-15T18:43:17+01:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 1d5e6479 by Pier Angelo Vendrame at 2024-01-15T18:43:17+01:00 Bug 40926: Implemented the New Identity feature - - - - - 13e8491d by Henry Wilkes at 2024-01-15T18:43:17+01:00 Bug 41736: Customize toolbar for base-browser. - - - - - cd181db2 by Pier Angelo Vendrame at 2024-01-15T18:43:18+01:00 Bug 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - accessible/android/SessionAccessibility.cpp - accessible/android/SessionAccessibility.h - accessible/ipc/DocAccessibleParent.cpp - accessible/ipc/DocAccessibleParent.h - accessible/ipc/moz.build - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-addons.js - browser/base/content/browser-context.inc - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/45… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/45… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.7.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 16 Jan '24

16 Jan '24

Pier Angelo Vendrame pushed new tag base-browser-115.7.0esr-13.5-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.7.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 16 Jan '24

16 Jan '24

Pier Angelo Vendrame pushed new branch base-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… 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.7.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 16 Jan '24

16 Jan '24

Pier Angelo Vendrame pushed new tag tor-browser-115.7.0esr-13.5-1-build1 at The Tor Project / Applications / Tor Browser -- 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-build][main] Bump Firefox version to 115.7.0esr for nightly builds.
by Pier Angelo Vendrame (＠pierov) 16 Jan '24

16 Jan '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 656f1be4 by Pier Angelo Vendrame at 2024-01-16T14:27:52+01:00 Bump Firefox version to 115.7.0esr for nightly builds. - - - - - 2 changed files: - projects/firefox/config - projects/geckoview/config Changes: ===================================== projects/firefox/config ===================================== @@ -14,11 +14,11 @@ container: use_container: 1 var: - firefox_platform_version: 115.6.0 + firefox_platform_version: 115.7.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 2 + browser_build: 1 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 ===================================== @@ -14,9 +14,9 @@ container: use_container: 1 var: - geckoview_version: 115.6.0esr + geckoview_version: 115.7.0esr browser_branch: 13.5-1 - browser_build: 3 + browser_build: 1 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") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- 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