- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-14.0a8-build1
by morgan (＠morgan) 04 Oct '24

04 Oct '24

morgan pushed new tag tbb-14.0a8-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][main] Bug 41249, 41250: Prepare Tor, Mullvad Browser 14.0a8
by morgan (＠morgan) 04 Oct '24

04 Oct '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ab31d942 by Morgan at 2024-10-04T00:41:05+00:00 Bug 41249,41250: Prepare Tor,Mullvad Browser 14.0a8 - - - - - 8 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/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,31 @@ +Mullvad Browser 14.0a8 - October 03 2024 + * All Platforms + * Updated uBlock Origin to 1.60.0 + * Bug 349: Tidy up mullvad Fluent files [mullvad-browser] + * Bug 30543: compat: make spoofed orientation reflect spoofed screen dimensions [1607032 + 1918202] [tor-browser] + * Bug 42054: ESR128: investigate - thorin's list [tor-browser] + * Bug 43164: Prevent search-bar from being auto-hidden when not used for awhile [tor-browser] + * Bug 43169: compat: align userAgent in navigator + HTTP Header [tor-browser] + * Bug 43173: Backport security fixes from Firefox 131 [tor-browser] + * Bug 43178: Audit fingerprinting overrides (MozBug 1834274) [tor-browser] + * Build System + * All Platforms + * Bug 43157: Move tb-dev to base-browser [tor-browser] + * Bug 41256: tools/signing/upload-update_responses-to-staticiforme should regenerate update-responses when it already exists [tor-browser-build] + +Mullvad Browser 13.5.6 - September 30 2024 + * All Platforms + * Updated Firefox to 115.16.0esr + * Updated NoScript to 11.4.40 + * Bug 356: Rebase Mullvad Browser Release onto Firefox 115.16.0esr [mullvad-browser] + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43173: Backport security fixes from Firefox 131 [tor-browser] + * Linux + * Bug 334: When set as default browser on Linux in standard mode, links don't open correctly [mullvad-browser] + * Build System + * macOS + * Bug 41231: Use var/browser_release_date in tools/signing/gatekeeper-bundling.sh [tor-browser-build] + Mullvad Browser 14.0a7 - September 27 2024 * All Platforms * Updated Firefox to 128.3.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,54 @@ +Tor Browser 14.0a8 - October 03 2024 + * All Platforms + * Bug 30543: compat: make spoofed orientation reflect spoofed screen dimensions [1607032 + 1918202] [tor-browser] + * Bug 42054: ESR128: investigate - thorin's list [tor-browser] + * Bug 42716: Disable unwanted about:* pages [tor-browser] + * Bug 43170: Disable user-agent spoofing in HTTP header [tor-browser] + * Bug 43173: Backport security fixes from Firefox 131 [tor-browser] + * Bug 43178: Audit fingerprinting overrides (MozBug 1834274) [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 128.3.0esr + * Bug 43098: YEC 2024 Takeover for Desktop Stable [tor-browser] + * Bug 43149: Update donate URL in YEC 2024 desktop [tor-browser] + * Bug 43164: Prevent search-bar from being auto-hidden when not used for awhile [tor-browser] + * Bug 43169: compat: align userAgent in navigator + HTTP Header [tor-browser] + * Android + * Updated GeckoView to 128.3.0esr + * Bug 42660: Review the patch on Android's ProxySelector [tor-browser] + * Bug 43102: Android notifications tell to make Firefox your default browser + * Bug 43151: MOZ_DATA_REPORTING, MOZ_TELEMETRY_REPORTING, MOZ_CRASHREPORTER, and MOZ_BACKGROUNDTASKS enabled on Android [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.23.2 + * Bug 43156: Update translation CI to account for the extended 13.5 release [tor-browser] + * Bug 43157: Move tb-dev to base-browser [tor-browser] + * Bug 43181: Run translation CI if there is a change in a string.xml file [tor-browser] + * Windows + macOS + Linux + * Bug 41247: Adapt tools/update-responses/update_responses to support multiple versions in the same xml files [tor-browser-build] + * Bug 41256: tools/signing/upload-update_responses-to-staticiforme should regenerate update-responses when it already exists [tor-browser-build] + +Tor Browser 13.5a11 - October 01 2024 + * All Platforms + * Bug 41252: Disable updating update_responses in 13.5-legacy branch [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.16.0esr + +Tor Browser 13.5.6 - September 30 2024 + * All Platforms + * Updated NoScript to 11.4.40 + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43167: Rebase Tor Browser Stable onto 115.16.0esr [tor-browser] + * Bug 43173: Backport security fixes from Firefox 131 [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.16.0esr + * Bug 42737: Drop the hash check on updates [tor-browser] + * Bug 43098: YEC 2024 Takeover for Desktop Stable [tor-browser] + * Windows + macOS + * Bug 42747: Windows 7/8 and macOS 10.12-10.14 Legacy/Maintenance [tor-browser] + * Android + * Updated GeckoView to 115.16.0esr + * Bug 43099: YEC 2024 Takeover for Android Stable [tor-browser] + Tor Browser 14.0a7 - September 27 2024 * All Platforms * Updated NoScript to 11.4.40 @@ -31,6 +82,12 @@ Tor Browser 13.5a10 - September 25 2024 * Windows + macOS + Linux * Updated Go to 1.21.12 +Tor Browser 13.5.5 - September 25 2024 + * Windows + macOS + * Bug 43125: Update message for legacy OS (windows ≤8.1, macOS ≤10.14) users [tor-browser] + * Linux + * Bug 334: When set as default browser on Linux in standard mode, links don't open correctly [mullvad-browser] + Tor Browser 14.0a6 - September 19 2024 * All Platforms * Bug 42831: Remove the shopping components [tor-browser] ===================================== projects/browser/config ===================================== @@ -111,9 +111,9 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4357325/noscript-11.4.40.… name: noscript sha256sum: 242ead426159d871480a13062cbee08abc97da746cdc5c643aee2692e9adbbb2 - - URL: https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.5… + - URL: https://addons.mozilla.org/firefox/downloads/file/4359936/ublock_origin-1.6… name: ublock-origin - sha256sum: 1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14 + sha256sum: e2cda9b2a1b0a7f6e5ef0da9f87f28df52f8560587ba2e51a3003121cfb81600 enable: '[% c("var/mullvad-browser") %]' - URL: https://cdn.mullvad.net/browser-extension/0.9.0/mullvad-browser-extension-0… name: mullvad-extension ===================================== projects/firefox/config ===================================== @@ -19,7 +19,7 @@ var: browser_series: '14.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 2 + browser_build: 3 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") %]' @@ -107,7 +107,7 @@ targets: gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' nightly_updates_publish_dir_prefix: mullvadbrowser- - browser_build: 1 + browser_build: 2 linux-x86_64: var: ===================================== projects/geckoview/config ===================================== @@ -21,7 +21,7 @@ var: browser_series: '14.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 2 + browser_build: 3 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: '1.23.1' +version: '1.23.2' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -126,7 +126,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d + sha256sum: 36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f - project: go-bootstrap name: go-bootstrap target_replace: ===================================== projects/translation/config ===================================== @@ -12,19 +12,19 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 16446c485b3be4198a7e79bfcac6510784a18506 + git_hash: b7ce711e8ed8cf7b0cdf25a3055cf84bab5b7a1f targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 816fcde248e0e25c8ad921d25ec97a374a59ed94 + git_hash: 59037afe137abb612bc185ce438ac3a3c657def7 targets: nightly: git_hash: 'tor-browser' mullvad-browser: mullvad-browser: '[% INCLUDE build %]' - git_hash: 78212a3da2439e436ac5f73d8e3eb908145c3ece + git_hash: 2f7d98b46ce480cdb4d7e9ddab912650c8673d6c targets: nightly: git_hash: 'mullvad-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: 12b033e4192448315794f5fe8203fe91dcc29a8c + git_hash: 11f4fdc77fa45fe6ff0d47d1586dea0779b354ee compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '14.0a7' + torbrowser_version: '14.0a8' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/09/27 00:19:33' + browser_release_date: '2024/10/03 19:27:08' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 14.0a7 - 14.0a6 - 14.0a5 - - 14.0a4 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' torbrowser_legacy_version: 13.5a11 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… 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-128.3.0esr-14.0-1-build2
by morgan (＠morgan) 04 Oct '24

04 Oct '24

morgan pushed new tag mullvad-browser-128.3.0esr-14.0-1-build2 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/tor-browser] Pushed new tag tor-browser-128.3.0esr-14.0-1-build3
by morgan (＠morgan) 04 Oct '24

04 Oct '24

morgan pushed new tag tor-browser-128.3.0esr-14.0-1-build3 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][tor-browser-128.3.0esr-14.0-1] fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
by morgan (＠morgan) 04 Oct '24

04 Oct '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: ba2f51a4 by Morgan at 2024-10-04T00:41:54+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 43170: Disable user-agent spoofing in HTTP header - - - - - 1 changed file: - browser/app/profile/000-tor-browser.js Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -52,9 +52,8 @@ pref("network.http.connection-retry-timeout", 0); // be reduced to the strictly required time). pref("extensions.torbutton.use_nontor_proxy", false); -// tor-browser#42647: Make OS HTTP User-Agent OS spoofing configurable by pref -// TODO: flip to false when we're happy this is not a privacy issue -pref("privacy.resistFingerprinting.spoofOsInUserAgentHeader", true); +// tor-browser#43170: Disable user-agent spoofing in HTTP header +pref("privacy.resistFingerprinting.spoofOsInUserAgentHeader", false); // Browser home page: pref("browser.startup.homepage", "about:tor"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba2f51a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba2f51a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! [android] Use NimbusDisabled
by morgan (＠morgan) 04 Oct '24

04 Oct '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 183d35fc by clairehurst at 2024-10-03T14:55:59-06:00 fixup! [android] Use NimbusDisabled - - - - - 3 changed files: - mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingController.kt - mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingStorage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NimbusComponents.kt Changes: ===================================== mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingController.kt ===================================== @@ -101,36 +101,36 @@ open class NimbusMessagingController( * creates a URI string for the message action. */ @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) - fun processMessageActionToUri(message: Message): Uri { + open fun processMessageActionToUri(message: Message): Uri { val (uuid, action) = messagingStorage.generateUuidAndFormatMessage(message) sendClickedMessageTelemetry(message.id, uuid) return convertActionIntoDeepLinkSchemeUri(action) } - private fun sendDismissedMessageTelemetry(messageId: String) { + open fun sendDismissedMessageTelemetry(messageId: String) { GleanMessaging.messageDismissed.record(GleanMessaging.MessageDismissedExtra(messageId)) } - private fun sendShownMessageTelemetry(messageId: String) { + open fun sendShownMessageTelemetry(messageId: String) { GleanMessaging.messageShown.record(GleanMessaging.MessageShownExtra(messageId)) } - private fun sendExpiredMessageTelemetry(messageId: String) { + open fun sendExpiredMessageTelemetry(messageId: String) { GleanMessaging.messageExpired.record(GleanMessaging.MessageExpiredExtra(messageId)) } - private fun sendClickedMessageTelemetry(messageId: String, uuid: String?) { + open fun sendClickedMessageTelemetry(messageId: String, uuid: String?) { GleanMessaging.messageClicked.record( GleanMessaging.MessageClickedExtra(messageKey = messageId, actionUuid = uuid), ) } - private fun sendMicrosurveyCompletedTelemetry(messageId: String, answer: String?) { + open fun sendMicrosurveyCompletedTelemetry(messageId: String, answer: String?) { MicroSurvey.response.record(MicroSurvey.ResponseExtra(surveyId = messageId, userSelection = answer)) } - private fun convertActionIntoDeepLinkSchemeUri(action: String): Uri = + open fun convertActionIntoDeepLinkSchemeUri(action: String): Uri = if (action.startsWith("://")) { "$deepLinkScheme$action".toUri() } else { ===================================== mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingStorage.kt ===================================== @@ -33,7 +33,7 @@ const val MESSAGING_FEATURE_ID = "messaging" /** * Provides messages from [messagingFeature] and combine with the metadata store on [metadataStorage]. */ -class NimbusMessagingStorage( +open class NimbusMessagingStorage( private val context: Context, private val metadataStorage: MessageMetadataStorage, private val onMalformedMessage: (String) -> Unit = { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NimbusComponents.kt ===================================== @@ -5,15 +5,21 @@ package org.mozilla.fenix.components import android.content.Context +import android.content.Intent +import android.net.Uri import mozilla.components.service.nimbus.NimbusApi import mozilla.components.service.nimbus.NimbusDisabled import mozilla.components.service.nimbus.messaging.FxNimbusMessaging import mozilla.components.service.nimbus.messaging.Message +import mozilla.components.service.nimbus.messaging.Message.Metadata +import mozilla.components.service.nimbus.messaging.MessageData import mozilla.components.service.nimbus.messaging.MessageMetadataStorage +import mozilla.components.service.nimbus.messaging.MessageSurfaceId import mozilla.components.service.nimbus.messaging.NimbusMessagingController import mozilla.components.service.nimbus.messaging.NimbusMessagingControllerInterface import mozilla.components.service.nimbus.messaging.NimbusMessagingStorage import mozilla.components.service.nimbus.messaging.OnDiskMessageMetadataStorage +import mozilla.components.service.nimbus.messaging.StyleData import org.mozilla.experiments.nimbus.NimbusEventStore import org.mozilla.experiments.nimbus.NimbusMessagingHelperInterface import org.mozilla.experiments.nimbus.NullNimbus @@ -91,7 +97,7 @@ class NimbusComponents(private val context: Context) { * from the Nimbus Messaging component. */ val messaging: NimbusMessagingControllerInterface by lazyMonitored { - NimbusMessagingController( + NullNimbusMessagingController( messagingStorage = messagingStorage, deepLinkScheme = BuildConfig.DEEP_LINK_SCHEME, ) @@ -127,3 +133,110 @@ class NullMessageMetadataStorage(): MessageMetadataStorage { // noop } } + +class NullNimbusMessagingController( + messagingStorage: NimbusMessagingStorage, + deepLinkScheme: String, +) : NimbusMessagingController(messagingStorage, deepLinkScheme) { + + private val nullMessage: Message = Message( + id = "", + data = MessageData(), + action = "", + style = StyleData(), + triggerIfAll = listOf(), + excludeIfAny = listOf(), + metadata = Metadata(""), + ) + + override suspend fun onMessageDisplayed(displayedMessage: Message, bootIdentifier: String?): Message { + return nullMessage + } + + /** + * Called when a message has been dismissed by the user. + * + * Records a messageDismissed event, and records that the message + * has been dismissed. + */ + override suspend fun onMessageDismissed(message: Message) { + return + } + + /** + * Called when a microsurvey attached to a message has been completed by the user. + * + * @param message The message containing the microsurvey that was completed. + * @param answer The user's response to the microsurvey question. + */ + override suspend fun onMicrosurveyCompleted(message: Message, answer: String) { + return + } + + /** + * Called once the user has clicked on a message. + * + * This records that the message has been clicked on, but does not record a + * glean event. That should be done via [processMessageActionToUri]. + */ + override suspend fun onMessageClicked(message: Message) { + return + } + + /** + * Create and return the relevant [Intent] for the given [Message]. + * + * @param message the [Message] to create the [Intent] for. + * @return an [Intent] using the processed [Message]. + */ + override fun getIntentForMessage(message: Message) = Intent() + + /** + * Will attempt to get the [Message] for the given [id]. + * + * @param id the [Message.id] of the [Message] to try to match. + * @return the [Message] with a matching [id], or null if no [Message] has a matching [id]. + */ + override suspend fun getMessage(id: String): Message? { + return nullMessage + } + + /** + * The [message] action needs to be examined for string substitutions + * and any `uuid` needs to be recorded in the Glean event. + * + * We call this `process` as it has a side effect of logging a Glean event while it + * creates a URI string for the message action. + */ + override fun processMessageActionToUri(message: Message): Uri { + return Uri.EMPTY + } + + override fun sendDismissedMessageTelemetry(messageId: String) { + return + } + + override fun sendShownMessageTelemetry(messageId: String) { + return + } + + override fun sendExpiredMessageTelemetry(messageId: String) { + return + } + + override fun sendClickedMessageTelemetry(messageId: String, uuid: String?) { + return + } + + override fun sendMicrosurveyCompletedTelemetry(messageId: String, answer: String?) { + return + } + + override fun convertActionIntoDeepLinkSchemeUri(action: String): Uri = Uri.EMPTY + + override suspend fun getMessages(): List<Message> = listOf() + + override suspend fun getNextMessage(surfaceId: MessageSurfaceId) = nullMessage + + override fun getNextMessage(surfaceId: MessageSurfaceId, messages: List<Message>) = nullMessage +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/183d35f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/183d35f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41256: Re-generate update-responses in upload-update_responses-to-staticiforme
by morgan (＠morgan) 03 Oct '24

03 Oct '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3f075f68 by Nicolas Vigier at 2024-10-03T18:09:53+00:00 Bug 41256: Re-generate update-responses in upload-update_responses-to-staticiforme The script was not re-generating update-responses if it had been generated before. In some case this can be a problem: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/4… - - - - - 1 changed file: - tools/signing/upload-update_responses-to-staticiforme Changes: ===================================== tools/signing/upload-update_responses-to-staticiforme ===================================== @@ -8,15 +8,12 @@ check_torbrowser_version_var update_responses_tar_filename="update-responses-$tbb_version_type-$tbb_version.tar" update_responses_tar="$script_dir/../../$SIGNING_PROJECTNAME/$tbb_version_type/update-responses/$update_responses_tar_filename" -if test -f "$update_responses_tar" -then - echo "$update_responses_tar_filename already exists: not running 'make $SIGNING_PROJECTNAME-update_responses-$tbb_version_type'" -else - echo "Running 'make $SIGNING_PROJECTNAME-update_responses-$tbb_version_type'" - pushd "$script_dir/../.." > /dev/null - make $SIGNING_PROJECTNAME-update_responses-$tbb_version_type - popd > /dev/null -fi +test -f "$update_responses_tar" && \ + echo "warning: $update_responses_tar_filename already exists. It will be re-generated." +echo "Running 'make $SIGNING_PROJECTNAME-update_responses-$tbb_version_type'" +pushd "$script_dir/../.." > /dev/null +make $SIGNING_PROJECTNAME-update_responses-$tbb_version_type +popd > /dev/null cd $update_responses_repository_dir git checkout main View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] fixup! Base Browser's .mozconfigs.
by morgan (＠morgan) 03 Oct '24

03 Oct '24

morgan pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: b4eaca29 by Pier Angelo Vendrame at 2024-10-03T17:57:36+00:00 fixup! Base Browser's .mozconfigs. Bug 43151: Uniform the behavior of the android-all mozconfig. - - - - - 2 changed files: - browser/config/mozconfigs/base-browser-android - mozconfig-android-all Changes: ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -1,3 +1,6 @@ +# Changes on this file might need to be synchronized with mozconfig-android-all! +# See also tor-browser#43151. + export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize @@ -29,6 +32,9 @@ ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-system-policies +# See tor-browser#41131 +ac_add_options --disable-backgroundtasks + # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= ===================================== mozconfig-android-all ===================================== @@ -1,18 +1,41 @@ +# Changes on this file might need to be synchronized with +# browser/config/mozconfigs/base-browser-android! +# See also tor-browser#43151. + export MOZILLA_OFFICIAL=1 ac_add_options --enable-application=mobile/android + ac_add_options --disable-compile-environment +ac_add_options --with-java-bin-path=$JAVA_HOME/bin +ac_add_options --with-android-sdk=$ANDROID_HOME +ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle + +ac_add_options --disable-tests +ac_add_options --disable-debug + +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls + +ac_add_options --enable-proxy-bypass-protection +ac_add_options --disable-system-policies + +# See tor-browser#41131 +ac_add_options --disable-backgroundtasks + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= + if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default - ac_add_options --without-wasm-sandboxed-libraries ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-minify fi -ac_add_options --with-tor-browser-version=dev-build - -ac_add_options --with-java-bin-path=$JAVA_HOME/bin -ac_add_options --with-android-sdk=$ANDROID_HOME -ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle +if test -z "$WASI_SYSROOT"; then + ac_add_options --without-wasm-sandboxed-libraries +fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b4e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b4e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.3.0esr-14.0-1] fixup! Base Browser's .mozconfigs.
by morgan (＠morgan) 03 Oct '24

03 Oct '24

morgan pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 0287abcb by Pier Angelo Vendrame at 2024-10-03T17:56:38+00:00 fixup! Base Browser's .mozconfigs. Bug 43151: Uniform the behavior of the android-all mozconfig. - - - - - 2 changed files: - browser/config/mozconfigs/base-browser-android - mozconfig-android-all Changes: ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -1,3 +1,6 @@ +# Changes on this file might need to be synchronized with mozconfig-android-all! +# See also tor-browser#43151. + export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize @@ -29,6 +32,9 @@ ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-system-policies +# See tor-browser#41131 +ac_add_options --disable-backgroundtasks + # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= ===================================== mozconfig-android-all ===================================== @@ -1,18 +1,41 @@ +# Changes on this file might need to be synchronized with +# browser/config/mozconfigs/base-browser-android! +# See also tor-browser#43151. + export MOZILLA_OFFICIAL=1 ac_add_options --enable-application=mobile/android + ac_add_options --disable-compile-environment +ac_add_options --with-java-bin-path=$JAVA_HOME/bin +ac_add_options --with-android-sdk=$ANDROID_HOME +ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle + +ac_add_options --disable-tests +ac_add_options --disable-debug + +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls + +ac_add_options --enable-proxy-bypass-protection +ac_add_options --disable-system-policies + +# See tor-browser#41131 +ac_add_options --disable-backgroundtasks + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= + if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default - ac_add_options --without-wasm-sandboxed-libraries ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-minify fi -ac_add_options --with-tor-browser-version=dev-build - -ac_add_options --with-java-bin-path=$JAVA_HOME/bin -ac_add_options --with-android-sdk=$ANDROID_HOME -ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle +if test -z "$WASI_SYSROOT"; then + ac_add_options --without-wasm-sandboxed-libraries +fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0287abc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0287abc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] 2 commits: fixup! TB3: Tor Browser's official .mozconfigs.
by morgan (＠morgan) 03 Oct '24

03 Oct '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 72a8c0c8 by Pier Angelo Vendrame at 2024-10-03T17:44:50+00:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 43151: Uniform the behavior of the android-all mozconfig. - - - - - 58271a0c by Pier Angelo Vendrame at 2024-10-03T17:44:50+00:00 fixup! Base Browser's .mozconfigs. Bug 43151: Uniform the behavior of the android-all mozconfig. - - - - - 2 changed files: - browser/config/mozconfigs/base-browser-android - mozconfig-android-all Changes: ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -1,3 +1,6 @@ +# Changes on this file might need to be synchronized with mozconfig-android-all! +# See also tor-browser#43151. + export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize @@ -29,6 +32,9 @@ ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-system-policies +# See tor-browser#41131 +ac_add_options --disable-backgroundtasks + # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= ===================================== mozconfig-android-all ===================================== @@ -1,16 +1,41 @@ +# Changes on this file might need to be synchronized with +# browser/config/mozconfigs/base-browser-android! +# See also tor-browser#43151. + export MOZILLA_OFFICIAL=1 ac_add_options --enable-application=mobile/android + ac_add_options --disable-compile-environment +ac_add_options --with-java-bin-path=$JAVA_HOME/bin +ac_add_options --with-android-sdk=$ANDROID_HOME +ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle + +ac_add_options --disable-tests +ac_add_options --disable-debug + +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls + +ac_add_options --enable-proxy-bypass-protection +ac_add_options --disable-system-policies + +# See tor-browser#41131 +ac_add_options --disable-backgroundtasks + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= + if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default - ac_add_options --without-wasm-sandboxed-libraries ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-minify fi -ac_add_options --with-java-bin-path=$JAVA_HOME/bin -ac_add_options --with-android-sdk=$ANDROID_HOME -ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle +if test -z "$WASI_SYSROOT"; then + ac_add_options --without-wasm-sandboxed-libraries +fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/816dae… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/816dae… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 13.5a11
by morgan (＠morgan) 03 Oct '24

03 Oct '24

morgan pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: da8075e4 by Morgan at 2024-10-03T17:00:16+00:00 alpha: new version, 13.5a11 - - - - - 30 changed files: - update_3/alpha/.htaccess - update_3/alpha/14.0a5-14.0a7-linux-x86_64-ALL.xml → update_3/alpha/13.5a10-14.0a7+13.5a11-linux-i686-ALL.xml - + update_3/alpha/13.5a10-14.0a7+13.5a11-linux-x86_64-ALL.xml - + update_3/alpha/13.5a10-14.0a7+13.5a11-macos-ALL.xml - + update_3/alpha/13.5a10-14.0a7+13.5a11-windows-i686-ALL.xml - update_3/alpha/14.0a7-windows-x86_64-ALL.xml → update_3/alpha/13.5a10-14.0a7+13.5a11-windows-x86_64-ALL.xml - + update_3/alpha/13.5a8-14.0a7+13.5a11-linux-i686-ALL.xml - + update_3/alpha/13.5a8-14.0a7+13.5a11-linux-x86_64-ALL.xml - + update_3/alpha/13.5a8-14.0a7+13.5a11-macos-ALL.xml - + update_3/alpha/13.5a8-14.0a7+13.5a11-windows-i686-ALL.xml - + update_3/alpha/13.5a8-14.0a7+13.5a11-windows-x86_64-ALL.xml - + update_3/alpha/13.5a9-14.0a7+13.5a11-linux-i686-ALL.xml - + update_3/alpha/13.5a9-14.0a7+13.5a11-linux-x86_64-ALL.xml - + update_3/alpha/13.5a9-14.0a7+13.5a11-macos-ALL.xml - + update_3/alpha/13.5a9-14.0a7+13.5a11-windows-i686-ALL.xml - + update_3/alpha/13.5a9-14.0a7+13.5a11-windows-x86_64-ALL.xml - update_3/alpha/14.0a4-14.0a7-linux-i686-ALL.xml → update_3/alpha/14.0a4-14.0a7+13.5a11-linux-i686-ALL.xml - + update_3/alpha/14.0a4-14.0a7+13.5a11-linux-x86_64-ALL.xml - update_3/alpha/14.0a6-14.0a7-macos-ALL.xml → update_3/alpha/14.0a4-14.0a7+13.5a11-macos-ALL.xml - + update_3/alpha/14.0a4-14.0a7+13.5a11-windows-i686-ALL.xml - + update_3/alpha/14.0a4-14.0a7+13.5a11-windows-x86_64-ALL.xml - update_3/alpha/14.0a4-14.0a7-linux-x86_64-ALL.xml → update_3/alpha/14.0a5-14.0a7+13.5a11-linux-i686-ALL.xml - + update_3/alpha/14.0a5-14.0a7+13.5a11-linux-x86_64-ALL.xml - update_3/alpha/14.0a5-14.0a7-macos-ALL.xml → update_3/alpha/14.0a5-14.0a7+13.5a11-macos-ALL.xml - update_3/alpha/14.0a5-14.0a7-windows-x86_64-ALL.xml → update_3/alpha/14.0a5-14.0a7+13.5a11-windows-i686-ALL.xml - + update_3/alpha/14.0a5-14.0a7+13.5a11-windows-x86_64-ALL.xml - update_3/alpha/14.0a5-14.0a7-linux-i686-ALL.xml → update_3/alpha/14.0a6-14.0a7+13.5a11-linux-i686-ALL.xml - + update_3/alpha/14.0a6-14.0a7+13.5a11-linux-x86_64-ALL.xml - update_3/alpha/14.0a4-14.0a7-macos-ALL.xml → update_3/alpha/14.0a6-14.0a7+13.5a11-macos-ALL.xml - update_3/alpha/14.0a4-14.0a7-windows-i686-ALL.xml → update_3/alpha/14.0a6-14.0a7+13.5a11-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-build][main] 4 commits: Bug 41247: Simplify tools/update-responses/update_responses
by morgan (＠morgan) 03 Oct '24

03 Oct '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7b2ef30f by Nicolas Vigier at 2024-10-03T10:17:59+02:00 Bug 41247: Simplify tools/update-responses/update_responses Most commands implemented in update_responses expect the channel to be an optional argument, doing the operation on all channels if no channel is provided. However we don't really need that feature. In this commit we simplify the script by making the channel a required argument. At the same time we remove the get_channel_version command, which was not used anywhere. - - - - - 97935517 by Nicolas Vigier at 2024-10-03T10:18:01+02:00 Bug 41247: Add support for multiple versions in update_responses - - - - - 0a476854 by Nicolas Vigier at 2024-10-03T16:19:53+02:00 Bug 41247: Add torbrowser_legacy_version to update-responses - - - - - d64bc351 by Nicolas Vigier at 2024-10-03T16:19:55+02:00 Bug 41247: Drop sha512 hash from update_responses files (except for nightly) With tor-browser#42737, the sha512 hash included in the update_responses files is not checked anymore. Since we're doing a watershed update, support for older versions checking the hash is not needed. However since we don't do watershed updates in nightly, we'll keep the sha512 hash in nightly for a little more time. - - - - - 8 changed files: - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md - projects/release/create_update_responses_tar - projects/release/update_responses_config.yml - rbm.conf - tools/signing/nightly/config.yml - tools/signing/nightly/sign-nightly - − tools/update-responses/get_channel_version - tools/update-responses/update_responses Changes: ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -39,6 +39,8 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - [ ] `var/browser_release_date` : update to build date. For the build to be reproducible, the date should be in the past when building. + - [ ] `var/torbrowser_legacy_version` : update to next version in the legacy-13.5 branch + - [ ] `var/torbrowser_legacy_platform_version` : update to firefox platform version in the legacy-13.5 branch - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail ===================================== projects/release/create_update_responses_tar ===================================== @@ -1,8 +1,8 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% shell_quote(c("basedir")) %]/tools/update-responses/update_responses -mkdir -p [% shell_quote(path(dest_dir)) %]/update-responses [% SET channel = c('var/channel') -%] +[% shell_quote(c("basedir")) %]/tools/update-responses/update_responses [% channel %] +mkdir -p [% shell_quote(path(dest_dir)) %]/update-responses mv [% shell_quote(c("basedir")) %]/tools/update-responses/htdocs/[% channel %] [% channel %] chmod 775 [% channel %] chmod 664 [% channel %]/.htaccess [% channel %]/* ===================================== projects/release/update_responses_config.yml ===================================== @@ -27,7 +27,11 @@ build_targets: - Darwin_x86_64-gcc3 - Darwin_aarch64-gcc3 channels: - [% c('var/channel') %]: [% c("var/torbrowser_version") %] + [% c('var/channel') %]: + - [% c("var/torbrowser_version") %] +[% IF c("var/torbrowser_legacy_version") -%] + - [% c("var/torbrowser_legacy_version") %] +[% END -%] versions: [% c("var/torbrowser_version") %]: [% IF c("var/create_unsigned_incrementals") -%] @@ -68,6 +72,26 @@ versions: minSupportedInstructionSet: SSE2 linux-x86_64: minSupportedInstructionSet: SSE2 +[% IF c("var/torbrowser_legacy_version") -%] + [% c("var/torbrowser_legacy_version") %]: + mar_channel_id: [% c('var/mar_channel_id') %] + platformVersion: [% c('var/torbrowser_legacy_platform_version') %] + detailsURL: https://blog.torproject.org/new[% IF c("var/alpha") %]-alpha[% END %]-release-tor-browser-[% c("var/torbrowser_legacy_version") FILTER remove('\.') %] + incremental_from: [] + # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) ) + macos: + # macOS v10.12.0 + minSupportedOSVersion: 16.0.0 + # minSupportedOsVersion on Windows corresponds to the operating system version ( https://docs.microsoft.com/en-us/windows/win32/sysinfo/operating-system-ver… ) + windows-i686: + # Windows 7 + minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 + windows-x86_64: + # Windows 7 + minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 +[% END -%] mar_compression: xz [% IF c("var/tor-browser") -%] tag: 'tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]' ===================================== rbm.conf ===================================== @@ -87,6 +87,9 @@ var: - 14.0a4 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' + torbrowser_legacy_version: 13.5a11 + torbrowser_legacy_platform_version: 115.16.0 + # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed # in the same order. In the cases where the installation order is ===================================== tools/signing/nightly/config.yml ===================================== @@ -1,4 +1,5 @@ --- +hashes_in_responses: 1 martools_version: 9.0.2 martools_url: https://archive.torproject.org/tor-package-archive/torbrowser/ martools_gpg_keyring: keyring/torbrowser.gpg ===================================== tools/signing/nightly/sign-nightly ===================================== @@ -256,7 +256,7 @@ sub update_responses { my $htdocsdir = "$topdir/tools/update-responses/htdocs/nightly"; path($htdocsdir)->remove_tree({ safe => 0 }); exit_error "Error running update_responses for $publish_dir" unless - system("$topdir/tools/update-responses/update_responses") == 0; + system("$topdir/tools/update-responses/update_responses", 'nightly') == 0; path("$topdir/nightly/updates/$publish_dir/nightly")->remove_tree({ safe => 0 }); make_path("$topdir/nightly/updates/$publish_dir"); dirmove($htdocsdir, "$topdir/nightly/updates/$publish_dir/nightly") ===================================== tools/update-responses/get_channel_version deleted ===================================== @@ -1 +0,0 @@ -update_responses \ No newline at end of file ===================================== tools/update-responses/update_responses ===================================== @@ -42,6 +42,10 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } +sub as_array { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; +} + sub get_tmpdir { my ($config) = @_; return File::Temp->newdir($config->{tmp_dir} ? @@ -72,13 +76,11 @@ sub write_htdocs { } sub clean_htdocs { - my (@channels) = @_; - foreach my $channel (@channels) { - opendir(my $d, "$htdocsdir/$channel"); - my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$channel/$_" } @files; - } + my ($channel) = @_; + opendir(my $d, "$htdocsdir/$channel"); + my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$channel/$_" } @files; } sub get_sha512_hex_of_file { @@ -105,8 +107,10 @@ sub get_version_files { type => 'complete', URL => "$download_url/$file", size => -s "$vdir/$file", - hashFunction => 'SHA512', - hashValue => get_sha512_hex_of_file("$vdir/$file"), + $config->{hashes_in_responses} ? ( + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + ) : (), }; next; } @@ -116,9 +120,11 @@ sub get_version_files { type => 'partial', URL => "$download_url/$file", size => -s "$vdir/$file", - hashFunction => 'SHA512', - hashValue => get_sha512_hex_of_file("$vdir/$file"), - } + $config->{hashes_in_responses} ? ( + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + ) : (), + }; } } closedir $d; @@ -239,8 +245,10 @@ sub create_incremental_mar { type => 'partial', URL => "$download_url/$mar_file", size => -s $mar_file_path, - hashFunction => 'SHA512', - hashValue => get_sha512_hex_of_file($mar_file_path), + $config->{hashes_in_responses} ? ( + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file($mar_file_path), + ) : (), }; }; return if $pm->start($finished_file); @@ -307,16 +315,6 @@ sub version_dir { return get_config($config, $version, 'any', 'releases_dir') . "/$version"; } -sub channel_to_version { - my ($config, @channels) = @_; - return values %{$config->{channels}} unless @channels; - foreach my $channel (@channels) { - exit_error "Unknown channel $channel" - unless $config->{channels}{$channel}; - } - return map { $config->{channels}{$_} } @channels; -} - sub get_buildinfos { my ($config, $version) = @_; return if exists $config->{versions}{$version}{buildID}; @@ -347,49 +345,58 @@ sub get_buildinfos { } sub get_response { - my ($config, $version, $os, @patches) = @_; + my ($config, $versions, $os, $lang, $from_version) = @_; my $res; my $writer = XML::Writer->new(OUTPUT => \$res, ENCODING => 'UTF-8'); $writer->xmlDecl; $writer->startTag('updates'); - if (get_config($config, $version, $os, 'unsupported')) { + foreach my $version (@$versions) { + if (get_config($config, $version, $os, 'unsupported')) { + $writer->startTag('update', + unsupported => 'true', + detailsURL => get_config($config, $version, $os, 'detailsURL'), + ); + goto CLOSETAGS; + } + my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); + my $mininstruc = get_config($config, $version, $os, 'minSupportedInstructionSet'); $writer->startTag('update', - unsupported => 'true', + type => 'minor', + displayVersion => $version, + appVersion => $version, + platformVersion => get_config($config, $version, $os, 'platformVersion'), + buildID => get_config($config, $version, $os, 'buildID'), detailsURL => get_config($config, $version, $os, 'detailsURL'), + actions => 'showURL', + openURL => get_config($config, $version, $os, 'detailsURL'), + defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), + defined $mininstruc ? ( minSupportedInstructionSet => $mininstruc ) : (), ); - goto CLOSETAGS; - } - my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); - my $mininstruc = get_config($config, $version, $os, 'minSupportedInstructionSet'); - $writer->startTag('update', - type => 'minor', - displayVersion => $version, - appVersion => $version, - platformVersion => get_config($config, $version, $os, 'platformVersion'), - buildID => get_config($config, $version, $os, 'buildID'), - detailsURL => get_config($config, $version, $os, 'detailsURL'), - actions => 'showURL', - openURL => get_config($config, $version, $os, 'detailsURL'), - defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), - defined $mininstruc ? ( minSupportedInstructionSet => $mininstruc ) : (), - ); - foreach my $patch (@patches) { - my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; - $writer->startTag('patch', @sorted_patch); - $writer->endTag('patch'); + if (my $patch = $config->{versions}{$version}{files}{$os}{$lang}{complete}) { + my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; + $writer->startTag('patch', @sorted_patch); + $writer->endTag('patch'); + } + if ($from_version) { + if (my $patch = $config->{versions}{$version}{files}{$os}{$lang}{partial}{$from_version}) { + my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; + $writer->startTag('patch', @sorted_patch); + $writer->endTag('patch'); + } + } + CLOSETAGS: + $writer->endTag('update'); } - CLOSETAGS: - $writer->endTag('update'); $writer->endTag('updates'); $writer->end; return $res; } sub write_responses { - my ($config, @channels) = @_; - @channels = keys %{$config->{channels}} unless @channels; - foreach my $channel (@channels) { - my $version = $config->{channels}{$channel}; + my ($config, $channel) = @_; + my $versions = as_array($config->{channels}{$channel}); + my (%oses, %langs, %from_versions); + foreach my $version (@$versions) { get_version_files($config, $version); get_buildinfos($config, $version); my $files = $config->{versions}{$version}{files}; @@ -398,79 +405,96 @@ sub write_responses { my $new_os = $migrate_archs->{$old_os}; foreach my $lang (keys %{$files->{$new_os}}) { $files->{$old_os}{$lang}{complete} = - $files->{$new_os}{$lang}{complete}; + $files->{$new_os}{$lang}{complete}; } } foreach my $os (keys %$files) { + $oses{$os} = 1; foreach my $lang (keys %{$files->{$os}}) { - my $resp = get_response($config, $version, $os, - $files->{$os}{$lang}{complete}); - write_htdocs($channel, "$version-$os-$lang.xml", $resp); + $langs{$lang} = 1; foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { - $resp = get_response($config, $version, $os, - $files->{$os}{$lang}{complete}, - $files->{$os}{$lang}{partial}{$from_version}); - write_htdocs($channel, "$from_version-$version-$os-$lang.xml", $resp); + $from_versions{$from_version} = 1; } } } - write_htdocs($channel, 'no-update.xml', - '<?xml version="1.0" encoding="UTF-8"?>' - . "\n<updates></updates>\n"); } + my $versions_str = join('+', @$versions); + foreach my $os (keys %oses) { + foreach my $lang (keys %langs) { + my $resp = get_response($config, $versions, $os, $lang); + write_htdocs($channel, "$versions_str-$os-$lang.xml", $resp); + foreach my $from_version (keys %from_versions) { + $resp = get_response($config, $versions, $os, $lang, $from_version); + write_htdocs($channel, "$from_version-$versions_str-$os-$lang.xml", $resp); + } + } + } + write_htdocs($channel, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } sub write_htaccess { - my ($config, @channels) = @_; - @channels = keys %{$config->{channels}} unless @channels; + my ($config, $channel) = @_; my $flags = "[last]"; - foreach my $channel (@channels) { - my $htaccess = "RewriteEngine On\n"; - $htaccess .= $config->{htaccess_rewrite_rules}{$channel} // ''; - my $version = $config->{channels}{$channel}; - my $migrate_langs = $config->{versions}{$version}{migrate_langs} // {}; + my $htaccess = "RewriteEngine On\n"; + $htaccess .= $config->{htaccess_rewrite_rules}{$channel} // ''; + my $versions = as_array($config->{channels}{$channel}); + my $versions_str = join('+', @$versions); + my (%oses, %langs, %from_versions); + my $migrate_langs; + foreach my $version (@$versions) { + $migrate_langs = $config->{versions}{$version}{migrate_langs} + if $config->{versions}{$version}{migrate_langs}; my $files = $config->{versions}{$version}{files}; - $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; - foreach my $os (sort keys %$files) { - foreach my $bt (build_targets_by_os($os)) { - foreach my $lang (sort keys %{$files->{$os}}) { - foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$version-$os-$lang.xml $flags\n"; - } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$lang.xml $flags\n"; + foreach my $os (keys %$files) { + $oses{$os} = 1; + foreach my $lang (keys %{$files->{$os}}) { + $langs{$lang} = 1; + foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + $from_versions{$from_version} = 1; } - foreach my $lang (sort keys %$migrate_langs) { - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$migrate_langs->{$lang}.xml $flags\n"; + } + } + $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; + } + foreach my $os (sort keys %oses) { + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %langs) { + foreach my $from_version (sort keys %from_versions) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$versions_str-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/ $version-$os-ALL.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$versions_str-$os-$lang.xml $flags\n"; + } + foreach my $lang (sort keys %$migrate_langs) { + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$versions_str-$os-$migrate_langs->{$lang}.xml $flags\n"; } + $htaccess .= "RewriteRule ^$bt/ $versions_str-$os-ALL.xml $flags\n"; } - write_htdocs($channel, '.htaccess', $htaccess); } + write_htdocs($channel, '.htaccess', $htaccess); } sub write_downloads_json { - my ($config, @channels) = @_; + my ($config, $channel) = @_; return unless $config->{create_downloads_json}; - @channels = keys %{$config->{channels}} unless @channels; - foreach my $channel (@channels) { - my $version = $config->{channels}{$channel}; - my $tag = get_config($config, $version, 'any', 'tag'); - my $data = { - version => "$version", - tag => "$tag", - downloads => get_version_downloads($config, $version), - }; - write_htdocs($channel, 'downloads.json', - JSON->new->utf8->canonical->encode($data)); - my $pp_downloads = get_perplatform_downloads($config, $version, $tag); - foreach my $os (keys %{$pp_downloads}) { - write_htdocs($channel, "download-$os.json", + my $versions = as_array($config->{channels}{$channel}); + my ($version) = @$versions; + my $tag = get_config($config, $version, 'any', 'tag'); + my $data = { + version => "$version", + tag => "$tag", + downloads => get_version_downloads($config, $version), + }; + write_htdocs($channel, 'downloads.json', + JSON->new->utf8->canonical->encode($data)); + my $pp_downloads = get_perplatform_downloads($config, $version, $tag); + foreach my $os (keys %{$pp_downloads}) { + write_htdocs($channel, "download-$os.json", JSON->new->utf8->canonical->encode($pp_downloads->{$os})); - } } } @@ -486,8 +510,10 @@ sub marzip_path { } my $martools_tmpdir; +my $extracted_martools; sub extract_martools { my ($config, $version) = @_; + return if $extracted_martools; my $marzip = marzip_path($config, $version); $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; @@ -503,6 +529,7 @@ sub extract_martools { } else { $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; } + $extracted_martools = 1; } sub log_step { @@ -559,7 +586,8 @@ sub build_targets_list { sub check_update_responses_channel { my ($config, $base_url, $channel) = @_; - my $channel_version = $config->{channels}{$channel}; + my $channel_versions = as_array($config->{channels}{$channel}); + my ($channel_version) = @$channel_versions; foreach my $build_target (build_targets_list()) { foreach my $lang (qw(en-US de)) { my $url = "$base_url/$channel/$build_target/1.0/$lang"; @@ -621,11 +649,11 @@ sub download_version { } sub download_missing_versions { - my ($config, @channels) = @_; - foreach my $channel (@channels) { - exit_error "Unknown channel $channel" - unless $config->{channels}{$channel}; - my $cversion = $config->{channels}{$channel}; + my ($config, $channel) = @_; + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + my $cversions = as_array($config->{channels}{$channel}); + foreach my $cversion (@$cversions) { next unless $config->{versions}{$cversion}{incremental_from}; foreach my $version (@{$config->{versions}{$cversion}{incremental_from}}) { next if -d version_dir($config, $version); @@ -636,11 +664,9 @@ sub download_missing_versions { sub check_update_responses { my ($config) = @_; - exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; - my ($base_url, @channels) = @ARGV; - foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { - check_update_responses_channel($config, $base_url, $channel); - } + exit_error "usage: $PROGRAM_NAME <base_url> <channel>" unless @ARGV; + my ($base_url, $channel) = @ARGV; + check_update_responses_channel($config, $base_url, $channel); if (!@check_errors) { print "\n\nNo errors\n"; return; @@ -660,38 +686,34 @@ sub check_update_responses { my %actions = ( update_responses => sub { my ($config) = @_; - my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; - foreach my $channel (@channels) { - exit_error "Unknown channel $channel" - unless $config->{channels}{$channel}; - $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; - } - write_responses($config, @channels); - write_htaccess($config, @channels); - write_downloads_json($config, @channels); - clean_htdocs(@channels); + exit_error "Wrong arguments" unless @ARGV == 1; + my $channel = $ARGV[0]; + exit_error "Unknown channel $channel" unless $config->{channels}{$channel}; + $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; + write_responses($config, $channel); + write_htaccess($config, $channel); + write_downloads_json($config, $channel); + clean_htdocs($channel); }, gen_incrementals => sub { my ($config) = @_; - foreach my $channel (@ARGV) { - my ($version) = channel_to_version($config, $channel); + exit_error "Wrong arguments" unless @ARGV == 1; + my $channel = $ARGV[0]; + exit_error "Unknown channel" unless $config->{channels}{$channel}; + my $versions = as_array($config->{channels}{$channel}); + foreach my $version (@$versions) { extract_martools($config, $version); get_version_files($config, $version); create_incremental_mars_for_version($config, $version, $channel); } }, download_missing_versions => sub { - my ($config) = @_; - my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; - download_missing_versions($config, @channels); - }, - check_update_responses_deployement => \&check_update_responses, - get_channel_version => sub { my ($config) = @_; exit_error "Wrong arguments" unless @ARGV == 1; - exit_error "Unknown channel" unless $config->{channels}{$ARGV[0]}; - print $config->{channels}{$ARGV[0]}, "\n"; + my $channel = $ARGV[0]; + download_missing_versions($config, $channel); }, + check_update_responses_deployement => \&check_update_responses, ); my $action = fileparse($PROGRAM_NAME); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] Fix 13.5.6 update
by boklm (＠boklm) 03 Oct '24

03 Oct '24

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: e6568d28 by Nicolas Vigier at 2024-10-03T15:17:16+02:00 Fix 13.5.6 update https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/4… - - - - - 8 changed files: - update_3/release/13.5.3-13.5.6-macos-ALL.xml - update_3/release/13.5.4-13.5.6-macos-ALL.xml - update_3/release/13.5.5-13.5.6-macos-ALL.xml - update_3/release/13.5.6-macos-ALL.xml - update_3/release/download-android-aarch64.json - update_3/release/download-android-armv7.json - update_3/release/download-android-x86.json - update_3/release/download-android-x86_64.json Changes: ===================================== update_3/release/13.5.3-13.5.6-macos-ALL.xml ===================================== @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://blog.torproject.org/new-release-tor-browser-1356" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-1356" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos-13.5.6_…" hashFunction="SHA512" hashValue="3812e78c7002ed4b8fe4ab326dd6f665b7948513d95dc1539eb3dd427122f35edd23a80601bca3ec1bcb3a6d1e2186c4f73afa5158fd2804c9c3ab3cb129803f" size="169711162" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos--13.5.3…" hashFunction="SHA512" hashValue="0e1f434b7a7cb2b05299ca20c909242401e486b04816b22338820530069822e95f352ef4010b60c8663d5870064410dcb9878cacd9d82e50560776a245992a3a" size="9024392" type="partial"></patch></update></updates> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://blog.torproject.org/new-release-tor-browser-1356" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-1356" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos-13.5.6_…" hashFunction="SHA512" hashValue="1e5b00a0e4d078647f8e04c967703e1d0e5ae8171108f2012ca36106c7bf76a41bb50766b79de6e4eabb1d1454f70754d731d1048ad96a20046221ed06677fce" size="169713986" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos--13.5.3…" hashFunction="SHA512" hashValue="10252334829fa21b7ec10154606cd1079482ef2cc65db6c41dd1ff293a06012b8321f53accb50876f9d53771f16ec666404088d8c42ee43b5ccbec14b76f99bb" size="9029180" type="partial"></patch></update></updates> ===================================== update_3/release/13.5.4-13.5.6-macos-ALL.xml ===================================== @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://blog.torproject.org/new-release-tor-browser-1356" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-1356" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos-13.5.6_…" hashFunction="SHA512" hashValue="3812e78c7002ed4b8fe4ab326dd6f665b7948513d95dc1539eb3dd427122f35edd23a80601bca3ec1bcb3a6d1e2186c4f73afa5158fd2804c9c3ab3cb129803f" size="169711162" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos--13.5.4…" hashFunction="SHA512" hashValue="bb89e1aacae8732d0e8a5f5e9ca78d089871edbad9dc7e6f73e1ba5dfdf2ee09e483833fcfa31c25ab38549b0753c95bd77c78180ba3b2a6de579943fa3e1638" size="8537264" type="partial"></patch></update></updates> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://blog.torproject.org/new-release-tor-browser-1356" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-1356" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos-13.5.6_…" hashFunction="SHA512" hashValue="1e5b00a0e4d078647f8e04c967703e1d0e5ae8171108f2012ca36106c7bf76a41bb50766b79de6e4eabb1d1454f70754d731d1048ad96a20046221ed06677fce" size="169713986" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos--13.5.4…" hashFunction="SHA512" hashValue="bb7d500f431022b5ce5b1b7385ef3db44217681b992ba4fc790b9db0c52ee797c6f54a3d47cb43b8e5d8879330dcc6bbd5e10d6c522563717b74fd50fd55cdaf" size="8534004" type="partial"></patch></update></updates> ===================================== update_3/release/13.5.5-13.5.6-macos-ALL.xml ===================================== @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://blog.torproject.org/new-release-tor-browser-1356" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-1356" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos-13.5.6_…" hashFunction="SHA512" hashValue="3812e78c7002ed4b8fe4ab326dd6f665b7948513d95dc1539eb3dd427122f35edd23a80601bca3ec1bcb3a6d1e2186c4f73afa5158fd2804c9c3ab3cb129803f" size="169711162" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos--13.5.5…" hashFunction="SHA512" hashValue="e4b7087c41afe1fd942f0e439e2ce7b175d10c4dc6c027af81e90204edcf8811b19bda84ee2eed70a1fe09c117303c8ba0d196b263965c2d7c6af01e6852f919" size="8476716" type="partial"></patch></update></updates> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://blog.torproject.org/new-release-tor-browser-1356" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-1356" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos-13.5.6_…" hashFunction="SHA512" hashValue="1e5b00a0e4d078647f8e04c967703e1d0e5ae8171108f2012ca36106c7bf76a41bb50766b79de6e4eabb1d1454f70754d731d1048ad96a20046221ed06677fce" size="169713986" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos--13.5.5…" hashFunction="SHA512" hashValue="d0848e8628a720a24c837dd2f53f93c9805083bd5aa1988bbb3d01cc8c52584bad06975b062e4ce14ab67dd7884a31c7453f4840243f750394733eaa2097662d" size="8478964" type="partial"></patch></update></updates> ===================================== update_3/release/13.5.6-macos-ALL.xml ===================================== @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://blog.torproject.org/new-release-tor-browser-1356" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-1356" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos-13.5.6_…" hashFunction="SHA512" hashValue="3812e78c7002ed4b8fe4ab326dd6f665b7948513d95dc1539eb3dd427122f35edd23a80601bca3ec1bcb3a6d1e2186c4f73afa5158fd2804c9c3ab3cb129803f" size="169711162" type="complete"></patch></update></updates> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://blog.torproject.org/new-release-tor-browser-1356" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-1356" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5.6/tor-browser-macos-13.5.6_…" hashFunction="SHA512" hashValue="1e5b00a0e4d078647f8e04c967703e1d0e5ae8171108f2012ca36106c7bf76a41bb50766b79de6e4eabb1d1454f70754d731d1048ad96a20046221ed06677fce" size="169713986" type="complete"></patch></update></updates> ===================================== update_3/release/download-android-aarch64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/13.5.4/tor-browser-android-aarch64-1…","git_tag":"tbb-13.5.4-build1","sig":"https://dist.torproject.org/torbrowser/13.5.4/tor-browser-android-aarch64-1…","version":"13.5.4"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/13.5.6/tor-browser-android-aarch64-1…","git_tag":"tbb-13.5.6-build1","sig":"https://dist.torproject.org/torbrowser/13.5.6/tor-browser-android-aarch64-1…","version":"13.5.6"} \ No newline at end of file ===================================== update_3/release/download-android-armv7.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/13.5.4/tor-browser-android-armv7-13.…","git_tag":"tbb-13.5.4-build1","sig":"https://dist.torproject.org/torbrowser/13.5.4/tor-browser-android-armv7-13.…","version":"13.5.4"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/13.5.6/tor-browser-android-armv7-13.…","git_tag":"tbb-13.5.6-build1","sig":"https://dist.torproject.org/torbrowser/13.5.6/tor-browser-android-armv7-13.…","version":"13.5.6"} \ No newline at end of file ===================================== update_3/release/download-android-x86.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/13.5.4/tor-browser-android-x86-13.5.…","git_tag":"tbb-13.5.4-build1","sig":"https://dist.torproject.org/torbrowser/13.5.4/tor-browser-android-x86-13.5.…","version":"13.5.4"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/13.5.6/tor-browser-android-x86-13.5.…","git_tag":"tbb-13.5.6-build1","sig":"https://dist.torproject.org/torbrowser/13.5.6/tor-browser-android-x86-13.5.…","version":"13.5.6"} \ No newline at end of file ===================================== update_3/release/download-android-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/13.5.4/tor-browser-android-x86_64-13…","git_tag":"tbb-13.5.4-build1","sig":"https://dist.torproject.org/torbrowser/13.5.4/tor-browser-android-x86_64-13…","version":"13.5.4"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/13.5.6/tor-browser-android-x86_64-13…","git_tag":"tbb-13.5.6-build1","sig":"https://dist.torproject.org/torbrowser/13.5.6/tor-browser-android-x86_64-13…","version":"13.5.6"} \ No newline at end of file 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/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 8523387b by Pier Angelo Vendrame at 2024-10-02T19:53:07+00:00 fixup! Firefox preference overrides. Bug 42054: ESR128: investigate - thorin's list. Set or remove some preferences as suggested by Thorin. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -101,6 +101,12 @@ pref("browser.pagethumbnails.capturing_disabled", true); // pref("privacy.exposeContentTitleInWindow", false); // pref("privacy.exposeContentTitleInWindow.pbm", false); +// tor-browser#42054: Opt-out from any built-in backup system, even though +// local, as it might be a violation of our standalone mode. +// Users can still opt-in if they wish. +pref("browser.backup.enabled", false); +pref("browser.backup.scheduled.enabled", false); + // Empty clipboard content from private windows on exit (tor-browser#42154) pref("browser.privatebrowsing.preserveClipboard", false); @@ -251,6 +257,9 @@ pref("privacy.trackingprotection.fingerprinting.enabled", false); pref("privacy.trackingprotection.socialtracking.enabled", false); pref("privacy.socialtracking.block_cookies.enabled", false); pref("privacy.annotate_channels.strict_list.enabled", false); +// tor-browser#43178: for defense-in-depth, avoid remote overrides to FPP. +// Notice that it should not apply to RFP anyway... +pref("privacy.fingerprintingProtection.remoteOverrides.enabled", false); // Disable the Pocket extension (Bug #18886 and #31602) pref("extensions.pocket.enabled", false); @@ -284,6 +293,9 @@ pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiment // Disable fetching asrouter.ftl and related console errors (tor-browser#40763). pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); +// tor-browser#42054: make sure search result telemetry is disabled. +pref("browser.search.serpEventTelemetryCategorization.enabled", false); + // tor-browser#42872, #42555: Disable translations. // Translation have a bad UX in 128 (and with our config). Maybe we will // re-enable after auditing and fixing the UX. @@ -444,9 +456,6 @@ pref("pdfjs.disabled", false, locked); #endif // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); -// Enforce non-native widget theme (true by default, defense in depth). -// Provides a uniform look and feel across platforms. Added with tor-browser#41496. -pref("widget.non-native-theme.enabled", true); // tor-browser#41676: Set the TZ environment variable as a defense-in-depth. // TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); @@ -524,7 +533,9 @@ pref("network.http.http2.websockets", true, locked); pref("network.http.http2.enable-hpack-dump", false, locked); // tor-browser#23044: Make sure we don't have any GIO supported protocols -// (defense in depth measure) +// (defense in depth measure). +// As of Firefox 118 (Bug 1843763), upstream does not add any protocol by +// default, but setting it to blank seems a good idea (tor-browser#42054). pref("network.gio.supported-protocols", ""); // Mullvad Browser enables WebRTC by default, meaning that there the following prefs // are first-line defense, rather than "in depth" (mullvad-browser#40) @@ -627,9 +638,6 @@ pref("security.cert_pinning.enforcement_level", 2); // Don't load OS client certs. pref("security.osclientcerts.autoload", false); -// Don't allow MitM via Microsoft Family Safety, see bug 21686 -pref("security.family_safety.mode", 0); - // Don't allow MitM via enterprise roots, see bug 30681 pref("security.enterprise_roots.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/852… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/852… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: b8610ea4 by Pier Angelo Vendrame at 2024-10-02T19:52:38+00:00 fixup! Firefox preference overrides. Bug 42054: ESR128: investigate - thorin's list. Set or remove some preferences as suggested by Thorin. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -101,6 +101,12 @@ pref("browser.pagethumbnails.capturing_disabled", true); // pref("privacy.exposeContentTitleInWindow", false); // pref("privacy.exposeContentTitleInWindow.pbm", false); +// tor-browser#42054: Opt-out from any built-in backup system, even though +// local, as it might be a violation of our standalone mode. +// Users can still opt-in if they wish. +pref("browser.backup.enabled", false); +pref("browser.backup.scheduled.enabled", false); + // Empty clipboard content from private windows on exit (tor-browser#42154) pref("browser.privatebrowsing.preserveClipboard", false); @@ -251,6 +257,9 @@ pref("privacy.trackingprotection.fingerprinting.enabled", false); pref("privacy.trackingprotection.socialtracking.enabled", false); pref("privacy.socialtracking.block_cookies.enabled", false); pref("privacy.annotate_channels.strict_list.enabled", false); +// tor-browser#43178: for defense-in-depth, avoid remote overrides to FPP. +// Notice that it should not apply to RFP anyway... +pref("privacy.fingerprintingProtection.remoteOverrides.enabled", false); // Disable the Pocket extension (Bug #18886 and #31602) pref("extensions.pocket.enabled", false); @@ -284,6 +293,9 @@ pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiment // Disable fetching asrouter.ftl and related console errors (tor-browser#40763). pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); +// tor-browser#42054: make sure search result telemetry is disabled. +pref("browser.search.serpEventTelemetryCategorization.enabled", false); + // tor-browser#42872, #42555: Disable translations. // Translation have a bad UX in 128 (and with our config). Maybe we will // re-enable after auditing and fixing the UX. @@ -444,9 +456,6 @@ pref("pdfjs.disabled", false, locked); #endif // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); -// Enforce non-native widget theme (true by default, defense in depth). -// Provides a uniform look and feel across platforms. Added with tor-browser#41496. -pref("widget.non-native-theme.enabled", true); // tor-browser#41676: Set the TZ environment variable as a defense-in-depth. // TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); @@ -524,7 +533,9 @@ pref("network.http.http2.websockets", true, locked); pref("network.http.http2.enable-hpack-dump", false, locked); // tor-browser#23044: Make sure we don't have any GIO supported protocols -// (defense in depth measure) +// (defense in depth measure). +// As of Firefox 118 (Bug 1843763), upstream does not add any protocol by +// default, but setting it to blank seems a good idea (tor-browser#42054). pref("network.gio.supported-protocols", ""); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces // Mullvad Browser enables WebRTC by default, meaning that there the following prefs @@ -631,9 +642,6 @@ pref("security.cert_pinning.enforcement_level", 2); // Don't load OS client certs. pref("security.osclientcerts.autoload", false); -// Don't allow MitM via Microsoft Family Safety, see bug 21686 -pref("security.family_safety.mode", 0); - // Don't allow MitM via enterprise roots, see bug 30681 pref("security.enterprise_roots.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b8610ea… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b8610ea… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 816dae39 by Pier Angelo Vendrame at 2024-10-02T19:32:59+00:00 fixup! Firefox preference overrides. Bug 42054: ESR128: investigate - thorin's list. Set or remove some preferences as suggested by Thorin. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -101,6 +101,12 @@ pref("browser.pagethumbnails.capturing_disabled", true); // pref("privacy.exposeContentTitleInWindow", false); // pref("privacy.exposeContentTitleInWindow.pbm", false); +// tor-browser#42054: Opt-out from any built-in backup system, even though +// local, as it might be a violation of our standalone mode. +// Users can still opt-in if they wish. +pref("browser.backup.enabled", false); +pref("browser.backup.scheduled.enabled", false); + // Empty clipboard content from private windows on exit (tor-browser#42154) pref("browser.privatebrowsing.preserveClipboard", false); @@ -251,6 +257,9 @@ pref("privacy.trackingprotection.fingerprinting.enabled", false); pref("privacy.trackingprotection.socialtracking.enabled", false); pref("privacy.socialtracking.block_cookies.enabled", false); pref("privacy.annotate_channels.strict_list.enabled", false); +// tor-browser#43178: for defense-in-depth, avoid remote overrides to FPP. +// Notice that it should not apply to RFP anyway... +pref("privacy.fingerprintingProtection.remoteOverrides.enabled", false); // Disable the Pocket extension (Bug #18886 and #31602) pref("extensions.pocket.enabled", false); @@ -284,6 +293,9 @@ pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiment // Disable fetching asrouter.ftl and related console errors (tor-browser#40763). pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); +// tor-browser#42054: make sure search result telemetry is disabled. +pref("browser.search.serpEventTelemetryCategorization.enabled", false); + // tor-browser#42872, #42555: Disable translations. // Translation have a bad UX in 128 (and with our config). Maybe we will // re-enable after auditing and fixing the UX. @@ -444,9 +456,6 @@ pref("pdfjs.disabled", false, locked); #endif // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); -// Enforce non-native widget theme (true by default, defense in depth). -// Provides a uniform look and feel across platforms. Added with tor-browser#41496. -pref("widget.non-native-theme.enabled", true); // tor-browser#41676: Set the TZ environment variable as a defense-in-depth. // TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); @@ -524,7 +533,9 @@ pref("network.http.http2.websockets", true, locked); pref("network.http.http2.enable-hpack-dump", false, locked); // tor-browser#23044: Make sure we don't have any GIO supported protocols -// (defense in depth measure) +// (defense in depth measure). +// As of Firefox 118 (Bug 1843763), upstream does not add any protocol by +// default, but setting it to blank seems a good idea (tor-browser#42054). pref("network.gio.supported-protocols", ""); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces // Mullvad Browser enables WebRTC by default, meaning that there the following prefs @@ -631,9 +642,6 @@ pref("security.cert_pinning.enforcement_level", 2); // Don't load OS client certs. pref("security.osclientcerts.autoload", false); -// Don't allow MitM via Microsoft Family Safety, see bug 21686 -pref("security.family_safety.mode", 0); - // Don't allow MitM via enterprise roots, see bug 30681 pref("security.enterprise_roots.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/816dae3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/816dae3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] 2 commits: Bug 1607032: Spoof screen orientation and angle to primary values. r=tjr, geckoview-reviewers, owlish
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 0c49d19c by Fatih at 2024-10-02T19:27:24+00:00 Bug 1607032: Spoof screen orientation and angle to primary values. r=tjr,geckoview-reviewers,owlish Differential Revision: https://phabricator.services.mozilla.com/D220904 - - - - - 0fb83408 by Fatih at 2024-10-02T19:27:24+00:00 Bug 1918202: Spoof orientation based on screen size. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221863 - - - - - 6 changed files: - dom/base/ScreenOrientation.cpp - dom/base/nsGlobalWindowInner.cpp - dom/base/test/chrome/bug418986-1.js - hal/android/AndroidHal.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== dom/base/ScreenOrientation.cpp ===================================== @@ -626,7 +626,13 @@ void ScreenOrientation::CleanupFullscreenListener() { OrientationType ScreenOrientation::DeviceType(CallerType aCallerType) const { if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return OrientationType::Landscape_primary; + Document* doc = GetResponsibleDocument(); + BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; + if (!bc) { + return nsRFPService::GetDefaultOrientationType(); + } + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToOrientationType(size.width, size.height); } return mType; } @@ -634,18 +640,19 @@ OrientationType ScreenOrientation::DeviceType(CallerType aCallerType) const { uint16_t ScreenOrientation::DeviceAngle(CallerType aCallerType) const { if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return 0; + Document* doc = GetResponsibleDocument(); + BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; + if (!bc) { + return 0; + } + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToAngle(size.width, size.height); } return mAngle; } OrientationType ScreenOrientation::GetType(CallerType aCallerType, ErrorResult& aRv) const { - if (nsContentUtils::ShouldResistFingerprinting( - aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return OrientationType::Landscape_primary; - } - Document* doc = GetResponsibleDocument(); BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; if (!bc) { @@ -653,16 +660,17 @@ OrientationType ScreenOrientation::GetType(CallerType aCallerType, return OrientationType::Portrait_primary; } - return bc->GetCurrentOrientationType(); -} - -uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, - ErrorResult& aRv) const { + OrientationType orientation = bc->GetCurrentOrientationType(); if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return 0; + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToOrientationType(size.width, size.height); } + return orientation; +} +uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, + ErrorResult& aRv) const { Document* doc = GetResponsibleDocument(); BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; if (!bc) { @@ -670,7 +678,13 @@ uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, return 0; } - return bc->GetCurrentOrientationAngle(); + uint16_t angle = static_cast<uint16_t>(bc->GetCurrentOrientationAngle()); + if (nsContentUtils::ShouldResistFingerprinting( + aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToAngle(size.width, size.height); + } + return angle; } ScreenOrientation::LockPermission ===================================== dom/base/nsGlobalWindowInner.cpp ===================================== @@ -7306,11 +7306,13 @@ void nsGlobalWindowInner::InitWasOffline() { mWasOffline = NS_IsOffline(); } int16_t nsGlobalWindowInner::Orientation(CallerType aCallerType) { // GetOrientationAngle() returns 0, 90, 180 or 270. // window.orientation returns -90, 0, 90 or 180. + uint16_t screenAngle = Screen()->GetOrientationAngle(); if (nsIGlobalObject::ShouldResistFingerprinting( aCallerType, RFPTarget::ScreenOrientation)) { - return 0; + CSSIntSize size = mBrowsingContext->GetTopInnerSizeForRFP(); + screenAngle = nsRFPService::ViewportSizeToAngle(size.width, size.height); } - int16_t angle = AssertedCast<int16_t>(Screen()->GetOrientationAngle()); + int16_t angle = AssertedCast<int16_t>(screenAngle); return angle <= 180 ? angle : angle - 360; } ===================================== dom/base/test/chrome/bug418986-1.js ===================================== @@ -32,9 +32,6 @@ var test = function (isContent) { ["screen.availTop", 0], ["screen.width", "outerWidth"], ["screen.height", "outerHeight"], - ["screen.orientation.type", "'landscape-primary'"], - ["screen.orientation.angle", 0], - ["screen.mozOrientation", "'landscape-primary'"], ["devicePixelRatio", 2], ]; ===================================== hal/android/AndroidHal.cpp ===================================== @@ -79,19 +79,20 @@ void GetCurrentNetworkInformation(hal::NetworkInformation* aNetworkInfo) { static bool IsSupportedScreenOrientation(hal::ScreenOrientation aOrientation) { // The Android backend only supports these orientations. - static constexpr ScreenOrientation kSupportedOrientations[] = { - ScreenOrientation::PortraitPrimary, - ScreenOrientation::PortraitSecondary, - ScreenOrientation::PortraitPrimary | ScreenOrientation::PortraitSecondary, - ScreenOrientation::LandscapePrimary, - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::LandscapePrimary | - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::PortraitPrimary | - ScreenOrientation::PortraitSecondary | - ScreenOrientation::LandscapePrimary | - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::Default, + static constexpr hal::ScreenOrientation kSupportedOrientations[] = { + hal::ScreenOrientation::PortraitPrimary, + hal::ScreenOrientation::PortraitSecondary, + hal::ScreenOrientation::PortraitPrimary | + hal::ScreenOrientation::PortraitSecondary, + hal::ScreenOrientation::LandscapePrimary, + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::LandscapePrimary | + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::PortraitPrimary | + hal::ScreenOrientation::PortraitSecondary | + hal::ScreenOrientation::LandscapePrimary | + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::Default, }; for (auto supportedOrientation : kSupportedOrientations) { if (aOrientation == supportedOrientation) { ===================================== toolkit/components/resistfingerprinting/nsRFPService.cpp ===================================== @@ -2284,3 +2284,34 @@ Maybe<RFPTarget> nsRFPService::GetOverriddenFingerprintingSettingsForURI( return result; } + +/* static */ +uint16_t nsRFPService::ViewportSizeToAngle(int32_t aWidth, int32_t aHeight) { +#ifdef MOZ_WIDGET_ANDROID + bool neutral = aHeight >= aWidth; +#else + bool neutral = aWidth >= aHeight; +#endif + if (neutral) { + return 0; + } + return 90; +} + +/* static */ +dom::OrientationType nsRFPService::ViewportSizeToOrientationType( + int32_t aWidth, int32_t aHeight) { + if (aWidth >= aHeight) { + return dom::OrientationType::Landscape_primary; + } + return dom::OrientationType::Portrait_primary; +} + +/* static */ +dom::OrientationType nsRFPService::GetDefaultOrientationType() { +#ifdef MOZ_WIDGET_ANDROID + return dom::OrientationType::Portrait_primary; +#else + return dom::OrientationType::Landscape_primary; +#endif +} ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -14,6 +14,7 @@ #include "mozilla/ContentBlockingLog.h" #include "mozilla/gfx/Types.h" #include "mozilla/TypedEnumBits.h" +#include "mozilla/dom/ScreenOrientationBinding.h" #include "js/RealmOptions.h" #include "nsHashtablesFwd.h" #include "nsICookieJarSettings.h" @@ -368,6 +369,16 @@ class nsRFPService final : public nsIObserver, public nsIRFPService { static bool CheckSuspiciousFingerprintingActivity( nsTArray<ContentBlockingLog::LogEntry>& aLogs); + // Converts the viewport size to the angle. + static uint16_t ViewportSizeToAngle(int32_t aWidth, int32_t aHeight); + + // Converts the viewport size to the orientation type. + static dom::OrientationType ViewportSizeToOrientationType(int32_t aWidth, + int32_t aHeight); + + // Returns the default orientation type for the given platform. + static dom::OrientationType GetDefaultOrientationType(); + private: nsresult Init(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/92… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/92… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.3.0esr-14.0-1] 2 commits: Bug 1607032: Spoof screen orientation and angle to primary values. r=tjr, geckoview-reviewers, owlish
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 9f066a06 by Fatih at 2024-10-02T19:25:48+00:00 Bug 1607032: Spoof screen orientation and angle to primary values. r=tjr,geckoview-reviewers,owlish Differential Revision: https://phabricator.services.mozilla.com/D220904 - - - - - 6112a1c3 by Fatih at 2024-10-02T19:25:48+00:00 Bug 1918202: Spoof orientation based on screen size. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221863 - - - - - 6 changed files: - dom/base/ScreenOrientation.cpp - dom/base/nsGlobalWindowInner.cpp - dom/base/test/chrome/bug418986-1.js - hal/android/AndroidHal.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== dom/base/ScreenOrientation.cpp ===================================== @@ -626,7 +626,13 @@ void ScreenOrientation::CleanupFullscreenListener() { OrientationType ScreenOrientation::DeviceType(CallerType aCallerType) const { if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return OrientationType::Landscape_primary; + Document* doc = GetResponsibleDocument(); + BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; + if (!bc) { + return nsRFPService::GetDefaultOrientationType(); + } + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToOrientationType(size.width, size.height); } return mType; } @@ -634,18 +640,19 @@ OrientationType ScreenOrientation::DeviceType(CallerType aCallerType) const { uint16_t ScreenOrientation::DeviceAngle(CallerType aCallerType) const { if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return 0; + Document* doc = GetResponsibleDocument(); + BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; + if (!bc) { + return 0; + } + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToAngle(size.width, size.height); } return mAngle; } OrientationType ScreenOrientation::GetType(CallerType aCallerType, ErrorResult& aRv) const { - if (nsContentUtils::ShouldResistFingerprinting( - aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return OrientationType::Landscape_primary; - } - Document* doc = GetResponsibleDocument(); BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; if (!bc) { @@ -653,16 +660,17 @@ OrientationType ScreenOrientation::GetType(CallerType aCallerType, return OrientationType::Portrait_primary; } - return bc->GetCurrentOrientationType(); -} - -uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, - ErrorResult& aRv) const { + OrientationType orientation = bc->GetCurrentOrientationType(); if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return 0; + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToOrientationType(size.width, size.height); } + return orientation; +} +uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, + ErrorResult& aRv) const { Document* doc = GetResponsibleDocument(); BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; if (!bc) { @@ -670,7 +678,13 @@ uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, return 0; } - return bc->GetCurrentOrientationAngle(); + uint16_t angle = static_cast<uint16_t>(bc->GetCurrentOrientationAngle()); + if (nsContentUtils::ShouldResistFingerprinting( + aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToAngle(size.width, size.height); + } + return angle; } ScreenOrientation::LockPermission ===================================== dom/base/nsGlobalWindowInner.cpp ===================================== @@ -7306,11 +7306,13 @@ void nsGlobalWindowInner::InitWasOffline() { mWasOffline = NS_IsOffline(); } int16_t nsGlobalWindowInner::Orientation(CallerType aCallerType) { // GetOrientationAngle() returns 0, 90, 180 or 270. // window.orientation returns -90, 0, 90 or 180. + uint16_t screenAngle = Screen()->GetOrientationAngle(); if (nsIGlobalObject::ShouldResistFingerprinting( aCallerType, RFPTarget::ScreenOrientation)) { - return 0; + CSSIntSize size = mBrowsingContext->GetTopInnerSizeForRFP(); + screenAngle = nsRFPService::ViewportSizeToAngle(size.width, size.height); } - int16_t angle = AssertedCast<int16_t>(Screen()->GetOrientationAngle()); + int16_t angle = AssertedCast<int16_t>(screenAngle); return angle <= 180 ? angle : angle - 360; } ===================================== dom/base/test/chrome/bug418986-1.js ===================================== @@ -32,9 +32,6 @@ var test = function (isContent) { ["screen.availTop", 0], ["screen.width", "outerWidth"], ["screen.height", "outerHeight"], - ["screen.orientation.type", "'landscape-primary'"], - ["screen.orientation.angle", 0], - ["screen.mozOrientation", "'landscape-primary'"], ["devicePixelRatio", 2], ]; ===================================== hal/android/AndroidHal.cpp ===================================== @@ -79,19 +79,20 @@ void GetCurrentNetworkInformation(hal::NetworkInformation* aNetworkInfo) { static bool IsSupportedScreenOrientation(hal::ScreenOrientation aOrientation) { // The Android backend only supports these orientations. - static constexpr ScreenOrientation kSupportedOrientations[] = { - ScreenOrientation::PortraitPrimary, - ScreenOrientation::PortraitSecondary, - ScreenOrientation::PortraitPrimary | ScreenOrientation::PortraitSecondary, - ScreenOrientation::LandscapePrimary, - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::LandscapePrimary | - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::PortraitPrimary | - ScreenOrientation::PortraitSecondary | - ScreenOrientation::LandscapePrimary | - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::Default, + static constexpr hal::ScreenOrientation kSupportedOrientations[] = { + hal::ScreenOrientation::PortraitPrimary, + hal::ScreenOrientation::PortraitSecondary, + hal::ScreenOrientation::PortraitPrimary | + hal::ScreenOrientation::PortraitSecondary, + hal::ScreenOrientation::LandscapePrimary, + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::LandscapePrimary | + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::PortraitPrimary | + hal::ScreenOrientation::PortraitSecondary | + hal::ScreenOrientation::LandscapePrimary | + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::Default, }; for (auto supportedOrientation : kSupportedOrientations) { if (aOrientation == supportedOrientation) { ===================================== toolkit/components/resistfingerprinting/nsRFPService.cpp ===================================== @@ -2284,3 +2284,34 @@ Maybe<RFPTarget> nsRFPService::GetOverriddenFingerprintingSettingsForURI( return result; } + +/* static */ +uint16_t nsRFPService::ViewportSizeToAngle(int32_t aWidth, int32_t aHeight) { +#ifdef MOZ_WIDGET_ANDROID + bool neutral = aHeight >= aWidth; +#else + bool neutral = aWidth >= aHeight; +#endif + if (neutral) { + return 0; + } + return 90; +} + +/* static */ +dom::OrientationType nsRFPService::ViewportSizeToOrientationType( + int32_t aWidth, int32_t aHeight) { + if (aWidth >= aHeight) { + return dom::OrientationType::Landscape_primary; + } + return dom::OrientationType::Portrait_primary; +} + +/* static */ +dom::OrientationType nsRFPService::GetDefaultOrientationType() { +#ifdef MOZ_WIDGET_ANDROID + return dom::OrientationType::Portrait_primary; +#else + return dom::OrientationType::Landscape_primary; +#endif +} ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -14,6 +14,7 @@ #include "mozilla/ContentBlockingLog.h" #include "mozilla/gfx/Types.h" #include "mozilla/TypedEnumBits.h" +#include "mozilla/dom/ScreenOrientationBinding.h" #include "js/RealmOptions.h" #include "nsHashtablesFwd.h" #include "nsICookieJarSettings.h" @@ -368,6 +369,16 @@ class nsRFPService final : public nsIObserver, public nsIRFPService { static bool CheckSuspiciousFingerprintingActivity( nsTArray<ContentBlockingLog::LogEntry>& aLogs); + // Converts the viewport size to the angle. + static uint16_t ViewportSizeToAngle(int32_t aWidth, int32_t aHeight); + + // Converts the viewport size to the orientation type. + static dom::OrientationType ViewportSizeToOrientationType(int32_t aWidth, + int32_t aHeight); + + // Returns the default orientation type for the given platform. + static dom::OrientationType GetDefaultOrientationType(); + private: nsresult Init(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dbdddf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dbdddf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] 2 commits: Bug 1607032: Spoof screen orientation and angle to primary values. r=tjr, geckoview-reviewers, owlish
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 89b45eb4 by Fatih at 2024-10-02T18:59:01+00:00 Bug 1607032: Spoof screen orientation and angle to primary values. r=tjr,geckoview-reviewers,owlish Differential Revision: https://phabricator.services.mozilla.com/D220904 - - - - - 084cb5b9 by Fatih at 2024-10-02T18:59:01+00:00 Bug 1918202: Spoof orientation based on screen size. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221863 - - - - - 6 changed files: - dom/base/ScreenOrientation.cpp - dom/base/nsGlobalWindowInner.cpp - dom/base/test/chrome/bug418986-1.js - hal/android/AndroidHal.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== dom/base/ScreenOrientation.cpp ===================================== @@ -626,7 +626,13 @@ void ScreenOrientation::CleanupFullscreenListener() { OrientationType ScreenOrientation::DeviceType(CallerType aCallerType) const { if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return OrientationType::Landscape_primary; + Document* doc = GetResponsibleDocument(); + BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; + if (!bc) { + return nsRFPService::GetDefaultOrientationType(); + } + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToOrientationType(size.width, size.height); } return mType; } @@ -634,18 +640,19 @@ OrientationType ScreenOrientation::DeviceType(CallerType aCallerType) const { uint16_t ScreenOrientation::DeviceAngle(CallerType aCallerType) const { if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return 0; + Document* doc = GetResponsibleDocument(); + BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; + if (!bc) { + return 0; + } + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToAngle(size.width, size.height); } return mAngle; } OrientationType ScreenOrientation::GetType(CallerType aCallerType, ErrorResult& aRv) const { - if (nsContentUtils::ShouldResistFingerprinting( - aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return OrientationType::Landscape_primary; - } - Document* doc = GetResponsibleDocument(); BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; if (!bc) { @@ -653,16 +660,17 @@ OrientationType ScreenOrientation::GetType(CallerType aCallerType, return OrientationType::Portrait_primary; } - return bc->GetCurrentOrientationType(); -} - -uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, - ErrorResult& aRv) const { + OrientationType orientation = bc->GetCurrentOrientationType(); if (nsContentUtils::ShouldResistFingerprinting( aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { - return 0; + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToOrientationType(size.width, size.height); } + return orientation; +} +uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, + ErrorResult& aRv) const { Document* doc = GetResponsibleDocument(); BrowsingContext* bc = doc ? doc->GetBrowsingContext() : nullptr; if (!bc) { @@ -670,7 +678,13 @@ uint16_t ScreenOrientation::GetAngle(CallerType aCallerType, return 0; } - return bc->GetCurrentOrientationAngle(); + uint16_t angle = static_cast<uint16_t>(bc->GetCurrentOrientationAngle()); + if (nsContentUtils::ShouldResistFingerprinting( + aCallerType, GetOwnerGlobal(), RFPTarget::ScreenOrientation)) { + CSSIntSize size = bc->GetTopInnerSizeForRFP(); + return nsRFPService::ViewportSizeToAngle(size.width, size.height); + } + return angle; } ScreenOrientation::LockPermission ===================================== dom/base/nsGlobalWindowInner.cpp ===================================== @@ -7306,11 +7306,13 @@ void nsGlobalWindowInner::InitWasOffline() { mWasOffline = NS_IsOffline(); } int16_t nsGlobalWindowInner::Orientation(CallerType aCallerType) { // GetOrientationAngle() returns 0, 90, 180 or 270. // window.orientation returns -90, 0, 90 or 180. + uint16_t screenAngle = Screen()->GetOrientationAngle(); if (nsIGlobalObject::ShouldResistFingerprinting( aCallerType, RFPTarget::ScreenOrientation)) { - return 0; + CSSIntSize size = mBrowsingContext->GetTopInnerSizeForRFP(); + screenAngle = nsRFPService::ViewportSizeToAngle(size.width, size.height); } - int16_t angle = AssertedCast<int16_t>(Screen()->GetOrientationAngle()); + int16_t angle = AssertedCast<int16_t>(screenAngle); return angle <= 180 ? angle : angle - 360; } ===================================== dom/base/test/chrome/bug418986-1.js ===================================== @@ -32,9 +32,6 @@ var test = function (isContent) { ["screen.availTop", 0], ["screen.width", "outerWidth"], ["screen.height", "outerHeight"], - ["screen.orientation.type", "'landscape-primary'"], - ["screen.orientation.angle", 0], - ["screen.mozOrientation", "'landscape-primary'"], ["devicePixelRatio", 2], ]; ===================================== hal/android/AndroidHal.cpp ===================================== @@ -79,19 +79,20 @@ void GetCurrentNetworkInformation(hal::NetworkInformation* aNetworkInfo) { static bool IsSupportedScreenOrientation(hal::ScreenOrientation aOrientation) { // The Android backend only supports these orientations. - static constexpr ScreenOrientation kSupportedOrientations[] = { - ScreenOrientation::PortraitPrimary, - ScreenOrientation::PortraitSecondary, - ScreenOrientation::PortraitPrimary | ScreenOrientation::PortraitSecondary, - ScreenOrientation::LandscapePrimary, - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::LandscapePrimary | - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::PortraitPrimary | - ScreenOrientation::PortraitSecondary | - ScreenOrientation::LandscapePrimary | - ScreenOrientation::LandscapeSecondary, - ScreenOrientation::Default, + static constexpr hal::ScreenOrientation kSupportedOrientations[] = { + hal::ScreenOrientation::PortraitPrimary, + hal::ScreenOrientation::PortraitSecondary, + hal::ScreenOrientation::PortraitPrimary | + hal::ScreenOrientation::PortraitSecondary, + hal::ScreenOrientation::LandscapePrimary, + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::LandscapePrimary | + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::PortraitPrimary | + hal::ScreenOrientation::PortraitSecondary | + hal::ScreenOrientation::LandscapePrimary | + hal::ScreenOrientation::LandscapeSecondary, + hal::ScreenOrientation::Default, }; for (auto supportedOrientation : kSupportedOrientations) { if (aOrientation == supportedOrientation) { ===================================== toolkit/components/resistfingerprinting/nsRFPService.cpp ===================================== @@ -2284,3 +2284,34 @@ Maybe<RFPTarget> nsRFPService::GetOverriddenFingerprintingSettingsForURI( return result; } + +/* static */ +uint16_t nsRFPService::ViewportSizeToAngle(int32_t aWidth, int32_t aHeight) { +#ifdef MOZ_WIDGET_ANDROID + bool neutral = aHeight >= aWidth; +#else + bool neutral = aWidth >= aHeight; +#endif + if (neutral) { + return 0; + } + return 90; +} + +/* static */ +dom::OrientationType nsRFPService::ViewportSizeToOrientationType( + int32_t aWidth, int32_t aHeight) { + if (aWidth >= aHeight) { + return dom::OrientationType::Landscape_primary; + } + return dom::OrientationType::Portrait_primary; +} + +/* static */ +dom::OrientationType nsRFPService::GetDefaultOrientationType() { +#ifdef MOZ_WIDGET_ANDROID + return dom::OrientationType::Portrait_primary; +#else + return dom::OrientationType::Landscape_primary; +#endif +} ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -14,6 +14,7 @@ #include "mozilla/ContentBlockingLog.h" #include "mozilla/gfx/Types.h" #include "mozilla/TypedEnumBits.h" +#include "mozilla/dom/ScreenOrientationBinding.h" #include "js/RealmOptions.h" #include "nsHashtablesFwd.h" #include "nsICookieJarSettings.h" @@ -368,6 +369,16 @@ class nsRFPService final : public nsIObserver, public nsIRFPService { static bool CheckSuspiciousFingerprintingActivity( nsTArray<ContentBlockingLog::LogEntry>& aLogs); + // Converts the viewport size to the angle. + static uint16_t ViewportSizeToAngle(int32_t aWidth, int32_t aHeight); + + // Converts the viewport size to the orientation type. + static dom::OrientationType ViewportSizeToOrientationType(int32_t aWidth, + int32_t aHeight); + + // Returns the default orientation type for the given platform. + static dom::OrientationType GetDefaultOrientationType(); + private: nsresult Init(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c4c73e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c4c73e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] Bug 1918009 - Fix the RFP-spoofed User-Agent header. r=tjr
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 92d9fad9 by Pier Angelo Vendrame at 2024-10-02T18:50:03+00:00 Bug 1918009 - Fix the RFP-spoofed User-Agent header. r=tjr The spoofed value of the HTTP user-agent header is not consistent with the value of navigator.userAgent on Windows, and this can lead to compatibility issues. Differential Revision: https://phabricator.services.mozilla.com/D223745 - - - - - 3 changed files: - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator.js ===================================== @@ -115,11 +115,11 @@ const SPOOFED_UA_NAVIGATOR_OS = { other: "X11; Linux x86_64", }; const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0", - win: "Windows NT 10.0", - macosx: "Windows NT 10.0", + linux: "Windows NT 10.0; Win64; x64", + win: "Windows NT 10.0; Win64; x64", + macosx: "Windows NT 10.0; Win64; x64", android: "Android 10; Mobile", - other: "Windows NT 10.0", + other: "Windows NT 10.0; Win64; x64", }; const SPOOFED_HW_CONCURRENCY = 2; ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js ===================================== @@ -130,11 +130,11 @@ const SPOOFED_UA_NAVIGATOR_OS = { other: "X11; Linux x86_64", }; const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0", - win: "Windows NT 10.0", - macosx: "Windows NT 10.0", + linux: "Windows NT 10.0; Win64; x64", + win: "Windows NT 10.0; Win64; x64", + macosx: "Windows NT 10.0; Win64; x64", android: "Android 10; Mobile", - other: "Windows NT 10.0", + other: "Windows NT 10.0; Win64; x64", }; const SPOOFED_HW_CONCURRENCY = 2; ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -63,7 +63,7 @@ #if defined(MOZ_WIDGET_ANDROID) # define SPOOFED_HTTP_UA_OS "Android 10; Mobile" #else -# define SPOOFED_HTTP_UA_OS "Windows NT 10.0" +# define SPOOFED_HTTP_UA_OS "Windows NT 10.0; Win64; x64" #endif struct JSContext; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/92d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/92d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.3.0esr-14.0-1] Bug 1918009 - Fix the RFP-spoofed User-Agent header. r=tjr
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: dbdddf48 by Pier Angelo Vendrame at 2024-10-02T18:49:35+00:00 Bug 1918009 - Fix the RFP-spoofed User-Agent header. r=tjr The spoofed value of the HTTP user-agent header is not consistent with the value of navigator.userAgent on Windows, and this can lead to compatibility issues. Differential Revision: https://phabricator.services.mozilla.com/D223745 - - - - - 3 changed files: - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator.js ===================================== @@ -115,11 +115,11 @@ const SPOOFED_UA_NAVIGATOR_OS = { other: "X11; Linux x86_64", }; const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0", - win: "Windows NT 10.0", - macosx: "Windows NT 10.0", + linux: "Windows NT 10.0; Win64; x64", + win: "Windows NT 10.0; Win64; x64", + macosx: "Windows NT 10.0; Win64; x64", android: "Android 10; Mobile", - other: "Windows NT 10.0", + other: "Windows NT 10.0; Win64; x64", }; const SPOOFED_HW_CONCURRENCY = 2; ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js ===================================== @@ -130,11 +130,11 @@ const SPOOFED_UA_NAVIGATOR_OS = { other: "X11; Linux x86_64", }; const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0", - win: "Windows NT 10.0", - macosx: "Windows NT 10.0", + linux: "Windows NT 10.0; Win64; x64", + win: "Windows NT 10.0; Win64; x64", + macosx: "Windows NT 10.0; Win64; x64", android: "Android 10; Mobile", - other: "Windows NT 10.0", + other: "Windows NT 10.0; Win64; x64", }; const SPOOFED_HW_CONCURRENCY = 2; ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -63,7 +63,7 @@ #if defined(MOZ_WIDGET_ANDROID) # define SPOOFED_HTTP_UA_OS "Android 10; Mobile" #else -# define SPOOFED_HTTP_UA_OS "Windows NT 10.0" +# define SPOOFED_HTTP_UA_OS "Windows NT 10.0; Win64; x64" #endif struct JSContext; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dbdddf4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dbdddf4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] Bug 1918009 - Fix the RFP-spoofed User-Agent header. r=tjr
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: c4c73ea4 by Pier Angelo Vendrame at 2024-10-02T18:31:19+00:00 Bug 1918009 - Fix the RFP-spoofed User-Agent header. r=tjr The spoofed value of the HTTP user-agent header is not consistent with the value of navigator.userAgent on Windows, and this can lead to compatibility issues. Differential Revision: https://phabricator.services.mozilla.com/D223745 - - - - - 3 changed files: - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator.js ===================================== @@ -115,11 +115,11 @@ const SPOOFED_UA_NAVIGATOR_OS = { other: "X11; Linux x86_64", }; const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0", - win: "Windows NT 10.0", - macosx: "Windows NT 10.0", + linux: "Windows NT 10.0; Win64; x64", + win: "Windows NT 10.0; Win64; x64", + macosx: "Windows NT 10.0; Win64; x64", android: "Android 10; Mobile", - other: "Windows NT 10.0", + other: "Windows NT 10.0; Win64; x64", }; const SPOOFED_HW_CONCURRENCY = 2; ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js ===================================== @@ -130,11 +130,11 @@ const SPOOFED_UA_NAVIGATOR_OS = { other: "X11; Linux x86_64", }; const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0", - win: "Windows NT 10.0", - macosx: "Windows NT 10.0", + linux: "Windows NT 10.0; Win64; x64", + win: "Windows NT 10.0; Win64; x64", + macosx: "Windows NT 10.0; Win64; x64", android: "Android 10; Mobile", - other: "Windows NT 10.0", + other: "Windows NT 10.0; Win64; x64", }; const SPOOFED_HW_CONCURRENCY = 2; ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -63,7 +63,7 @@ #if defined(MOZ_WIDGET_ANDROID) # define SPOOFED_HTTP_UA_OS "Android 10; Mobile" #else -# define SPOOFED_HTTP_UA_OS "Windows NT 10.0" +# define SPOOFED_HTTP_UA_OS "Windows NT 10.0; Win64; x64" #endif struct JSContext; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c4c73ea… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c4c73ea… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 37ace560 by Morgan at 2024-10-02T17:36:53+00:00 fixup! Firefox preference overrides. Bug 43164: Prevent search-bar from being auto-hidden when not used for awhile - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -9,6 +9,11 @@ pref("intl.locale.requested", ""); pref("browser.startup.homepage", "about:blank"); pref("browser.newtabpage.enabled", false); +// tor-browser#43164: Prevent search-bar from being auto-hidden when not used for awhile +// This preference is locked so that the browser itself can never set an actual +// value that would trigger the migration. +pref("browser.search.widget.lastUsed", "", locked); + // Disable initial homepage notifications pref("browser.search.update", false); pref("startup.homepage_welcome_url", ""); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/37a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/37a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: e25795c4 by Morgan at 2024-10-02T17:34:44+00:00 fixup! Firefox preference overrides. Bug 43164: Prevent search-bar from being auto-hidden when not used for awhile - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -9,6 +9,11 @@ pref("intl.locale.requested", ""); pref("browser.startup.homepage", "about:blank"); pref("browser.newtabpage.enabled", false); +// tor-browser#43164: Prevent search-bar from being auto-hidden when not used for awhile +// This preference is locked so that the browser itself can never set an actual +// value that would trigger the migration. +pref("browser.search.widget.lastUsed", "", locked); + // Disable initial homepage notifications pref("browser.search.update", false); pref("startup.homepage_welcome_url", ""); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e25795c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e25795c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 019449c4 by Morgan at 2024-10-02T17:32:43+00:00 fixup! Firefox preference overrides. Bug 43164: Prevent search-bar from being auto-hidden when not used for awhile - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -9,6 +9,11 @@ pref("intl.locale.requested", ""); pref("browser.startup.homepage", "about:blank"); pref("browser.newtabpage.enabled", false); +// tor-browser#43164: Prevent search-bar from being auto-hidden when not used for awhile +// This preference is locked so that the browser itself can never set an actual +// value that would trigger the migration. +pref("browser.search.widget.lastUsed", "", locked); + // Disable initial homepage notifications pref("browser.search.update", false); pref("startup.homepage_welcome_url", ""); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/019449c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/019449c… 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.5a11-build1
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed new tag tbb-13.5a11-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.5a11] Bug 41253: Prepare Tor Browser 13.5a11
by morgan (＠morgan) 02 Oct '24

02 Oct '24

morgan pushed to branch maint-13.5a11 at The Tor Project / Applications / tor-browser-build Commits: a4cc91f7 by Morgan at 2024-10-02T16:56:22+00:00 Bug 41253: Prepare Tor Browser 13.5a11 - - - - - 5 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/config - projects/firefox/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,47 @@ +Tor Browser 13.5a11 - October 01 2024 + * All Platforms + * Bug 41252: Disable updating update_responses in 13.5-legacy branch [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.16.0esr + +Tor Browser 13.5.6 - September 30 2024 + * All Platforms + * Updated NoScript to 11.4.40 + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43167: Rebase Tor Browser Stable onto 115.16.0esr [tor-browser] + * Bug 43173: Backport security fixes from Firefox 131 [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.16.0esr + * Bug 42737: Drop the hash check on updates [tor-browser] + * Bug 43098: YEC 2024 Takeover for Desktop Stable [tor-browser] + * Windows + macOS + * Bug 42747: Windows 7/8 and macOS 10.12-10.14 Legacy/Maintenance [tor-browser] + * Android + * Updated GeckoView to 115.16.0esr + * Bug 43099: YEC 2024 Takeover for Android Stable [tor-browser] + +Tor Browser 14.0a7 - September 27 2024 + * All Platforms + * Updated NoScript to 11.4.40 + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43163: Disable offscreen canvas until verified it is not fingerprintable [tor-browser] + * Bug 43166: Rebase Tor Browser alpha onto Firefox 128.3.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 128.3.0esr + * Bug 42070: Backport Bugzilla 1834307 and hide smooth-scroll UX [tor-browser] + * Bug 42362: "New window" missing from File menu [tor-browser] + * Bug 42742: Inconsistent use of "New private window" vs "New window" [tor-browser] + * Bug 41248: Check and update bundled font versions [tor-browser-build] + * Android + * Updated GeckoView to 128.3.0esr + * Bug 43172: remove remote settings and SERPTelemetry [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.23.1 + * Bug 41236: Remove binutils when not needed [tor-browser-build] + * Windows + macOS + Linux + * Bug 41246: Add updater rewriterules to make 13.5a10 a watershed [tor-browser-build] + Tor Browser 13.5a10 - September 25 2024 * Windows + macOS + Linux * Updated Firefox to 115.15.0esr ===================================== projects/browser/config ===================================== @@ -104,9 +104,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4349514/noscript-11.4.37.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4357325/noscript-11.4.40.… name: noscript - sha256sum: 5e9921599c63e0b357851ea7ca1354554b3af2c676bbbfff5687cafce4396c18 + sha256sum: 242ead426159d871480a13062cbee08abc97da746cdc5c643aee2692e9adbbb2 - URL: https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.5… name: ublock-origin sha256sum: 1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14 ===================================== projects/firefox/config ===================================== @@ -14,12 +14,12 @@ container: use_container: 1 var: - firefox_platform_version: 115.15.0 + firefox_platform_version: 115.16.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' - browser_rebase: 2 + browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 1 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 16446c485b3be4198a7e79bfcac6510784a18506 + git_hash: a142f78af87f994913faa15fb4b0f34f0ce1a22b targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: a2bf4c2f45736958ac99f60e60b9f6d0e94454c3 + git_hash: 04f824bce1b6fb4b989bb9303949af17eab11406 targets: nightly: git_hash: 'tor-browser' ===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5a10' + torbrowser_version: '13.5a11' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/09/25 17:00:00' + browser_release_date: '2024/10/01 17:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 13.5a10 - 13.5a9 - 13.5a8 - - 13.5a7 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] 2 commits: fixup! Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
by Pier Angelo Vendrame (＠pierov) 02 Oct '24

02 Oct '24

Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 8acd4ac6 by Dan Ballard at 2024-10-02T16:09:15+00:00 fixup! Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. This reverts commit a16d36fce768826615620ee73bec755fcd7081ea for tb-42660 - - - - - 10a39162 by Dan Ballard at 2024-10-02T16:09:15+00:00 Bug 42660: Disable ProxySelector.openConnectionWithProxy and NOPify CrashReporter.sendCrashReport - - - - - 2 changed files: - mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java Changes: ===================================== mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java ===================================== @@ -28,40 +28,19 @@ import java.net.URLConnection; import java.util.List; public class ProxySelector { - private static final String TOR_PROXY_ADDRESS = "127.0.0.1"; - private static final int TOR_SOCKS_PROXY_PORT = 9150; - private static final int TOR_HTTP_PROXY_PORT = 8218; - public static URLConnection openConnectionWithProxy(final URI uri) throws IOException { - final java.net.ProxySelector ps = java.net.ProxySelector.getDefault(); - Proxy proxy = Proxy.NO_PROXY; - if (ps != null) { - final List<Proxy> proxies = ps.select(uri); - if (proxies != null && !proxies.isEmpty()) { - proxy = proxies.get(0); - } - } - - /* Ignore the proxy we found from the VM, only use Tor. We can probably - * safely use the logic in this class in the future. */ - return uri.toURL().openConnection(getProxy()); - } - - public static Proxy getProxy() { - // TODO make configurable - return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(TOR_PROXY_ADDRESS, TOR_SOCKS_PROXY_PORT)); - } - - public static String getProxyHostAddress() { - return TOR_PROXY_ADDRESS; - } - - public static int getSocksProxyPort() { - return TOR_SOCKS_PROXY_PORT; - } - - public static int getHttpProxyPort() { - return TOR_HTTP_PROXY_PORT; +// tb-42660: This should not be used: it cannot safely get tor configs so would be a proxy leak risk + throw new IOException("openConnectionWithProxy disabled by tb-42660"); +// final java.net.ProxySelector ps = java.net.ProxySelector.getDefault(); +// Proxy proxy = Proxy.NO_PROXY; +// if (ps != null) { +// final List<Proxy> proxies = ps.select(uri); +// if (proxies != null && !proxies.isEmpty()) { +// proxy = proxies.get(0); +// } +// } +// +// return uri.toURL().openConnection(proxy); } public ProxySelector() {} ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java ===================================== @@ -169,6 +169,11 @@ public class CrashReporter { @NonNull final File minidumpFile, @NonNull final JSONObject extras) throws IOException, URISyntaxException { + // tb-42660: makeing a NOP + if (true) { + return GeckoResult.fromValue("0"); + } + Log.d(LOGTAG, "Sending crash report: " + minidumpFile.getPath()); HttpURLConnection conn = null; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ac6b47… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ac6b47… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! Add CI for Tor Browser
by Pier Angelo Vendrame (＠pierov) 02 Oct '24

02 Oct '24

Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: ac6b47d5 by Henry Wilkes at 2024-10-02T10:27:03+01:00 fixup! Add CI for Tor Browser Bug 43181: Automatically run translation CI for strings.xml changes. - - - - - 1 changed file: - .gitlab/ci/update-translations.yml Changes: ===================================== .gitlab/ci/update-translations.yml ===================================== @@ -6,6 +6,7 @@ - "**/*.ftl" - "**/*.properties" - "**/*.dtd" + - "**/*strings.xml" - if: $FORCE_UPDATE_TRANSLATIONS == "true" variables: TOR_BROWSER_COMBINED_FILES_JSON: "combined-translation-files.json" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ac6b47d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ac6b47d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41254: Stop copying cryptoSafetyPrompt.properties.
by Pier Angelo Vendrame (＠pierov) 02 Oct '24

02 Oct '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: bab35eb4 by Pier Angelo Vendrame at 2024-10-02T12:53:54+02:00 Bug 41254: Stop copying cryptoSafetyPrompt.properties. That file is not used anymore, and it was supposed to not exist, but it has been deleted only from the en-US directory in translation.git. - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -143,7 +143,6 @@ mkdir "$HOME/.mozbuild" fi [% END -%] mv "$transl_tor_browser/$source_lang/tor-browser.ftl" "$l10ncentral/$lang/toolkit/toolkit/global/" - mv "$transl_tor_browser/$source_lang/cryptoSafetyPrompt.properties" "$l10ncentral/$lang/browser/chrome/browser/" mv "$transl_tor_browser/$source_lang" "$torbutton_locales/$lang" echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5a11] Bug 41252: Do not run upload-update_responses-to-staticiforme
by morgan (＠morgan) 01 Oct '24

01 Oct '24

morgan pushed to branch maint-13.5a11 at The Tor Project / Applications / tor-browser-build Commits: f9e2b4a5 by Nicolas Vigier at 2024-10-01T19:36:41+02:00 Bug 41252: Do not run upload-update_responses-to-staticiforme When signing a 13.5-legacy release, don't update and upload update_responses. The update_responses containing both the 14.0 and 13.5-legacy releases will be generated from the `maint-14.0` branch. - - - - - 1 changed file: - tools/signing/do-all-signing Changes: ===================================== tools/signing/do-all-signing ===================================== @@ -206,5 +206,4 @@ do_step download-unsigned-sha256sums-gpg-signatures-from-people-tpo do_step sync-local-to-staticiforme do_step sync-scripts-to-staticiforme do_step staticiforme-prepare-cdn-dist-upload -do_step upload-update_responses-to-staticiforme do_step finished-signing-clean-linux-signer View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Deleted tag mullvad-browser-115.16.0esr-13.5-1-build2
by morgan (＠morgan) 01 Oct '24

01 Oct '24

morgan deleted tag mullvad-browser-115.16.0esr-13.5-1-build2 at The Tor Project / Applications / Tor Browser -- 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.16.0esr-13.5-1-build2
by morgan (＠morgan) 01 Oct '24

01 Oct '24

morgan pushed new tag mullvad-browser-115.16.0esr-13.5-1-build2 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/tor-browser][base-browser-128.3.0esr-14.0-1] Bug 42716: Disable unwanted about: pages
by morgan (＠morgan) 01 Oct '24

01 Oct '24

morgan pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 520cda9e by Morgan at 2024-10-01T20:36:57+00:00 Bug 42716: Disable unwanted about: pages - - - - - 5 changed files: - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - toolkit/content/jar.mn Changes: ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -86,9 +86,11 @@ static const RedirEntry kRedirMap[] = { {"rights", "chrome://global/content/aboutRights.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, +#ifndef BASE_BROWSER_VERSION {"robots", "chrome://browser/content/aboutRobots.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, +#endif {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, ===================================== browser/components/about/components.conf ===================================== @@ -23,7 +23,7 @@ pages = [ 'reader', 'restartrequired', 'rights', - 'robots', + # Removed 'robots'. tor-browser#42831. 'sessionrestore', 'settings', # Removed 'shoppingsidebar'. tor-browser#42831. ===================================== docshell/base/nsAboutRedirector.cpp ===================================== @@ -135,8 +135,10 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::IS_SECURE_CHROME_UI}, +#ifndef BASE_BROWSER_VERSION {"mozilla", "chrome://global/content/mozilla.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, +#endif #if !defined(ANDROID) && !defined(XP_WIN) {"webauthn", "chrome://global/content/aboutWebauthn.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, @@ -181,15 +183,17 @@ static const RedirEntry kRedirMap[] = { {"windows-messages", "chrome://global/content/aboutWindowsMessages.html", nsIAboutModule::ALLOW_SCRIPT}, #endif -#ifndef MOZ_GLEAN_ANDROID +#ifdef MOZ_TELEMETRY_REPORTING +# ifndef MOZ_GLEAN_ANDROID {"glean", "chrome://global/content/aboutGlean.html", -# if !defined(NIGHTLY_BUILD) && defined(MOZILLA_OFFICIAL) +# if !defined(NIGHTLY_BUILD) && defined(MOZILLA_OFFICIAL) nsIAboutModule::HIDE_FROM_ABOUTABOUT | -# endif +# endif nsIAboutModule::ALLOW_SCRIPT}, -#endif +# endif {"telemetry", "chrome://global/content/aboutTelemetry.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, +#endif {"translations", "chrome://global/content/translations/translations.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | @@ -200,8 +204,10 @@ static const RedirEntry kRedirMap[] = { {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml", nsIAboutModule::ALLOW_SCRIPT}, #endif +#ifdef MOZ_WEBRTC {"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html", nsIAboutModule::ALLOW_SCRIPT}, +#endif {"crashparent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT}, {"crashcontent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT | ===================================== docshell/build/components.conf ===================================== @@ -22,7 +22,7 @@ about_pages = [ 'logging', 'logo', 'memory', - 'mozilla', + # Removed 'mozilla'. tor-browser#42831. 'neterror', 'networking', 'performance', @@ -30,20 +30,22 @@ about_pages = [ 'serviceworkers', 'srcdoc', 'support', - 'telemetry', 'translations', - 'url-classifier', - 'webrtc', + # Removed 'url-classifier'. tor-browser#42831. ] if defined('MOZ_CRASHREPORTER'): about_pages.append('crashes') +if defined('MOZ_TELEMETRY_REPORTING'): + about_pages.append('telemetry') +if defined('MOZ_WEBRTC'): + about_pages.append('webrtc') if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android': about_pages.append('profiles') if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'windows': about_pages.append('third-party') about_pages.append('windows-messages') -if not defined('MOZ_GLEAN_ANDROID'): +if defined('MOZ_TELEMETRY_REPORTING') and not defined('MOZ_GLEAN_ANDROID'): about_pages.append('glean') if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android' and buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'windows': about_pages.append('webauthn') ===================================== toolkit/content/jar.mn ===================================== @@ -23,6 +23,7 @@ toolkit.jar: #endif content/global/aboutServiceWorkers.js content/global/aboutServiceWorkers.xhtml +#ifdef MOZ_WEBRTC content/global/aboutwebrtc/aboutWebrtc.css (aboutwebrtc/aboutWebrtc.css) content/global/aboutwebrtc/aboutWebrtc.mjs (aboutwebrtc/aboutWebrtc.mjs) content/global/aboutwebrtc/graph.mjs (aboutwebrtc/graph.mjs) @@ -31,16 +32,19 @@ toolkit.jar: content/global/aboutwebrtc/disclosure.mjs (aboutwebrtc/disclosure.mjs) content/global/aboutwebrtc/copyButton.mjs (aboutwebrtc/copyButton.mjs) content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html) +#endif content/global/aboutSupport.js * content/global/aboutSupport.xhtml -#ifndef MOZ_GLEAN_ANDROID +#ifdef MOZ_TELEMETRY_REPORTING +# ifndef MOZ_GLEAN_ANDROID content/global/aboutGlean.js content/global/aboutGlean.html content/global/aboutGlean.css -#endif +# endif content/global/aboutTelemetry.js content/global/aboutTelemetry.xhtml content/global/aboutTelemetry.css +#endif content/global/aboutUrlClassifier.js content/global/aboutUrlClassifier.xhtml content/global/aboutUrlClassifier.css View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/520cda9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/520cda9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] Bug 42716: Disable unwanted about: pages
by morgan (＠morgan) 01 Oct '24

01 Oct '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 9921cbc8 by Morgan at 2024-10-01T20:31:28+00:00 Bug 42716: Disable unwanted about: pages - - - - - 5 changed files: - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - toolkit/content/jar.mn Changes: ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -91,9 +91,11 @@ static const RedirEntry kRedirMap[] = { {"rights", "chrome://global/content/aboutRights.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, +#ifndef BASE_BROWSER_VERSION {"robots", "chrome://browser/content/aboutRobots.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, +#endif {"rulesets", "chrome://browser/content/rulesets/aboutRulesets.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | ===================================== browser/components/about/components.conf ===================================== @@ -24,7 +24,7 @@ pages = [ 'reader', 'restartrequired', 'rights', - 'robots', + # Removed 'robots'. tor-browser#42831. 'rulesets', 'sessionrestore', 'settings', ===================================== docshell/base/nsAboutRedirector.cpp ===================================== @@ -135,8 +135,10 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::IS_SECURE_CHROME_UI}, +#ifndef BASE_BROWSER_VERSION {"mozilla", "chrome://global/content/mozilla.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, +#endif #if !defined(ANDROID) && !defined(XP_WIN) {"webauthn", "chrome://global/content/aboutWebauthn.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, @@ -181,15 +183,17 @@ static const RedirEntry kRedirMap[] = { {"windows-messages", "chrome://global/content/aboutWindowsMessages.html", nsIAboutModule::ALLOW_SCRIPT}, #endif -#ifndef MOZ_GLEAN_ANDROID +#ifdef MOZ_TELEMETRY_REPORTING +# ifndef MOZ_GLEAN_ANDROID {"glean", "chrome://global/content/aboutGlean.html", -# if !defined(NIGHTLY_BUILD) && defined(MOZILLA_OFFICIAL) +# if !defined(NIGHTLY_BUILD) && defined(MOZILLA_OFFICIAL) nsIAboutModule::HIDE_FROM_ABOUTABOUT | -# endif +# endif nsIAboutModule::ALLOW_SCRIPT}, -#endif +# endif {"telemetry", "chrome://global/content/aboutTelemetry.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, +#endif {"torconnect", "chrome://global/content/torconnect/aboutTorConnect.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | @@ -205,8 +209,10 @@ static const RedirEntry kRedirMap[] = { {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml", nsIAboutModule::ALLOW_SCRIPT}, #endif +#ifdef MOZ_WEBRTC {"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html", nsIAboutModule::ALLOW_SCRIPT}, +#endif {"crashparent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT}, {"crashcontent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT | ===================================== docshell/build/components.conf ===================================== @@ -22,7 +22,7 @@ about_pages = [ 'logging', 'logo', 'memory', - 'mozilla', + # Removed 'mozilla'. tor-browser#42831. 'neterror', 'networking', 'performance', @@ -30,22 +30,24 @@ about_pages = [ 'serviceworkers', 'srcdoc', 'support', - 'telemetry', 'torconnect', 'translations', 'tor', - 'url-classifier', - 'webrtc', + # Removed 'url-classifier'. tor-browser#42831. ] if defined('MOZ_CRASHREPORTER'): about_pages.append('crashes') +if defined('MOZ_TELEMETRY_REPORTING'): + about_pages.append('telemetry') +if defined('MOZ_WEBRTC'): + about_pages.append('webrtc') if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android': about_pages.append('profiles') if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'windows': about_pages.append('third-party') about_pages.append('windows-messages') -if not defined('MOZ_GLEAN_ANDROID'): +if defined('MOZ_TELEMETRY_REPORTING') and not defined('MOZ_GLEAN_ANDROID'): about_pages.append('glean') if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android' and buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'windows': about_pages.append('webauthn') ===================================== toolkit/content/jar.mn ===================================== @@ -23,6 +23,7 @@ toolkit.jar: #endif content/global/aboutServiceWorkers.js content/global/aboutServiceWorkers.xhtml +#ifdef MOZ_WEBRTC content/global/aboutwebrtc/aboutWebrtc.css (aboutwebrtc/aboutWebrtc.css) content/global/aboutwebrtc/aboutWebrtc.mjs (aboutwebrtc/aboutWebrtc.mjs) content/global/aboutwebrtc/graph.mjs (aboutwebrtc/graph.mjs) @@ -31,16 +32,19 @@ toolkit.jar: content/global/aboutwebrtc/disclosure.mjs (aboutwebrtc/disclosure.mjs) content/global/aboutwebrtc/copyButton.mjs (aboutwebrtc/copyButton.mjs) content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html) +#endif content/global/aboutSupport.js * content/global/aboutSupport.xhtml -#ifndef MOZ_GLEAN_ANDROID +#ifdef MOZ_TELEMETRY_REPORTING +# ifndef MOZ_GLEAN_ANDROID content/global/aboutGlean.js content/global/aboutGlean.html content/global/aboutGlean.css -#endif +# endif content/global/aboutTelemetry.js content/global/aboutTelemetry.xhtml content/global/aboutTelemetry.css +#endif content/global/aboutUrlClassifier.js content/global/aboutUrlClassifier.xhtml content/global/aboutUrlClassifier.css View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9921cbc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9921cbc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8
by ma1 (＠ma1) 01 Oct '24

01 Oct '24

ma1 pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 6e72b4ae by Nika Layzell at 2024-10-01T22:29:48+02:00 Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8 Previously these checks were largely diagnostic tools for finding bugs in other code as it evolves. This unifies the checks a bit more and makes them stronger for BrowsingContexts created over IPC, providing a place for more coherency checks to be added in the future. Differential Revision: https://phabricator.services.mozilla.com/D218860 - - - - - 2 changed files: - docshell/base/BrowsingContext.cpp - docshell/base/BrowsingContext.h Changes: ===================================== docshell/base/BrowsingContext.cpp ===================================== @@ -578,9 +578,20 @@ mozilla::ipc::IPCResult BrowsingContext::CreateFromIPC( context->mRequestContextId = aInit.mRequestContextId; // NOTE: Private browsing ID is set by `SetOriginAttributes`. + if (const char* failure = + context->BrowsingContextCoherencyChecks(aOriginProcess)) { + mozilla::ipc::IProtocol* actor = aOriginProcess; + if (!actor) { + actor = ContentChild::GetSingleton(); + } + return IPC_FAIL_UNSAFE_PRINTF(actor, "Incoherent BrowsingContext: %s", + failure); + } + Register(context); - return context->Attach(/* aFromIPC */ true, aOriginProcess); + context->Attach(/* aFromIPC */ true, aOriginProcess); + return IPC_OK(); } BrowsingContext::BrowsingContext(WindowContext* aParentWindow, @@ -795,8 +806,64 @@ void BrowsingContext::Embed() { } } -mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, - ContentParent* aOriginProcess) { +const char* BrowsingContext::BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess) { +#define COHERENCY_ASSERT(condition) \ + if (!(condition)) return "Assertion " #condition " failed"; + + if (mGroup->IsPotentiallyCrossOriginIsolated() != + (Top()->GetOpenerPolicy() == + nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { + return "Invalid CrossOriginIsolated state"; + } + + if (aOriginProcess && !IsContent()) { + return "Content cannot create chrome BCs"; + } + + // LoadContext should generally match our opener or parent. + if (IsContent()) { + if (RefPtr<BrowsingContext> opener = GetOpener()) { + COHERENCY_ASSERT(opener->mType == mType); + COHERENCY_ASSERT(opener->mGroup == mGroup); + COHERENCY_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + } + if (RefPtr<BrowsingContext> parent = GetParent()) { + COHERENCY_ASSERT(parent->mType == mType); + COHERENCY_ASSERT(parent->mGroup == mGroup); + COHERENCY_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + + // UseRemoteSubframes and UseRemoteTabs must match. + if (mUseRemoteSubframes && !mUseRemoteTabs) { + return "Cannot set useRemoteSubframes without also setting useRemoteTabs"; + } + + // Double-check OriginAttributes/Private Browsing + // Chrome browsing contexts must not have a private browsing OriginAttribute + // Content browsing contexts must maintain the equality: + // mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId + if (IsChrome()) { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0); + } else { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == + mPrivateBrowsingId); + } +#undef COHERENCY_ASSERT + + return nullptr; +} + +void BrowsingContext::Attach(bool aFromIPC, ContentParent* aOriginProcess) { MOZ_DIAGNOSTIC_ASSERT(!mEverAttached); MOZ_DIAGNOSTIC_ASSERT_IF(aFromIPC, aOriginProcess || XRE_IsContentProcess()); mEverAttached = true; @@ -815,25 +882,15 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, MOZ_DIAGNOSTIC_ASSERT(mGroup); MOZ_DIAGNOSTIC_ASSERT(!mIsDiscarded); - if (mGroup->IsPotentiallyCrossOriginIsolated() != - (Top()->GetOpenerPolicy() == - nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { - MOZ_DIAGNOSTIC_ASSERT(aFromIPC); - if (aFromIPC) { - auto* actor = aOriginProcess - ? static_cast<mozilla::ipc::IProtocol*>(aOriginProcess) - : static_cast<mozilla::ipc::IProtocol*>( - ContentChild::GetSingleton()); - return IPC_FAIL( - actor, - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); - } else { - MOZ_CRASH( - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); +#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED + // We'll already have checked this if `aFromIPC` is set before calling this + // function. + if (!aFromIPC) { + if (const char* failure = BrowsingContextCoherencyChecks(aOriginProcess)) { + MOZ_CRASH_UNSAFE_PRINTF("Incoherent BrowsingContext: %s", failure); } } - - AssertCoherentLoadContext(); +#endif // Add ourselves either to our parent or BrowsingContextGroup's child list. // Important: We shouldn't return IPC_FAIL after this point, since the @@ -915,7 +972,6 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, if (XRE_IsParentProcess()) { Canonical()->CanonicalAttach(); } - return IPC_OK(); } void BrowsingContext::Detach(bool aFromIPC) { @@ -1768,40 +1824,6 @@ nsresult BrowsingContext::SetOriginAttributes(const OriginAttributes& aAttrs) { return NS_OK; } -void BrowsingContext::AssertCoherentLoadContext() { -#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED - // LoadContext should generally match our opener or parent. - if (IsContent()) { - if (RefPtr<BrowsingContext> opener = GetOpener()) { - MOZ_DIAGNOSTIC_ASSERT(opener->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(opener->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - } - if (RefPtr<BrowsingContext> parent = GetParent()) { - MOZ_DIAGNOSTIC_ASSERT(parent->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(parent->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - - // UseRemoteSubframes and UseRemoteTabs must match. - MOZ_DIAGNOSTIC_ASSERT( - !mUseRemoteSubframes || mUseRemoteTabs, - "Cannot set useRemoteSubframes without also setting useRemoteTabs"); - - // Double-check OriginAttributes/Private Browsing - AssertOriginAttributesMatchPrivateBrowsing(); -#endif -} - void BrowsingContext::AssertOriginAttributesMatchPrivateBrowsing() { // Chrome browsing contexts must not have a private browsing OriginAttribute // Content browsing contexts must maintain the equality: ===================================== docshell/base/BrowsingContext.h ===================================== @@ -984,7 +984,18 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { bool aHasPostData); private: - mozilla::ipc::IPCResult Attach(bool aFromIPC, ContentParent* aOriginProcess); + // Assert that this BrowsingContext is coherent relative to related + // BrowsingContexts. This will be run before the BrowsingContext is attached. + // + // A non-null string return value indicates that there was a coherency check + // failure, which will be handled with either a crash or IPC failure. + // + // If provided, `aOriginProcess` is the process which is responsible for the + // creation of this BrowsingContext. + [[nodiscard]] const char* BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess); + + void Attach(bool aFromIPC, ContentParent* aOriginProcess); // Recomputes whether we can execute scripts in this BrowsingContext based on // the value of AllowJavascript() and whether scripts are allowed in the @@ -998,10 +1009,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { void AssertOriginAttributesMatchPrivateBrowsing(); - // Assert that the BrowsingContext's LoadContext flags appear coherent - // relative to related BrowsingContexts. - void AssertCoherentLoadContext(); - friend class ::nsOuterWindowProxy; friend class ::nsGlobalWindowOuter; friend class WindowContext; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/6e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/6e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.3.0esr-14.0-1] Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8
by ma1 (＠ma1) 01 Oct '24

01 Oct '24

ma1 pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: eda9f7de by Nika Layzell at 2024-10-01T22:29:35+02:00 Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8 Previously these checks were largely diagnostic tools for finding bugs in other code as it evolves. This unifies the checks a bit more and makes them stronger for BrowsingContexts created over IPC, providing a place for more coherency checks to be added in the future. Differential Revision: https://phabricator.services.mozilla.com/D218860 - - - - - 2 changed files: - docshell/base/BrowsingContext.cpp - docshell/base/BrowsingContext.h Changes: ===================================== docshell/base/BrowsingContext.cpp ===================================== @@ -578,9 +578,20 @@ mozilla::ipc::IPCResult BrowsingContext::CreateFromIPC( context->mRequestContextId = aInit.mRequestContextId; // NOTE: Private browsing ID is set by `SetOriginAttributes`. + if (const char* failure = + context->BrowsingContextCoherencyChecks(aOriginProcess)) { + mozilla::ipc::IProtocol* actor = aOriginProcess; + if (!actor) { + actor = ContentChild::GetSingleton(); + } + return IPC_FAIL_UNSAFE_PRINTF(actor, "Incoherent BrowsingContext: %s", + failure); + } + Register(context); - return context->Attach(/* aFromIPC */ true, aOriginProcess); + context->Attach(/* aFromIPC */ true, aOriginProcess); + return IPC_OK(); } BrowsingContext::BrowsingContext(WindowContext* aParentWindow, @@ -795,8 +806,64 @@ void BrowsingContext::Embed() { } } -mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, - ContentParent* aOriginProcess) { +const char* BrowsingContext::BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess) { +#define COHERENCY_ASSERT(condition) \ + if (!(condition)) return "Assertion " #condition " failed"; + + if (mGroup->IsPotentiallyCrossOriginIsolated() != + (Top()->GetOpenerPolicy() == + nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { + return "Invalid CrossOriginIsolated state"; + } + + if (aOriginProcess && !IsContent()) { + return "Content cannot create chrome BCs"; + } + + // LoadContext should generally match our opener or parent. + if (IsContent()) { + if (RefPtr<BrowsingContext> opener = GetOpener()) { + COHERENCY_ASSERT(opener->mType == mType); + COHERENCY_ASSERT(opener->mGroup == mGroup); + COHERENCY_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + } + if (RefPtr<BrowsingContext> parent = GetParent()) { + COHERENCY_ASSERT(parent->mType == mType); + COHERENCY_ASSERT(parent->mGroup == mGroup); + COHERENCY_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + + // UseRemoteSubframes and UseRemoteTabs must match. + if (mUseRemoteSubframes && !mUseRemoteTabs) { + return "Cannot set useRemoteSubframes without also setting useRemoteTabs"; + } + + // Double-check OriginAttributes/Private Browsing + // Chrome browsing contexts must not have a private browsing OriginAttribute + // Content browsing contexts must maintain the equality: + // mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId + if (IsChrome()) { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0); + } else { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == + mPrivateBrowsingId); + } +#undef COHERENCY_ASSERT + + return nullptr; +} + +void BrowsingContext::Attach(bool aFromIPC, ContentParent* aOriginProcess) { MOZ_DIAGNOSTIC_ASSERT(!mEverAttached); MOZ_DIAGNOSTIC_ASSERT_IF(aFromIPC, aOriginProcess || XRE_IsContentProcess()); mEverAttached = true; @@ -815,25 +882,15 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, MOZ_DIAGNOSTIC_ASSERT(mGroup); MOZ_DIAGNOSTIC_ASSERT(!mIsDiscarded); - if (mGroup->IsPotentiallyCrossOriginIsolated() != - (Top()->GetOpenerPolicy() == - nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { - MOZ_DIAGNOSTIC_ASSERT(aFromIPC); - if (aFromIPC) { - auto* actor = aOriginProcess - ? static_cast<mozilla::ipc::IProtocol*>(aOriginProcess) - : static_cast<mozilla::ipc::IProtocol*>( - ContentChild::GetSingleton()); - return IPC_FAIL( - actor, - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); - } else { - MOZ_CRASH( - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); +#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED + // We'll already have checked this if `aFromIPC` is set before calling this + // function. + if (!aFromIPC) { + if (const char* failure = BrowsingContextCoherencyChecks(aOriginProcess)) { + MOZ_CRASH_UNSAFE_PRINTF("Incoherent BrowsingContext: %s", failure); } } - - AssertCoherentLoadContext(); +#endif // Add ourselves either to our parent or BrowsingContextGroup's child list. // Important: We shouldn't return IPC_FAIL after this point, since the @@ -915,7 +972,6 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, if (XRE_IsParentProcess()) { Canonical()->CanonicalAttach(); } - return IPC_OK(); } void BrowsingContext::Detach(bool aFromIPC) { @@ -1768,40 +1824,6 @@ nsresult BrowsingContext::SetOriginAttributes(const OriginAttributes& aAttrs) { return NS_OK; } -void BrowsingContext::AssertCoherentLoadContext() { -#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED - // LoadContext should generally match our opener or parent. - if (IsContent()) { - if (RefPtr<BrowsingContext> opener = GetOpener()) { - MOZ_DIAGNOSTIC_ASSERT(opener->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(opener->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - } - if (RefPtr<BrowsingContext> parent = GetParent()) { - MOZ_DIAGNOSTIC_ASSERT(parent->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(parent->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - - // UseRemoteSubframes and UseRemoteTabs must match. - MOZ_DIAGNOSTIC_ASSERT( - !mUseRemoteSubframes || mUseRemoteTabs, - "Cannot set useRemoteSubframes without also setting useRemoteTabs"); - - // Double-check OriginAttributes/Private Browsing - AssertOriginAttributesMatchPrivateBrowsing(); -#endif -} - void BrowsingContext::AssertOriginAttributesMatchPrivateBrowsing() { // Chrome browsing contexts must not have a private browsing OriginAttribute // Content browsing contexts must maintain the equality: ===================================== docshell/base/BrowsingContext.h ===================================== @@ -984,7 +984,18 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { bool aHasPostData); private: - mozilla::ipc::IPCResult Attach(bool aFromIPC, ContentParent* aOriginProcess); + // Assert that this BrowsingContext is coherent relative to related + // BrowsingContexts. This will be run before the BrowsingContext is attached. + // + // A non-null string return value indicates that there was a coherency check + // failure, which will be handled with either a crash or IPC failure. + // + // If provided, `aOriginProcess` is the process which is responsible for the + // creation of this BrowsingContext. + [[nodiscard]] const char* BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess); + + void Attach(bool aFromIPC, ContentParent* aOriginProcess); // Recomputes whether we can execute scripts in this BrowsingContext based on // the value of AllowJavascript() and whether scripts are allowed in the @@ -998,10 +1009,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { void AssertOriginAttributesMatchPrivateBrowsing(); - // Assert that the BrowsingContext's LoadContext flags appear coherent - // relative to related BrowsingContexts. - void AssertCoherentLoadContext(); - friend class ::nsOuterWindowProxy; friend class ::nsGlobalWindowOuter; friend class WindowContext; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eda9f7d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eda9f7d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] 3 commits: Bug 1906024 - Format download file names better a=diannaS
by ma1 (＠ma1) 01 Oct '24

01 Oct '24

ma1 pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 42b4d421 by rahulsainani at 2024-10-01T17:58:48+02:00 Bug 1906024 - Format download file names better a=diannaS Original Revision: https://phabricator.services.mozilla.com/D220559 Differential Revision: https://phabricator.services.mozilla.com/D222254 - - - - - 5928c112 by rahulsainani at 2024-10-01T17:58:55+02:00 Bug 1906024 - Format download file names a=diannaS Original Revision: https://phabricator.services.mozilla.com/D221771 Differential Revision: https://phabricator.services.mozilla.com/D222259 - - - - - e139ad27 by Nika Layzell at 2024-10-01T18:01:23+02:00 Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8 Previously these checks were largely diagnostic tools for finding bugs in other code as it evolves. This unifies the checks a bit more and makes them stronger for BrowsingContexts created over IPC, providing a place for more coherency checks to be added in the future. Differential Revision: https://phabricator.services.mozilla.com/D218860 - - - - - 4 changed files: - docshell/base/BrowsingContext.cpp - docshell/base/BrowsingContext.h - mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt - mobile/android/android-components/components/support/ktx/src/test/java/mozilla/components/support/ktx/kotlin/StringTest.kt Changes: ===================================== docshell/base/BrowsingContext.cpp ===================================== @@ -578,9 +578,20 @@ mozilla::ipc::IPCResult BrowsingContext::CreateFromIPC( context->mRequestContextId = aInit.mRequestContextId; // NOTE: Private browsing ID is set by `SetOriginAttributes`. + if (const char* failure = + context->BrowsingContextCoherencyChecks(aOriginProcess)) { + mozilla::ipc::IProtocol* actor = aOriginProcess; + if (!actor) { + actor = ContentChild::GetSingleton(); + } + return IPC_FAIL_UNSAFE_PRINTF(actor, "Incoherent BrowsingContext: %s", + failure); + } + Register(context); - return context->Attach(/* aFromIPC */ true, aOriginProcess); + context->Attach(/* aFromIPC */ true, aOriginProcess); + return IPC_OK(); } BrowsingContext::BrowsingContext(WindowContext* aParentWindow, @@ -795,8 +806,64 @@ void BrowsingContext::Embed() { } } -mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, - ContentParent* aOriginProcess) { +const char* BrowsingContext::BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess) { +#define COHERENCY_ASSERT(condition) \ + if (!(condition)) return "Assertion " #condition " failed"; + + if (mGroup->IsPotentiallyCrossOriginIsolated() != + (Top()->GetOpenerPolicy() == + nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { + return "Invalid CrossOriginIsolated state"; + } + + if (aOriginProcess && !IsContent()) { + return "Content cannot create chrome BCs"; + } + + // LoadContext should generally match our opener or parent. + if (IsContent()) { + if (RefPtr<BrowsingContext> opener = GetOpener()) { + COHERENCY_ASSERT(opener->mType == mType); + COHERENCY_ASSERT(opener->mGroup == mGroup); + COHERENCY_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + } + if (RefPtr<BrowsingContext> parent = GetParent()) { + COHERENCY_ASSERT(parent->mType == mType); + COHERENCY_ASSERT(parent->mGroup == mGroup); + COHERENCY_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + + // UseRemoteSubframes and UseRemoteTabs must match. + if (mUseRemoteSubframes && !mUseRemoteTabs) { + return "Cannot set useRemoteSubframes without also setting useRemoteTabs"; + } + + // Double-check OriginAttributes/Private Browsing + // Chrome browsing contexts must not have a private browsing OriginAttribute + // Content browsing contexts must maintain the equality: + // mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId + if (IsChrome()) { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0); + } else { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == + mPrivateBrowsingId); + } +#undef COHERENCY_ASSERT + + return nullptr; +} + +void BrowsingContext::Attach(bool aFromIPC, ContentParent* aOriginProcess) { MOZ_DIAGNOSTIC_ASSERT(!mEverAttached); MOZ_DIAGNOSTIC_ASSERT_IF(aFromIPC, aOriginProcess || XRE_IsContentProcess()); mEverAttached = true; @@ -815,25 +882,15 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, MOZ_DIAGNOSTIC_ASSERT(mGroup); MOZ_DIAGNOSTIC_ASSERT(!mIsDiscarded); - if (mGroup->IsPotentiallyCrossOriginIsolated() != - (Top()->GetOpenerPolicy() == - nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { - MOZ_DIAGNOSTIC_ASSERT(aFromIPC); - if (aFromIPC) { - auto* actor = aOriginProcess - ? static_cast<mozilla::ipc::IProtocol*>(aOriginProcess) - : static_cast<mozilla::ipc::IProtocol*>( - ContentChild::GetSingleton()); - return IPC_FAIL( - actor, - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); - } else { - MOZ_CRASH( - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); +#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED + // We'll already have checked this if `aFromIPC` is set before calling this + // function. + if (!aFromIPC) { + if (const char* failure = BrowsingContextCoherencyChecks(aOriginProcess)) { + MOZ_CRASH_UNSAFE_PRINTF("Incoherent BrowsingContext: %s", failure); } } - - AssertCoherentLoadContext(); +#endif // Add ourselves either to our parent or BrowsingContextGroup's child list. // Important: We shouldn't return IPC_FAIL after this point, since the @@ -915,7 +972,6 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, if (XRE_IsParentProcess()) { Canonical()->CanonicalAttach(); } - return IPC_OK(); } void BrowsingContext::Detach(bool aFromIPC) { @@ -1768,40 +1824,6 @@ nsresult BrowsingContext::SetOriginAttributes(const OriginAttributes& aAttrs) { return NS_OK; } -void BrowsingContext::AssertCoherentLoadContext() { -#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED - // LoadContext should generally match our opener or parent. - if (IsContent()) { - if (RefPtr<BrowsingContext> opener = GetOpener()) { - MOZ_DIAGNOSTIC_ASSERT(opener->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(opener->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - } - if (RefPtr<BrowsingContext> parent = GetParent()) { - MOZ_DIAGNOSTIC_ASSERT(parent->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(parent->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - - // UseRemoteSubframes and UseRemoteTabs must match. - MOZ_DIAGNOSTIC_ASSERT( - !mUseRemoteSubframes || mUseRemoteTabs, - "Cannot set useRemoteSubframes without also setting useRemoteTabs"); - - // Double-check OriginAttributes/Private Browsing - AssertOriginAttributesMatchPrivateBrowsing(); -#endif -} - void BrowsingContext::AssertOriginAttributesMatchPrivateBrowsing() { // Chrome browsing contexts must not have a private browsing OriginAttribute // Content browsing contexts must maintain the equality: ===================================== docshell/base/BrowsingContext.h ===================================== @@ -984,7 +984,18 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { bool aHasPostData); private: - mozilla::ipc::IPCResult Attach(bool aFromIPC, ContentParent* aOriginProcess); + // Assert that this BrowsingContext is coherent relative to related + // BrowsingContexts. This will be run before the BrowsingContext is attached. + // + // A non-null string return value indicates that there was a coherency check + // failure, which will be handled with either a crash or IPC failure. + // + // If provided, `aOriginProcess` is the process which is responsible for the + // creation of this BrowsingContext. + [[nodiscard]] const char* BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess); + + void Attach(bool aFromIPC, ContentParent* aOriginProcess); // Recomputes whether we can execute scripts in this BrowsingContext based on // the value of AllowJavascript() and whether scripts are allowed in the @@ -998,10 +1009,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { void AssertOriginAttributesMatchPrivateBrowsing(); - // Assert that the BrowsingContext's LoadContext flags appear coherent - // relative to related BrowsingContexts. - void AssertCoherentLoadContext(); - friend class ::nsOuterWindowProxy; friend class ::nsGlobalWindowOuter; friend class WindowContext; ===================================== mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt ===================================== @@ -53,6 +53,8 @@ const val MAX_URI_LENGTH = 25000 private const val FILE_PREFIX = "file://" private const val MAX_VALID_PORT = 65_535 +private const val SPACE = " " +private const val UNDERSCORE = "_" /** * Shortens URLs to be more user friendly. @@ -316,7 +318,9 @@ fun String.sanitizeFileName(): String { file.name.replace("\\.\\.+".toRegex(), ".") } else { file.name.replace(".", "") - }.replaceEscapedCharacters() + }.replaceContinuousSpaces() + .replaceEscapedCharacters() + .trim() } /** @@ -324,8 +328,16 @@ fun String.sanitizeFileName(): String { * and is correctly displayed. */ private fun String.replaceEscapedCharacters(): String { - val controlCharactersRegex = "[\\x00-\\x13/*\"?<>:|\\\\]".toRegex() - return replace(controlCharactersRegex, "_") + val escapedCharactersRegex = "[\\x00-\\x13*\"?<>:|\\\\]".toRegex() + return replace(escapedCharactersRegex, UNDERSCORE) +} + +/** + * Replaces continuous spaces with a single space. + */ +private fun String.replaceContinuousSpaces(): String { + val escapedCharactersRegex = "[\\p{Z}\\s]+".toRegex() + return replace(escapedCharactersRegex, SPACE) } /** ===================================== mobile/android/android-components/components/support/ktx/src/test/java/mozilla/components/support/ktx/kotlin/StringTest.kt ===================================== @@ -199,11 +199,11 @@ class StringTest { "acknowledge\u0006signal" to "acknowledge_signal", "bell\u0007sound" to "bell_sound", "back\u0008space" to "back_space", - "horizontal\u0009tab" to "horizontal_tab", - "new\u000Aline" to "new_line", - "vertical\u000Btab" to "vertical_tab", - "form\u000Cfeed" to "form_feed", - "return\u000Dcarriage" to "return_carriage", + "horizontal\u0009tab" to "horizontal tab", + "new\u000Aline" to "new line", + "vertical\u000Btab" to "vertical tab", + "form\u000Cfeed" to "form feed", + "return\u000Dcarriage" to "return carriage", "shift\u000Eout" to "shift_out", "shift\u000Fin" to "shift_in", "escape\u0010data" to "escape_data", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/689b06… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/689b06… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch maint-13.5a11
by morgan (＠morgan) 01 Oct '24

01 Oct '24

morgan pushed new branch maint-13.5a11 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mai… 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.5.6
by morgan (＠morgan) 01 Oct '24

01 Oct '24

morgan pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: a7b0d4ca by Morgan at 2024-10-01T18:21:08+00:00 release: new version, 13.5.6 - - - - - 29 changed files: - update_1/release/.htaccess - − update_1/release/13.5-13.5.3-linux-x86_64-ALL.xml - − update_1/release/13.5-13.5.3-macos-ALL.xml - − update_1/release/13.5-13.5.3-windows-x86_64-ALL.xml - − update_1/release/13.5.1-13.5.3-linux-x86_64-ALL.xml - − update_1/release/13.5.1-13.5.3-macos-ALL.xml - − update_1/release/13.5.1-13.5.3-windows-x86_64-ALL.xml - + update_1/release/13.5.1-13.5.6-linux-x86_64-ALL.xml - + update_1/release/13.5.1-13.5.6-macos-ALL.xml - + update_1/release/13.5.1-13.5.6-windows-x86_64-ALL.xml - − update_1/release/13.5.2-13.5.3-linux-x86_64-ALL.xml - − update_1/release/13.5.2-13.5.3-macos-ALL.xml - − update_1/release/13.5.2-13.5.3-windows-x86_64-ALL.xml - + update_1/release/13.5.2-13.5.6-linux-x86_64-ALL.xml - + update_1/release/13.5.2-13.5.6-macos-ALL.xml - + update_1/release/13.5.2-13.5.6-windows-x86_64-ALL.xml - + update_1/release/13.5.3-13.5.6-linux-x86_64-ALL.xml - + update_1/release/13.5.3-13.5.6-macos-ALL.xml - + update_1/release/13.5.3-13.5.6-windows-x86_64-ALL.xml - − update_1/release/13.5.3-linux-x86_64-ALL.xml - − update_1/release/13.5.3-macos-ALL.xml - − update_1/release/13.5.3-windows-x86_64-ALL.xml - + update_1/release/13.5.6-linux-x86_64-ALL.xml - + update_1/release/13.5.6-macos-ALL.xml - + update_1/release/13.5.6-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.5.3/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5/ALL 13.5-13.5.3-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5.1/ALL 13.5.1-13.5.3-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5.2/ALL 13.5.2-13.5.3-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5.3-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 13.5.3-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5/ALL 13.5-13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5.1/ALL 13.5.1-13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5.2/ALL 13.5.2-13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5/ALL 13.5-13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5.1/ALL 13.5.1-13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5.2/ALL 13.5.2-13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5.3-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 13.5.3-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5/ALL 13.5-13.5.3-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5.1/ALL 13.5.1-13.5.3-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5.2/ALL 13.5.2-13.5.3-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5.3-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5.3-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/13.5.6/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5.1/ALL 13.5.1-13.5.6-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5.2/ALL 13.5.2-13.5.6-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5.3/ALL 13.5.3-13.5.6-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5.6-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.5.6-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5.1/ALL 13.5.1-13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5.2/ALL 13.5.2-13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5.3/ALL 13.5.3-13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5.1/ALL 13.5.1-13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5.2/ALL 13.5.2-13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5.3/ALL 13.5.3-13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5.6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.5.6-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5.1/ALL 13.5.1-13.5.6-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5.2/ALL 13.5.2-13.5.6-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5.3/ALL 13.5.3-13.5.6-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5.6-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5.6-windows-x86_64-ALL.xml [last] ===================================== update_1/release/13.5-13.5.3-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64-13.5.3_…" hashFunction="SHA512" hashValue="dc9228d0edf637fe171b3a5f81374cfaa78112877eb9bd8f1617aedb02d58258612eea64dfb6d7a89dff8536089627db40d5be03460529a322d0d391f85f80ca" size="108537331" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64--13.5-1…" hashFunction="SHA512" hashValue="42a0143d23a3bb94515262449cd6481fc5ef7fb7f20b4d901dc5e6beaf8a46aa2f54e1af2e1227602c57e773cb3ba4707b1e45b4f2973cc319366a70db3d60a1" size="11672332" type="partial"></patch></update></updates> ===================================== update_1/release/13.5-13.5.3-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos-13.5.3_ALL.mar" hashFunction="SHA512" hashValue="251a1b6961102a454f1e35645a7fb85a259018801437fd1a0069fd701dee461934a3184378e0648330c931a71e4c6817f049434406b279f6673af06a2140c462" size="115932183" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos--13.5-13.5.3_A…" hashFunction="SHA512" hashValue="736be650e6bffc5fa19ccc0424de07672901746004c22553c25e45808952af796f9322aee9c39d77879979df4f4440bb8c01f3d5681e22f971ddf164d6606c9f" size="15466803" type="partial"></patch></update></updates> ===================================== update_1/release/13.5-13.5.3-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="0006e44ff67522342954b0475cffe92d4d7065a47e7c7e2964ce4e88110216923373c163125067b7a8c238dc8ee4650c950b9add295d4c3deac352663e1e5edf" size="90162344" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="9793e3aaba128f4a3391b2cd7b0a97f876b8a39211fbeb19c73b37c1002182e93bcd044bf68e0694a508e22cd89227ad12270a4c0985bac2c80ce6cca2d96c14" size="10945176" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.1-13.5.3-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64-13.5.3_…" hashFunction="SHA512" hashValue="dc9228d0edf637fe171b3a5f81374cfaa78112877eb9bd8f1617aedb02d58258612eea64dfb6d7a89dff8536089627db40d5be03460529a322d0d391f85f80ca" size="108537331" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64--13.5.1…" hashFunction="SHA512" hashValue="8fb8e294c0db3548f078fce2f693c743923337210797c7a10b627e94cd3b6820b2898188fc3e6131054c90fefe8046744c2db515a0cf7931d9620840f788869f" size="10214120" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.1-13.5.3-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos-13.5.3_ALL.mar" hashFunction="SHA512" hashValue="251a1b6961102a454f1e35645a7fb85a259018801437fd1a0069fd701dee461934a3184378e0648330c931a71e4c6817f049434406b279f6673af06a2140c462" size="115932183" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos--13.5.1-13.5.3…" hashFunction="SHA512" hashValue="265355cff22dd08d1a3ba2f7a28a91a8bd630836d5a241ab049b8866ce67aaf6e5eb9704baea0709ba4aa792915dc06eb9c02c3b4450466cc2934a3c6ea8494e" size="13834075" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.1-13.5.3-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="0006e44ff67522342954b0475cffe92d4d7065a47e7c7e2964ce4e88110216923373c163125067b7a8c238dc8ee4650c950b9add295d4c3deac352663e1e5edf" size="90162344" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="10cdc7ce117160c44b6a1688d28fffb44718575efe57723b8627dd6add73930e8a993fb44a63215f112dfab0a2c4b1895a6210436f00b4a513eaa115043a0914" size="9669788" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.1-13.5.6-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64-13.5.6_…" hashFunction="SHA512" hashValue="9620c90cabb8bf83af95ba28abceac3632b0f0e9fc04a935ad67d661e58509e8ff45d50295f7fad23cad8b4463097e15a59b821a83ed58280cf697d896a50e4d" size="108542679" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64--13.5.1…" hashFunction="SHA512" hashValue="f0c40051f0b8110fd39e7f21b6a4cf44fe83b1ba089959235fcfa713359d89bafb384e6e747e945bcc3c6144cb312704f3df7eb2ab62e53c26f18a90def91320" size="10612484" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.1-13.5.6-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos-13.5.6_ALL.mar" hashFunction="SHA512" hashValue="b41b05e42b0c74f4a1815dfe6ffbb20ccfee0d22cda6de17c0afb1f3579e30c34f4e0ea1cf6a86d648beb200f54d4a962e2e1cf63329cb025a42594785cc50ff" size="115945715" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos--13.5.1-13.5.6…" hashFunction="SHA512" hashValue="72e41c2c46b1ad7356c3b1100f19364b12e02a91dca9569ab5cd7138b9a5c524e52a174c8781117e143796033744c20a9d42efa1ffede6652ddd43638971d001" size="14247375" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.1-13.5.6-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="066692a2f7bd660a8899abb72a1f7e555c66a5927cdc073a7d69480c08e88f19828df09e0da310b9c69c65b026b03ec7f89a3a6bc415c18030d4aa237d006f2a" size="90184748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="0eefada51ca927a67d51544b94a74e7c644893847f3b32f4ae50c17d7ac3c139ead4d1978d25c5ca4bc9997da54633c7af24e7f4f4c19a04e28a38361376f7a8" size="10220268" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.2-13.5.3-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64-13.5.3_…" hashFunction="SHA512" hashValue="dc9228d0edf637fe171b3a5f81374cfaa78112877eb9bd8f1617aedb02d58258612eea64dfb6d7a89dff8536089627db40d5be03460529a322d0d391f85f80ca" size="108537331" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64--13.5.2…" hashFunction="SHA512" hashValue="c83637183b14c2c8f7db94489995fa383722d6072e013b31e472919a289bc70973c1369dae75e36b68e4a782fe2a754c0830d5891d19cce0d42ea6cb432d8ba8" size="6252302" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.2-13.5.3-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos-13.5.3_ALL.mar" hashFunction="SHA512" hashValue="251a1b6961102a454f1e35645a7fb85a259018801437fd1a0069fd701dee461934a3184378e0648330c931a71e4c6817f049434406b279f6673af06a2140c462" size="115932183" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos--13.5.2-13.5.3…" hashFunction="SHA512" hashValue="5af87ba2d3286c871041a0000fef1e29e61eaeca3439fb0610e9257fd1114a93d2cc6797dbdaa4556da1a9fb6dd2815ebfa1d8963340f8250ee1c290d163d27a" size="10054890" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.2-13.5.3-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="0006e44ff67522342954b0475cffe92d4d7065a47e7c7e2964ce4e88110216923373c163125067b7a8c238dc8ee4650c950b9add295d4c3deac352663e1e5edf" size="90162344" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="d565447daf652f520cb87e1044669edf291fbf08ee28fe413157a2f730f1db43ff8972306fe6703ec69905c3dce8a79ee54be8777febcdcd8f213ab6c2598610" size="6047450" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.2-13.5.6-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64-13.5.6_…" hashFunction="SHA512" hashValue="9620c90cabb8bf83af95ba28abceac3632b0f0e9fc04a935ad67d661e58509e8ff45d50295f7fad23cad8b4463097e15a59b821a83ed58280cf697d896a50e4d" size="108542679" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64--13.5.2…" hashFunction="SHA512" hashValue="4f5bd89ee28b1f4a75647295f97ccaf7a7bda51b63cea098abc74a04edd7f7f96cd4f177e82bf2899f272d89db49b37a125bafa2ba969ea8099630bdf75d4d70" size="7013226" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.2-13.5.6-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos-13.5.6_ALL.mar" hashFunction="SHA512" hashValue="b41b05e42b0c74f4a1815dfe6ffbb20ccfee0d22cda6de17c0afb1f3579e30c34f4e0ea1cf6a86d648beb200f54d4a962e2e1cf63329cb025a42594785cc50ff" size="115945715" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos--13.5.2-13.5.6…" hashFunction="SHA512" hashValue="d3e2501611221ba8d9eb76eb2ecb523582c2b0e3fb0f3f810a65f6f03350e50affca712a63977c89e87c778ffb6e82b9f523faf6cd47f20cb91397b9f7229a04" size="10602802" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.2-13.5.6-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="066692a2f7bd660a8899abb72a1f7e555c66a5927cdc073a7d69480c08e88f19828df09e0da310b9c69c65b026b03ec7f89a3a6bc415c18030d4aa237d006f2a" size="90184748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="3d423ac467ae74bf8a055fa9db2f252244c82fa4e334f043cfd0822ccbb05d2042c3420dfe684aa1c33a384c12a0b925798b8ecab9f153f813b71019398bb3f4" size="6750018" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.3-13.5.6-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64-13.5.6_…" hashFunction="SHA512" hashValue="9620c90cabb8bf83af95ba28abceac3632b0f0e9fc04a935ad67d661e58509e8ff45d50295f7fad23cad8b4463097e15a59b821a83ed58280cf697d896a50e4d" size="108542679" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64--13.5.3…" hashFunction="SHA512" hashValue="b1d2dff541513220b3573eecfdb0afd9c71f4c9521b3601fa61fd0aa507156c5a851434edcc008925a5855b7897c792cc4c65d85283654caef17048a02e4efc4" size="5605850" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.3-13.5.6-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos-13.5.6_ALL.mar" hashFunction="SHA512" hashValue="b41b05e42b0c74f4a1815dfe6ffbb20ccfee0d22cda6de17c0afb1f3579e30c34f4e0ea1cf6a86d648beb200f54d4a962e2e1cf63329cb025a42594785cc50ff" size="115945715" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos--13.5.3-13.5.6…" hashFunction="SHA512" hashValue="6cddfa8a01e5e0803e786dd5c36614365677dae76886310776374c6fa9ead40e8b99c1d2f3dd88e68929110ae047729be165c42e61031420df9afeba0dc56f0f" size="8307266" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.3-13.5.6-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="066692a2f7bd660a8899abb72a1f7e555c66a5927cdc073a7d69480c08e88f19828df09e0da310b9c69c65b026b03ec7f89a3a6bc415c18030d4aa237d006f2a" size="90184748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="a7de28e4a5b9b9e7a10795be1cd52d38761aa21ae6aace849a74e68787622ebcd4440f5fa27be0e3555571f422347f9dd230f7c4e8633fceaa4cf4c317390ce5" size="5083386" type="partial"></patch></update></updates> ===================================== update_1/release/13.5.3-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64-13.5.3_…" hashFunction="SHA512" hashValue="dc9228d0edf637fe171b3a5f81374cfaa78112877eb9bd8f1617aedb02d58258612eea64dfb6d7a89dff8536089627db40d5be03460529a322d0d391f85f80ca" size="108537331" type="complete"></patch></update></updates> ===================================== update_1/release/13.5.3-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos-13.5.3_ALL.mar" hashFunction="SHA512" hashValue="251a1b6961102a454f1e35645a7fb85a259018801437fd1a0069fd701dee461934a3184378e0648330c931a71e4c6817f049434406b279f6673af06a2140c462" size="115932183" type="complete"></patch></update></updates> ===================================== update_1/release/13.5.3-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5.3" appVersion="13.5.3" platformVersion="115.15.0" buildID="20240903073000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.3" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="0006e44ff67522342954b0475cffe92d4d7065a47e7c7e2964ce4e88110216923373c163125067b7a8c238dc8ee4650c950b9add295d4c3deac352663e1e5edf" size="90162344" type="complete"></patch></update></updates> ===================================== update_1/release/13.5.6-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64-13.5.6_…" hashFunction="SHA512" hashValue="9620c90cabb8bf83af95ba28abceac3632b0f0e9fc04a935ad67d661e58509e8ff45d50295f7fad23cad8b4463097e15a59b821a83ed58280cf697d896a50e4d" size="108542679" type="complete"></patch></update></updates> ===================================== update_1/release/13.5.6-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos-13.5.6_ALL.mar" hashFunction="SHA512" hashValue="b41b05e42b0c74f4a1815dfe6ffbb20ccfee0d22cda6de17c0afb1f3579e30c34f4e0ea1cf6a86d648beb200f54d4a962e2e1cf63329cb025a42594785cc50ff" size="115945715" type="complete"></patch></update></updates> ===================================== update_1/release/13.5.6-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.6" appVersion="13.5.6" platformVersion="115.16.0" buildID="20240930230510" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="066692a2f7bd660a8899abb72a1f7e555c66a5927cdc073a7d69480c08e88f19828df09e0da310b9c69c65b026b03ec7f89a3a6bc415c18030d4aa237d006f2a" size="90184748" type="complete"></patch></update></updates> ===================================== update_1/release/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64-13.5.3.…","git_tag":"mb-13.5.3-build1","sig":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64-13.5.3.…","version":"13.5.3"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64-13.5.6.…","git_tag":"mb-13.5.6-build1","sig":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64-13.5.6.…","version":"13.5.6"} \ No newline at end of file ===================================== update_1/release/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos-13.5.3.dmg","git_tag":"mb-13.5.3-build1","sig":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos-13.5.3.dmg.asc","version":"13.5.3"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos-13.5.6.dmg","git_tag":"mb-13.5.6-build1","sig":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos-13.5.6.dmg.asc","version":"13.5.6"} \ No newline at end of file ===================================== update_1/release/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64-13.5.…","git_tag":"mb-13.5.3-build1","sig":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64-13.5.…","version":"13.5.3"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64-13.5.…","git_tag":"mb-13.5.6-build1","sig":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64-13.5.…","version":"13.5.6"} \ 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.5.3/mullvad-browser-linux-x86_64-13.5.3.…","sig":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-linux-x86_64-13.5.3.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos-13.5.3.dmg","sig":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-macos-13.5.3.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64-13.5.…","sig":"https://cdn.mullvad.net/browser/13.5.3/mullvad-browser-windows-x86_64-13.5.…"}}},"tag":"mb-13.5.3-build1","version":"13.5.3"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64-13.5.6.…","sig":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-linux-x86_64-13.5.6.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos-13.5.6.dmg","sig":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-macos-13.5.6.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64-13.5.…","sig":"https://cdn.mullvad.net/browser/13.5.6/mullvad-browser-windows-x86_64-13.5.…"}}},"tag":"mb-13.5.6-build1","version":"13.5.6"} \ 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/tor-browser-update-responses][main] release: new version, 13.5.6
by morgan (＠morgan) 01 Oct '24

01 Oct '24

morgan pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 90a96463 by Morgan at 2024-10-01T17:49:26+00:00 release: new version, 13.5.6 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/13.5.2-13.5.5-linux-i686-ALL.xml - − update_3/release/13.5.2-13.5.5-linux-x86_64-ALL.xml - − update_3/release/13.5.2-13.5.5-macos-ALL.xml - − update_3/release/13.5.2-13.5.5-windows-i686-ALL.xml - − update_3/release/13.5.2-13.5.5-windows-x86_64-ALL.xml - − update_3/release/13.5.3-13.5.5-linux-i686-ALL.xml - − update_3/release/13.5.3-13.5.5-linux-x86_64-ALL.xml - − update_3/release/13.5.3-13.5.5-macos-ALL.xml - − update_3/release/13.5.3-13.5.5-windows-i686-ALL.xml - − update_3/release/13.5.3-13.5.5-windows-x86_64-ALL.xml - + update_3/release/13.5.3-13.5.6-linux-i686-ALL.xml - + update_3/release/13.5.3-13.5.6-linux-x86_64-ALL.xml - + update_3/release/13.5.3-13.5.6-macos-ALL.xml - + update_3/release/13.5.3-13.5.6-windows-i686-ALL.xml - + update_3/release/13.5.3-13.5.6-windows-x86_64-ALL.xml - − update_3/release/13.5.4-13.5.5-linux-i686-ALL.xml - − update_3/release/13.5.4-13.5.5-linux-x86_64-ALL.xml - − update_3/release/13.5.4-13.5.5-macos-ALL.xml - − update_3/release/13.5.4-13.5.5-windows-i686-ALL.xml - − update_3/release/13.5.4-13.5.5-windows-x86_64-ALL.xml - + update_3/release/13.5.4-13.5.6-linux-i686-ALL.xml - + update_3/release/13.5.4-13.5.6-linux-x86_64-ALL.xml - + update_3/release/13.5.4-13.5.6-macos-ALL.xml - + update_3/release/13.5.4-13.5.6-windows-i686-ALL.xml - + update_3/release/13.5.4-13.5.6-windows-x86_64-ALL.xml - + update_3/release/13.5.5-13.5.6-linux-i686-ALL.xml - + update_3/release/13.5.5-13.5.6-linux-x86_64-ALL.xml - + update_3/release/13.5.5-13.5.6-macos-ALL.xml - + update_3/release/13.5.5-13.5.6-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-128.3.0esr-14.0-1] 2 commits: fixup! Bug 42305: Add script to combine translation files across versions.
by Pier Angelo Vendrame (＠pierov) 01 Oct '24

01 Oct '24

Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 459f1275 by Henry Wilkes at 2024-10-01T16:05:28+01:00 fixup! Bug 42305: Add script to combine translation files across versions. Bug 43156: Add an option to also include strings from a legacy branch. Also, instead of using the tagger date to find the highest version branch, we use version ordering. - - - - - 689b068f by Henry Wilkes at 2024-10-01T16:05:29+01:00 fixup! Add CI for Tor Browser Bug 43156: Also include strings from the legacy branch. - - - - - 2 changed files: - .gitlab/ci/update-translations.yml - tools/torbrowser/l10n/combine-translation-versions.py Changes: ===================================== .gitlab/ci/update-translations.yml ===================================== @@ -28,6 +28,7 @@ combine-en-US-translations: base-browser:base-browser.ftl fenix-torbrowserstringsxml:torbrowser_strings.xml ' + TRANSLATION_INCLUDE_LEGACY: "true" cache: paths: - .cache/pip ===================================== tools/torbrowser/l10n/combine-translation-versions.py ===================================== @@ -67,136 +67,227 @@ def git_lines(git_args: list[str]) -> list[str]: return [line for line in git_text(git_args).split("\n") if line] -def git_file_paths(git_ref: str) -> list[str]: - """Get the full list of file paths found under the given tree. - - :param git_ref: The git reference for the tree to search. - :returns: The found file paths. - """ - return git_lines(["ls-tree", "-r", "--format=%(path)", git_ref]) - - -def matching_path(search_paths: list[str], filename: str) -> str | None: - """Get the matching file path with the given filename, if it exists. - - :param search_paths: The file paths to search through. - :param filename: The file name to match. - :returns: The unique file path with the matching name, or None if no such - match was found. - :throws Exception: If multiple paths shared the same file name. - """ - matching = [path for path in search_paths if os.path.basename(path) == filename] - if not matching: - return None - if len(matching) > 1: - raise Exception("Multiple occurrences of {filename}") - return matching[0] - - -def git_file_content(git_ref: str, path: str | None) -> str | None: - """Get the file content of the specified git blob object. - - :param git_ref: The reference for the tree to find the file under. - :param path: The file path for the object, or None if there is no path. - :returns: The file content, or None if no path was given. - """ - if path is None: - return None - return git_text(["cat-file", "blob", f"{git_ref}:{path}"]) - - -def get_stable_branch(branch_prefix: str) -> str: +class BrowserBranch: + """Represents a browser git branch.""" + + def __init__(self, branch_name: str, is_head: bool = False) -> None: + """Create a new instance. + + :param branch_name: The branch's git name. + :param is_head: Whether the branch matches "HEAD". + """ + version_match = re.match( + r"(?P<prefix>[a-z]+\-browser)\-" + r"(?P<firefox>[0-9]+(?:\.[0-9]+){1,2})esr\-" + r"(?P<browser>[0-9]+\.[05])\-" + r"(?P<number>[0-9]+)$", + branch_name, + ) + + if not version_match: + raise ValueError(f"Unable to parse the version from the ref {branch_name}") + + self.name = branch_name + self.prefix = version_match.group("prefix") + self.browser_version = version_match.group("browser") + self._is_head = is_head + self._ref = "HEAD" if is_head else f"origin/{branch_name}" + + firefox_nums = [int(n) for n in version_match.group("firefox").split(".")] + if len(firefox_nums) == 2: + firefox_nums.append(0) + browser_nums = [int(n) for n in self.browser_version.split(".")] + branch_number = int(version_match.group("number")) + # Prioritise the firefox ESR version, then the browser version then the + # branch number. + self._ordered = ( + firefox_nums[0], + firefox_nums[1], + firefox_nums[2], + browser_nums[0], + browser_nums[1], + branch_number, + ) + + # Minor version for browser is only ever "0" or "5", so we can convert + # the version to an integer. + self._browser_int_version = int(2 * float(self.browser_version)) + + self._file_paths: list[str] | None = None + + def release_below(self, other: "BrowserBranch", num: int) -> bool: + """Determine whether another branch is within range of a previous + browser release. + + The browser versions are expected to increment by "0.5", and a previous + release branch's version is expected to be `num * 0.5` behind the + current one. + + :param other: The branch to compare. + :param num: The number of "0.5" releases behind to test with. + """ + return other._browser_int_version == self._browser_int_version - num + + def __lt__(self, other: "BrowserBranch") -> bool: + return self._ordered < other._ordered + + def __gt__(self, other: "BrowserBranch") -> bool: + return self._ordered > other._ordered + + def get_file_content(self, filename: str) -> str | None: + """Fetch the file content for the named file in this branch. + + :param filename: The name of the file to fetch the content for. + :returns: The file content, or `None` if no file could be found. + """ + if self._file_paths is None: + if not self._is_head: + # Minimal fetch of non-HEAD branch to get the file paths. + # Individual file blobs will be downloaded as needed. + git_run( + ["fetch", "--depth=1", "--filter=blob:none", "origin", self._ref] + ) + self._file_paths = git_lines( + ["ls-tree", "-r", "--format=%(path)", self._ref] + ) + + matching = [ + path for path in self._file_paths if os.path.basename(path) == filename + ] + if not matching: + return None + if len(matching) > 1: + raise Exception(f"Multiple occurrences of {filename}") + + path = matching[0] + + return git_text(["cat-file", "blob", f"{self._ref}:{path}"]) + + +def get_stable_branch( + compare_version: BrowserBranch, +) -> tuple[BrowserBranch, BrowserBranch | None]: """Find the most recent stable branch in the origin repository. - :param branch_prefix: The prefix that the stable branch should have. - :returns: The branch name. + :param compare_version: The development branch to compare against. + :returns: The stable and legacy branches. If no legacy branch is found, + `None` will be returned instead. """ - tag_glob = f"{branch_prefix}-*-build1" + # We search for build1 tags. These are added *after* the rebase of browser + # commits, so the corresponding branch should contain our strings. + # Moreover, we *assume* that the branch with the most recent ESR version + # with such a tag will be used in the *next* stable build in + # tor-browser-build. + tag_glob = f"{compare_version.prefix}-*esr-*-*-build1" + # To speed up, only fetch the tags without blobs. git_run( ["fetch", "--depth=1", "--filter=object:type=tag", "origin", "tag", tag_glob] ) - # Get most recent stable tag. + stable_branches = [] + legacy_branches = [] + stable_annotation_regex = re.compile(r"\bstable\b") + legacy_annotation_regex = re.compile(r"\blegacy\b") + for build_tag, annotation in ( - line.split(" ", 1) - for line in git_lines(["tag", "-n1", "--list", tag_glob, "--sort=-taggerdate"]) + line.split(" ", 1) for line in git_lines(["tag", "-n1", "--list", tag_glob]) ): - if "stable" in annotation: + is_stable = bool(stable_annotation_regex.search(annotation)) + is_legacy = bool(legacy_annotation_regex.search(annotation)) + if not is_stable and not is_legacy: + continue + try: # Branch name is the same as the tag, minus "-build1". - return re.sub(r"-build1$", "", build_tag) - raise Exception("No stable build1 tag found") - - -def get_version_from_branch_name(branch_name: str) -> tuple[str, float]: - """Get the branch prefix and version from its name. - - :param branch_name: The branch to extract from. - :returns: The branch prefix and its version number. - """ - version_match = re.match( - r"([a-z-]+)-[^-]*-([0-9]+\.[05])-", - branch_name, + branch = BrowserBranch(re.sub(r"-build1$", "", build_tag)) + except ValueError: + logger.warning(f"Could not read the version for {build_tag}") + continue + if branch.prefix != compare_version.prefix: + continue + if is_stable: + # Stable can be one release version behind. + # NOTE: In principle, when switching between versions there may be a + # window of time where the development branch has not yet progressed + # to the next "0.5" release, so has the same browser version as the + # stable branch. So we also allow for matching browser versions. + # NOTE: + # 1. The "Will be unused in" message will not make sense, but we do + # not expect string differences in this scenario. + # 2. We do not expect this scenario to last for long. + if not ( + compare_version.release_below(branch, 1) + or compare_version.release_below(branch, 0) + ): + continue + stable_branches.append(branch) + elif is_legacy: + # Legacy can be two release versions behind. + # We also allow for being just one version behind. + if not ( + compare_version.release_below(branch, 2) + or compare_version.release_below(branch, 1) + ): + continue + legacy_branches.append(branch) + + if not stable_branches: + raise Exception("No stable build1 branch found") + + return ( + # Return the stable branch with the highest version. + max(stable_branches), + max(legacy_branches) if legacy_branches else None, ) - if not version_match: - raise ValueError(f"Unable to parse the version from the branch {branch_name}") - return (version_match.group(1), float(version_match.group(2))) +current_branch = BrowserBranch(args.current_branch, is_head=True) +stable_branch, legacy_branch = get_stable_branch(current_branch) -branch_prefix, current_version = get_version_from_branch_name(args.current_branch) +if os.environ.get("TRANSLATION_INCLUDE_LEGACY", "") != "true": + legacy_branch = None -stable_branch = get_stable_branch(branch_prefix) -_, stable_version = get_version_from_branch_name(stable_branch) - -if stable_version > current_version or stable_version < current_version - 0.5: - raise Exception( - f"Version of stable branch {stable_branch} is not within 0.5 of the " - f"current branch {args.current_branch}" - ) - -# Minimal fetch of stable_branch. -# Individual file blobs will be downloaded as needed. -git_run(["fetch", "--depth=1", "--filter=blob:none", "origin", stable_branch]) - -current_file_paths = git_file_paths("HEAD") -old_file_paths = git_file_paths(f"origin/{stable_branch}") - -ci_commit = os.environ.get("CI_COMMIT_SHA", "") -ci_url_base = os.environ.get("CI_PROJECT_URL", "") - -json_data = { - "commit": ci_commit, - "commit-url": f"{ci_url_base}/-/commit/{ci_commit}" - if (ci_commit and ci_url_base) - else "", - "project-path": os.environ.get("CI_PROJECT_PATH", ""), - "current-branch": args.current_branch, - "stable-branch": stable_branch, - "files": [], -} +files_list = [] for translation_branch, name in ( part.strip().split(":", 1) for part in args.filenames.split(" ") if part.strip() ): - current_path = matching_path(current_file_paths, name) - old_path = matching_path(old_file_paths, name) + current_content = current_branch.get_file_content(name) + stable_content = stable_branch.get_file_content(name) - if current_path is None and old_path is None: + if current_content is None and stable_content is None: # No file in either branch. logger.warning(f"{name} does not exist in either the current or stable branch") - elif current_path is None: + elif current_content is None: logger.warning(f"{name} deleted in the current branch") - elif old_path is None: + elif stable_content is None: logger.warning(f"{name} does not exist in the stable branch") content = combine_files( name, - git_file_content("HEAD", current_path), - git_file_content(f"origin/{stable_branch}", old_path), - f"Will be unused in Tor Browser {current_version}!", + current_content, + stable_content, + f"Will be unused in Tor Browser {current_branch.browser_version}!", ) - json_data["files"].append( + + if legacy_branch: + legacy_content = legacy_branch.get_file_content(name) + if ( + legacy_content is not None + and current_content is None + and stable_content is None + ): + logger.warning(f"{name} still exists in the legacy branch") + elif legacy_content is None: + logger.warning(f"{name} does not exist in the legacy branch") + content = combine_files( + name, + content, + legacy_content, + f"Unused in Tor Browser {stable_branch.browser_version}!", + ) + + files_list.append( { "name": name, "branch": translation_branch, @@ -204,5 +295,23 @@ for translation_branch, name in ( } ) + +ci_commit = os.environ.get("CI_COMMIT_SHA", "") +ci_url_base = os.environ.get("CI_PROJECT_URL", "") + +json_data = { + "commit": ci_commit, + "commit-url": f"{ci_url_base}/-/commit/{ci_commit}" + if (ci_commit and ci_url_base) + else "", + "project-path": os.environ.get("CI_PROJECT_PATH", ""), + "current-branch": current_branch.name, + "stable-branch": stable_branch.name, + "files": files_list, +} + +if legacy_branch: + json_data["legacy-branch"] = legacy_branch.name + with open(args.outname, "w") as file: json.dump(json_data, file) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/217346… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/217346… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41251: Fix jtorctl.0.2.jar missing dependency
by ma1 (＠ma1) 01 Oct '24

01 Oct '24

ma1 pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: ecac6d89 by hackademix at 2024-10-01T14:24:17+02:00 Bug 41251: Fix jtorctl.0.2.jar missing dependency - - - - - 2 changed files: - projects/firefox-android/config - projects/firefox-android/gradle-dependencies-list.txt Changes: ===================================== projects/firefox-android/config ===================================== @@ -19,7 +19,7 @@ var: browser_build: 15 variant: Beta # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 1 + gradle_dependencies_version: 2 gradle_version: 7.6.1 glean_parser: 7.1.0 as_version: '[% pc("application-services", "version") %]' ===================================== projects/firefox-android/gradle-dependencies-list.txt ===================================== @@ -1,6 +1,6 @@ sha256sum | url -ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… -3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… +ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://build-sources.tbb.torproject.org/jtorctl/jtorctl-0.2.jar +3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://build-sources.tbb.torproject.org/jtorctl/jtorctl-0.2.pom caa72885d1ce7979c1d6c59a8b255c6097b770780d4d4da95d56979a348646cd | https://maven.google.com/androidx/activity/activity-compose/1.7.0/activity-… f7a29bcba338575dcf89a553cff9cfad3f140340eaf2b56fd0193244da602c0a | https://maven.google.com/androidx/activity/activity-compose/1.7.0/activity-… 90f32e60dcb83add1aff051ee8709023123d524cc3f6390fff6a4a31c20d9798 | https://maven.google.com/androidx/activity/activity-compose/1.7.0/activity-… View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] 4 commits: Mullvad Browser strings
by Pier Angelo Vendrame (＠pierov) 01 Oct '24

01 Oct '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: cbadd0c5 by Henry Wilkes at 2024-10-01T09:26:25+01:00 Mullvad Browser strings This commit adds strings needed by the following Mullvad Browser patches. - - - - - 96e5e78f by Henry Wilkes at 2024-10-01T09:26:26+01:00 fixup! MB 37: Customization for the about dialog MB 349: Merge Fluent files into one. - - - - - e0227da3 by Henry Wilkes at 2024-10-01T09:26:27+01:00 fixup! MB 39: Add home page about:mullvad-browser MB 349: Merge Fluent files into one. - - - - - 6243c664 by Henry Wilkes at 2024-10-01T09:26:28+01:00 fixup! MB 63: Customize some about pages for Mullvad Browser MB 349: Merge Fluent files into one. - - - - - 11 changed files: - browser/base/content/aboutDialog.xhtml - browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml - browser/components/preferences/preferences.xhtml - − browser/locales/en-US/browser/aboutDialogMullvad.ftl - − browser/locales/en-US/browser/mullvad-browser/preferences.ftl - toolkit/content/aboutRightsMullvad.xhtml - toolkit/content/aboutTelemetryMullvad.xhtml - − toolkit/locales/en-US/toolkit/about/aboutRightsMullvad.ftl - − toolkit/locales/en-US/toolkit/about/aboutTelemetryMullvad.ftl - browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl → toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - tools/lint/fluent-lint/exclusions.yml Changes: ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -37,7 +37,7 @@ <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> <html:link rel="localization" href="toolkit/global/base-browser.ftl"/> - <html:link rel="localization" href="browser/aboutDialogMullvad.ftl"/> + <html:link rel="localization" href="toolkit/global/mullvad-browser.ftl"/> </linkset> <html:div id="aboutDialogContainer"> ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml ===================================== @@ -17,10 +17,7 @@ /> <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> - <link - rel="localization" - href="browser/mullvad-browser/aboutMullvadBrowser.ftl" - /> + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" /> <script src="chrome://browser/content/mullvad-browser/aboutMullvadBrowser.js"></script> </head> ===================================== browser/components/preferences/preferences.xhtml ===================================== @@ -80,7 +80,7 @@ <link rel="localization" href="security/certificates/deviceManager.ftl"/> <link rel="localization" href="toolkit/updates/history.ftl"/> <link rel="localization" href="toolkit/global/base-browser.ftl"/> - <link rel="localization" href="browser/mullvad-browser/preferences.ftl"/> + <link rel="localization" href="toolkit/global/mullvad-browser.ftl"/> <link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/> ===================================== browser/locales/en-US/browser/aboutDialogMullvad.ftl deleted ===================================== @@ -1,11 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -## Variables -## $emailAddress (String) - The email address of Mullvad's support - -mullvad-about-desc = { -brand-short-name } is a privacy-focused web browser developed in collaboration between <label data-l10n-name="mullvad-about-mullvadLink">Mullvad VPN</label> and the <label data-l10n-name="mullvad-about-torProjectLink">Tor Project</label>. It’s produced to minimize tracking and fingerprinting. -mullvad-about-readMore = Read more -mullvad-about-feedback2 = Help & feedback: { $emailAddress } -mullvad-about-telemetryLink = Telemetry ===================================== browser/locales/en-US/browser/mullvad-browser/preferences.ftl deleted ===================================== @@ -1,2 +0,0 @@ -home-mode-choice-mullvad = - .label = { -brand-product-name } Home ===================================== toolkit/content/aboutRightsMullvad.xhtml ===================================== @@ -21,7 +21,7 @@ /> <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="toolkit/about/aboutRights.ftl" /> - <link rel="localization" href="toolkit/about/aboutRightsMullvad.ftl" /> + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" /> </head> <body id="your-rights" class="aboutPageWideContainer"> ===================================== toolkit/content/aboutTelemetryMullvad.xhtml ===================================== @@ -20,7 +20,7 @@ type="text/css" /> <link rel="localization" href="branding/brand.ftl" /> - <link rel="localization" href="toolkit/about/aboutTelemetryMullvad.ftl" /> + <link rel="localization" href="toolkit/global/mullvad-browser.ftl" /> </head> <body id="your-rights" class="aboutPageWideContainer"> ===================================== toolkit/locales/en-US/toolkit/about/aboutRightsMullvad.ftl deleted ===================================== @@ -1,10 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -rights-mullvad-intro = { -brand-short-name } is free and open source software. -rights-mullvad-you-should-know = There are a few things you should know: -rights-mullvad-trademarks = - You are not granted any trademark rights or licenses to the trademarks of - the { -brand-short-name } or any party, including without limitation the - { -brand-short-name } name or logo. ===================================== toolkit/locales/en-US/toolkit/about/aboutTelemetryMullvad.ftl deleted ===================================== @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - -telemetry-title = Telemetry Information -telemetry-description = Telemetry is disabled in { -brand-short-name }. ===================================== browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl → toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl ===================================== @@ -1,3 +1,18 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +## About Mullvad browser dialog. + +mullvad-about-desc = { -brand-short-name } is a privacy-focused web browser developed in collaboration between <label data-l10n-name="mullvad-about-mullvadLink">Mullvad VPN</label> and the <label data-l10n-name="mullvad-about-torProjectLink">Tor Project</label>. It’s produced to minimize tracking and fingerprinting. +mullvad-about-readMore = Read more +# Variables +# $emailAddress (String) - The email address of Mullvad's support +mullvad-about-feedback2 = Help & feedback: { $emailAddress } +mullvad-about-telemetryLink = Telemetry + +## Mullvad browser home page. + about-mullvad-browser-heading = { -brand-product-name } about-mullvad-browser-developed-by = Developed in collaboration between the <a data-l10n-name="tor-project-link">Tor Project</a> and <a data-l10n-name="mullvad-vpn-link">Mullvad VPN</a> about-mullvad-browser-use-vpn = Get more privacy by using the browser <a data-l10n-name="with-vpn-link">with Mullvad VPN</a>. @@ -8,6 +23,21 @@ about-mullvad-browser-learn-more = Curious to learn more about the browser? <a d # $version (String) - The new browser version. about-mullvad-browser-update-message = { -brand-short-name } has been updated to { $version }. <a data-l10n-name="update-link">See what’s new</a> -## Deprecated. To be removed when 13.5 becomes stable. +## Home preferences. + +home-mode-choice-mullvad = + .label = { -brand-product-name } Home + +## about:rights page. + +rights-mullvad-intro = { -brand-short-name } is free and open source software. +rights-mullvad-you-should-know = There are a few things you should know: +rights-mullvad-trademarks = + You are not granted any trademark rights or licenses to the trademarks of + the { -brand-short-name } or any party, including without limitation the + { -brand-short-name } name or logo. + +## about:telemetry page. -about-mullvad-browser-page-title = { -brand-product-name } Home +telemetry-title = Telemetry Information +telemetry-description = Telemetry is disabled in { -brand-short-name }. ===================================== tools/lint/fluent-lint/exclusions.yml ===================================== @@ -87,7 +87,6 @@ ID01: # The webext-perms-description-* IDs are generated programmatically # from permission names - toolkit/locales/en-US/toolkit/global/extensionPermissions.ftl - - browser/locales/en-US/browser/aboutDialogMullvad.ftl ID02: messages: # browser/components/ion/content/ion.ftl View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/56… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/56… 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.5.6-build1
by ma1 (＠ma1) 01 Oct '24

01 Oct '24

ma1 pushed new tag mb-13.5.6-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] Pushed new tag tbb-13.5.6-build1
by ma1 (＠ma1) 01 Oct '24

01 Oct '24

ma1 pushed new tag tbb-13.5.6-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.5] Bug 41245, 41235: Prepare Tor, Mullvad Browser 13.5.6
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: b32fad62 by hackademix at 2024-10-01T01:09:21+02:00 Bug 41245,41235: Prepare Tor,Mullvad Browser 13.5.6 - - - - - 8 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/config - projects/geckoview/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,93 @@ +Mullvad Browser 13.5.6 - September 30 2024 + * All Platforms + * Updated Firefox to 115.16.0esr + * Updated NoScript to 11.4.40 + * Bug 356: Rebase Mullvad Browser Release onto Firefox 115.16.0esr [mullvad-browser] + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43173: Backport security fixes from Firefox 131 [tor-browser] + * Linux + * Bug 334: When set as default browser on Linux in standard mode, links don't open correctly [mullvad-browser] + * Build System + * macOS + * Bug 41231: Use var/browser_release_date in tools/signing/gatekeeper-bundling.sh [tor-browser-build] + +Mullvad Browser 14.0a7 - September 27 2024 + * All Platforms + * Updated Firefox to 128.3.0esr + * Updated NoScript to 11.4.40 + * Bug 355: Rebase Mullvad Browser Alpha onto Firefox 128.3.0esr [mullvad-browser] + * Bug 42070: Backport Bugzilla 1834307 and hide smooth-scroll UX [tor-browser] + * Bug 42362: "New window" missing from File menu [tor-browser] + * Bug 42742: Inconsistent use of "New private window" vs "New window" [tor-browser] + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43163: Disable offscreen canvas until verified it is not fingerprintable [tor-browser] + * Bug 41248: Check and update bundled font versions [tor-browser-build] + * Build System + * All Platforms + * Bug 41236: Remove binutils when not needed [tor-browser-build] + +Mullvad Browser 14.0a6 - September 19 2024 + * All Platforms + * Bug 344: set media.navigator.enabled = true [mullvad-browser] + * Bug 42718: Remove the firefox-view button from UI, even when always-on private-browsing mode is disabled [tor-browser] + * Bug 42740: Stop trying to hide "Restore previous session" [tor-browser] + * Bug 42831: Remove the shopping components [tor-browser] + * Bug 43072: moz-message-bar does not get announced on Orca screen-reader [tor-browser] + * Bug 43083: Backport fix for Mozilla 1436462 [tor-browser] + * Bug 43144: Ensure non-privacy browsing also sets the GPC header [tor-browser] + * Linux + * Bug 43141: Hardcode Arimo as a system-ui font [tor-browser] + * Bug 41237: Add some aliases to our Linux font config for compatibility [tor-browser-build] + +Mullvad Browser 14.0a5 - September 12 2024 + * All Platforms + * Updated NoScript to 11.4.37 + * Bug 328: Provide search engine icons [mullvad-browser] + * Bug 42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable [tor-browser] + * Bug 42647: "Switching to a new device" regressed on 128 [tor-browser] + * Bug 42653: The Neterror page has a checkbox to report iframe origin errors to TPO [tor-browser] + * Bug 42777: Remove 'Website Privacy Preferences' and ensure sensible default prefs [tor-browser] + * Bug 43046: Review Mozilla 1866927: Adds ability to enable email tracker blocking protection in private mode [tor-browser] + * Bug 43054: check bounceTrackingProtection in PB mode does not persist to disk [tor-browser] + * Bug 43109: Remove mention of Firefox Relay from settings [tor-browser] + * Bug 43117: Hide 'Always underline links' option [tor-browser] + * Linux + * Bug 334: When set as default browser on Linux in standard mode, links don't open correctly [mullvad-browser] + * Build System + * macOS + * Bug 41231: Use var/browser_release_date in tools/signing/gatekeeper-bundling.sh [tor-browser-build] + +Mullvad Browser 14.0a4 - September 06 2024 + * All Platforms + * Updated NoScript to 11.4.35 + * Bug 329: Remove the Security Levels icon from the toolbar [mullvad-browser] + * Bug 30862: 10ms time precision via EXSLT date-time function [tor-browser] + * Bug 40147: Re-enable Picture-in-Picture mode [tor-browser] + * Bug 41309: Re-enable screenshots component [tor-browser] + * Bug 42601: Check Bug 1894779: Allow font-face urls to be resource:// urls and relax CORS for resource:// URLs [tor-browser] + * Bug 42617: Restore the HTML form on DDG when using safest in 128 [tor-browser] + * Bug 42630: Review LaterRun in 128 [tor-browser] + * Bug 42640: Disable Firefox Flame button due to unknown interactions with New Identity [tor-browser] + * Bug 42684: Disable network prefetch [tor-browser] + * Bug 42685: compat: ESR128: enable textmetrics [tor-browser] + * Bug 42686: Backport Mozilla 1885101 [tor-browser] + * Bug 42730: Make RemoteSettings use only local dumps [tor-browser] + * Bug 42735: Disable recent search suggestions [tor-browser] + * Bug 42745: Remove some residuals from update scripts [tor-browser] + * Bug 42764: Unconditionally disable find-bar transition animation [tor-browser] + * Bug 42867: Disable contentRelevancy component [tor-browser] + * Bug 43100: Backport security fixes from Firefox 130 [tor-browser] + * Bug 43103: Verify whether an update is unsupported before choosing one [tor-browser] + * macOS + * Bug 42494: mac: add Arial Black and Arial Narrow to allowlist [tor-browser] + * Linux + * Bug 42773: Replace ~ with the original HOME [tor-browser] + * Bug 43092: Disable Wayland by default in 14.0 [tor-browser] + * Build System + * All Platforms + * Bug 41096: Set SOURCE_DATE_EPOCH in the default env variables [tor-browser-build] + * Bug 41188: Upgrade binutils to 2.41 [tor-browser-build] + Mullvad Browser 13.5.3 - September 03 2024 * All Platforms * Updated Firefox to 115.15.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,8 +1,51 @@ -Tor Browser 13.5.5 - September 25 2024 +Tor Browser 13.5.6 - September 30 2024 + * All Platforms + * Updated NoScript to 11.4.40 + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43167: Rebase Tor Browser Stable onto 115.16.0esr [tor-browser] + * Bug 43173: Backport security fixes from Firefox 131 [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.16.0esr + * Bug 42737: Drop the hash check on updates [tor-browser] + * Bug 43098: YEC 2024 Takeover for Desktop Stable [tor-browser] * Windows + macOS - * Bug 43125: Update message for legacy OS (windows ≤8.1, macOS ≤10.14) users [tor-browser] - * Linux - * Bug 334: When set as default browser on Linux in standard mode, links don't open correctly [mullvad-browser] + * Bug 42747: Windows 7/8 and macOS 10.12-10.14 Legacy/Maintenance [tor-browser] + * Android + * Updated GeckoView to 115.16.0esr + * Bug 43099: YEC 2024 Takeover for Android Stable [tor-browser] + +Tor Browser 14.0a7 - September 27 2024 + * All Platforms + * Updated NoScript to 11.4.40 + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43163: Disable offscreen canvas until verified it is not fingerprintable [tor-browser] + * Bug 43166: Rebase Tor Browser alpha onto Firefox 128.3.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 128.3.0esr + * Bug 42070: Backport Bugzilla 1834307 and hide smooth-scroll UX [tor-browser] + * Bug 42362: "New window" missing from File menu [tor-browser] + * Bug 42742: Inconsistent use of "New private window" vs "New window" [tor-browser] + * Bug 41248: Check and update bundled font versions [tor-browser-build] + * Android + * Updated GeckoView to 128.3.0esr + * Bug 43172: remove remote settings and SERPTelemetry [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.23.1 + * Bug 41236: Remove binutils when not needed [tor-browser-build] + * Windows + macOS + Linux + * Bug 41246: Add updater rewriterules to make 13.5a10 a watershed [tor-browser-build] + +Tor Browser 13.5a10 - September 25 2024 + * Windows + macOS + Linux + * Updated Firefox to 115.15.0esr + * Updated NoScript to 11.4.37 + * Updated OpenSSL to 3.0.15 + * Windows + macOS + * Bug 42747: Windows 7/8 and macOS 10.12-10.14 Legacy/Maintenance [tor-browser] + * Build System + * Windows + macOS + Linux + * Updated Go to 1.21.12 Tor Browser 14.0a6 - September 19 2024 * All Platforms ===================================== 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": 1198801, + "average_daily_users": 1204514, "categories": { "firefox": [ "web-development", @@ -218,10 +218,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5264, - "bayesian_average": 4.525326004974587, - "count": 5857, - "text_count": 1842 + "average": 4.5262, + "bayesian_average": 4.525128945531112, + "count": 5874, + "text_count": 1848 }, "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": 27576 + "weekly_downloads": 27270 }, "notes": null }, @@ -334,7 +334,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 256931, + "average_daily_users": 257341, "categories": { "firefox": [ "privacy-security" @@ -547,9 +547,9 @@ "category": "recommended" }, "ratings": { - "average": 4.7942, - "bayesian_average": 4.789582900272357, - "count": 1458, + "average": 4.7944, + "bayesian_average": 4.7897830310986445, + "count": 1459, "text_count": 263 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", @@ -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": 2895 + "weekly_downloads": 2715 }, "notes": null }, @@ -651,7 +651,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1266195, + "average_daily_users": 1271165, "categories": { "firefox": [ "privacy-security" @@ -1170,9 +1170,9 @@ "category": "recommended" }, "ratings": { - "average": 4.8028, - "bayesian_average": 4.800114682839264, - "count": 2515, + "average": 4.803, + "bayesian_average": 4.800317190701833, + "count": 2518, "text_count": 474 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", @@ -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": 23651 + "weekly_downloads": 23241 }, "notes": null }, @@ -1213,7 +1213,7 @@ "picture_url": null } ], - "average_daily_users": 8366519, + "average_daily_users": 8420658, "categories": { "firefox": [ "privacy-security" @@ -1378,7 +1378,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-09-22T16:00:37Z", + "last_updated": "2024-09-29T16:50:40Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1523,10 +1523,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7907, - "bayesian_average": 4.79033490555104, - "count": 18453, - "text_count": 4820 + "average": 4.791, + "bayesian_average": 4.790635808907738, + "count": 18504, + "text_count": 4830 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1589,7 +1589,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": 200561 + "weekly_downloads": 199435 }, "notes": null }, @@ -1605,7 +1605,7 @@ "picture_url": null } ], - "average_daily_users": 185437, + "average_daily_users": 186259, "categories": { "firefox": [ "photos-music-videos", @@ -1701,10 +1701,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4547, - "bayesian_average": 4.449884980099753, - "count": 1280, - "text_count": 495 + "average": 4.4528, + "bayesian_average": 4.447998328835177, + "count": 1283, + "text_count": 498 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1726,7 +1726,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": 383 + "weekly_downloads": 343 }, "notes": null }, @@ -1742,7 +1742,7 @@ "picture_url": null } ], - "average_daily_users": 63093, + "average_daily_users": 63018, "categories": { "firefox": [ "privacy-security", @@ -1877,7 +1877,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": 315 + "weekly_downloads": 280 }, "notes": null }, @@ -1893,7 +1893,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 362010, + "average_daily_users": 363451, "categories": { "firefox": [ "search-tools", @@ -2110,10 +2110,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6193, - "bayesian_average": 4.615135958292723, - "count": 1547, - "text_count": 309 + "average": 4.6174, + "bayesian_average": 4.613245740860053, + "count": 1550, + "text_count": 310 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2136,7 +2136,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": 5685 + "weekly_downloads": 5585 }, "notes": null }, @@ -2159,7 +2159,7 @@ "picture_url": null } ], - "average_daily_users": 122255, + "average_daily_users": 122336, "categories": { "firefox": [ "search-tools", @@ -2440,9 +2440,9 @@ "category": "recommended" }, "ratings": { - "average": 4.3811, - "bayesian_average": 4.3767733606543135, - "count": 1396, + "average": 4.3815, + "bayesian_average": 4.377175971962635, + "count": 1397, "text_count": 392 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", @@ -2463,7 +2463,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": 35 + "weekly_downloads": 25 }, "notes": null }, @@ -2479,7 +2479,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 289757, + "average_daily_users": 290589, "categories": { "firefox": [ "privacy-security", @@ -2489,7 +2489,7 @@ "contributions_url": "https://www.paypal.com/donate/?hosted_button_id=9ERKTU5MBH4EW&utm_content=p…", "created": "2005-05-13T10:51:32Z", "current_version": { - "id": 5805224, + "id": 5813035, "compatibility": { "firefox": { "min": "59.0", @@ -2500,7 +2500,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5805224", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5813035", "is_strict_compatibility_enabled": false, "license": { "id": 13, @@ -2511,22 +2511,22 @@ "url": "https://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { - "en-US": "v 11.4.37\n============================================================\nx [nscl] Do not patch windows with WebGLHook if webgl is\n globally disabled\nx [nscl] Do not patch workers if webgl is globally disabled\nx [L10n] Updated uk\nx [nscl] Workers-aware WebGL Hook" + "en-US": "11.4.40\n============================================================\nx [nscl] Fix patched workers failures caused by Firefox\n webRequest filters disconnect() breaking on large files\n (thanks barbaz for reporting)\n\nv 11.4.39\n============================================================\nx [nscl] Improved WebGL-hooking and worker patching\n stability\nx [L10n] Lower to 90% the threshold for including a new\n translation\nx [L10n] Updated he, pt_PT\nx [nscl] Prevent patchWindow from throwing on SOP violations\nx [nscl] Correctly propagate extra arguments to shadowed\n worker constructors" }, - "reviewed": "2024-09-10T14:37:13Z", - "version": "11.4.37", + "reviewed": "2024-09-26T09:59:52Z", + "version": "11.4.40", "files": [ { - "id": 4349514, - "created": "2024-09-08T16:36:27Z", - "hash": "sha256:5e9921599c63e0b357851ea7ca1354554b3af2c676bbbfff5687cafce4396c18", + "id": 4357325, + "created": "2024-09-22T06:25:28Z", + "hash": "sha256:242ead426159d871480a13062cbee08abc97da746cdc5c643aee2692e9adbbb2", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 964305, + "size": 965455, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4349514/noscript-11.4.37.…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4357325/noscript-11.4.40.…", "permissions": [ "contextMenus", "storage", @@ -2593,7 +2593,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-09-21T23:20:33Z", + "last_updated": "2024-09-26T09:59:52Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2665,10 +2665,10 @@ "category": "recommended" }, "ratings": { - "average": 4.409, - "bayesian_average": 4.406329174495118, - "count": 2279, - "text_count": 867 + "average": 4.4095, + "bayesian_average": 4.406829615955648, + "count": 2281, + "text_count": 868 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2712,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": 7547 + "weekly_downloads": 7253 }, "notes": null }, @@ -2728,7 +2728,7 @@ "picture_url": null } ], - "average_daily_users": 163291, + "average_daily_users": 164045, "categories": { "firefox": [ "photos-music-videos", @@ -2838,9 +2838,9 @@ "category": "recommended" }, "ratings": { - "average": 3.8362, - "bayesian_average": 3.832209285841853, - "count": 1282, + "average": 3.8371, + "bayesian_average": 3.8331062194266265, + "count": 1283, "text_count": 464 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", @@ -2860,7 +2860,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": 1740 + "weekly_downloads": 1559 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -104,9 +104,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4349514/noscript-11.4.37.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4357325/noscript-11.4.40.… name: noscript - sha256sum: 5e9921599c63e0b357851ea7ca1354554b3af2c676bbbfff5687cafce4396c18 + sha256sum: 242ead426159d871480a13062cbee08abc97da746cdc5c643aee2692e9adbbb2 - URL: https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.5… name: ublock-origin sha256sum: 1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14 ===================================== projects/firefox/config ===================================== @@ -14,12 +14,12 @@ container: use_container: 1 var: - firefox_platform_version: 115.15.0 + firefox_platform_version: 115.16.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 5 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' @@ -103,7 +103,6 @@ targets: mullvadbrowser: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: - browser_build: 2 branding_directory_prefix: 'mb' gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' ===================================== projects/geckoview/config ===================================== @@ -14,9 +14,9 @@ container: use_container: 1 var: - geckoview_version: 115.15.0esr + geckoview_version: 115.16.0esr browser_branch: 13.5-1 - browser_build: 5 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 16446c485b3be4198a7e79bfcac6510784a18506 + git_hash: a142f78af87f994913faa15fb4b0f34f0ce1a22b targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: a2bf4c2f45736958ac99f60e60b9f6d0e94454c3 + git_hash: 04f824bce1b6fb4b989bb9303949af17eab11406 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: 12b033e4192448315794f5fe8203fe91dcc29a8c + git_hash: 559ac499551ba78889c61b5dc0669ba10a256674 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,19 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5.5' + torbrowser_version: '13.5.6' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/09/25 17:40:27' + browser_release_date: '2024/09/30 23:05:10' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - '[% IF c("var/tor-browser") %]13.5.5[% END %]' - '[% IF c("var/tor-browser") %]13.5.4[% END %]' - 13.5.3 - - 13.5.2 + - '[% IF c("var/mullvad-browser") %]13.5.2[% END %]' - '[% IF c("var/mullvad-browser") %]13.5.1[% END %]' mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag mullvad-browser-115.16.0esr-13.5-1-build2
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed new tag mullvad-browser-115.16.0esr-13.5-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/mullvad-b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.16.0esr-13.5-1] 7 commits: Bug 1881037 - Part 1: Stop showing unknown protocol error pages for...
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed to branch mullvad-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: eafe617f by Nika Layzell at 2024-10-01T00:57:18+02:00 Bug 1881037 - Part 1: Stop showing unknown protocol error pages for web-triggered loads, r=smaug,necko-reviewers,kershaw, a=dsmith Differential Revision: https://phabricator.services.mozilla.com/D217495 - - - - - db726edf by Paul Zuehlcke at 2024-10-01T00:57:20+02:00 Bug 1916659, a=diannaS Original Revision: https://phabricator.services.mozilla.com/D222629 Differential Revision: https://phabricator.services.mozilla.com/D222934 - - - - - be142b0d by André Bargull at 2024-10-01T00:57:21+02:00 Bug 1915249: Add more nodiscard. a=RyanVM Original Revision: https://phabricator.services.mozilla.com/D220311 Differential Revision: https://phabricator.services.mozilla.com/D221663 - - - - - bfc54ed4 by Emilio Cobos Álvarez at 2024-10-01T00:57:23+02:00 Bug 1914106 - Deal with insertRule edge-case. r=jwatt a=RyanVM When there's trailing garbage after an @import rule we throw, but we still trigger the load (that's not great but not trivial to change). Deal with that case before calling ImportRuleLoaded(). Differential Revision: https://phabricator.services.mozilla.com/D219783 - - - - - cb01df5c by Steve Fink at 2024-10-01T00:57:25+02:00 Bug 1912471 - Disallow deserializing structured clone buffers with transferables more than once r=iain, a=dsmith Differential Revision: https://phabricator.services.mozilla.com/D220644 - - - - - 84dc8a8a by Nika Layzell at 2024-10-01T00:57:26+02:00 Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8 Previously these checks were largely diagnostic tools for finding bugs in other code as it evolves. This unifies the checks a bit more and makes them stronger for BrowsingContexts created over IPC, providing a place for more coherency checks to be added in the future. Differential Revision: https://phabricator.services.mozilla.com/D218860 - - - - - 0fe417ba by Kershaw Chang at 2024-10-01T00:57:28+02:00 Bug 1907726 - Make sure WebTransportSessionProxy::NotifyDatagramReceived is called after OnStopRequest, a=RyanVM The crash occurs because WebTransportSessionProxy::OnDatagramReceivedInternal is called before WebTransportSessionProxy::OnStopRequest. When this happens, WebTransportSessionProxy::mTarget is the main thread, so a task is dispatched to the main thread. This causes WebTransportSessionProxy::NotifyDatagramReceived to be called on the main thread. If WebTransportSessionProxy::NotifyDatagramReceived is invoked while WebTransportSessionProxy::mStopRequestCalled is true, it can lead to OnDatagramReceived being called on the main thread (instead of the socket thread), resulting in a crash. Original Revision: https://phabricator.services.mozilla.com/D220013 Differential Revision: https://phabricator.services.mozilla.com/D221661 - - - - - 22 changed files: - browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js - browser/components/prompts/PromptCollection.sys.mjs - docshell/base/BrowsingContext.cpp - docshell/base/BrowsingContext.h - docshell/base/nsDocShell.cpp - docshell/base/nsDocShell.h - dom/base/Document.cpp - dom/base/Document.h - dom/base/ShadowRoot.cpp - dom/base/ShadowRoot.h - dom/filesystem/tests/script_promptHandler.js - js/public/StructuredClone.h - js/public/friend/ErrorNumbers.msg - js/src/jit-test/tests/structured-clone/transferable-cleanup.js - js/src/jit/IonAnalysis.cpp - js/src/vm/StructuredClone.cpp - layout/style/ServoStyleSet.cpp - layout/style/ServoStyleSet.h - layout/style/StyleSheet.cpp - netwerk/ipc/DocumentLoadListener.cpp - netwerk/protocol/webtransport/WebTransportSessionProxy.cpp - + testing/web-platform/tests/css/cssom/insertRule-import-trailing-garbage-crash.html Changes: ===================================== browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js ===================================== @@ -101,8 +101,29 @@ async function testUploadPrompt(confirmUpload) { // Wait for confirmation prompt let prompt = await promptPromise; ok(prompt, "Shown upload confirmation prompt"); + is(prompt.ui.button0.label, "Upload", "Accept button label"); + ok( + prompt.ui.button0.disabled, + "Accept button should be disabled by the security delay initially." + ); + ok(prompt.ui.button1.hasAttribute("default"), "Cancel is default button"); + ok( + !prompt.ui.button1.disabled, + "Cancel button should not be disabled by the security delay." + ); + + info("Wait for the security delay to pass."); + let delayTime = Services.prefs.getIntPref("security.dialog_enable_delay"); + // eslint-disable-next-line mozilla/no-arbitrary-setTimeout + await new Promise(resolve => setTimeout(resolve, delayTime + 100)); + + ok( + !prompt.ui.button0.disabled, + "Accept button should no longer be disabled." + ); + ok(!prompt.ui.button1.disabled, "Cancel button should remain enabled."); // Close confirmation prompt await PromptTestUtils.handlePrompt(prompt, { ===================================== browser/components/prompts/PromptCollection.sys.mjs ===================================== @@ -156,7 +156,7 @@ export class PromptCollection { Services.prompt.MODAL_TYPE_TAB, title, message, - buttonFlags, + buttonFlags | Ci.nsIPrompt.BUTTON_DELAY_ENABLE, acceptLabel, null, null, ===================================== docshell/base/BrowsingContext.cpp ===================================== @@ -572,9 +572,19 @@ mozilla::ipc::IPCResult BrowsingContext::CreateFromIPC( context->mRequestContextId = aInit.mRequestContextId; // NOTE: Private browsing ID is set by `SetOriginAttributes`. + if (const char* failure = + context->BrowsingContextCoherencyChecks(aOriginProcess)) { + mozilla::ipc::IProtocol* actor = aOriginProcess; + if (!actor) { + actor = ContentChild::GetSingleton(); + } + return IPC_FAIL(actor, "Incoherent BrowsingContext"); + } + Register(context); - return context->Attach(/* aFromIPC */ true, aOriginProcess); + context->Attach(/* aFromIPC */ true, aOriginProcess); + return IPC_OK(); } BrowsingContext::BrowsingContext(WindowContext* aParentWindow, @@ -786,8 +796,64 @@ void BrowsingContext::Embed() { } } -mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, - ContentParent* aOriginProcess) { +const char* BrowsingContext::BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess) { +#define COHERENCY_ASSERT(condition) \ + if (!(condition)) return "Assertion " #condition " failed"; + + if (mGroup->IsPotentiallyCrossOriginIsolated() != + (Top()->GetOpenerPolicy() == + nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { + return "Invalid CrossOriginIsolated state"; + } + + if (aOriginProcess && !IsContent()) { + return "Content cannot create chrome BCs"; + } + + // LoadContext should generally match our opener or parent. + if (IsContent()) { + if (RefPtr<BrowsingContext> opener = GetOpener()) { + COHERENCY_ASSERT(opener->mType == mType); + COHERENCY_ASSERT(opener->mGroup == mGroup); + COHERENCY_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + } + if (RefPtr<BrowsingContext> parent = GetParent()) { + COHERENCY_ASSERT(parent->mType == mType); + COHERENCY_ASSERT(parent->mGroup == mGroup); + COHERENCY_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + + // UseRemoteSubframes and UseRemoteTabs must match. + if (mUseRemoteSubframes && !mUseRemoteTabs) { + return "Cannot set useRemoteSubframes without also setting useRemoteTabs"; + } + + // Double-check OriginAttributes/Private Browsing + // Chrome browsing contexts must not have a private browsing OriginAttribute + // Content browsing contexts must maintain the equality: + // mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId + if (IsChrome()) { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0); + } else { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == + mPrivateBrowsingId); + } +#undef COHERENCY_ASSERT + + return nullptr; +} + +void BrowsingContext::Attach(bool aFromIPC, ContentParent* aOriginProcess) { MOZ_DIAGNOSTIC_ASSERT(!mEverAttached); MOZ_DIAGNOSTIC_ASSERT_IF(aFromIPC, aOriginProcess || XRE_IsContentProcess()); mEverAttached = true; @@ -806,25 +872,15 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, MOZ_DIAGNOSTIC_ASSERT(mGroup); MOZ_DIAGNOSTIC_ASSERT(!mIsDiscarded); - if (mGroup->IsPotentiallyCrossOriginIsolated() != - (Top()->GetOpenerPolicy() == - nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { - MOZ_DIAGNOSTIC_ASSERT(aFromIPC); - if (aFromIPC) { - auto* actor = aOriginProcess - ? static_cast<mozilla::ipc::IProtocol*>(aOriginProcess) - : static_cast<mozilla::ipc::IProtocol*>( - ContentChild::GetSingleton()); - return IPC_FAIL( - actor, - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); - } else { - MOZ_CRASH( - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); +#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED + // We'll already have checked this if `aFromIPC` is set before calling this + // function. + if (!aFromIPC) { + if (const char* failure = BrowsingContextCoherencyChecks(aOriginProcess)) { + MOZ_CRASH_UNSAFE_PRINTF("Incoherent BrowsingContext: %s", failure); } } - - AssertCoherentLoadContext(); +#endif // Add ourselves either to our parent or BrowsingContextGroup's child list. // Important: We shouldn't return IPC_FAIL after this point, since the @@ -906,7 +962,6 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, if (XRE_IsParentProcess()) { Canonical()->CanonicalAttach(); } - return IPC_OK(); } void BrowsingContext::Detach(bool aFromIPC) { @@ -1743,40 +1798,6 @@ nsresult BrowsingContext::SetOriginAttributes(const OriginAttributes& aAttrs) { return NS_OK; } -void BrowsingContext::AssertCoherentLoadContext() { -#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED - // LoadContext should generally match our opener or parent. - if (IsContent()) { - if (RefPtr<BrowsingContext> opener = GetOpener()) { - MOZ_DIAGNOSTIC_ASSERT(opener->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(opener->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - } - if (RefPtr<BrowsingContext> parent = GetParent()) { - MOZ_DIAGNOSTIC_ASSERT(parent->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(parent->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - - // UseRemoteSubframes and UseRemoteTabs must match. - MOZ_DIAGNOSTIC_ASSERT( - !mUseRemoteSubframes || mUseRemoteTabs, - "Cannot set useRemoteSubframes without also setting useRemoteTabs"); - - // Double-check OriginAttributes/Private Browsing - AssertOriginAttributesMatchPrivateBrowsing(); -#endif -} - void BrowsingContext::AssertOriginAttributesMatchPrivateBrowsing() { // Chrome browsing contexts must not have a private browsing OriginAttribute // Content browsing contexts must maintain the equality: ===================================== docshell/base/BrowsingContext.h ===================================== @@ -971,7 +971,18 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { bool aHasPostData); private: - mozilla::ipc::IPCResult Attach(bool aFromIPC, ContentParent* aOriginProcess); + // Assert that this BrowsingContext is coherent relative to related + // BrowsingContexts. This will be run before the BrowsingContext is attached. + // + // A non-null string return value indicates that there was a coherency check + // failure, which will be handled with either a crash or IPC failure. + // + // If provided, `aOriginProcess` is the process which is responsible for the + // creation of this BrowsingContext. + [[nodiscard]] const char* BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess); + + void Attach(bool aFromIPC, ContentParent* aOriginProcess); // Recomputes whether we can execute scripts in this BrowsingContext based on // the value of AllowJavascript() and whether scripts are allowed in the @@ -985,10 +996,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { void AssertOriginAttributesMatchPrivateBrowsing(); - // Assert that the BrowsingContext's LoadContext flags appear coherent - // relative to related BrowsingContexts. - void AssertCoherentLoadContext(); - friend class ::nsOuterWindowProxy; friend class ::nsGlobalWindowOuter; friend class WindowContext; ===================================== docshell/base/nsDocShell.cpp ===================================== @@ -6254,7 +6254,7 @@ already_AddRefed<nsIURI> nsDocShell::AttemptURIFixup( nsresult nsDocShell::FilterStatusForErrorPage( nsresult aStatus, nsIChannel* aChannel, uint32_t aLoadType, - bool aIsTopFrame, bool aUseErrorPages, bool aIsInitialDocument, + bool aIsTopFrame, bool aUseErrorPages, bool* aSkippedUnknownProtocolNavigation) { // Errors to be shown only on top-level frames if ((aStatus == NS_ERROR_UNKNOWN_HOST || @@ -6298,18 +6298,10 @@ nsresult nsDocShell::FilterStatusForErrorPage( if (aStatus == NS_ERROR_UNKNOWN_PROTOCOL) { // For unknown protocols we only display an error if the load is triggered - // by the browser itself, or we're replacing the initial document (and - // nothing else). Showing the error for page-triggered navigations causes - // annoying behavior for users, see bug 1528305. - // - // We could, maybe, try to detect if this is in response to some user - // interaction (like clicking a link, or something else) and maybe show - // the error page in that case. But this allows for ctrl+clicking and such - // to see the error page. + // by the browser itself. Showing the error for page-triggered navigations + // causes annoying behavior for users, see bug 1528305. nsCOMPtr<nsILoadInfo> info = aChannel->LoadInfo(); - if (!info->TriggeringPrincipal()->IsSystemPrincipal() && - StaticPrefs::dom_no_unknown_protocol_error_enabled() && - !aIsInitialDocument) { + if (!info->TriggeringPrincipal()->IsSystemPrincipal()) { if (aSkippedUnknownProtocolNavigation) { *aSkippedUnknownProtocolNavigation = true; } @@ -6459,12 +6451,9 @@ nsresult nsDocShell::EndPageLoad(nsIWebProgress* aProgress, aStatus == NS_ERROR_CONTENT_BLOCKED); UnblockEmbedderLoadEventForFailure(fireFrameErrorEvent); - bool isInitialDocument = - !GetExtantDocument() || GetExtantDocument()->IsInitialDocument(); bool skippedUnknownProtocolNavigation = false; aStatus = FilterStatusForErrorPage(aStatus, aChannel, mLoadType, isTopFrame, mBrowsingContext->GetUseErrorPages(), - isInitialDocument, &skippedUnknownProtocolNavigation); hadErrorStatus = true; if (NS_FAILED(aStatus)) { ===================================== docshell/base/nsDocShell.h ===================================== @@ -464,7 +464,7 @@ class nsDocShell final : public nsDocLoader, // navigation. static nsresult FilterStatusForErrorPage( nsresult aStatus, nsIChannel* aChannel, uint32_t aLoadType, - bool aIsTopFrame, bool aUseErrorPages, bool aIsInitialDocument, + bool aIsTopFrame, bool aUseErrorPages, bool* aSkippedUnknownProtocolNavigation = nullptr); // Notify consumers of a search being loaded through the observer service: ===================================== dom/base/Document.cpp ===================================== @@ -8266,7 +8266,7 @@ void Document::RuleAdded(StyleSheet& aSheet, css::Rule& aRule) { } } -void Document::ImportRuleLoaded(dom::CSSImportRule& aRule, StyleSheet& aSheet) { +void Document::ImportRuleLoaded(StyleSheet& aSheet) { if (aSheet.IsApplicable()) { ApplicableStylesChanged(); } ===================================== dom/base/Document.h ===================================== @@ -2135,7 +2135,7 @@ class Document : public nsINode, void RuleAdded(StyleSheet&, css::Rule&); void RuleRemoved(StyleSheet&, css::Rule&); void SheetCloned(StyleSheet&) {} - void ImportRuleLoaded(CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); /** * Flush notifications for this document and its parent documents ===================================== dom/base/ShadowRoot.cpp ===================================== @@ -412,7 +412,7 @@ void ShadowRoot::RuleChanged(StyleSheet& aSheet, css::Rule*, ApplicableRulesChanged(); } -void ShadowRoot::ImportRuleLoaded(CSSImportRule&, StyleSheet& aSheet) { +void ShadowRoot::ImportRuleLoaded(StyleSheet& aSheet) { if (mStyleRuleMap) { mStyleRuleMap->SheetAdded(aSheet); } ===================================== dom/base/ShadowRoot.h ===================================== @@ -86,7 +86,7 @@ class ShadowRoot final : public DocumentFragment, void RuleAdded(StyleSheet&, css::Rule&); void RuleRemoved(StyleSheet&, css::Rule&); void RuleChanged(StyleSheet&, css::Rule*, StyleRuleChangeKind); - void ImportRuleLoaded(CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); void SheetCloned(StyleSheet&); void StyleSheetApplicableStateChanged(StyleSheet&); ===================================== dom/filesystem/tests/script_promptHandler.js ===================================== @@ -2,7 +2,45 @@ let dialogObserverTopic = "common-dialog-loaded"; -function dialogObserver(subj, topic, data) { +function waitForButtonEnabledState(button) { + return new Promise(resolve => { + // Check if the button is already enabled (not disabled) + if (!button.disabled) { + resolve(); + return; + } + + // Create a MutationObserver instance + let win = button.ownerGlobal; + let { MutationObserver } = win; + const observer = new MutationObserver(mutationsList => { + for (const mutation of mutationsList) { + if ( + mutation.type === "attributes" && + mutation.attributeName === "disabled" + ) { + if (!button.disabled) { + // Resolve the promise when the button is enabled + observer.disconnect(); // Stop observing + resolve(); + } + } + } + }); + + // Start observing the button for changes to the 'disabled' attribute + observer.observe(button, { + attributes: true, + attributeFilter: ["disabled"], + }); + }); +} + +async function dialogObserver(subj) { + let dialog = subj.document.querySelector("dialog"); + let acceptButton = dialog.getButton("accept"); + await waitForButtonEnabledState(acceptButton); + subj.document.querySelector("dialog").acceptDialog(); sendAsyncMessage("promptAccepted"); } ===================================== js/public/StructuredClone.h ===================================== @@ -744,6 +744,7 @@ class JS_PUBLIC_API JSAutoStructuredCloneBuffer { #define JS_SCERR_WASM_NO_TRANSFER 6 #define JS_SCERR_NOT_CLONABLE 7 #define JS_SCERR_NOT_CLONABLE_WITH_COOP_COEP 8 +#define JS_SCERR_TRANSFERABLE_TWICE 9 JS_PUBLIC_API bool JS_ReadUint32Pair(JSStructuredCloneReader* r, uint32_t* p1, uint32_t* p2); ===================================== js/public/friend/ErrorNumbers.msg ===================================== @@ -527,6 +527,7 @@ MSG_DEF(JSMSG_SC_BAD_CLONE_VERSION, 0, JSEXN_ERR, "unsupported structured clo MSG_DEF(JSMSG_SC_BAD_SERIALIZED_DATA, 1, JSEXN_INTERNALERR, "bad serialized structured data ({0})") MSG_DEF(JSMSG_SC_DUP_TRANSFERABLE, 0, JSEXN_TYPEERR, "duplicate transferable for structured clone") MSG_DEF(JSMSG_SC_NOT_TRANSFERABLE, 0, JSEXN_TYPEERR, "invalid transferable array for structured clone") +MSG_DEF(JSMSG_SC_TRANSFERABLE_TWICE, 0, JSEXN_TYPEERR, "structured clone cannot transfer twice") MSG_DEF(JSMSG_SC_UNSUPPORTED_TYPE, 0, JSEXN_TYPEERR, "unsupported type for structured data") MSG_DEF(JSMSG_SC_NOT_CLONABLE, 1, JSEXN_TYPEERR, "The {0} object cannot be serialized. The Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy HTTP headers will enable this in the future.") MSG_DEF(JSMSG_SC_NOT_CLONABLE_WITH_COOP_COEP, 1, JSEXN_TYPEERR, "The {0} object cannot be serialized. The Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy HTTP headers can be used to enable this.") ===================================== js/src/jit-test/tests/structured-clone/transferable-cleanup.js ===================================== @@ -160,6 +160,15 @@ function testMultiWithDeserializeReadTransferErrorHelper(g, BASE, desc) { } catch (e) { assertEq(e.message.includes("invalid transferable"), true); } + + try { + // This fails without logging anything, since the re-transfer will be caught + // by looking at its header before calling any callbacks. + let clone = deserialize(s); + } catch (e) { + assertEq(e.message.includes("cannot transfer twice"), true); + } + s = null; gc(); printTrace(arguments.callee.name, g, BASE, obj.log, "deserialize"); @@ -170,6 +179,7 @@ function testMultiWithDeserializeReadTransferErrorHelper(g, BASE, desc) { // which comes before the main reading. obj transfer data is now owned by its // clone. obj3 transfer data was not successfully handed over to a new object, // so it is still owned by the clone buffer and must be discarded with freeTransfer. + // 'F' means the data is freed. BASE + 3, "F", ], "deserialize " + desc); obj.log = null; ===================================== js/src/jit/IonAnalysis.cpp ===================================== @@ -29,8 +29,9 @@ using MPhiUseIteratorStack = // Look for Phi uses with a depth-first search. If any uses are found the stack // of MPhi instructions is returned in the |worklist| argument. -static bool DepthFirstSearchUse(MIRGenerator* mir, - MPhiUseIteratorStack& worklist, MPhi* phi) { +[[nodiscard]] static bool DepthFirstSearchUse(MIRGenerator* mir, + MPhiUseIteratorStack& worklist, + MPhi* phi) { // Push a Phi and the next use to iterate over in the worklist. auto push = [&worklist](MPhi* phi, MUseIterator use) -> bool { phi->setInWorklist(); @@ -131,9 +132,9 @@ static bool DepthFirstSearchUse(MIRGenerator* mir, return true; } -static bool FlagPhiInputsAsImplicitlyUsed(MIRGenerator* mir, MBasicBlock* block, - MBasicBlock* succ, - MPhiUseIteratorStack& worklist) { +[[nodiscard]] static bool FlagPhiInputsAsImplicitlyUsed( + MIRGenerator* mir, MBasicBlock* block, MBasicBlock* succ, + MPhiUseIteratorStack& worklist) { // When removing an edge between 2 blocks, we might remove the ability of // later phases to figure out that the uses of a Phi should be considered as // a use of all its inputs. Thus we need to mark the Phi inputs as being @@ -265,7 +266,7 @@ static MInstructionIterator FindFirstInstructionAfterBail(MBasicBlock* block) { // Given an iterator pointing to the first removed instruction, mark // the operands of each removed instruction as having implicit uses. -static bool FlagOperandsAsImplicitlyUsedAfter( +[[nodiscard]] static bool FlagOperandsAsImplicitlyUsedAfter( MIRGenerator* mir, MBasicBlock* block, MInstructionIterator firstRemoved) { MOZ_ASSERT(firstRemoved->block() == block); @@ -312,8 +313,8 @@ static bool FlagOperandsAsImplicitlyUsedAfter( return true; } -static bool FlagEntryResumePointOperands(MIRGenerator* mir, - MBasicBlock* block) { +[[nodiscard]] static bool FlagEntryResumePointOperands(MIRGenerator* mir, + MBasicBlock* block) { // Flag observable operands of the entry resume point as having implicit uses. MResumePoint* rp = block->entryResumePoint(); while (rp) { @@ -334,8 +335,8 @@ static bool FlagEntryResumePointOperands(MIRGenerator* mir, return true; } -static bool FlagAllOperandsAsImplicitlyUsed(MIRGenerator* mir, - MBasicBlock* block) { +[[nodiscard]] static bool FlagAllOperandsAsImplicitlyUsed(MIRGenerator* mir, + MBasicBlock* block) { return FlagEntryResumePointOperands(mir, block) && FlagOperandsAsImplicitlyUsedAfter(mir, block, block->begin()); } @@ -420,12 +421,16 @@ bool jit::PruneUnusedBranches(MIRGenerator* mir, MIRGraph& graph) { if (!block->isMarked()) { // If we are removing the block entirely, mark the operands of every // instruction as being implicitly used. - FlagAllOperandsAsImplicitlyUsed(mir, block); + if (!FlagAllOperandsAsImplicitlyUsed(mir, block)) { + return false; + } } else if (block->alwaysBails()) { // If we are only trimming instructions after a bail, only mark operands // of removed instructions. MInstructionIterator firstRemoved = FindFirstInstructionAfterBail(block); - FlagOperandsAsImplicitlyUsedAfter(mir, block, firstRemoved); + if (!FlagOperandsAsImplicitlyUsedAfter(mir, block, firstRemoved)) { + return false; + } } } @@ -503,7 +508,8 @@ bool jit::PruneUnusedBranches(MIRGenerator* mir, MIRGraph& graph) { return true; } -static bool SplitCriticalEdgesForBlock(MIRGraph& graph, MBasicBlock* block) { +[[nodiscard]] static bool SplitCriticalEdgesForBlock(MIRGraph& graph, + MBasicBlock* block) { if (block->numSuccessors() < 2) { return true; } @@ -767,8 +773,8 @@ static bool IsDiamondPattern(MBasicBlock* initialBlock) { return true; } -static bool MaybeFoldDiamondConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldDiamondConditionBlock( + MIRGraph& graph, MBasicBlock* initialBlock) { MOZ_ASSERT(IsDiamondPattern(initialBlock)); // Optimize the MIR graph to improve the code generated for conditional @@ -936,8 +942,8 @@ static bool IsTrianglePattern(MBasicBlock* initialBlock) { return false; } -static bool MaybeFoldTriangleConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldTriangleConditionBlock( + MIRGraph& graph, MBasicBlock* initialBlock) { MOZ_ASSERT(IsTrianglePattern(initialBlock)); // Optimize the MIR graph to improve the code generated for boolean @@ -1089,8 +1095,8 @@ static bool MaybeFoldTriangleConditionBlock(MIRGraph& graph, return true; } -static bool MaybeFoldConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldConditionBlock(MIRGraph& graph, + MBasicBlock* initialBlock) { if (IsDiamondPattern(initialBlock)) { return MaybeFoldDiamondConditionBlock(graph, initialBlock); } @@ -1100,7 +1106,8 @@ static bool MaybeFoldConditionBlock(MIRGraph& graph, return true; } -static bool MaybeFoldTestBlock(MIRGraph& graph, MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldTestBlock(MIRGraph& graph, + MBasicBlock* initialBlock) { // Handle test expressions on more than two inputs. For example // |if ((x > 10) && (y > 20) && (z > 30)) { ... }|, which results in the below // pattern. @@ -2752,7 +2759,9 @@ bool jit::RemoveUnmarkedBlocks(MIRGenerator* mir, MIRGraph& graph, continue; } - FlagAllOperandsAsImplicitlyUsed(mir, block); + if (!FlagAllOperandsAsImplicitlyUsed(mir, block)) { + return false; + } } // Find unmarked blocks and remove them. @@ -4003,8 +4012,8 @@ bool jit::EliminateRedundantShapeGuards(MIRGraph& graph) { return true; } -static bool TryEliminateGCBarriersForAllocation(TempAllocator& alloc, - MInstruction* allocation) { +[[nodiscard]] static bool TryEliminateGCBarriersForAllocation( + TempAllocator& alloc, MInstruction* allocation) { MOZ_ASSERT(allocation->type() == MIRType::Object); JitSpew(JitSpew_RedundantGCBarriers, "Analyzing allocation %s", ===================================== js/src/vm/StructuredClone.cpp ===================================== @@ -172,17 +172,25 @@ enum StructuredDataType : uint32_t { /* * Format of transfer map: - * <SCTAG_TRANSFER_MAP_HEADER, TransferableMapHeader(UNREAD|TRANSFERRED)> - * numTransferables (64 bits) - * array of: - * <SCTAG_TRANSFER_MAP_*, TransferableOwnership> - * pointer (64 bits) - * extraData (64 bits), eg byte length for ArrayBuffers + * - <SCTAG_TRANSFER_MAP_HEADER, UNREAD|TRANSFERRING|TRANSFERRED> + * - numTransferables (64 bits) + * - array of: + * - <SCTAG_TRANSFER_MAP_*, TransferableOwnership> pointer (64 + * bits) + * - extraData (64 bits), eg byte length for ArrayBuffers + * - any data written for custom transferables */ // Data associated with an SCTAG_TRANSFER_MAP_HEADER that tells whether the -// contents have been read out yet or not. -enum TransferableMapHeader { SCTAG_TM_UNREAD = 0, SCTAG_TM_TRANSFERRED }; +// contents have been read out yet or not. TRANSFERRING is for the case where we +// have started but not completed reading, which due to errors could mean that +// there are things still owned by the clone buffer that need to be released, so +// discarding should not just be skipped. +enum TransferableMapHeader { + SCTAG_TM_UNREAD = 0, + SCTAG_TM_TRANSFERRING, + SCTAG_TM_TRANSFERRED +}; static inline uint64_t PairToUInt64(uint32_t tag, uint32_t data) { return uint64_t(data) | (uint64_t(tag) << 32); @@ -693,6 +701,10 @@ static void ReportDataCloneError(JSContext* cx, errorNumber = JSMSG_SC_SHMEM_TRANSFERABLE; break; + case JS_SCERR_TRANSFERABLE_TWICE: + errorNumber = JSMSG_SC_TRANSFERABLE_TWICE; + break; + case JS_SCERR_TYPED_ARRAY_DETACHED: errorNumber = JSMSG_TYPED_ARRAY_DETACHED; break; @@ -3209,11 +3221,21 @@ bool JSStructuredCloneReader::readTransferMap() { return in.reportTruncated(); } + auto transferState = static_cast<TransferableMapHeader>(data); + if (tag != SCTAG_TRANSFER_MAP_HEADER || - TransferableMapHeader(data) == SCTAG_TM_TRANSFERRED) { + transferState == SCTAG_TM_TRANSFERRED) { return true; } + if (transferState == SCTAG_TM_TRANSFERRING) { + ReportDataCloneError(cx, callbacks, JS_SCERR_TRANSFERABLE_TWICE, closure); + return false; + } + + headerPos.write( + PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRING)); + uint64_t numTransferables; MOZ_ALWAYS_TRUE(in.readPair(&tag, &data)); if (!in.read(&numTransferables)) { @@ -3329,7 +3351,7 @@ bool JSStructuredCloneReader::readTransferMap() { #ifdef DEBUG SCInput::getPair(headerPos.peek(), &tag, &data); MOZ_ASSERT(tag == SCTAG_TRANSFER_MAP_HEADER); - MOZ_ASSERT(TransferableMapHeader(data) != SCTAG_TM_TRANSFERRED); + MOZ_ASSERT(TransferableMapHeader(data) == SCTAG_TM_TRANSFERRING); #endif headerPos.write( PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRED)); ===================================== layout/style/ServoStyleSet.cpp ===================================== @@ -954,7 +954,7 @@ static OriginFlags ToOriginFlags(StyleOrigin aOrigin) { } } -void ServoStyleSet::ImportRuleLoaded(dom::CSSImportRule&, StyleSheet& aSheet) { +void ServoStyleSet::ImportRuleLoaded(StyleSheet& aSheet) { if (mStyleRuleMap) { mStyleRuleMap->SheetAdded(aSheet); } ===================================== layout/style/ServoStyleSet.h ===================================== @@ -133,7 +133,7 @@ class ServoStyleSet { void RuleRemoved(StyleSheet&, css::Rule&); void RuleChanged(StyleSheet&, css::Rule*, StyleRuleChangeKind); void SheetCloned(StyleSheet&); - void ImportRuleLoaded(dom::CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); // Runs style invalidation due to document state changes. void InvalidateStyleForDocumentStateChanges( ===================================== layout/style/StyleSheet.cpp ===================================== @@ -836,15 +836,19 @@ StyleSheet::StyleSheetLoaded(StyleSheet* aSheet, bool aWasDeferred, if (!aSheet->GetParentSheet()) { return NS_OK; // ignore if sheet has been detached already } - MOZ_ASSERT(this == aSheet->GetParentSheet(), - "We are being notified of a sheet load for a sheet that is not " - "our child!"); + MOZ_DIAGNOSTIC_ASSERT(this == aSheet->GetParentSheet(), + "We are being notified of a sheet load for a sheet " + "that is not our child!"); if (NS_FAILED(aStatus)) { return NS_OK; } - - MOZ_ASSERT(aSheet->GetOwnerRule()); - NOTIFY(ImportRuleLoaded, (*aSheet->GetOwnerRule(), *aSheet)); + // The assert below should hold if we stop triggering import loads for invalid + // insertRule() calls, see bug 1914106. + // MOZ_ASSERT(aSheet->GetOwnerRule()); + if (!aSheet->GetOwnerRule()) { + return NS_OK; + } + NOTIFY(ImportRuleLoaded, (*aSheet)); return NS_OK; } ===================================== netwerk/ipc/DocumentLoadListener.cpp ===================================== @@ -2316,15 +2316,9 @@ bool DocumentLoadListener::DocShellWillDisplayContent(nsresult aStatus) { auto* loadingContext = GetLoadingBrowsingContext(); - bool isInitialDocument = true; - if (WindowGlobalParent* currentWindow = - loadingContext->GetCurrentWindowGlobal()) { - isInitialDocument = currentWindow->IsInitialDocument(); - } - nsresult rv = nsDocShell::FilterStatusForErrorPage( aStatus, mChannel, mLoadStateLoadType, loadingContext->IsTop(), - loadingContext->GetUseErrorPages(), isInitialDocument, nullptr); + loadingContext->GetUseErrorPages(), nullptr); if (NS_SUCCEEDED(rv)) { MOZ_LOG(gProcessIsolationLog, LogLevel::Verbose, ===================================== netwerk/protocol/webtransport/WebTransportSessionProxy.cpp ===================================== @@ -1042,15 +1042,6 @@ void WebTransportSessionProxy::NotifyDatagramReceived( MutexAutoLock lock(mMutex); MOZ_ASSERT(mTarget->IsOnCurrentThread()); - if (!mStopRequestCalled) { - CopyableTArray<uint8_t> copied(aData); - mPendingEvents.AppendElement( - [self = RefPtr{this}, data = std::move(copied)]() mutable { - self->NotifyDatagramReceived(std::move(data)); - }); - return; - } - if (mState != WebTransportSessionProxyState::ACTIVE || !mListener) { return; } @@ -1066,6 +1057,15 @@ NS_IMETHODIMP WebTransportSessionProxy::OnDatagramReceivedInternal( { MutexAutoLock lock(mMutex); + if (!mStopRequestCalled) { + CopyableTArray<uint8_t> copied(aData); + mPendingEvents.AppendElement( + [self = RefPtr{this}, data = std::move(copied)]() mutable { + self->OnDatagramReceivedInternal(std::move(data)); + }); + return NS_OK; + } + if (!mTarget->IsOnCurrentThread()) { return mTarget->Dispatch(NS_NewRunnableFunction( "WebTransportSessionProxy::OnDatagramReceived", ===================================== testing/web-platform/tests/css/cssom/insertRule-import-trailing-garbage-crash.html ===================================== @@ -0,0 +1,6 @@ +<!doctype html> +<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1914106"> +<style></style> +<script> +document.querySelector("style").sheet.insertRule("@import url('data:text/css,:root{background:red}');html,body{/* random garbage */}"); +</script> View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/4d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/4d… 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.16.0esr-13.5-1-build2
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed new tag base-browser-115.16.0esr-13.5-1-build2 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][base-browser-115.16.0esr-13.5-1] 7 commits: Bug 1881037 - Part 1: Stop showing unknown protocol error pages for...
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed to branch base-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 9ce14cc7 by Nika Layzell at 2024-10-01T00:53:35+02:00 Bug 1881037 - Part 1: Stop showing unknown protocol error pages for web-triggered loads, r=smaug,necko-reviewers,kershaw, a=dsmith Differential Revision: https://phabricator.services.mozilla.com/D217495 - - - - - 63cf9662 by Paul Zuehlcke at 2024-10-01T00:53:37+02:00 Bug 1916659, a=diannaS Original Revision: https://phabricator.services.mozilla.com/D222629 Differential Revision: https://phabricator.services.mozilla.com/D222934 - - - - - 32373e41 by André Bargull at 2024-10-01T00:53:38+02:00 Bug 1915249: Add more nodiscard. a=RyanVM Original Revision: https://phabricator.services.mozilla.com/D220311 Differential Revision: https://phabricator.services.mozilla.com/D221663 - - - - - e6dfa497 by Emilio Cobos Álvarez at 2024-10-01T00:53:40+02:00 Bug 1914106 - Deal with insertRule edge-case. r=jwatt a=RyanVM When there's trailing garbage after an @import rule we throw, but we still trigger the load (that's not great but not trivial to change). Deal with that case before calling ImportRuleLoaded(). Differential Revision: https://phabricator.services.mozilla.com/D219783 - - - - - 35286ac0 by Steve Fink at 2024-10-01T00:53:42+02:00 Bug 1912471 - Disallow deserializing structured clone buffers with transferables more than once r=iain, a=dsmith Differential Revision: https://phabricator.services.mozilla.com/D220644 - - - - - bf0a17a2 by Nika Layzell at 2024-10-01T00:53:43+02:00 Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8 Previously these checks were largely diagnostic tools for finding bugs in other code as it evolves. This unifies the checks a bit more and makes them stronger for BrowsingContexts created over IPC, providing a place for more coherency checks to be added in the future. Differential Revision: https://phabricator.services.mozilla.com/D218860 - - - - - bf6b766b by Kershaw Chang at 2024-10-01T00:53:46+02:00 Bug 1907726 - Make sure WebTransportSessionProxy::NotifyDatagramReceived is called after OnStopRequest, a=RyanVM The crash occurs because WebTransportSessionProxy::OnDatagramReceivedInternal is called before WebTransportSessionProxy::OnStopRequest. When this happens, WebTransportSessionProxy::mTarget is the main thread, so a task is dispatched to the main thread. This causes WebTransportSessionProxy::NotifyDatagramReceived to be called on the main thread. If WebTransportSessionProxy::NotifyDatagramReceived is invoked while WebTransportSessionProxy::mStopRequestCalled is true, it can lead to OnDatagramReceived being called on the main thread (instead of the socket thread), resulting in a crash. Original Revision: https://phabricator.services.mozilla.com/D220013 Differential Revision: https://phabricator.services.mozilla.com/D221661 - - - - - 22 changed files: - browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js - browser/components/prompts/PromptCollection.sys.mjs - docshell/base/BrowsingContext.cpp - docshell/base/BrowsingContext.h - docshell/base/nsDocShell.cpp - docshell/base/nsDocShell.h - dom/base/Document.cpp - dom/base/Document.h - dom/base/ShadowRoot.cpp - dom/base/ShadowRoot.h - dom/filesystem/tests/script_promptHandler.js - js/public/StructuredClone.h - js/public/friend/ErrorNumbers.msg - js/src/jit-test/tests/structured-clone/transferable-cleanup.js - js/src/jit/IonAnalysis.cpp - js/src/vm/StructuredClone.cpp - layout/style/ServoStyleSet.cpp - layout/style/ServoStyleSet.h - layout/style/StyleSheet.cpp - netwerk/ipc/DocumentLoadListener.cpp - netwerk/protocol/webtransport/WebTransportSessionProxy.cpp - + testing/web-platform/tests/css/cssom/insertRule-import-trailing-garbage-crash.html Changes: ===================================== browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js ===================================== @@ -101,8 +101,29 @@ async function testUploadPrompt(confirmUpload) { // Wait for confirmation prompt let prompt = await promptPromise; ok(prompt, "Shown upload confirmation prompt"); + is(prompt.ui.button0.label, "Upload", "Accept button label"); + ok( + prompt.ui.button0.disabled, + "Accept button should be disabled by the security delay initially." + ); + ok(prompt.ui.button1.hasAttribute("default"), "Cancel is default button"); + ok( + !prompt.ui.button1.disabled, + "Cancel button should not be disabled by the security delay." + ); + + info("Wait for the security delay to pass."); + let delayTime = Services.prefs.getIntPref("security.dialog_enable_delay"); + // eslint-disable-next-line mozilla/no-arbitrary-setTimeout + await new Promise(resolve => setTimeout(resolve, delayTime + 100)); + + ok( + !prompt.ui.button0.disabled, + "Accept button should no longer be disabled." + ); + ok(!prompt.ui.button1.disabled, "Cancel button should remain enabled."); // Close confirmation prompt await PromptTestUtils.handlePrompt(prompt, { ===================================== browser/components/prompts/PromptCollection.sys.mjs ===================================== @@ -156,7 +156,7 @@ export class PromptCollection { Services.prompt.MODAL_TYPE_TAB, title, message, - buttonFlags, + buttonFlags | Ci.nsIPrompt.BUTTON_DELAY_ENABLE, acceptLabel, null, null, ===================================== docshell/base/BrowsingContext.cpp ===================================== @@ -572,9 +572,19 @@ mozilla::ipc::IPCResult BrowsingContext::CreateFromIPC( context->mRequestContextId = aInit.mRequestContextId; // NOTE: Private browsing ID is set by `SetOriginAttributes`. + if (const char* failure = + context->BrowsingContextCoherencyChecks(aOriginProcess)) { + mozilla::ipc::IProtocol* actor = aOriginProcess; + if (!actor) { + actor = ContentChild::GetSingleton(); + } + return IPC_FAIL(actor, "Incoherent BrowsingContext"); + } + Register(context); - return context->Attach(/* aFromIPC */ true, aOriginProcess); + context->Attach(/* aFromIPC */ true, aOriginProcess); + return IPC_OK(); } BrowsingContext::BrowsingContext(WindowContext* aParentWindow, @@ -786,8 +796,64 @@ void BrowsingContext::Embed() { } } -mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, - ContentParent* aOriginProcess) { +const char* BrowsingContext::BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess) { +#define COHERENCY_ASSERT(condition) \ + if (!(condition)) return "Assertion " #condition " failed"; + + if (mGroup->IsPotentiallyCrossOriginIsolated() != + (Top()->GetOpenerPolicy() == + nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { + return "Invalid CrossOriginIsolated state"; + } + + if (aOriginProcess && !IsContent()) { + return "Content cannot create chrome BCs"; + } + + // LoadContext should generally match our opener or parent. + if (IsContent()) { + if (RefPtr<BrowsingContext> opener = GetOpener()) { + COHERENCY_ASSERT(opener->mType == mType); + COHERENCY_ASSERT(opener->mGroup == mGroup); + COHERENCY_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + } + if (RefPtr<BrowsingContext> parent = GetParent()) { + COHERENCY_ASSERT(parent->mType == mType); + COHERENCY_ASSERT(parent->mGroup == mGroup); + COHERENCY_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + + // UseRemoteSubframes and UseRemoteTabs must match. + if (mUseRemoteSubframes && !mUseRemoteTabs) { + return "Cannot set useRemoteSubframes without also setting useRemoteTabs"; + } + + // Double-check OriginAttributes/Private Browsing + // Chrome browsing contexts must not have a private browsing OriginAttribute + // Content browsing contexts must maintain the equality: + // mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId + if (IsChrome()) { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0); + } else { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == + mPrivateBrowsingId); + } +#undef COHERENCY_ASSERT + + return nullptr; +} + +void BrowsingContext::Attach(bool aFromIPC, ContentParent* aOriginProcess) { MOZ_DIAGNOSTIC_ASSERT(!mEverAttached); MOZ_DIAGNOSTIC_ASSERT_IF(aFromIPC, aOriginProcess || XRE_IsContentProcess()); mEverAttached = true; @@ -806,25 +872,15 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, MOZ_DIAGNOSTIC_ASSERT(mGroup); MOZ_DIAGNOSTIC_ASSERT(!mIsDiscarded); - if (mGroup->IsPotentiallyCrossOriginIsolated() != - (Top()->GetOpenerPolicy() == - nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { - MOZ_DIAGNOSTIC_ASSERT(aFromIPC); - if (aFromIPC) { - auto* actor = aOriginProcess - ? static_cast<mozilla::ipc::IProtocol*>(aOriginProcess) - : static_cast<mozilla::ipc::IProtocol*>( - ContentChild::GetSingleton()); - return IPC_FAIL( - actor, - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); - } else { - MOZ_CRASH( - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); +#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED + // We'll already have checked this if `aFromIPC` is set before calling this + // function. + if (!aFromIPC) { + if (const char* failure = BrowsingContextCoherencyChecks(aOriginProcess)) { + MOZ_CRASH_UNSAFE_PRINTF("Incoherent BrowsingContext: %s", failure); } } - - AssertCoherentLoadContext(); +#endif // Add ourselves either to our parent or BrowsingContextGroup's child list. // Important: We shouldn't return IPC_FAIL after this point, since the @@ -906,7 +962,6 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, if (XRE_IsParentProcess()) { Canonical()->CanonicalAttach(); } - return IPC_OK(); } void BrowsingContext::Detach(bool aFromIPC) { @@ -1743,40 +1798,6 @@ nsresult BrowsingContext::SetOriginAttributes(const OriginAttributes& aAttrs) { return NS_OK; } -void BrowsingContext::AssertCoherentLoadContext() { -#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED - // LoadContext should generally match our opener or parent. - if (IsContent()) { - if (RefPtr<BrowsingContext> opener = GetOpener()) { - MOZ_DIAGNOSTIC_ASSERT(opener->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(opener->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - } - if (RefPtr<BrowsingContext> parent = GetParent()) { - MOZ_DIAGNOSTIC_ASSERT(parent->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(parent->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - - // UseRemoteSubframes and UseRemoteTabs must match. - MOZ_DIAGNOSTIC_ASSERT( - !mUseRemoteSubframes || mUseRemoteTabs, - "Cannot set useRemoteSubframes without also setting useRemoteTabs"); - - // Double-check OriginAttributes/Private Browsing - AssertOriginAttributesMatchPrivateBrowsing(); -#endif -} - void BrowsingContext::AssertOriginAttributesMatchPrivateBrowsing() { // Chrome browsing contexts must not have a private browsing OriginAttribute // Content browsing contexts must maintain the equality: ===================================== docshell/base/BrowsingContext.h ===================================== @@ -971,7 +971,18 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { bool aHasPostData); private: - mozilla::ipc::IPCResult Attach(bool aFromIPC, ContentParent* aOriginProcess); + // Assert that this BrowsingContext is coherent relative to related + // BrowsingContexts. This will be run before the BrowsingContext is attached. + // + // A non-null string return value indicates that there was a coherency check + // failure, which will be handled with either a crash or IPC failure. + // + // If provided, `aOriginProcess` is the process which is responsible for the + // creation of this BrowsingContext. + [[nodiscard]] const char* BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess); + + void Attach(bool aFromIPC, ContentParent* aOriginProcess); // Recomputes whether we can execute scripts in this BrowsingContext based on // the value of AllowJavascript() and whether scripts are allowed in the @@ -985,10 +996,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { void AssertOriginAttributesMatchPrivateBrowsing(); - // Assert that the BrowsingContext's LoadContext flags appear coherent - // relative to related BrowsingContexts. - void AssertCoherentLoadContext(); - friend class ::nsOuterWindowProxy; friend class ::nsGlobalWindowOuter; friend class WindowContext; ===================================== docshell/base/nsDocShell.cpp ===================================== @@ -6254,7 +6254,7 @@ already_AddRefed<nsIURI> nsDocShell::AttemptURIFixup( nsresult nsDocShell::FilterStatusForErrorPage( nsresult aStatus, nsIChannel* aChannel, uint32_t aLoadType, - bool aIsTopFrame, bool aUseErrorPages, bool aIsInitialDocument, + bool aIsTopFrame, bool aUseErrorPages, bool* aSkippedUnknownProtocolNavigation) { // Errors to be shown only on top-level frames if ((aStatus == NS_ERROR_UNKNOWN_HOST || @@ -6298,18 +6298,10 @@ nsresult nsDocShell::FilterStatusForErrorPage( if (aStatus == NS_ERROR_UNKNOWN_PROTOCOL) { // For unknown protocols we only display an error if the load is triggered - // by the browser itself, or we're replacing the initial document (and - // nothing else). Showing the error for page-triggered navigations causes - // annoying behavior for users, see bug 1528305. - // - // We could, maybe, try to detect if this is in response to some user - // interaction (like clicking a link, or something else) and maybe show - // the error page in that case. But this allows for ctrl+clicking and such - // to see the error page. + // by the browser itself. Showing the error for page-triggered navigations + // causes annoying behavior for users, see bug 1528305. nsCOMPtr<nsILoadInfo> info = aChannel->LoadInfo(); - if (!info->TriggeringPrincipal()->IsSystemPrincipal() && - StaticPrefs::dom_no_unknown_protocol_error_enabled() && - !aIsInitialDocument) { + if (!info->TriggeringPrincipal()->IsSystemPrincipal()) { if (aSkippedUnknownProtocolNavigation) { *aSkippedUnknownProtocolNavigation = true; } @@ -6459,12 +6451,9 @@ nsresult nsDocShell::EndPageLoad(nsIWebProgress* aProgress, aStatus == NS_ERROR_CONTENT_BLOCKED); UnblockEmbedderLoadEventForFailure(fireFrameErrorEvent); - bool isInitialDocument = - !GetExtantDocument() || GetExtantDocument()->IsInitialDocument(); bool skippedUnknownProtocolNavigation = false; aStatus = FilterStatusForErrorPage(aStatus, aChannel, mLoadType, isTopFrame, mBrowsingContext->GetUseErrorPages(), - isInitialDocument, &skippedUnknownProtocolNavigation); hadErrorStatus = true; if (NS_FAILED(aStatus)) { ===================================== docshell/base/nsDocShell.h ===================================== @@ -464,7 +464,7 @@ class nsDocShell final : public nsDocLoader, // navigation. static nsresult FilterStatusForErrorPage( nsresult aStatus, nsIChannel* aChannel, uint32_t aLoadType, - bool aIsTopFrame, bool aUseErrorPages, bool aIsInitialDocument, + bool aIsTopFrame, bool aUseErrorPages, bool* aSkippedUnknownProtocolNavigation = nullptr); // Notify consumers of a search being loaded through the observer service: ===================================== dom/base/Document.cpp ===================================== @@ -8266,7 +8266,7 @@ void Document::RuleAdded(StyleSheet& aSheet, css::Rule& aRule) { } } -void Document::ImportRuleLoaded(dom::CSSImportRule& aRule, StyleSheet& aSheet) { +void Document::ImportRuleLoaded(StyleSheet& aSheet) { if (aSheet.IsApplicable()) { ApplicableStylesChanged(); } ===================================== dom/base/Document.h ===================================== @@ -2135,7 +2135,7 @@ class Document : public nsINode, void RuleAdded(StyleSheet&, css::Rule&); void RuleRemoved(StyleSheet&, css::Rule&); void SheetCloned(StyleSheet&) {} - void ImportRuleLoaded(CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); /** * Flush notifications for this document and its parent documents ===================================== dom/base/ShadowRoot.cpp ===================================== @@ -412,7 +412,7 @@ void ShadowRoot::RuleChanged(StyleSheet& aSheet, css::Rule*, ApplicableRulesChanged(); } -void ShadowRoot::ImportRuleLoaded(CSSImportRule&, StyleSheet& aSheet) { +void ShadowRoot::ImportRuleLoaded(StyleSheet& aSheet) { if (mStyleRuleMap) { mStyleRuleMap->SheetAdded(aSheet); } ===================================== dom/base/ShadowRoot.h ===================================== @@ -86,7 +86,7 @@ class ShadowRoot final : public DocumentFragment, void RuleAdded(StyleSheet&, css::Rule&); void RuleRemoved(StyleSheet&, css::Rule&); void RuleChanged(StyleSheet&, css::Rule*, StyleRuleChangeKind); - void ImportRuleLoaded(CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); void SheetCloned(StyleSheet&); void StyleSheetApplicableStateChanged(StyleSheet&); ===================================== dom/filesystem/tests/script_promptHandler.js ===================================== @@ -2,7 +2,45 @@ let dialogObserverTopic = "common-dialog-loaded"; -function dialogObserver(subj, topic, data) { +function waitForButtonEnabledState(button) { + return new Promise(resolve => { + // Check if the button is already enabled (not disabled) + if (!button.disabled) { + resolve(); + return; + } + + // Create a MutationObserver instance + let win = button.ownerGlobal; + let { MutationObserver } = win; + const observer = new MutationObserver(mutationsList => { + for (const mutation of mutationsList) { + if ( + mutation.type === "attributes" && + mutation.attributeName === "disabled" + ) { + if (!button.disabled) { + // Resolve the promise when the button is enabled + observer.disconnect(); // Stop observing + resolve(); + } + } + } + }); + + // Start observing the button for changes to the 'disabled' attribute + observer.observe(button, { + attributes: true, + attributeFilter: ["disabled"], + }); + }); +} + +async function dialogObserver(subj) { + let dialog = subj.document.querySelector("dialog"); + let acceptButton = dialog.getButton("accept"); + await waitForButtonEnabledState(acceptButton); + subj.document.querySelector("dialog").acceptDialog(); sendAsyncMessage("promptAccepted"); } ===================================== js/public/StructuredClone.h ===================================== @@ -744,6 +744,7 @@ class JS_PUBLIC_API JSAutoStructuredCloneBuffer { #define JS_SCERR_WASM_NO_TRANSFER 6 #define JS_SCERR_NOT_CLONABLE 7 #define JS_SCERR_NOT_CLONABLE_WITH_COOP_COEP 8 +#define JS_SCERR_TRANSFERABLE_TWICE 9 JS_PUBLIC_API bool JS_ReadUint32Pair(JSStructuredCloneReader* r, uint32_t* p1, uint32_t* p2); ===================================== js/public/friend/ErrorNumbers.msg ===================================== @@ -527,6 +527,7 @@ MSG_DEF(JSMSG_SC_BAD_CLONE_VERSION, 0, JSEXN_ERR, "unsupported structured clo MSG_DEF(JSMSG_SC_BAD_SERIALIZED_DATA, 1, JSEXN_INTERNALERR, "bad serialized structured data ({0})") MSG_DEF(JSMSG_SC_DUP_TRANSFERABLE, 0, JSEXN_TYPEERR, "duplicate transferable for structured clone") MSG_DEF(JSMSG_SC_NOT_TRANSFERABLE, 0, JSEXN_TYPEERR, "invalid transferable array for structured clone") +MSG_DEF(JSMSG_SC_TRANSFERABLE_TWICE, 0, JSEXN_TYPEERR, "structured clone cannot transfer twice") MSG_DEF(JSMSG_SC_UNSUPPORTED_TYPE, 0, JSEXN_TYPEERR, "unsupported type for structured data") MSG_DEF(JSMSG_SC_NOT_CLONABLE, 1, JSEXN_TYPEERR, "The {0} object cannot be serialized. The Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy HTTP headers will enable this in the future.") MSG_DEF(JSMSG_SC_NOT_CLONABLE_WITH_COOP_COEP, 1, JSEXN_TYPEERR, "The {0} object cannot be serialized. The Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy HTTP headers can be used to enable this.") ===================================== js/src/jit-test/tests/structured-clone/transferable-cleanup.js ===================================== @@ -160,6 +160,15 @@ function testMultiWithDeserializeReadTransferErrorHelper(g, BASE, desc) { } catch (e) { assertEq(e.message.includes("invalid transferable"), true); } + + try { + // This fails without logging anything, since the re-transfer will be caught + // by looking at its header before calling any callbacks. + let clone = deserialize(s); + } catch (e) { + assertEq(e.message.includes("cannot transfer twice"), true); + } + s = null; gc(); printTrace(arguments.callee.name, g, BASE, obj.log, "deserialize"); @@ -170,6 +179,7 @@ function testMultiWithDeserializeReadTransferErrorHelper(g, BASE, desc) { // which comes before the main reading. obj transfer data is now owned by its // clone. obj3 transfer data was not successfully handed over to a new object, // so it is still owned by the clone buffer and must be discarded with freeTransfer. + // 'F' means the data is freed. BASE + 3, "F", ], "deserialize " + desc); obj.log = null; ===================================== js/src/jit/IonAnalysis.cpp ===================================== @@ -29,8 +29,9 @@ using MPhiUseIteratorStack = // Look for Phi uses with a depth-first search. If any uses are found the stack // of MPhi instructions is returned in the |worklist| argument. -static bool DepthFirstSearchUse(MIRGenerator* mir, - MPhiUseIteratorStack& worklist, MPhi* phi) { +[[nodiscard]] static bool DepthFirstSearchUse(MIRGenerator* mir, + MPhiUseIteratorStack& worklist, + MPhi* phi) { // Push a Phi and the next use to iterate over in the worklist. auto push = [&worklist](MPhi* phi, MUseIterator use) -> bool { phi->setInWorklist(); @@ -131,9 +132,9 @@ static bool DepthFirstSearchUse(MIRGenerator* mir, return true; } -static bool FlagPhiInputsAsImplicitlyUsed(MIRGenerator* mir, MBasicBlock* block, - MBasicBlock* succ, - MPhiUseIteratorStack& worklist) { +[[nodiscard]] static bool FlagPhiInputsAsImplicitlyUsed( + MIRGenerator* mir, MBasicBlock* block, MBasicBlock* succ, + MPhiUseIteratorStack& worklist) { // When removing an edge between 2 blocks, we might remove the ability of // later phases to figure out that the uses of a Phi should be considered as // a use of all its inputs. Thus we need to mark the Phi inputs as being @@ -265,7 +266,7 @@ static MInstructionIterator FindFirstInstructionAfterBail(MBasicBlock* block) { // Given an iterator pointing to the first removed instruction, mark // the operands of each removed instruction as having implicit uses. -static bool FlagOperandsAsImplicitlyUsedAfter( +[[nodiscard]] static bool FlagOperandsAsImplicitlyUsedAfter( MIRGenerator* mir, MBasicBlock* block, MInstructionIterator firstRemoved) { MOZ_ASSERT(firstRemoved->block() == block); @@ -312,8 +313,8 @@ static bool FlagOperandsAsImplicitlyUsedAfter( return true; } -static bool FlagEntryResumePointOperands(MIRGenerator* mir, - MBasicBlock* block) { +[[nodiscard]] static bool FlagEntryResumePointOperands(MIRGenerator* mir, + MBasicBlock* block) { // Flag observable operands of the entry resume point as having implicit uses. MResumePoint* rp = block->entryResumePoint(); while (rp) { @@ -334,8 +335,8 @@ static bool FlagEntryResumePointOperands(MIRGenerator* mir, return true; } -static bool FlagAllOperandsAsImplicitlyUsed(MIRGenerator* mir, - MBasicBlock* block) { +[[nodiscard]] static bool FlagAllOperandsAsImplicitlyUsed(MIRGenerator* mir, + MBasicBlock* block) { return FlagEntryResumePointOperands(mir, block) && FlagOperandsAsImplicitlyUsedAfter(mir, block, block->begin()); } @@ -420,12 +421,16 @@ bool jit::PruneUnusedBranches(MIRGenerator* mir, MIRGraph& graph) { if (!block->isMarked()) { // If we are removing the block entirely, mark the operands of every // instruction as being implicitly used. - FlagAllOperandsAsImplicitlyUsed(mir, block); + if (!FlagAllOperandsAsImplicitlyUsed(mir, block)) { + return false; + } } else if (block->alwaysBails()) { // If we are only trimming instructions after a bail, only mark operands // of removed instructions. MInstructionIterator firstRemoved = FindFirstInstructionAfterBail(block); - FlagOperandsAsImplicitlyUsedAfter(mir, block, firstRemoved); + if (!FlagOperandsAsImplicitlyUsedAfter(mir, block, firstRemoved)) { + return false; + } } } @@ -503,7 +508,8 @@ bool jit::PruneUnusedBranches(MIRGenerator* mir, MIRGraph& graph) { return true; } -static bool SplitCriticalEdgesForBlock(MIRGraph& graph, MBasicBlock* block) { +[[nodiscard]] static bool SplitCriticalEdgesForBlock(MIRGraph& graph, + MBasicBlock* block) { if (block->numSuccessors() < 2) { return true; } @@ -767,8 +773,8 @@ static bool IsDiamondPattern(MBasicBlock* initialBlock) { return true; } -static bool MaybeFoldDiamondConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldDiamondConditionBlock( + MIRGraph& graph, MBasicBlock* initialBlock) { MOZ_ASSERT(IsDiamondPattern(initialBlock)); // Optimize the MIR graph to improve the code generated for conditional @@ -936,8 +942,8 @@ static bool IsTrianglePattern(MBasicBlock* initialBlock) { return false; } -static bool MaybeFoldTriangleConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldTriangleConditionBlock( + MIRGraph& graph, MBasicBlock* initialBlock) { MOZ_ASSERT(IsTrianglePattern(initialBlock)); // Optimize the MIR graph to improve the code generated for boolean @@ -1089,8 +1095,8 @@ static bool MaybeFoldTriangleConditionBlock(MIRGraph& graph, return true; } -static bool MaybeFoldConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldConditionBlock(MIRGraph& graph, + MBasicBlock* initialBlock) { if (IsDiamondPattern(initialBlock)) { return MaybeFoldDiamondConditionBlock(graph, initialBlock); } @@ -1100,7 +1106,8 @@ static bool MaybeFoldConditionBlock(MIRGraph& graph, return true; } -static bool MaybeFoldTestBlock(MIRGraph& graph, MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldTestBlock(MIRGraph& graph, + MBasicBlock* initialBlock) { // Handle test expressions on more than two inputs. For example // |if ((x > 10) && (y > 20) && (z > 30)) { ... }|, which results in the below // pattern. @@ -2752,7 +2759,9 @@ bool jit::RemoveUnmarkedBlocks(MIRGenerator* mir, MIRGraph& graph, continue; } - FlagAllOperandsAsImplicitlyUsed(mir, block); + if (!FlagAllOperandsAsImplicitlyUsed(mir, block)) { + return false; + } } // Find unmarked blocks and remove them. @@ -4003,8 +4012,8 @@ bool jit::EliminateRedundantShapeGuards(MIRGraph& graph) { return true; } -static bool TryEliminateGCBarriersForAllocation(TempAllocator& alloc, - MInstruction* allocation) { +[[nodiscard]] static bool TryEliminateGCBarriersForAllocation( + TempAllocator& alloc, MInstruction* allocation) { MOZ_ASSERT(allocation->type() == MIRType::Object); JitSpew(JitSpew_RedundantGCBarriers, "Analyzing allocation %s", ===================================== js/src/vm/StructuredClone.cpp ===================================== @@ -172,17 +172,25 @@ enum StructuredDataType : uint32_t { /* * Format of transfer map: - * <SCTAG_TRANSFER_MAP_HEADER, TransferableMapHeader(UNREAD|TRANSFERRED)> - * numTransferables (64 bits) - * array of: - * <SCTAG_TRANSFER_MAP_*, TransferableOwnership> - * pointer (64 bits) - * extraData (64 bits), eg byte length for ArrayBuffers + * - <SCTAG_TRANSFER_MAP_HEADER, UNREAD|TRANSFERRING|TRANSFERRED> + * - numTransferables (64 bits) + * - array of: + * - <SCTAG_TRANSFER_MAP_*, TransferableOwnership> pointer (64 + * bits) + * - extraData (64 bits), eg byte length for ArrayBuffers + * - any data written for custom transferables */ // Data associated with an SCTAG_TRANSFER_MAP_HEADER that tells whether the -// contents have been read out yet or not. -enum TransferableMapHeader { SCTAG_TM_UNREAD = 0, SCTAG_TM_TRANSFERRED }; +// contents have been read out yet or not. TRANSFERRING is for the case where we +// have started but not completed reading, which due to errors could mean that +// there are things still owned by the clone buffer that need to be released, so +// discarding should not just be skipped. +enum TransferableMapHeader { + SCTAG_TM_UNREAD = 0, + SCTAG_TM_TRANSFERRING, + SCTAG_TM_TRANSFERRED +}; static inline uint64_t PairToUInt64(uint32_t tag, uint32_t data) { return uint64_t(data) | (uint64_t(tag) << 32); @@ -693,6 +701,10 @@ static void ReportDataCloneError(JSContext* cx, errorNumber = JSMSG_SC_SHMEM_TRANSFERABLE; break; + case JS_SCERR_TRANSFERABLE_TWICE: + errorNumber = JSMSG_SC_TRANSFERABLE_TWICE; + break; + case JS_SCERR_TYPED_ARRAY_DETACHED: errorNumber = JSMSG_TYPED_ARRAY_DETACHED; break; @@ -3209,11 +3221,21 @@ bool JSStructuredCloneReader::readTransferMap() { return in.reportTruncated(); } + auto transferState = static_cast<TransferableMapHeader>(data); + if (tag != SCTAG_TRANSFER_MAP_HEADER || - TransferableMapHeader(data) == SCTAG_TM_TRANSFERRED) { + transferState == SCTAG_TM_TRANSFERRED) { return true; } + if (transferState == SCTAG_TM_TRANSFERRING) { + ReportDataCloneError(cx, callbacks, JS_SCERR_TRANSFERABLE_TWICE, closure); + return false; + } + + headerPos.write( + PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRING)); + uint64_t numTransferables; MOZ_ALWAYS_TRUE(in.readPair(&tag, &data)); if (!in.read(&numTransferables)) { @@ -3329,7 +3351,7 @@ bool JSStructuredCloneReader::readTransferMap() { #ifdef DEBUG SCInput::getPair(headerPos.peek(), &tag, &data); MOZ_ASSERT(tag == SCTAG_TRANSFER_MAP_HEADER); - MOZ_ASSERT(TransferableMapHeader(data) != SCTAG_TM_TRANSFERRED); + MOZ_ASSERT(TransferableMapHeader(data) == SCTAG_TM_TRANSFERRING); #endif headerPos.write( PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRED)); ===================================== layout/style/ServoStyleSet.cpp ===================================== @@ -954,7 +954,7 @@ static OriginFlags ToOriginFlags(StyleOrigin aOrigin) { } } -void ServoStyleSet::ImportRuleLoaded(dom::CSSImportRule&, StyleSheet& aSheet) { +void ServoStyleSet::ImportRuleLoaded(StyleSheet& aSheet) { if (mStyleRuleMap) { mStyleRuleMap->SheetAdded(aSheet); } ===================================== layout/style/ServoStyleSet.h ===================================== @@ -133,7 +133,7 @@ class ServoStyleSet { void RuleRemoved(StyleSheet&, css::Rule&); void RuleChanged(StyleSheet&, css::Rule*, StyleRuleChangeKind); void SheetCloned(StyleSheet&); - void ImportRuleLoaded(dom::CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); // Runs style invalidation due to document state changes. void InvalidateStyleForDocumentStateChanges( ===================================== layout/style/StyleSheet.cpp ===================================== @@ -836,15 +836,19 @@ StyleSheet::StyleSheetLoaded(StyleSheet* aSheet, bool aWasDeferred, if (!aSheet->GetParentSheet()) { return NS_OK; // ignore if sheet has been detached already } - MOZ_ASSERT(this == aSheet->GetParentSheet(), - "We are being notified of a sheet load for a sheet that is not " - "our child!"); + MOZ_DIAGNOSTIC_ASSERT(this == aSheet->GetParentSheet(), + "We are being notified of a sheet load for a sheet " + "that is not our child!"); if (NS_FAILED(aStatus)) { return NS_OK; } - - MOZ_ASSERT(aSheet->GetOwnerRule()); - NOTIFY(ImportRuleLoaded, (*aSheet->GetOwnerRule(), *aSheet)); + // The assert below should hold if we stop triggering import loads for invalid + // insertRule() calls, see bug 1914106. + // MOZ_ASSERT(aSheet->GetOwnerRule()); + if (!aSheet->GetOwnerRule()) { + return NS_OK; + } + NOTIFY(ImportRuleLoaded, (*aSheet)); return NS_OK; } ===================================== netwerk/ipc/DocumentLoadListener.cpp ===================================== @@ -2316,15 +2316,9 @@ bool DocumentLoadListener::DocShellWillDisplayContent(nsresult aStatus) { auto* loadingContext = GetLoadingBrowsingContext(); - bool isInitialDocument = true; - if (WindowGlobalParent* currentWindow = - loadingContext->GetCurrentWindowGlobal()) { - isInitialDocument = currentWindow->IsInitialDocument(); - } - nsresult rv = nsDocShell::FilterStatusForErrorPage( aStatus, mChannel, mLoadStateLoadType, loadingContext->IsTop(), - loadingContext->GetUseErrorPages(), isInitialDocument, nullptr); + loadingContext->GetUseErrorPages(), nullptr); if (NS_SUCCEEDED(rv)) { MOZ_LOG(gProcessIsolationLog, LogLevel::Verbose, ===================================== netwerk/protocol/webtransport/WebTransportSessionProxy.cpp ===================================== @@ -1042,15 +1042,6 @@ void WebTransportSessionProxy::NotifyDatagramReceived( MutexAutoLock lock(mMutex); MOZ_ASSERT(mTarget->IsOnCurrentThread()); - if (!mStopRequestCalled) { - CopyableTArray<uint8_t> copied(aData); - mPendingEvents.AppendElement( - [self = RefPtr{this}, data = std::move(copied)]() mutable { - self->NotifyDatagramReceived(std::move(data)); - }); - return; - } - if (mState != WebTransportSessionProxyState::ACTIVE || !mListener) { return; } @@ -1066,6 +1057,15 @@ NS_IMETHODIMP WebTransportSessionProxy::OnDatagramReceivedInternal( { MutexAutoLock lock(mMutex); + if (!mStopRequestCalled) { + CopyableTArray<uint8_t> copied(aData); + mPendingEvents.AppendElement( + [self = RefPtr{this}, data = std::move(copied)]() mutable { + self->OnDatagramReceivedInternal(std::move(data)); + }); + return NS_OK; + } + if (!mTarget->IsOnCurrentThread()) { return mTarget->Dispatch(NS_NewRunnableFunction( "WebTransportSessionProxy::OnDatagramReceived", ===================================== testing/web-platform/tests/css/cssom/insertRule-import-trailing-garbage-crash.html ===================================== @@ -0,0 +1,6 @@ +<!doctype html> +<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1914106"> +<style></style> +<script> +document.querySelector("style").sheet.insertRule("@import url('data:text/css,:root{background:red}');html,body{/* random garbage */}"); +</script> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b97760… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b97760… 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.16.0esr-13.5-1-build2
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed new tag tor-browser-115.16.0esr-13.5-1-build2 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/firefox-android][firefox-android-115.2.1-13.5-1] Bug 1906024 - Format download file names better a=diannaS [BP131]
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 257aa5e5 by hackademix at 2024-09-30T21:41:21+02:00 Bug 1906024 - Format download file names better a=diannaS [BP131] - - - - - 1 changed file: - android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt Changes: ===================================== android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt ===================================== @@ -49,6 +49,8 @@ const val MAX_URI_LENGTH = 25000 private const val FILE_PREFIX = "file://" private const val MAX_VALID_PORT = 65_535 +private const val SPACE = " " +private const val UNDERSCORE = "_" /** * Shortens URLs to be more user friendly. @@ -303,7 +305,27 @@ fun String.sanitizeFileName(): String { file.name.replace("\\.\\.+".toRegex(), ".") } else { file.name.replace(".", "") - } + }.replaceContinuousSpaces() + .replaceEscapedCharacters() + .trim() +} + + +/** + * Replaces control characters from ASCII 0 to ASCII 19 with '_' so the file name is valid + * and is correctly displayed. + */ +private fun String.replaceEscapedCharacters(): String { + val escapedCharactersRegex = "[\\x00-\\x13*\"?<>:|\\\\]".toRegex() + return replace(escapedCharactersRegex, UNDERSCORE) +} + +/** + * Replaces continuous spaces with a single space. + */ +private fun String.replaceContinuousSpaces(): String { + val escapedCharactersRegex = "[\\p{Z}\\s]+".toRegex() + return replace(escapedCharactersRegex, SPACE) } /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/257… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/257… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.16.0esr-13.5-1] 7 commits: Bug 1881037 - Part 1: Stop showing unknown protocol error pages for...
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed to branch tor-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 55489055 by Nika Layzell at 2024-09-30T22:11:11+02:00 Bug 1881037 - Part 1: Stop showing unknown protocol error pages for web-triggered loads, r=smaug,necko-reviewers,kershaw, a=dsmith Differential Revision: https://phabricator.services.mozilla.com/D217495 - - - - - a22b191f by Paul Zuehlcke at 2024-09-30T22:11:13+02:00 Bug 1916659, a=diannaS Original Revision: https://phabricator.services.mozilla.com/D222629 Differential Revision: https://phabricator.services.mozilla.com/D222934 - - - - - 54c94044 by André Bargull at 2024-09-30T22:11:14+02:00 Bug 1915249: Add more nodiscard. a=RyanVM Original Revision: https://phabricator.services.mozilla.com/D220311 Differential Revision: https://phabricator.services.mozilla.com/D221663 - - - - - 604b2140 by Emilio Cobos Álvarez at 2024-09-30T22:11:16+02:00 Bug 1914106 - Deal with insertRule edge-case. r=jwatt a=RyanVM When there's trailing garbage after an @import rule we throw, but we still trigger the load (that's not great but not trivial to change). Deal with that case before calling ImportRuleLoaded(). Differential Revision: https://phabricator.services.mozilla.com/D219783 - - - - - a5b0cd63 by Steve Fink at 2024-09-30T22:11:17+02:00 Bug 1912471 - Disallow deserializing structured clone buffers with transferables more than once r=iain, a=dsmith Differential Revision: https://phabricator.services.mozilla.com/D220644 - - - - - 46b546e1 by Nika Layzell at 2024-09-30T23:33:48+02:00 Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8 Previously these checks were largely diagnostic tools for finding bugs in other code as it evolves. This unifies the checks a bit more and makes them stronger for BrowsingContexts created over IPC, providing a place for more coherency checks to be added in the future. Differential Revision: https://phabricator.services.mozilla.com/D218860 - - - - - 58bcbec1 by Kershaw Chang at 2024-09-30T23:33:56+02:00 Bug 1907726 - Make sure WebTransportSessionProxy::NotifyDatagramReceived is called after OnStopRequest, a=RyanVM The crash occurs because WebTransportSessionProxy::OnDatagramReceivedInternal is called before WebTransportSessionProxy::OnStopRequest. When this happens, WebTransportSessionProxy::mTarget is the main thread, so a task is dispatched to the main thread. This causes WebTransportSessionProxy::NotifyDatagramReceived to be called on the main thread. If WebTransportSessionProxy::NotifyDatagramReceived is invoked while WebTransportSessionProxy::mStopRequestCalled is true, it can lead to OnDatagramReceived being called on the main thread (instead of the socket thread), resulting in a crash. Original Revision: https://phabricator.services.mozilla.com/D220013 Differential Revision: https://phabricator.services.mozilla.com/D221661 - - - - - 22 changed files: - browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js - browser/components/prompts/PromptCollection.sys.mjs - docshell/base/BrowsingContext.cpp - docshell/base/BrowsingContext.h - docshell/base/nsDocShell.cpp - docshell/base/nsDocShell.h - dom/base/Document.cpp - dom/base/Document.h - dom/base/ShadowRoot.cpp - dom/base/ShadowRoot.h - dom/filesystem/tests/script_promptHandler.js - js/public/StructuredClone.h - js/public/friend/ErrorNumbers.msg - js/src/jit-test/tests/structured-clone/transferable-cleanup.js - js/src/jit/IonAnalysis.cpp - js/src/vm/StructuredClone.cpp - layout/style/ServoStyleSet.cpp - layout/style/ServoStyleSet.h - layout/style/StyleSheet.cpp - netwerk/ipc/DocumentLoadListener.cpp - netwerk/protocol/webtransport/WebTransportSessionProxy.cpp - + testing/web-platform/tests/css/cssom/insertRule-import-trailing-garbage-crash.html Changes: ===================================== browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js ===================================== @@ -101,8 +101,29 @@ async function testUploadPrompt(confirmUpload) { // Wait for confirmation prompt let prompt = await promptPromise; ok(prompt, "Shown upload confirmation prompt"); + is(prompt.ui.button0.label, "Upload", "Accept button label"); + ok( + prompt.ui.button0.disabled, + "Accept button should be disabled by the security delay initially." + ); + ok(prompt.ui.button1.hasAttribute("default"), "Cancel is default button"); + ok( + !prompt.ui.button1.disabled, + "Cancel button should not be disabled by the security delay." + ); + + info("Wait for the security delay to pass."); + let delayTime = Services.prefs.getIntPref("security.dialog_enable_delay"); + // eslint-disable-next-line mozilla/no-arbitrary-setTimeout + await new Promise(resolve => setTimeout(resolve, delayTime + 100)); + + ok( + !prompt.ui.button0.disabled, + "Accept button should no longer be disabled." + ); + ok(!prompt.ui.button1.disabled, "Cancel button should remain enabled."); // Close confirmation prompt await PromptTestUtils.handlePrompt(prompt, { ===================================== browser/components/prompts/PromptCollection.sys.mjs ===================================== @@ -156,7 +156,7 @@ export class PromptCollection { Services.prompt.MODAL_TYPE_TAB, title, message, - buttonFlags, + buttonFlags | Ci.nsIPrompt.BUTTON_DELAY_ENABLE, acceptLabel, null, null, ===================================== docshell/base/BrowsingContext.cpp ===================================== @@ -572,9 +572,19 @@ mozilla::ipc::IPCResult BrowsingContext::CreateFromIPC( context->mRequestContextId = aInit.mRequestContextId; // NOTE: Private browsing ID is set by `SetOriginAttributes`. + if (const char* failure = + context->BrowsingContextCoherencyChecks(aOriginProcess)) { + mozilla::ipc::IProtocol* actor = aOriginProcess; + if (!actor) { + actor = ContentChild::GetSingleton(); + } + return IPC_FAIL(actor, "Incoherent BrowsingContext"); + } + Register(context); - return context->Attach(/* aFromIPC */ true, aOriginProcess); + context->Attach(/* aFromIPC */ true, aOriginProcess); + return IPC_OK(); } BrowsingContext::BrowsingContext(WindowContext* aParentWindow, @@ -786,8 +796,64 @@ void BrowsingContext::Embed() { } } -mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, - ContentParent* aOriginProcess) { +const char* BrowsingContext::BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess) { +#define COHERENCY_ASSERT(condition) \ + if (!(condition)) return "Assertion " #condition " failed"; + + if (mGroup->IsPotentiallyCrossOriginIsolated() != + (Top()->GetOpenerPolicy() == + nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { + return "Invalid CrossOriginIsolated state"; + } + + if (aOriginProcess && !IsContent()) { + return "Content cannot create chrome BCs"; + } + + // LoadContext should generally match our opener or parent. + if (IsContent()) { + if (RefPtr<BrowsingContext> opener = GetOpener()) { + COHERENCY_ASSERT(opener->mType == mType); + COHERENCY_ASSERT(opener->mGroup == mGroup); + COHERENCY_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + } + if (RefPtr<BrowsingContext> parent = GetParent()) { + COHERENCY_ASSERT(parent->mType == mType); + COHERENCY_ASSERT(parent->mGroup == mGroup); + COHERENCY_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); + COHERENCY_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); + COHERENCY_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); + COHERENCY_ASSERT( + parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); + } + + // UseRemoteSubframes and UseRemoteTabs must match. + if (mUseRemoteSubframes && !mUseRemoteTabs) { + return "Cannot set useRemoteSubframes without also setting useRemoteTabs"; + } + + // Double-check OriginAttributes/Private Browsing + // Chrome browsing contexts must not have a private browsing OriginAttribute + // Content browsing contexts must maintain the equality: + // mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId + if (IsChrome()) { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0); + } else { + COHERENCY_ASSERT(mOriginAttributes.mPrivateBrowsingId == + mPrivateBrowsingId); + } +#undef COHERENCY_ASSERT + + return nullptr; +} + +void BrowsingContext::Attach(bool aFromIPC, ContentParent* aOriginProcess) { MOZ_DIAGNOSTIC_ASSERT(!mEverAttached); MOZ_DIAGNOSTIC_ASSERT_IF(aFromIPC, aOriginProcess || XRE_IsContentProcess()); mEverAttached = true; @@ -806,25 +872,15 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, MOZ_DIAGNOSTIC_ASSERT(mGroup); MOZ_DIAGNOSTIC_ASSERT(!mIsDiscarded); - if (mGroup->IsPotentiallyCrossOriginIsolated() != - (Top()->GetOpenerPolicy() == - nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP)) { - MOZ_DIAGNOSTIC_ASSERT(aFromIPC); - if (aFromIPC) { - auto* actor = aOriginProcess - ? static_cast<mozilla::ipc::IProtocol*>(aOriginProcess) - : static_cast<mozilla::ipc::IProtocol*>( - ContentChild::GetSingleton()); - return IPC_FAIL( - actor, - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); - } else { - MOZ_CRASH( - "Invalid CrossOriginIsolated state in BrowsingContext::Attach call"); +#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED + // We'll already have checked this if `aFromIPC` is set before calling this + // function. + if (!aFromIPC) { + if (const char* failure = BrowsingContextCoherencyChecks(aOriginProcess)) { + MOZ_CRASH_UNSAFE_PRINTF("Incoherent BrowsingContext: %s", failure); } } - - AssertCoherentLoadContext(); +#endif // Add ourselves either to our parent or BrowsingContextGroup's child list. // Important: We shouldn't return IPC_FAIL after this point, since the @@ -906,7 +962,6 @@ mozilla::ipc::IPCResult BrowsingContext::Attach(bool aFromIPC, if (XRE_IsParentProcess()) { Canonical()->CanonicalAttach(); } - return IPC_OK(); } void BrowsingContext::Detach(bool aFromIPC) { @@ -1743,40 +1798,6 @@ nsresult BrowsingContext::SetOriginAttributes(const OriginAttributes& aAttrs) { return NS_OK; } -void BrowsingContext::AssertCoherentLoadContext() { -#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED - // LoadContext should generally match our opener or parent. - if (IsContent()) { - if (RefPtr<BrowsingContext> opener = GetOpener()) { - MOZ_DIAGNOSTIC_ASSERT(opener->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(opener->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(opener->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(opener->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - opener->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - } - if (RefPtr<BrowsingContext> parent = GetParent()) { - MOZ_DIAGNOSTIC_ASSERT(parent->mType == mType); - MOZ_DIAGNOSTIC_ASSERT(parent->mGroup == mGroup); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteTabs == mUseRemoteTabs); - MOZ_DIAGNOSTIC_ASSERT(parent->mUseRemoteSubframes == mUseRemoteSubframes); - MOZ_DIAGNOSTIC_ASSERT(parent->mPrivateBrowsingId == mPrivateBrowsingId); - MOZ_DIAGNOSTIC_ASSERT( - parent->mOriginAttributes.EqualsIgnoringFPD(mOriginAttributes)); - } - - // UseRemoteSubframes and UseRemoteTabs must match. - MOZ_DIAGNOSTIC_ASSERT( - !mUseRemoteSubframes || mUseRemoteTabs, - "Cannot set useRemoteSubframes without also setting useRemoteTabs"); - - // Double-check OriginAttributes/Private Browsing - AssertOriginAttributesMatchPrivateBrowsing(); -#endif -} - void BrowsingContext::AssertOriginAttributesMatchPrivateBrowsing() { // Chrome browsing contexts must not have a private browsing OriginAttribute // Content browsing contexts must maintain the equality: ===================================== docshell/base/BrowsingContext.h ===================================== @@ -971,7 +971,18 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { bool aHasPostData); private: - mozilla::ipc::IPCResult Attach(bool aFromIPC, ContentParent* aOriginProcess); + // Assert that this BrowsingContext is coherent relative to related + // BrowsingContexts. This will be run before the BrowsingContext is attached. + // + // A non-null string return value indicates that there was a coherency check + // failure, which will be handled with either a crash or IPC failure. + // + // If provided, `aOriginProcess` is the process which is responsible for the + // creation of this BrowsingContext. + [[nodiscard]] const char* BrowsingContextCoherencyChecks( + ContentParent* aOriginProcess); + + void Attach(bool aFromIPC, ContentParent* aOriginProcess); // Recomputes whether we can execute scripts in this BrowsingContext based on // the value of AllowJavascript() and whether scripts are allowed in the @@ -985,10 +996,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { void AssertOriginAttributesMatchPrivateBrowsing(); - // Assert that the BrowsingContext's LoadContext flags appear coherent - // relative to related BrowsingContexts. - void AssertCoherentLoadContext(); - friend class ::nsOuterWindowProxy; friend class ::nsGlobalWindowOuter; friend class WindowContext; ===================================== docshell/base/nsDocShell.cpp ===================================== @@ -6307,7 +6307,7 @@ already_AddRefed<nsIURI> nsDocShell::AttemptURIFixup( nsresult nsDocShell::FilterStatusForErrorPage( nsresult aStatus, nsIChannel* aChannel, uint32_t aLoadType, - bool aIsTopFrame, bool aUseErrorPages, bool aIsInitialDocument, + bool aIsTopFrame, bool aUseErrorPages, bool* aSkippedUnknownProtocolNavigation) { // Errors to be shown only on top-level frames if ((aStatus == NS_ERROR_UNKNOWN_HOST || @@ -6352,18 +6352,10 @@ nsresult nsDocShell::FilterStatusForErrorPage( if (aStatus == NS_ERROR_UNKNOWN_PROTOCOL) { // For unknown protocols we only display an error if the load is triggered - // by the browser itself, or we're replacing the initial document (and - // nothing else). Showing the error for page-triggered navigations causes - // annoying behavior for users, see bug 1528305. - // - // We could, maybe, try to detect if this is in response to some user - // interaction (like clicking a link, or something else) and maybe show - // the error page in that case. But this allows for ctrl+clicking and such - // to see the error page. + // by the browser itself. Showing the error for page-triggered navigations + // causes annoying behavior for users, see bug 1528305. nsCOMPtr<nsILoadInfo> info = aChannel->LoadInfo(); - if (!info->TriggeringPrincipal()->IsSystemPrincipal() && - StaticPrefs::dom_no_unknown_protocol_error_enabled() && - !aIsInitialDocument) { + if (!info->TriggeringPrincipal()->IsSystemPrincipal()) { if (aSkippedUnknownProtocolNavigation) { *aSkippedUnknownProtocolNavigation = true; } @@ -6513,12 +6505,9 @@ nsresult nsDocShell::EndPageLoad(nsIWebProgress* aProgress, aStatus == NS_ERROR_CONTENT_BLOCKED); UnblockEmbedderLoadEventForFailure(fireFrameErrorEvent); - bool isInitialDocument = - !GetExtantDocument() || GetExtantDocument()->IsInitialDocument(); bool skippedUnknownProtocolNavigation = false; aStatus = FilterStatusForErrorPage(aStatus, aChannel, mLoadType, isTopFrame, mBrowsingContext->GetUseErrorPages(), - isInitialDocument, &skippedUnknownProtocolNavigation); hadErrorStatus = true; if (NS_FAILED(aStatus)) { ===================================== docshell/base/nsDocShell.h ===================================== @@ -464,7 +464,7 @@ class nsDocShell final : public nsDocLoader, // navigation. static nsresult FilterStatusForErrorPage( nsresult aStatus, nsIChannel* aChannel, uint32_t aLoadType, - bool aIsTopFrame, bool aUseErrorPages, bool aIsInitialDocument, + bool aIsTopFrame, bool aUseErrorPages, bool* aSkippedUnknownProtocolNavigation = nullptr); // Notify consumers of a search being loaded through the observer service: ===================================== dom/base/Document.cpp ===================================== @@ -8326,7 +8326,7 @@ void Document::RuleAdded(StyleSheet& aSheet, css::Rule& aRule) { } } -void Document::ImportRuleLoaded(dom::CSSImportRule& aRule, StyleSheet& aSheet) { +void Document::ImportRuleLoaded(StyleSheet& aSheet) { if (aSheet.IsApplicable()) { ApplicableStylesChanged(); } ===================================== dom/base/Document.h ===================================== @@ -2135,7 +2135,7 @@ class Document : public nsINode, void RuleAdded(StyleSheet&, css::Rule&); void RuleRemoved(StyleSheet&, css::Rule&); void SheetCloned(StyleSheet&) {} - void ImportRuleLoaded(CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); /** * Flush notifications for this document and its parent documents ===================================== dom/base/ShadowRoot.cpp ===================================== @@ -412,7 +412,7 @@ void ShadowRoot::RuleChanged(StyleSheet& aSheet, css::Rule*, ApplicableRulesChanged(); } -void ShadowRoot::ImportRuleLoaded(CSSImportRule&, StyleSheet& aSheet) { +void ShadowRoot::ImportRuleLoaded(StyleSheet& aSheet) { if (mStyleRuleMap) { mStyleRuleMap->SheetAdded(aSheet); } ===================================== dom/base/ShadowRoot.h ===================================== @@ -86,7 +86,7 @@ class ShadowRoot final : public DocumentFragment, void RuleAdded(StyleSheet&, css::Rule&); void RuleRemoved(StyleSheet&, css::Rule&); void RuleChanged(StyleSheet&, css::Rule*, StyleRuleChangeKind); - void ImportRuleLoaded(CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); void SheetCloned(StyleSheet&); void StyleSheetApplicableStateChanged(StyleSheet&); ===================================== dom/filesystem/tests/script_promptHandler.js ===================================== @@ -2,7 +2,45 @@ let dialogObserverTopic = "common-dialog-loaded"; -function dialogObserver(subj, topic, data) { +function waitForButtonEnabledState(button) { + return new Promise(resolve => { + // Check if the button is already enabled (not disabled) + if (!button.disabled) { + resolve(); + return; + } + + // Create a MutationObserver instance + let win = button.ownerGlobal; + let { MutationObserver } = win; + const observer = new MutationObserver(mutationsList => { + for (const mutation of mutationsList) { + if ( + mutation.type === "attributes" && + mutation.attributeName === "disabled" + ) { + if (!button.disabled) { + // Resolve the promise when the button is enabled + observer.disconnect(); // Stop observing + resolve(); + } + } + } + }); + + // Start observing the button for changes to the 'disabled' attribute + observer.observe(button, { + attributes: true, + attributeFilter: ["disabled"], + }); + }); +} + +async function dialogObserver(subj) { + let dialog = subj.document.querySelector("dialog"); + let acceptButton = dialog.getButton("accept"); + await waitForButtonEnabledState(acceptButton); + subj.document.querySelector("dialog").acceptDialog(); sendAsyncMessage("promptAccepted"); } ===================================== js/public/StructuredClone.h ===================================== @@ -744,6 +744,7 @@ class JS_PUBLIC_API JSAutoStructuredCloneBuffer { #define JS_SCERR_WASM_NO_TRANSFER 6 #define JS_SCERR_NOT_CLONABLE 7 #define JS_SCERR_NOT_CLONABLE_WITH_COOP_COEP 8 +#define JS_SCERR_TRANSFERABLE_TWICE 9 JS_PUBLIC_API bool JS_ReadUint32Pair(JSStructuredCloneReader* r, uint32_t* p1, uint32_t* p2); ===================================== js/public/friend/ErrorNumbers.msg ===================================== @@ -527,6 +527,7 @@ MSG_DEF(JSMSG_SC_BAD_CLONE_VERSION, 0, JSEXN_ERR, "unsupported structured clo MSG_DEF(JSMSG_SC_BAD_SERIALIZED_DATA, 1, JSEXN_INTERNALERR, "bad serialized structured data ({0})") MSG_DEF(JSMSG_SC_DUP_TRANSFERABLE, 0, JSEXN_TYPEERR, "duplicate transferable for structured clone") MSG_DEF(JSMSG_SC_NOT_TRANSFERABLE, 0, JSEXN_TYPEERR, "invalid transferable array for structured clone") +MSG_DEF(JSMSG_SC_TRANSFERABLE_TWICE, 0, JSEXN_TYPEERR, "structured clone cannot transfer twice") MSG_DEF(JSMSG_SC_UNSUPPORTED_TYPE, 0, JSEXN_TYPEERR, "unsupported type for structured data") MSG_DEF(JSMSG_SC_NOT_CLONABLE, 1, JSEXN_TYPEERR, "The {0} object cannot be serialized. The Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy HTTP headers will enable this in the future.") MSG_DEF(JSMSG_SC_NOT_CLONABLE_WITH_COOP_COEP, 1, JSEXN_TYPEERR, "The {0} object cannot be serialized. The Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy HTTP headers can be used to enable this.") ===================================== js/src/jit-test/tests/structured-clone/transferable-cleanup.js ===================================== @@ -160,6 +160,15 @@ function testMultiWithDeserializeReadTransferErrorHelper(g, BASE, desc) { } catch (e) { assertEq(e.message.includes("invalid transferable"), true); } + + try { + // This fails without logging anything, since the re-transfer will be caught + // by looking at its header before calling any callbacks. + let clone = deserialize(s); + } catch (e) { + assertEq(e.message.includes("cannot transfer twice"), true); + } + s = null; gc(); printTrace(arguments.callee.name, g, BASE, obj.log, "deserialize"); @@ -170,6 +179,7 @@ function testMultiWithDeserializeReadTransferErrorHelper(g, BASE, desc) { // which comes before the main reading. obj transfer data is now owned by its // clone. obj3 transfer data was not successfully handed over to a new object, // so it is still owned by the clone buffer and must be discarded with freeTransfer. + // 'F' means the data is freed. BASE + 3, "F", ], "deserialize " + desc); obj.log = null; ===================================== js/src/jit/IonAnalysis.cpp ===================================== @@ -29,8 +29,9 @@ using MPhiUseIteratorStack = // Look for Phi uses with a depth-first search. If any uses are found the stack // of MPhi instructions is returned in the |worklist| argument. -static bool DepthFirstSearchUse(MIRGenerator* mir, - MPhiUseIteratorStack& worklist, MPhi* phi) { +[[nodiscard]] static bool DepthFirstSearchUse(MIRGenerator* mir, + MPhiUseIteratorStack& worklist, + MPhi* phi) { // Push a Phi and the next use to iterate over in the worklist. auto push = [&worklist](MPhi* phi, MUseIterator use) -> bool { phi->setInWorklist(); @@ -131,9 +132,9 @@ static bool DepthFirstSearchUse(MIRGenerator* mir, return true; } -static bool FlagPhiInputsAsImplicitlyUsed(MIRGenerator* mir, MBasicBlock* block, - MBasicBlock* succ, - MPhiUseIteratorStack& worklist) { +[[nodiscard]] static bool FlagPhiInputsAsImplicitlyUsed( + MIRGenerator* mir, MBasicBlock* block, MBasicBlock* succ, + MPhiUseIteratorStack& worklist) { // When removing an edge between 2 blocks, we might remove the ability of // later phases to figure out that the uses of a Phi should be considered as // a use of all its inputs. Thus we need to mark the Phi inputs as being @@ -265,7 +266,7 @@ static MInstructionIterator FindFirstInstructionAfterBail(MBasicBlock* block) { // Given an iterator pointing to the first removed instruction, mark // the operands of each removed instruction as having implicit uses. -static bool FlagOperandsAsImplicitlyUsedAfter( +[[nodiscard]] static bool FlagOperandsAsImplicitlyUsedAfter( MIRGenerator* mir, MBasicBlock* block, MInstructionIterator firstRemoved) { MOZ_ASSERT(firstRemoved->block() == block); @@ -312,8 +313,8 @@ static bool FlagOperandsAsImplicitlyUsedAfter( return true; } -static bool FlagEntryResumePointOperands(MIRGenerator* mir, - MBasicBlock* block) { +[[nodiscard]] static bool FlagEntryResumePointOperands(MIRGenerator* mir, + MBasicBlock* block) { // Flag observable operands of the entry resume point as having implicit uses. MResumePoint* rp = block->entryResumePoint(); while (rp) { @@ -334,8 +335,8 @@ static bool FlagEntryResumePointOperands(MIRGenerator* mir, return true; } -static bool FlagAllOperandsAsImplicitlyUsed(MIRGenerator* mir, - MBasicBlock* block) { +[[nodiscard]] static bool FlagAllOperandsAsImplicitlyUsed(MIRGenerator* mir, + MBasicBlock* block) { return FlagEntryResumePointOperands(mir, block) && FlagOperandsAsImplicitlyUsedAfter(mir, block, block->begin()); } @@ -420,12 +421,16 @@ bool jit::PruneUnusedBranches(MIRGenerator* mir, MIRGraph& graph) { if (!block->isMarked()) { // If we are removing the block entirely, mark the operands of every // instruction as being implicitly used. - FlagAllOperandsAsImplicitlyUsed(mir, block); + if (!FlagAllOperandsAsImplicitlyUsed(mir, block)) { + return false; + } } else if (block->alwaysBails()) { // If we are only trimming instructions after a bail, only mark operands // of removed instructions. MInstructionIterator firstRemoved = FindFirstInstructionAfterBail(block); - FlagOperandsAsImplicitlyUsedAfter(mir, block, firstRemoved); + if (!FlagOperandsAsImplicitlyUsedAfter(mir, block, firstRemoved)) { + return false; + } } } @@ -503,7 +508,8 @@ bool jit::PruneUnusedBranches(MIRGenerator* mir, MIRGraph& graph) { return true; } -static bool SplitCriticalEdgesForBlock(MIRGraph& graph, MBasicBlock* block) { +[[nodiscard]] static bool SplitCriticalEdgesForBlock(MIRGraph& graph, + MBasicBlock* block) { if (block->numSuccessors() < 2) { return true; } @@ -767,8 +773,8 @@ static bool IsDiamondPattern(MBasicBlock* initialBlock) { return true; } -static bool MaybeFoldDiamondConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldDiamondConditionBlock( + MIRGraph& graph, MBasicBlock* initialBlock) { MOZ_ASSERT(IsDiamondPattern(initialBlock)); // Optimize the MIR graph to improve the code generated for conditional @@ -936,8 +942,8 @@ static bool IsTrianglePattern(MBasicBlock* initialBlock) { return false; } -static bool MaybeFoldTriangleConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldTriangleConditionBlock( + MIRGraph& graph, MBasicBlock* initialBlock) { MOZ_ASSERT(IsTrianglePattern(initialBlock)); // Optimize the MIR graph to improve the code generated for boolean @@ -1089,8 +1095,8 @@ static bool MaybeFoldTriangleConditionBlock(MIRGraph& graph, return true; } -static bool MaybeFoldConditionBlock(MIRGraph& graph, - MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldConditionBlock(MIRGraph& graph, + MBasicBlock* initialBlock) { if (IsDiamondPattern(initialBlock)) { return MaybeFoldDiamondConditionBlock(graph, initialBlock); } @@ -1100,7 +1106,8 @@ static bool MaybeFoldConditionBlock(MIRGraph& graph, return true; } -static bool MaybeFoldTestBlock(MIRGraph& graph, MBasicBlock* initialBlock) { +[[nodiscard]] static bool MaybeFoldTestBlock(MIRGraph& graph, + MBasicBlock* initialBlock) { // Handle test expressions on more than two inputs. For example // |if ((x > 10) && (y > 20) && (z > 30)) { ... }|, which results in the below // pattern. @@ -2752,7 +2759,9 @@ bool jit::RemoveUnmarkedBlocks(MIRGenerator* mir, MIRGraph& graph, continue; } - FlagAllOperandsAsImplicitlyUsed(mir, block); + if (!FlagAllOperandsAsImplicitlyUsed(mir, block)) { + return false; + } } // Find unmarked blocks and remove them. @@ -4003,8 +4012,8 @@ bool jit::EliminateRedundantShapeGuards(MIRGraph& graph) { return true; } -static bool TryEliminateGCBarriersForAllocation(TempAllocator& alloc, - MInstruction* allocation) { +[[nodiscard]] static bool TryEliminateGCBarriersForAllocation( + TempAllocator& alloc, MInstruction* allocation) { MOZ_ASSERT(allocation->type() == MIRType::Object); JitSpew(JitSpew_RedundantGCBarriers, "Analyzing allocation %s", ===================================== js/src/vm/StructuredClone.cpp ===================================== @@ -172,17 +172,25 @@ enum StructuredDataType : uint32_t { /* * Format of transfer map: - * <SCTAG_TRANSFER_MAP_HEADER, TransferableMapHeader(UNREAD|TRANSFERRED)> - * numTransferables (64 bits) - * array of: - * <SCTAG_TRANSFER_MAP_*, TransferableOwnership> - * pointer (64 bits) - * extraData (64 bits), eg byte length for ArrayBuffers + * - <SCTAG_TRANSFER_MAP_HEADER, UNREAD|TRANSFERRING|TRANSFERRED> + * - numTransferables (64 bits) + * - array of: + * - <SCTAG_TRANSFER_MAP_*, TransferableOwnership> pointer (64 + * bits) + * - extraData (64 bits), eg byte length for ArrayBuffers + * - any data written for custom transferables */ // Data associated with an SCTAG_TRANSFER_MAP_HEADER that tells whether the -// contents have been read out yet or not. -enum TransferableMapHeader { SCTAG_TM_UNREAD = 0, SCTAG_TM_TRANSFERRED }; +// contents have been read out yet or not. TRANSFERRING is for the case where we +// have started but not completed reading, which due to errors could mean that +// there are things still owned by the clone buffer that need to be released, so +// discarding should not just be skipped. +enum TransferableMapHeader { + SCTAG_TM_UNREAD = 0, + SCTAG_TM_TRANSFERRING, + SCTAG_TM_TRANSFERRED +}; static inline uint64_t PairToUInt64(uint32_t tag, uint32_t data) { return uint64_t(data) | (uint64_t(tag) << 32); @@ -693,6 +701,10 @@ static void ReportDataCloneError(JSContext* cx, errorNumber = JSMSG_SC_SHMEM_TRANSFERABLE; break; + case JS_SCERR_TRANSFERABLE_TWICE: + errorNumber = JSMSG_SC_TRANSFERABLE_TWICE; + break; + case JS_SCERR_TYPED_ARRAY_DETACHED: errorNumber = JSMSG_TYPED_ARRAY_DETACHED; break; @@ -3209,11 +3221,21 @@ bool JSStructuredCloneReader::readTransferMap() { return in.reportTruncated(); } + auto transferState = static_cast<TransferableMapHeader>(data); + if (tag != SCTAG_TRANSFER_MAP_HEADER || - TransferableMapHeader(data) == SCTAG_TM_TRANSFERRED) { + transferState == SCTAG_TM_TRANSFERRED) { return true; } + if (transferState == SCTAG_TM_TRANSFERRING) { + ReportDataCloneError(cx, callbacks, JS_SCERR_TRANSFERABLE_TWICE, closure); + return false; + } + + headerPos.write( + PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRING)); + uint64_t numTransferables; MOZ_ALWAYS_TRUE(in.readPair(&tag, &data)); if (!in.read(&numTransferables)) { @@ -3329,7 +3351,7 @@ bool JSStructuredCloneReader::readTransferMap() { #ifdef DEBUG SCInput::getPair(headerPos.peek(), &tag, &data); MOZ_ASSERT(tag == SCTAG_TRANSFER_MAP_HEADER); - MOZ_ASSERT(TransferableMapHeader(data) != SCTAG_TM_TRANSFERRED); + MOZ_ASSERT(TransferableMapHeader(data) == SCTAG_TM_TRANSFERRING); #endif headerPos.write( PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRED)); ===================================== layout/style/ServoStyleSet.cpp ===================================== @@ -954,7 +954,7 @@ static OriginFlags ToOriginFlags(StyleOrigin aOrigin) { } } -void ServoStyleSet::ImportRuleLoaded(dom::CSSImportRule&, StyleSheet& aSheet) { +void ServoStyleSet::ImportRuleLoaded(StyleSheet& aSheet) { if (mStyleRuleMap) { mStyleRuleMap->SheetAdded(aSheet); } ===================================== layout/style/ServoStyleSet.h ===================================== @@ -133,7 +133,7 @@ class ServoStyleSet { void RuleRemoved(StyleSheet&, css::Rule&); void RuleChanged(StyleSheet&, css::Rule*, StyleRuleChangeKind); void SheetCloned(StyleSheet&); - void ImportRuleLoaded(dom::CSSImportRule&, StyleSheet&); + void ImportRuleLoaded(StyleSheet&); // Runs style invalidation due to document state changes. void InvalidateStyleForDocumentStateChanges( ===================================== layout/style/StyleSheet.cpp ===================================== @@ -836,15 +836,19 @@ StyleSheet::StyleSheetLoaded(StyleSheet* aSheet, bool aWasDeferred, if (!aSheet->GetParentSheet()) { return NS_OK; // ignore if sheet has been detached already } - MOZ_ASSERT(this == aSheet->GetParentSheet(), - "We are being notified of a sheet load for a sheet that is not " - "our child!"); + MOZ_DIAGNOSTIC_ASSERT(this == aSheet->GetParentSheet(), + "We are being notified of a sheet load for a sheet " + "that is not our child!"); if (NS_FAILED(aStatus)) { return NS_OK; } - - MOZ_ASSERT(aSheet->GetOwnerRule()); - NOTIFY(ImportRuleLoaded, (*aSheet->GetOwnerRule(), *aSheet)); + // The assert below should hold if we stop triggering import loads for invalid + // insertRule() calls, see bug 1914106. + // MOZ_ASSERT(aSheet->GetOwnerRule()); + if (!aSheet->GetOwnerRule()) { + return NS_OK; + } + NOTIFY(ImportRuleLoaded, (*aSheet)); return NS_OK; } ===================================== netwerk/ipc/DocumentLoadListener.cpp ===================================== @@ -2316,15 +2316,9 @@ bool DocumentLoadListener::DocShellWillDisplayContent(nsresult aStatus) { auto* loadingContext = GetLoadingBrowsingContext(); - bool isInitialDocument = true; - if (WindowGlobalParent* currentWindow = - loadingContext->GetCurrentWindowGlobal()) { - isInitialDocument = currentWindow->IsInitialDocument(); - } - nsresult rv = nsDocShell::FilterStatusForErrorPage( aStatus, mChannel, mLoadStateLoadType, loadingContext->IsTop(), - loadingContext->GetUseErrorPages(), isInitialDocument, nullptr); + loadingContext->GetUseErrorPages(), nullptr); if (NS_SUCCEEDED(rv)) { MOZ_LOG(gProcessIsolationLog, LogLevel::Verbose, ===================================== netwerk/protocol/webtransport/WebTransportSessionProxy.cpp ===================================== @@ -1042,15 +1042,6 @@ void WebTransportSessionProxy::NotifyDatagramReceived( MutexAutoLock lock(mMutex); MOZ_ASSERT(mTarget->IsOnCurrentThread()); - if (!mStopRequestCalled) { - CopyableTArray<uint8_t> copied(aData); - mPendingEvents.AppendElement( - [self = RefPtr{this}, data = std::move(copied)]() mutable { - self->NotifyDatagramReceived(std::move(data)); - }); - return; - } - if (mState != WebTransportSessionProxyState::ACTIVE || !mListener) { return; } @@ -1066,6 +1057,15 @@ NS_IMETHODIMP WebTransportSessionProxy::OnDatagramReceivedInternal( { MutexAutoLock lock(mMutex); + if (!mStopRequestCalled) { + CopyableTArray<uint8_t> copied(aData); + mPendingEvents.AppendElement( + [self = RefPtr{this}, data = std::move(copied)]() mutable { + self->OnDatagramReceivedInternal(std::move(data)); + }); + return NS_OK; + } + if (!mTarget->IsOnCurrentThread()) { return mTarget->Dispatch(NS_NewRunnableFunction( "WebTransportSessionProxy::OnDatagramReceived", ===================================== testing/web-platform/tests/css/cssom/insertRule-import-trailing-garbage-crash.html ===================================== @@ -0,0 +1,6 @@ +<!doctype html> +<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1914106"> +<style></style> +<script> +document.querySelector("style").sheet.insertRule("@import url('data:text/css,:root{background:red}');html,body{/* random garbage */}"); +</script> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec92fd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec92fd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] Bug_43099: 2024 YEC
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 217346c0 by clairehurst at 2024-09-30T22:03:33+00:00 Bug_43099: 2024 YEC - - - - - 12 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeScreenViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - + mobile/android/fenix/app/src/main/res/drawable/heart.xml - + mobile/android/fenix/app/src/main/res/drawable/illo_green_browse.xml - + mobile/android/fenix/app/src/main/res/drawable/illo_purple_speak.xml - + mobile/android/fenix/app/src/main/res/drawable/illo_red_search.xml - + mobile/android/fenix/app/src/main/res/font/spacegrotesk_bold.ttf - mobile/android/fenix/app/src/main/res/layout/fragment_home.xml - mobile/android/fenix/app/src/main/res/values/colors.xml - mobile/android/fenix/app/src/main/res/values/preference_keys.xml - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -16,23 +16,58 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.activity.result.ActivityResultLauncher +import androidx.annotation.ColorRes +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes import androidx.annotation.VisibleForTesting +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.Button import androidx.compose.material.ButtonDefaults +import androidx.compose.material.Icon +import androidx.compose.material.IconButton import androidx.compose.material.Text import androidx.compose.material.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.draw.scale +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.ViewCompositionStrategy +import androidx.compose.ui.res.painterResource import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag import androidx.compose.ui.semantics.testTagsAsResourceId +import androidx.compose.ui.text.TextLayoutResult +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat @@ -87,6 +122,7 @@ import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.UserInteractionHandler import mozilla.components.support.base.feature.ViewBoundFeatureWrapper +import mozilla.components.support.locale.LocaleManager import mozilla.components.support.utils.ext.isLandscape import mozilla.components.ui.colors.PhotonColors import org.mozilla.fenix.BrowserDirection @@ -155,6 +191,8 @@ import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks import org.mozilla.fenix.search.toolbar.DefaultSearchSelectorController import org.mozilla.fenix.search.toolbar.SearchSelectorMenu +import org.mozilla.fenix.settings.SupportUtils +import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.tabstray.Page import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.theme.FirefoxTheme @@ -513,6 +551,8 @@ class HomeFragment : Fragment(), UserInteractionHandler { activity.themeManager.applyStatusBarTheme(activity) + setDonationScreen() + // FxNimbus.features.homescreen.recordExposure() // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! @@ -524,6 +564,19 @@ class HomeFragment : Fragment(), UserInteractionHandler { return binding.root } + private fun setDonationScreen() { + if (homeViewModel.shouldShowDonationScreen()) { + binding.exploreprivately.visibility = View.GONE + binding.onionPatternImage.visibility = View.GONE + binding.composeYec2024.apply { + setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) + setContent { + DonationScreen() + } + } + } + } + private fun reinitializeNavBar() { initializeNavBar(activity = requireActivity() as HomeActivity) } @@ -1402,4 +1455,311 @@ class HomeFragment : Fragment(), UserInteractionHandler { requireActivity().finish() return true } + + @Composable + fun DonationScreen() { + BoxWithConstraints( + contentAlignment = Alignment.Center, + modifier = Modifier + .fillMaxWidth() + .wrapContentHeight() + ) { + val alternateLayout = this.maxWidth >= 500.dp + + YecLayout( + alternateLayout, + maxWidth = this.maxWidth, + getYecStyle(), + modifier = Modifier + .padding(top = 55.dp, bottom = 56.dp), + ) + } + } + + @Composable + private fun YecLayout( + alternateLayout: Boolean, + maxWidth: Dp, + yecStyle: YecStyle, + modifier: Modifier + ) { + Column( + modifier = modifier + .padding(horizontal = 22.dp) + .verticalScroll(rememberScrollState()) + .fillMaxWidth(getVariableWidth(maxWidth)), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + PurpleYecBox(alternateLayout, yecStyle, horizontalPadding = 16.dp) + AlwaysFreeText() + } + } + + private fun getVariableWidth(width: Dp): Float = (500.dp / width).coerceIn(0.75f, 1.0f) + + @Composable + private fun PurpleYecBox( + alternateLayout: Boolean, + yecStyle: YecStyle, + horizontalPadding: Dp, + ) { + Box( + modifier = Modifier.background(PhotonColors.Ink90, shape = RoundedCornerShape(8.dp)), + ) { + ExitIcon() + DynamicYecContent(alternateLayout, yecStyle, horizontalPadding) + } + } + + @Composable + private fun AlwaysFreeText() { + Text( + text = getString( + R.string.YEC_2024_tor_browser_for_android_will_always_be_free_no_donation_required, + getString(R.string.app_name), + ), + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 8.dp), + color = Color(0xFFFBFBFE), + fontSize = 12.5.sp, + textAlign = TextAlign.Center, + lineHeight = 18.75.sp, + ) + } + + @Composable + private fun ExitIcon() { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End, + ) { + IconButton( + onClick = { + binding.exploreprivately.visibility = View.VISIBLE + binding.onionPatternImage.visibility = View.VISIBLE + binding.composeYec2024.visibility = View.GONE + homeViewModel.yecDismissed = true + }, + ) { + Icon( + painter = painterResource(id = R.drawable.ic_close), + tint = Color( + getColor( + requireContext(), + R.color.photonWhite, + ), + ), + contentDescription = getString(R.string.YEC_2024_close), + modifier = Modifier + .size(48.dp) + .padding(8.dp) + .scale(0.65f), + ) + } + } + } + + @Composable + private fun DynamicYecContent( + alternateLayout: Boolean, + yecStyle: YecStyle, + horizontalPadding: Dp, + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column( + modifier = Modifier.fillMaxWidth(fraction = if (alternateLayout) .70f else 1f), + horizontalAlignment = if (alternateLayout) Alignment.Start else Alignment.CenterHorizontally, + ) { + if (!alternateLayout) { + IlloYecImage(yecStyle, false, horizontalPadding) + } + + YecRightsText(yecStyle, alternateLayout, horizontalPadding) + + DonationEncouragementText(alternateLayout, horizontalPadding) + + DonationMatchText(alternateLayout, horizontalPadding) + + DonateNowButton(alternateLayout, horizontalPadding) + } + if (alternateLayout) { + IlloYecImage(yecStyle, true, horizontalPadding) + } + } + } + + @Composable + private fun IlloYecImage(yecStyle: YecStyle, alternateLayout: Boolean, horizontalPadding: Dp) { + Image( + painter = painterResource(id = yecStyle.illo), + contentDescription = null, + modifier = Modifier + .fillMaxWidth() + .padding( + top = if (alternateLayout) 0.dp else 41.dp, + bottom = if (alternateLayout) 0.dp else 25.dp, + end = if (alternateLayout) horizontalPadding else 0.dp, + ), + ) + } + + @Composable + private fun YecRightsText( + yecStyle: YecStyle, + alternateLayout: Boolean, + horizontalPadding: Dp, + ) { + var textLayoutResult by remember { mutableStateOf<TextLayoutResult?>(null) } + + Text( + text = getString(yecStyle.text), + color = PhotonColors.Ink90, + textAlign = if (alternateLayout) TextAlign.Left else TextAlign.Center, + fontFamily = FontFamily(Font(R.font.spacegrotesk_bold, FontWeight.Bold)), + fontSize = 18.sp, + lineHeight = 30.sp, + onTextLayout = { textLayoutResult = it }, + modifier = Modifier + .padding( + top = if (alternateLayout) 24.dp else 0.dp, + start = horizontalPadding, + end = if (alternateLayout) 0.dp else horizontalPadding, + bottom = if (alternateLayout) 8.dp else 16.dp, + ) + .drawBehind { + textLayoutResult?.let { result -> + for (i in 0 until result.lineCount) { + val endOfLineSpacing = 4.dp + + val lineTop = result.getLineTop(i) + val lineBottom = result.getLineBottom(i) + val lineLeft = result.getLineLeft(i) - endOfLineSpacing.toPx() + val lineRight = result.getLineRight(i) + endOfLineSpacing.toPx() + + drawRoundRect( + color = Color(getColor(requireContext(), yecStyle.color)), + topLeft = Offset( + lineLeft, + lineTop + 2.dp.toPx(), + ), + size = Size( + lineRight - lineLeft, + lineBottom - lineTop - 4.dp.toPx(), + ), + cornerRadius = CornerRadius(2.dp.toPx(), 2.dp.toPx()), + ) + } + } + }, + ) + } + + @Composable + private fun DonationEncouragementText(alternateLayout: Boolean, horizontalPadding: Dp) { + Text( + text = getString(R.string.YEC_2024_donation_encouragement), + modifier = Modifier + .fillMaxWidth() + .padding( + start = horizontalPadding, + end = if (alternateLayout) 0.dp else horizontalPadding, + bottom = if (alternateLayout) 8.dp else 16.dp, + ), + color = Color(0xFFFBFBFE), + textAlign = TextAlign.Left, + ) + } + + @Composable + private fun DonationMatchText(alternateLayout: Boolean, horizontalPadding: Dp) { + Text( + text = getString(R.string.YEC_2024_donation_match_text), + modifier = Modifier + .fillMaxWidth() + .padding( + start = horizontalPadding, + end = if (alternateLayout) horizontalPadding else 0.dp, + bottom = 16.dp, + ), + color = Color(0xFFFBFBFE), + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Left, + ) + } + + @Composable + private fun DonateNowButton(alternateLayout: Boolean, horizontalPadding: Dp) { + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (locale.isNotEmpty()) { + locale += '-' + } + Button( + onClick = { + (activity as HomeActivity).openToBrowserAndLoad( + searchTermOrURL = "https://www.torproject.org/donate/donate-${locale}mobile-yec2024", + newTab = true, + from = BrowserDirection.FromHome, + ) + }, + modifier = Modifier + .padding(bottom = if (alternateLayout) 24.dp else 40.dp) + .padding(horizontal = horizontalPadding), + colors = ButtonDefaults.buttonColors( + backgroundColor = Color( + 0xFFFFBD4F, + ), + ), + shape = RoundedCornerShape(4.dp), + ) { + Text( + text = getString(R.string.YEC_2024_donate_now), + color = PhotonColors.DarkGrey80, + modifier = Modifier.padding( + horizontal = if (alternateLayout) 6.dp else 8.dp, + vertical = if (alternateLayout) 3.dp else 6.dp, + ), + fontSize = 16.sp, + fontWeight = FontWeight.Bold, + letterSpacing = 0.sp, + ) + Icon( + painter = painterResource(R.drawable.heart), + contentDescription = null, + modifier = Modifier.size(20.dp), + ) + } + } + + private fun getYecStyle(): YecStyle { + if (homeViewModel.firstYecLoad) { + homeViewModel.firstYecLoad = false + homeViewModel.yecStyleIndex = requireContext().settings().yecStyleIndex + requireContext().settings().yecStyleIndex = + (requireContext().settings().yecStyleIndex + 1) % 3 + } + return YecStyle.entries[homeViewModel.yecStyleIndex] + } + + enum class YecStyle( + @DrawableRes val illo: Int, + @StringRes val text: Int, + @ColorRes val color: Int, + ) { + PurpleSpeak( + illo = R.drawable.illo_purple_speak, + text = R.string.YEC_2024_right_to_speak, + color = R.color.YEC_2024_speak_purple, + ), + GreenBrowse( + illo = R.drawable.illo_green_browse, + text = R.string.YEC_2024_right_to_BROWSE, + color = R.color.YEC_2024_browse_green, + ), + RedSearch( + illo = R.drawable.illo_red_search, + text = R.string.YEC_2024_right_to_SEARCH, + color = R.color.YEC_2024_search_red, + ) + } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeScreenViewModel.kt ===================================== @@ -4,11 +4,35 @@ package org.mozilla.fenix.home +import android.annotation.SuppressLint +import androidx.annotation.IntRange import androidx.lifecycle.ViewModel +import org.mozilla.fenix.BuildConfig +import java.text.SimpleDateFormat +import java.util.Date class HomeScreenViewModel : ViewModel() { /** * Used to delete a specific session once the home screen is resumed */ var sessionToDelete: String? = null + + @IntRange(0, 2) + var yecStyleIndex: Int = 0 + var firstYecLoad: Boolean = true + var yecDismissed: Boolean = false + + fun shouldShowDonationScreen(): Boolean { + @SuppressLint("SimpleDateFormat") + val dateFormat = SimpleDateFormat("yyyy-MM-dd") + val startDate = dateFormat.parse("2024-10-14") // Change to a date in the past to test + val endDate = dateFormat.parse("2025-1-2") + val currentDate = Date() + + @Suppress("KotlinConstantConditions") + return !yecDismissed + && BuildConfig.BUILD_TYPE == "release" // Comment this line out to test + && currentDate.after(startDate) + && currentDate.before(endDate) + } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -339,6 +339,11 @@ class Settings(private val appContext: Context) : PreferencesHolder { default = false ) + var yecStyleIndex by intPreference( + appContext.getPreferenceKey(R.string.pref_key_yec_style_index), + default = 0 + ) + var defaultSearchEngineName by stringPreference( appContext.getPreferenceKey(R.string.pref_key_search_engine), default = "", ===================================== mobile/android/fenix/app/src/main/res/drawable/heart.xml ===================================== @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="16dp" android:viewportHeight="17" android:viewportWidth="17" android:width="16dp"> + + <path android:fillColor="#1C1B22" android:pathData="M8.5,6.5C8.5,6.5 8.5,2.5 12,2.5C15.5,2.5 15.5,5.5 15.5,6.5C15.5,11 8.5,15.5 8.5,15.5V6.5Z"/> + + <path android:fillColor="#1C1B22" android:pathData="M8.5,6.5C8.5,6.5 8.5,2.5 5,2.5C1.5,2.5 1.5,5.5 1.5,6.5C1.5,11 8.5,15.5 8.5,15.5L9.5,9.5L8.5,6.5Z"/> + +</vector> ===================================== mobile/android/fenix/app/src/main/res/drawable/illo_green_browse.xml ===================================== @@ -0,0 +1,59 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="144dp" android:viewportHeight="144" android:viewportWidth="198" android:width="198dp"> + + <group> + + <clip-path android:pathData="M8.49,0L189.97,0A8,8 0,0 1,197.97 8L197.97,136A8,8 0,0 1,189.97 144L8.49,144A8,8 0,0 1,0.49 136L0.49,8A8,8 0,0 1,8.49 0z"/> + + <path android:fillColor="#1D1133" android:pathData="M8.49,0L189.97,0A8,8 0,0 1,197.97 8L197.97,136A8,8 0,0 1,189.97 144L8.49,144A8,8 0,0 1,0.49 136L0.49,8A8,8 0,0 1,8.49 0z"/> + + <path android:fillAlpha="0.7" android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M41.55,66.09C42.32,66.09 42.94,66.71 42.94,67.47V74.16H90.02C90.79,74.16 91.41,74.78 91.41,75.55V82.24H91.41V90.32H99.27V82.46H99.26V75.55C99.26,74.78 99.88,74.16 100.65,74.16H138.49C138.98,74.16 139.41,74.42 139.66,74.8V74.16H178.88C179.65,74.16 180.27,74.78 180.27,75.55V81.08C180.27,81.57 180.02,82 179.63,82.24H180.27V90.54H179.63C180.02,90.79 180.27,91.22 180.27,91.7V106.49H195.05C195.81,106.49 196.43,107.1 196.43,107.87V113.4C196.43,114.16 195.81,114.78 195.05,114.78H180.27V121.46C180.27,122.22 179.65,122.84 178.89,122.84H164.11V129.54C164.11,130.3 163.49,130.92 162.73,130.92H157.2C156.43,130.92 155.81,130.3 155.81,129.54V122.84H139.88V129.54C139.88,130.3 139.26,130.92 138.49,130.92H132.96C132.2,130.92 131.58,130.3 131.58,129.54V122.84L19.87,122.84C19.1,122.84 18.48,122.22 18.48,121.46V114.54H34.64V106.7H11.79C11.02,106.7 10.4,106.08 10.4,105.31V98.62H3.71C2.94,98.62 2.32,98 2.32,97.24V91.7C2.32,90.94 2.94,90.32 3.71,90.32H10.4V83.63C10.4,82.86 11.02,82.24 11.79,82.24H18.48V75.55C18.48,74.78 19.1,74.16 19.86,74.16H34.64V67.47C34.64,66.71 35.26,66.09 36.02,66.09H41.55ZM36.02,66.31H41.55C42.19,66.31 42.72,66.83 42.72,67.47V74.16H34.86V67.47C34.86,66.83 35.38,66.31 36.02,66.31ZM171.97,122.62V114.78H164.11L164.11,122.62H171.97ZM171.98,114.54V106.71H164.12V114.54H171.98ZM180.05,114.54H172.2V106.71H180.05V114.54ZM172.19,122.62H178.89C179.53,122.62 180.05,122.1 180.05,121.46V114.78H172.19L172.19,122.62ZM163.9,106.71V114.54H156.04V106.71H163.9ZM163.89,114.78V122.62H156.04V114.78H163.89ZM155.82,114.78V122.62H147.96L147.96,114.78H155.82ZM155.82,114.54V106.71H147.96V114.54H155.82ZM139.66,122.62V114.78H131.8L131.8,122.62H139.66ZM139.66,114.54L139.66,114.54V106.71H131.8V114.54L139.66,114.54ZM147.74,114.54H139.88V106.71H147.74V114.54ZM139.88,122.62H147.74V114.78H139.88L139.88,122.62ZM131.58,106.71V114.54H123.72V106.71H131.58ZM131.58,114.78V122.62H123.72L123.72,114.78H131.58ZM123.5,122.62V114.78H115.64L115.64,122.62H123.5ZM123.5,114.54L123.5,114.54V106.71H115.65V114.54L123.5,114.54ZM115.42,114.78V122.62H107.57V114.78L115.42,114.78ZM107.35,114.54L107.35,114.54V106.71H99.49V114.54L107.35,114.54ZM115.43,114.54H107.57V106.71H115.43V114.54ZM107.35,122.62H99.49L99.49,114.78L107.35,114.78V122.62ZM91.41,114.78H99.27V122.62H91.41L91.41,114.78ZM91.19,122.62V114.78H83.33L83.33,122.62H91.19ZM91.19,114.54V106.71H83.33V114.54H91.19ZM99.27,114.54H91.41V106.71H99.27V114.54ZM83.11,106.71V114.54H75.25V106.71H83.11ZM83.11,114.78V122.62H75.25V114.78H83.11ZM75.03,114.54L75.03,114.54V106.71H67.18V114.54L75.03,114.54ZM67.17,114.78V122.62H75.03V114.78H67.17ZM66.96,106.71V114.54H59.1V106.71H66.96ZM66.95,114.78V122.62H59.09V114.78H66.95ZM58.88,114.54V106.71H51.02V114.54H58.88ZM51.02,114.78V122.62H58.87V114.78H51.02ZM50.8,106.71V114.54H42.94V106.71H50.8ZM50.8,114.78V122.62H42.94V114.78L50.8,114.78ZM42.72,114.54V106.71H34.86V114.54H42.72ZM42.72,122.62H34.86L34.86,114.78H42.72V122.62ZM34.64,114.76V122.62H26.78V114.76H34.64ZM188.13,106.71H180.27V114.56H188.13V106.71ZM188.35,114.56H195.05C195.69,114.56 196.21,114.04 196.21,113.4V107.87C196.21,107.23 195.69,106.71 195.05,106.71H188.35V114.56ZM18.7,106.48L18.7,98.62H26.56L26.56,106.48H18.7ZM18.48,98.62H10.62V105.31C10.62,105.96 11.14,106.48 11.79,106.48H18.48L18.48,98.62ZM34.64,106.48H26.78L26.78,98.62H34.64V106.48ZM34.86,106.48H42.72L42.72,98.62L34.86,98.62V106.48ZM50.79,106.48H42.94V98.62H50.79V106.48ZM66.95,106.48H59.09V98.62L66.95,98.62L66.95,106.48ZM58.87,106.48H51.01V98.62L58.87,98.62L58.87,106.48ZM67.17,106.48H75.03L75.03,98.62L67.17,98.62V106.48ZM83.11,106.48H75.25V98.62L83.11,98.62L83.11,106.48ZM83.33,106.48H91.19L91.19,98.62L83.33,98.62V106.48ZM99.26,106.48H91.41V98.62H99.26V106.48ZM115.42,106.48H107.56V98.62L115.42,98.62L115.42,106.48ZM107.34,106.48H99.48V98.62L107.34,98.62L107.34,106.48ZM115.64,106.48H123.5L123.5,98.62L115.64,98.62V106.48ZM131.58,106.48H123.72V98.62L131.58,98.62L131.58,106.48ZM131.8,106.48H139.66V98.62H131.8V106.48ZM147.96,106.48H155.81L155.81,98.62L147.96,98.62V106.48ZM147.73,98.62L139.88,98.62V106.48H147.73L147.73,98.62ZM163.89,106.48H156.03V98.62L163.89,98.62L163.89,106.48ZM164.11,106.48H171.97L171.97,98.62L164.11,98.62V106.48ZM180.05,106.48H172.19V98.62H180.05V106.48ZM18.48,98.4H10.62V90.54H18.48V98.4ZM10.4,98.4V90.54H3.71C3.06,90.54 2.54,91.06 2.54,91.7V97.24C2.54,97.88 3.06,98.4 3.71,98.4H10.4ZM10.62,90.32V83.63C10.62,82.98 11.14,82.46 11.79,82.46H18.48V90.32H10.62ZM18.7,98.4V90.54H26.56V98.4H18.7ZM34.64,98.4H26.78V90.54H34.64L34.64,98.4ZM26.56,82.46V90.32H18.7V82.46H26.56ZM26.78,90.32V82.46H34.64V90.32H26.78ZM34.86,90.54V98.4H42.72L42.72,90.54H34.86ZM50.79,98.4H42.94V90.54H50.79V98.4ZM42.72,82.46V90.32H34.86V82.46H42.72ZM42.94,90.32V82.46L50.79,82.46L50.79,90.32H42.94ZM66.95,98.4H59.09V90.54H66.95L66.95,98.4ZM58.87,82.46L58.87,90.32H51.01V82.46L58.87,82.46ZM51.01,90.54V98.4H58.87L58.87,90.54H51.01ZM59.09,90.32V82.46H66.95V90.32H59.09ZM67.17,98.4H75.03L75.03,90.54H67.17V98.4ZM83.11,98.4H75.25V90.54L75.25,90.54H83.11L83.11,98.4ZM75.03,82.46V90.32L75.03,90.32H67.17V82.46L75.03,82.46ZM75.25,90.32L83.11,90.32L83.11,90.32L83.11,82.46L75.25,82.46V90.32ZM83.33,98.4H91.19L91.19,90.54H83.33L83.33,90.54V98.4ZM99.26,98.4H91.41V90.54L91.41,90.54L99.26,90.54V98.4ZM91.19,82.46V90.32L91.19,90.32L83.33,90.32V82.46H91.19ZM50.79,74.38H42.94V82.24H50.79V74.38ZM51.01,82.24H58.87V74.38H51.01V82.24ZM172.19,74.38H178.88C179.53,74.38 180.05,74.91 180.05,75.55V81.08C180.05,81.72 179.53,82.24 178.88,82.24H172.19V74.38ZM115.42,98.4H107.56V90.54L107.56,90.54H115.42L115.42,98.4ZM107.34,82.46L107.34,90.32L107.34,90.32L99.49,90.32V82.46L107.34,82.46ZM107.34,90.54L99.48,90.54V98.4H107.34L107.34,90.54ZM107.56,90.32L115.42,90.32L115.42,90.32L115.42,82.46L107.56,82.46V90.32ZM115.64,98.4H123.5L123.5,90.54H115.64L115.64,90.54V98.4ZM131.58,98.4H123.72V90.54L123.72,90.54H131.58L131.58,98.4ZM123.5,82.46V90.32L123.5,90.32L115.64,90.32V82.46H123.5ZM123.72,90.32L131.58,90.32L131.58,90.32V82.46L123.72,82.46V90.32ZM131.8,98.4H139.66L139.66,90.54H131.8L131.8,90.54V98.4ZM139.66,82.46V90.32L139.66,90.32L131.8,90.32V82.46H139.66ZM139.88,90.32L147.73,90.32L147.74,90.32L147.74,82.46L139.88,82.46V90.32ZM147.96,98.4H155.81L155.81,90.54H147.96L147.96,90.54V98.4ZM139.88,98.4H147.73L147.73,90.54H139.88L139.88,90.54V98.4ZM163.89,98.4H156.03V90.54L156.03,90.54H163.89L163.89,98.4ZM155.81,82.46L155.81,90.32L155.81,90.32L147.96,90.32V82.46L155.81,82.46ZM156.03,90.32L163.89,90.32L163.89,90.32L163.89,82.46L156.03,82.46V90.32ZM164.11,90.54L164.11,90.54V98.4H171.97L171.97,90.54H164.11ZM180.05,98.4H172.19V90.54L172.19,90.54H178.89C179.53,90.55 180.05,91.07 180.05,91.7V98.4ZM171.97,82.46L171.97,90.32L171.97,90.32L164.11,90.32V82.46L171.97,82.46ZM178.9,90.32L178.88,90.32L172.19,90.32V82.46H180.05V90.32H178.9ZM163.89,82.24L156.03,82.24L156.03,82.24V74.38H163.89V82.24ZM115.42,74.38H107.56V82.24H115.42V74.38ZM107.34,74.38H100.65C100,74.38 99.48,74.91 99.48,75.55V82.24H107.34V74.38ZM123.5,82.24H115.64V74.38H123.5V82.24ZM139.66,82.24H131.8V74.38H138.49C139.13,74.38 139.65,74.9 139.66,75.54L139.66,75.55V82.24ZM123.72,74.38H131.58V82.24H123.72V74.38ZM147.73,74.38H139.88V75.54L139.88,75.55L139.88,82.24H147.73V74.38ZM155.81,82.24H147.96V74.38H155.81V82.24ZM171.97,82.24H164.11V74.38H171.97V82.24ZM83.33,74.38H90.02C90.66,74.38 91.19,74.91 91.19,75.55V82.24H83.33V74.38ZM66.95,82.24H59.09V74.38H66.95V82.24ZM83.11,82.24H75.25V74.38H83.11V82.24ZM67.17,74.38H75.03V82.24H67.17V74.38ZM34.86,74.38H42.72V82.24H34.86V74.38ZM34.64,74.38H26.78V82.24H34.64V74.38ZM19.86,74.38H26.56V82.24H18.7V75.55C18.7,74.91 19.22,74.38 19.86,74.38ZM26.56,122.62H19.87C19.22,122.62 18.7,122.1 18.7,121.46L18.7,114.76H26.56V122.62ZM131.8,122.84V129.54C131.8,130.18 132.32,130.7 132.96,130.7H138.49C139.13,130.7 139.66,130.18 139.66,129.54V122.84H131.8ZM156.03,129.54V122.84H163.89V129.54C163.89,130.18 163.37,130.7 162.73,130.7H157.2C156.55,130.7 156.03,130.18 156.03,129.54Z" android:strokeAlpha="0.7"/> + + <path android:fillColor="#ffffff" android:pathData="M28.14,100.94a6.85,23.41 89.68,1 0,46.82 -0.26a6.85,23.41 89.68,1 0,-46.82 0.26z"/> + + <path android:fillColor="#ffffff" android:pathData="M121.77,100.94a6.85,23.41 89.68,1 0,46.82 -0.26a6.85,23.41 89.68,1 0,-46.82 0.26z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M144.92,14.5C144.92,15.23 144.33,15.82 143.6,15.82C142.87,15.82 142.27,15.23 142.27,14.5C142.27,13.76 142.87,13.17 143.6,13.17C144.33,13.17 144.92,13.76 144.92,14.5ZM144.4,14.5C144.4,14.94 144.04,15.3 143.6,15.3C143.15,15.3 142.79,14.94 142.79,14.5C142.79,14.05 143.15,13.69 143.6,13.69C144.04,13.69 144.4,14.05 144.4,14.5Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M143.6,16.82C144.88,16.82 145.92,15.78 145.92,14.5C145.92,13.21 144.88,12.17 143.6,12.17C142.32,12.17 141.28,13.21 141.28,14.5C141.28,15.78 142.32,16.82 143.6,16.82ZM143.6,16.3C144.59,16.3 145.4,15.49 145.4,14.5C145.4,13.5 144.59,12.69 143.6,12.69C142.6,12.69 141.8,13.5 141.8,14.5C141.8,15.49 142.6,16.3 143.6,16.3Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M143.6,17.81C145.43,17.81 146.91,16.33 146.91,14.5C146.91,12.66 145.43,11.18 143.6,11.18C141.77,11.18 140.29,12.66 140.29,14.5C140.29,16.33 141.77,17.81 143.6,17.81ZM143.6,17.29C145.14,17.29 146.39,16.04 146.39,14.5C146.39,12.95 145.14,11.7 143.6,11.7C142.05,11.7 140.8,12.95 140.8,14.5C140.8,16.04 142.05,17.29 143.6,17.29Z"/> + + <path android:fillColor="#ffffff" android:pathData="M126.45,45.24C127.77,45.93 129.4,45.66 130.28,44.46C130.93,43.58 131.52,42.71 131.98,42C132.62,41 132.59,39.73 131.9,38.77C128.1,33.47 114.83,16.71 98.94,16.71C83.24,16.71 69.93,33.06 65.88,38.57C65.1,39.63 65.15,41.06 65.96,42.11C66.38,42.66 66.89,43.29 67.43,43.95C68.37,45.1 69.99,45.38 71.31,44.71C79.89,40.36 88.77,37.93 98.77,37.93C108.84,37.93 117.82,40.78 126.45,45.24Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M130.04,44.28C130.69,43.41 131.27,42.54 131.73,41.84C132.3,40.94 132.27,39.81 131.65,38.94C129.76,36.3 125.51,30.81 119.76,25.98C114,21.14 106.78,17 98.94,17C91.19,17 84.01,21.04 78.23,25.8C72.46,30.56 68.14,36 66.13,38.74C65.42,39.7 65.46,40.98 66.19,41.92C66.62,42.47 67.12,43.11 67.66,43.76C68.5,44.8 69.97,45.05 71.17,44.44C79.79,40.07 88.72,37.63 98.77,37.63C108.9,37.63 117.93,40.49 126.59,44.98C127.8,45.6 129.26,45.35 130.04,44.28ZM130.28,44.46C129.4,45.66 127.77,45.93 126.45,45.24C117.82,40.78 108.84,37.93 98.77,37.93C88.77,37.93 79.89,40.36 71.31,44.71C69.99,45.38 68.37,45.1 67.43,43.95C66.89,43.29 66.38,42.66 65.96,42.11C65.15,41.06 65.1,39.63 65.88,38.57C69.93,33.06 83.24,16.71 98.94,16.71C114.83,16.71 128.1,33.47 131.9,38.77C132.59,39.73 132.62,41 131.98,42C131.52,42.71 130.93,43.58 130.28,44.46Z"/> + + <path android:fillColor="#212529" android:pathData="M107.52,34.94C109.36,34.94 110.94,33.86 111.68,32.3C112.69,34.16 113.31,36.26 113.43,38.49C108.65,37.37 103.71,36.79 98.68,36.79C93.74,36.79 88.88,37.35 84.18,38.43C84.63,30.74 91.01,24.63 98.81,24.63C101.18,24.63 103.42,25.2 105.4,26.21C103.92,26.97 102.9,28.52 102.9,30.31C102.9,32.87 104.96,34.94 107.52,34.94Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M132.12,102.6C129.93,102.6 128.16,100.82 128.16,98.63C128.16,82.31 114.9,69.04 98.6,69.04C82.3,69.04 69.04,82.31 69.04,98.63C69.04,100.82 67.27,102.6 65.08,102.6C62.9,102.6 61.12,100.82 61.12,98.63C61.12,77.94 77.93,61.11 98.6,61.11C119.27,61.11 136.08,77.94 136.08,98.63C136.08,100.82 134.31,102.6 132.12,102.6Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M128.46,98.63C128.46,100.65 130.1,102.3 132.12,102.3C134.14,102.3 135.78,100.65 135.78,98.63C135.78,78.11 119.1,61.41 98.6,61.41C78.1,61.41 61.42,78.11 61.42,98.63C61.42,100.65 63.06,102.3 65.08,102.3C67.1,102.3 68.74,100.65 68.74,98.63C68.74,82.15 82.13,68.74 98.6,68.74C115.07,68.74 128.46,82.15 128.46,98.63ZM128.16,98.63C128.16,100.82 129.93,102.6 132.12,102.6C134.31,102.6 136.08,100.82 136.08,98.63C136.08,77.94 119.27,61.11 98.6,61.11C77.93,61.11 61.12,77.94 61.12,98.63C61.12,100.82 62.9,102.6 65.08,102.6C67.27,102.6 69.04,100.82 69.04,98.63C69.04,82.31 82.3,69.04 98.6,69.04C114.9,69.04 128.16,82.31 128.16,98.63Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M158.51,102.6C156.33,102.6 154.55,100.82 154.55,98.63C154.55,67.74 129.46,42.61 98.6,42.61C67.75,42.61 42.65,67.74 42.65,98.63C42.65,100.82 40.87,102.6 38.69,102.6C36.5,102.6 34.73,100.82 34.73,98.63C34.73,81.55 41.37,65.49 53.44,53.42C65.5,41.34 81.54,34.69 98.6,34.69C115.66,34.69 131.7,41.34 143.76,53.42C155.83,65.49 162.47,81.55 162.47,98.63C162.47,100.82 160.7,102.6 158.51,102.6Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M154.85,98.63C154.85,100.65 156.49,102.3 158.51,102.3C160.53,102.3 162.18,100.65 162.18,98.63C162.18,81.63 155.56,65.65 143.55,53.63C131.55,41.61 115.58,34.99 98.6,34.99C81.62,34.99 65.66,41.61 53.65,53.63C41.64,65.65 35.03,81.63 35.03,98.63C35.03,100.65 36.67,102.3 38.69,102.3C40.71,102.3 42.35,100.65 42.35,98.63C42.35,67.58 67.58,42.32 98.6,42.32C129.62,42.32 154.85,67.58 154.85,98.63ZM154.55,98.63C154.55,100.82 156.33,102.6 158.51,102.6C160.7,102.6 162.47,100.82 162.47,98.63C162.47,81.55 155.83,65.49 143.76,53.42C131.7,41.34 115.66,34.69 98.6,34.69C81.54,34.69 65.5,41.34 53.44,53.42C41.37,65.49 34.73,81.55 34.73,98.63C34.73,100.82 36.5,102.6 38.69,102.6C40.87,102.6 42.65,100.82 42.65,98.63C42.65,67.74 67.75,42.61 98.6,42.61C129.46,42.61 154.55,67.74 154.55,98.63Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M145.32,102.6C143.13,102.6 141.36,100.82 141.36,98.63C141.36,75.03 122.18,55.83 98.6,55.83C75.02,55.83 55.84,75.03 55.84,98.63C55.84,100.82 54.07,102.6 51.88,102.6C49.7,102.6 47.92,100.82 47.92,98.63C47.92,70.66 70.66,47.9 98.6,47.9C126.54,47.9 149.28,70.66 149.28,98.63C149.28,100.82 147.5,102.6 145.32,102.6Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M141.66,98.63C141.66,100.65 143.3,102.3 145.32,102.3C147.34,102.3 148.98,100.65 148.98,98.63C148.98,70.82 126.38,48.2 98.6,48.2C70.82,48.2 48.22,70.82 48.22,98.63C48.22,100.65 49.86,102.3 51.88,102.3C53.9,102.3 55.54,100.65 55.54,98.63C55.54,74.86 74.86,55.53 98.6,55.53C122.34,55.53 141.66,74.86 141.66,98.63ZM141.36,98.63C141.36,100.82 143.13,102.6 145.32,102.6C147.5,102.6 149.28,100.82 149.28,98.63C149.28,70.66 126.54,47.9 98.6,47.9C70.66,47.9 47.92,70.66 47.92,98.63C47.92,100.82 49.7,102.6 51.88,102.6C54.07,102.6 55.84,100.82 55.84,98.63C55.84,75.03 75.02,55.83 98.6,55.83C122.18,55.83 141.36,75.03 141.36,98.63Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M166.69,66.45V55.84H166.99V66.45H166.69Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M171.2,61.3L162.37,61.27L162.37,60.97L171.2,61L171.2,61.3Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M37.89,31.19V7.2H38.19V31.19H37.89Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M47.98,19.45L28.1,19.4L28.1,19.1L47.98,19.15L47.98,19.45Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M42.05,23.48L33.74,15.15L33.95,14.94L42.26,23.26L42.05,23.48Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M33.95,23.48L42.26,15.15L42.05,14.94L33.74,23.26L33.95,23.48Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M168.11,43.01C168.11,43.75 167.52,44.34 166.79,44.34C166.05,44.34 165.46,43.75 165.46,43.01C165.46,42.28 166.05,41.69 166.79,41.69C167.52,41.69 168.11,42.28 168.11,43.01Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M157.07,51.42C158.41,51.42 159.5,50.33 159.5,48.98C159.5,47.64 158.41,46.55 157.07,46.55C155.73,46.55 154.64,47.64 154.64,48.98C154.64,50.33 155.73,51.42 157.07,51.42ZM157.07,51.12C158.24,51.12 159.2,50.16 159.2,48.98C159.2,47.81 158.24,46.85 157.07,46.85C155.89,46.85 154.94,47.81 154.94,48.98C154.94,50.16 155.89,51.12 157.07,51.12Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M33.84,62.47C33.84,63.2 33.25,63.8 32.52,63.8C31.79,63.8 31.19,63.2 31.19,62.47C31.19,61.74 31.79,61.14 32.52,61.14C33.25,61.14 33.84,61.74 33.84,62.47Z"/> + + </group> + +</vector> ===================================== mobile/android/fenix/app/src/main/res/drawable/illo_purple_speak.xml ===================================== @@ -0,0 +1,97 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="127.75595dp" android:viewportHeight="127" android:viewportWidth="168" android:width="169dp"> + + <group> + + <clip-path android:pathData="M0.17,0.74h167.66v126h-167.66z"/> + + <path android:fillColor="#D898FA" android:pathData="M66.66,57.55C68.64,60.1 70.08,62.41 70.99,64.47C72.26,67.35 71.75,70.57 71.59,73.71C71.31,78.94 72.47,86.11 81.99,86.11C97.83,86.11 108.25,38.11 90.46,25.38C78.73,16.99 70.37,21.54 64.51,30.96C58.22,41.07 62.15,51.71 66.66,57.55Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M70.96,32.96C73.91,29.73 78.49,27.95 84.17,29.71C90.36,31.63 93.43,37.78 94.41,44.69C95.39,51.6 94.26,59.22 92.13,64.02C92.1,64.09 92.13,64.17 92.2,64.2C92.27,64.23 92.35,64.2 92.39,64.13C94.55,59.28 95.67,51.6 94.69,44.65C93.71,37.7 90.61,31.41 84.25,29.44C78.47,27.64 73.77,29.46 70.75,32.76C67.74,36.06 66.4,40.84 67.3,44.97C67.73,46.95 68.41,48.23 69.24,49.06C70.07,49.9 71.04,50.29 72.02,50.51C72.51,50.62 73.01,50.68 73.5,50.75C73.57,50.75 73.64,50.76 73.71,50.77C74.12,50.82 74.53,50.87 74.92,50.94C75.83,51.11 76.65,51.39 77.29,52.03C77.87,52.61 78.15,53.52 78.16,54.49C78.17,55.47 77.91,56.49 77.44,57.28C76.97,58.08 76.29,58.63 75.46,58.71C74.64,58.79 73.62,58.4 72.46,57.2C72.41,57.15 72.32,57.15 72.26,57.2C72.21,57.25 72.2,57.34 72.26,57.4C73.45,58.63 74.55,59.08 75.49,58.99C76.43,58.9 77.18,58.27 77.68,57.43C78.19,56.58 78.46,55.51 78.44,54.49C78.43,53.47 78.14,52.48 77.49,51.83C76.79,51.13 75.91,50.84 74.97,50.67C74.57,50.59 74.16,50.54 73.74,50.49C73.67,50.48 73.6,50.47 73.53,50.46C73.05,50.4 72.56,50.34 72.08,50.23C71.13,50.02 70.22,49.65 69.44,48.87C68.66,48.08 68,46.86 67.58,44.91C66.7,40.87 68.01,36.19 70.96,32.96Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M74.66,44.44C73.27,45.39 72.11,47.19 71.47,49.96C71.46,50.04 71.5,50.11 71.58,50.13C71.66,50.15 71.73,50.1 71.75,50.02C72.37,47.29 73.51,45.57 74.82,44.68C76.13,43.79 77.63,43.71 79.03,44.3C81.82,45.48 84.21,49.38 83.6,54.86C83.4,56.56 82.67,57.58 81.97,58.42C81.9,58.51 81.83,58.59 81.76,58.67C81.14,59.41 80.57,60.1 80.57,61.09C80.57,61.21 80.62,61.32 80.7,61.43C80.77,61.53 80.88,61.65 81,61.77C81.13,61.89 81.27,62.02 81.43,62.17L81.44,62.17C81.6,62.32 81.78,62.48 81.96,62.65C82.71,63.36 83.62,64.34 84.25,65.74C84.55,66.4 84.42,67.45 83.96,68.46C83.49,69.47 82.7,70.41 81.74,70.86C80.79,71.3 79.66,71.27 78.45,70.32C77.23,69.36 75.94,67.46 74.71,64.15C74.69,64.07 74.61,64.04 74.53,64.06C74.46,64.09 74.42,64.17 74.45,64.25C75.68,67.57 76.99,69.53 78.27,70.54C79.56,71.56 80.81,71.6 81.86,71.11C82.9,70.63 83.73,69.63 84.21,68.58C84.69,67.53 84.86,66.39 84.51,65.63C83.86,64.18 82.92,63.17 82.16,62.45C81.97,62.27 81.79,62.11 81.63,61.96L81.62,61.96C81.46,61.81 81.32,61.68 81.2,61.56C81.08,61.45 80.99,61.35 80.93,61.26C80.87,61.18 80.85,61.12 80.85,61.09C80.85,60.2 81.35,59.6 81.99,58.84C82.05,58.76 82.12,58.69 82.18,58.6C82.9,57.74 83.68,56.68 83.88,54.89C84.5,49.33 82.08,45.29 79.14,44.04C77.66,43.41 76.06,43.49 74.66,44.44Z"/> + + <path android:fillColor="#D898FA" android:pathData="M63.18,74.94L63.62,76.88L70.34,96.04L51.86,108.67L23.05,89.16L27.26,79.04L58.45,68.17L63.18,74.94Z"/> + + <path android:fillColor="#ffffff" android:pathData="M27.27,80.09C47.15,81.57 57.64,73.32 60.39,69.01L53.37,63.05L33.93,69.24L27.27,80.09Z"/> + + <path android:fillColor="#ffffff" android:pathData="M57.31,95.39C58.88,94.84 63.78,89.37 66.04,86.7L68.09,93.95L60.83,103L42.92,99.83C47.06,98.58 55.73,95.94 57.31,95.39Z"/> + + <path android:fillColor="#8C3EB2" android:fillType="evenOdd" android:pathData="M22.96,89.15C23.89,83.54 25.28,72.35 25.27,69.69C25.26,66.31 30.23,60.72 37.4,62.07C41.88,62.92 44.65,61.26 47.2,59.75C48.73,58.83 50.17,57.97 51.86,57.73C55.74,57.19 64.52,58.88 63.59,76.2C63.77,76.35 63.9,76.65 64.19,77.33C64.8,78.79 66.13,81.96 70.24,89.06C78.29,102.96 70.79,108.38 57.8,112.21C44.81,116.04 31.76,100.93 30.36,98.29C29.01,95.71 24.96,91.31 23,89.32C22.99,89.31 22.98,89.3 22.98,89.28C22.96,89.24 22.96,89.19 22.96,89.15ZM23.24,89.17C24.88,87.75 26.63,85.76 28.47,83.18C29.08,82.33 29.63,81.03 30.24,79.58C31.54,76.5 33.13,72.75 36.09,71.41C37.47,70.79 38.88,71.08 40.34,71.38C42.56,71.84 44.89,72.32 47.36,69.7C51.47,65.35 55.73,66.43 56.92,68.47C57.77,69.95 61.38,74.16 63.38,76.22C62.69,77.2 62.22,82.56 65.85,90.59C70.58,101.09 47.2,103.75 39.32,97.04C36.53,94.65 26.77,89.67 23.24,89.17Z"/> + + <path android:fillColor="#D898FA" android:fillType="evenOdd" android:pathData="M28.73,64.22C30.84,62.59 33.84,61.54 37.38,62.21C41.9,63.07 44.72,61.39 47.26,59.87L47.27,59.87C48.8,58.95 50.23,58.11 51.88,57.87C53.79,57.61 56.9,57.89 59.43,60.37C61.95,62.84 63.9,67.52 63.46,76.1C62.46,75.07 61.08,73.52 59.83,72.04C58.57,70.54 57.46,69.13 57.04,68.4C55.79,66.25 51.41,65.21 47.26,69.6C46.04,70.89 44.87,71.41 43.74,71.56C42.59,71.7 41.48,71.47 40.37,71.24L40.35,71.24C38.9,70.94 37.45,70.64 36.04,71.28C34.52,71.97 33.36,73.27 32.42,74.77C31.49,76.27 30.76,77.98 30.11,79.52L30.11,79.53C29.49,80.98 28.95,82.27 28.36,83.1C26.52,85.67 24.78,87.66 23.15,89.06C23.13,89.07 23.12,89.08 23.12,89.1C23.58,86.29 24.15,82.13 24.61,78.33C25.07,74.5 25.42,71.03 25.41,69.69C25.41,68.06 26.61,65.85 28.73,64.22ZM23.1,89.19C23.1,89.2 23.1,89.2 23.1,89.21C23.11,89.22 23.11,89.23 23.12,89.25C23.12,89.24 23.11,89.23 23.1,89.23C23.1,89.22 23.1,89.21 23.1,89.19ZM23.16,89.28C23.18,89.29 23.2,89.3 23.22,89.31C24.09,89.43 25.35,89.83 26.8,90.4C28.25,90.98 29.88,91.72 31.5,92.52C34.73,94.13 37.85,95.96 39.23,97.14C41.23,98.85 44.19,99.95 47.43,100.48C50.68,101.01 54.2,100.98 57.34,100.41C60.47,99.84 63.23,98.72 64.91,97.07C65.75,96.25 66.32,95.28 66.53,94.19C66.74,93.09 66.58,91.87 65.97,90.54C64.17,86.53 63.38,83.2 63.14,80.75C63.01,79.52 63.02,78.52 63.11,77.76C63.19,77 63.34,76.52 63.49,76.3C63.5,76.3 63.5,76.3 63.5,76.3C63.5,76.3 63.5,76.3 63.5,76.3C63.57,76.36 63.64,76.46 63.72,76.63C63.81,76.81 63.91,77.05 64.06,77.39C64.67,78.85 66.01,82.02 70.12,89.13C74.13,96.06 74.24,100.83 71.79,104.33C69.33,107.86 64.26,110.16 57.76,112.07C51.33,113.97 44.86,111.18 39.82,107.56C37.29,105.75 35.13,103.74 33.52,102.02C31.9,100.3 30.83,98.87 30.49,98.22C29.8,96.92 28.44,95.17 27.02,93.49C25.61,91.85 24.14,90.28 23.16,89.28ZM28.56,63.99C26.4,65.66 25.12,67.94 25.13,69.69C25.14,71.01 24.79,74.46 24.33,78.3C23.87,82.13 23.29,86.33 22.82,89.13C22.81,89.19 22.82,89.27 22.84,89.34C22.86,89.37 22.87,89.4 22.9,89.42C23.88,90.41 25.38,92.01 26.8,93.68C28.23,95.35 29.57,97.08 30.24,98.36C30.6,99.03 31.68,100.49 33.31,102.21C34.94,103.95 37.11,105.97 39.65,107.79C44.72,111.43 51.28,114.28 57.84,112.34C64.33,110.43 69.5,108.11 72.02,104.49C74.56,100.86 74.4,95.96 70.36,88.99C66.26,81.9 64.93,78.73 64.32,77.28L64.32,77.27C64.17,76.94 64.07,76.69 63.98,76.5C63.9,76.35 63.83,76.23 63.74,76.14C64.19,67.5 62.23,62.72 59.63,60.17C57.02,57.61 53.81,57.32 51.84,57.59C50.13,57.83 48.66,58.71 47.14,59.62L47.12,59.63C44.58,61.14 41.85,62.77 37.43,61.93C33.8,61.25 30.72,62.32 28.56,63.99ZM36.15,71.54C37.48,70.94 38.84,71.22 40.31,71.52L40.32,71.52C41.42,71.75 42.58,71.99 43.77,71.84C44.98,71.68 46.21,71.13 47.46,69.8C51.54,65.48 55.67,66.62 56.79,68.54C57.23,69.29 58.35,70.73 59.61,72.22C60.84,73.68 62.21,75.21 63.2,76.24C63.04,76.54 62.9,77.05 62.82,77.73C62.74,78.51 62.73,79.53 62.85,80.77C63.1,83.26 63.9,86.62 65.72,90.65C66.3,91.94 66.45,93.1 66.25,94.13C66.06,95.16 65.52,96.08 64.71,96.87C63.09,98.47 60.4,99.56 57.29,100.13C54.19,100.7 50.69,100.73 47.48,100.2C44.27,99.67 41.36,98.58 39.41,96.93C38,95.73 34.85,93.88 31.62,92.27C30,91.46 28.36,90.72 26.9,90.14C25.6,89.63 24.43,89.24 23.56,89.08C25.14,87.67 26.82,85.73 28.59,83.26C29.2,82.4 29.76,81.09 30.36,79.65L30.37,79.64C31.02,78.09 31.74,76.4 32.66,74.92C33.59,73.44 34.71,72.19 36.15,71.54Z"/> + + <path android:fillColor="#ffffff" android:pathData="M128.88,24.35C119.46,24.35 110.89,32.44 107.28,37.1C106.97,37.49 107.07,38.05 107.47,38.33C112.04,41.53 119.8,46.43 128.88,46.43C137.97,46.43 144.99,41.51 149.13,38.31C149.49,38.03 149.58,37.52 149.32,37.15C146.16,32.49 138.33,24.35 128.88,24.35Z"/> + + <path android:fillColor="#D898FA" android:fillType="evenOdd" android:pathData="M115.98,29.09C112.22,31.69 109.19,34.87 107.39,37.19C107.13,37.51 107.21,37.98 107.55,38.22C112.12,41.41 119.85,46.29 128.88,46.29C137.92,46.29 144.91,41.39 149.04,38.2C149.35,37.96 149.42,37.54 149.2,37.23C147.63,34.91 144.89,31.72 141.37,29.12C137.85,26.51 133.56,24.49 128.88,24.49C124.21,24.49 119.74,26.5 115.98,29.09ZM115.82,28.86C119.6,26.25 124.13,24.21 128.88,24.21C133.64,24.21 137.99,26.26 141.54,28.89C145.09,31.52 147.85,34.73 149.44,37.07C149.74,37.51 149.63,38.1 149.21,38.42C145.08,41.62 138.02,46.57 128.88,46.57C119.75,46.57 111.96,41.65 107.39,38.45C106.92,38.12 106.81,37.47 107.16,37.01C108.98,34.67 112.04,31.48 115.82,28.86Z"/> + + <path android:fillColor="#D898FA" android:pathData="M128.17,41.65C134.28,41.65 139.24,36.71 139.24,30.61C139.24,29.42 139.05,28.27 138.7,27.19C135.76,25.5 132.43,24.35 128.88,24.35C124.78,24.35 120.85,25.88 117.42,27.99C117.21,28.83 117.1,29.71 117.1,30.61C117.1,36.71 122.06,41.65 128.17,41.65Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M128.8,10.35C128.88,10.35 128.94,10.41 128.94,10.49V21.45C128.94,21.53 128.88,21.59 128.8,21.59C128.72,21.59 128.66,21.53 128.66,21.45V10.49C128.66,10.41 128.72,10.35 128.8,10.35Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M101.93,22.96C101.98,22.9 102.07,22.9 102.13,22.96L109.9,30.71C109.96,30.76 109.96,30.85 109.9,30.91C109.84,30.96 109.75,30.96 109.7,30.91L101.93,23.16C101.87,23.1 101.87,23.01 101.93,22.96Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M155.43,22.96C155.38,22.9 155.29,22.9 155.23,22.96L147.46,30.71C147.41,30.76 147.41,30.85 147.46,30.91C147.52,30.96 147.61,30.96 147.66,30.91L155.43,23.16C155.49,23.1 155.49,23.01 155.43,22.96Z"/> + + <path android:fillColor="#D898FA" android:pathData="M124.8,105.07C124.8,116.65 115.39,126.04 103.78,126.04C92.17,126.04 82.76,116.65 82.76,105.07C82.76,93.5 92.17,84.11 103.78,84.11C115.39,84.11 124.8,93.5 124.8,105.07Z"/> + + <path android:fillColor="#D898FA" android:fillType="evenOdd" android:pathData="M125.08,105.07C125.08,116.81 115.54,126.32 103.78,126.32C92.01,126.32 82.47,116.81 82.47,105.07C82.47,93.34 92.01,83.83 103.78,83.83C115.54,83.83 125.08,93.34 125.08,105.07ZM103.78,126.04C115.39,126.04 124.8,116.65 124.8,105.07C124.8,93.5 115.39,84.11 103.78,84.11C92.17,84.11 82.76,93.5 82.76,105.07C82.76,116.65 92.17,126.04 103.78,126.04Z"/> + + <group> + + <clip-path android:pathData="M124.8,105.07C124.8,116.65 115.39,126.04 103.78,126.04C92.17,126.04 82.76,116.65 82.76,105.07C82.76,93.5 92.17,84.11 103.78,84.11C115.39,84.11 124.8,93.5 124.8,105.07Z"/> + + <path android:fillColor="#D898FA" android:pathData="M129.47,105.18C129.47,119.38 117.92,130.9 103.68,130.9C89.43,130.9 77.88,119.38 77.88,105.18C77.88,90.97 89.43,79.45 103.68,79.45C117.92,79.45 129.47,90.97 129.47,105.18Z"/> + + <path android:fillColor="#D898FA" android:pathData="M129.47,105.18C129.47,119.38 117.92,130.9 103.68,130.9C89.43,130.9 77.88,119.38 77.88,105.18C77.88,90.97 89.43,79.45 103.68,79.45C117.92,79.45 129.47,90.97 129.47,105.18Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M110.19,97.89C115.28,97.89 118.43,96.06 119.93,94.6C120.38,94.17 121.15,94.14 121.53,94.63L126.5,100.9C126.96,101.49 126.55,102.38 125.81,102.48C123.18,102.83 119.39,103.93 117.09,106.61C113.44,110.86 107.65,105.32 103.49,105.32C99.33,105.32 98.72,109.44 95.27,112.89C91.82,116.34 88.17,107.62 86.14,104.31C84.11,101 91.82,102.35 96.59,102.35C101.36,102.35 98.72,100.18 93.85,99.58C88.98,98.97 87.36,96.4 90.1,95.25C92.84,94.1 102.27,97.89 110.19,97.89Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M98.6,119.96C97.13,119.96 94.67,121.51 92.97,122.78C92.43,123.18 92.56,124.01 93.19,124.26L104.1,128.55C104.29,128.63 104.49,128.64 104.69,128.58L119.02,124.14C119.66,123.95 119.85,123.15 119.33,122.72C117.81,121.46 115.48,119.96 113.53,119.96C110.38,119.96 107.13,121.68 104.39,121.68C101.65,121.68 100.94,119.96 98.6,119.96Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M109.48,111.76C111.43,113.29 109.84,116.6 108.21,117.45C108.1,117.51 107.97,117.53 107.84,117.51C106.72,117.29 103.68,115.55 101.99,114.74C99.73,113.65 103.16,113.93 104.52,113.2C105.87,112.48 106.95,109.78 109.48,111.76Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M103.58,89.78C99.95,90.75 94.7,89.85 91.21,88.94C90.42,88.73 90.37,87.67 91.13,87.36L103.3,82.3C103.48,82.23 103.68,82.21 103.86,82.26C109.28,83.66 118.99,86.23 116.68,85.83C113.73,85.33 109.26,88.26 103.58,89.78Z"/> + + </group> + + <path android:fillColor="#D898FA" android:pathData="M103.78,66.64C103.78,59.47 109.59,53.66 116.76,53.66H154.62C161.79,53.66 167.6,59.47 167.6,66.64C167.6,73.81 161.79,79.62 154.62,79.62H116.76C109.59,79.62 103.78,73.81 103.78,66.64Z"/> + + <path android:fillColor="#ffffff" android:pathData="M132.3,72.66L132.79,70.46C133.74,70.46 134.61,70.45 135.41,70.44C136.21,70.41 136.9,70.38 137.5,70.34C138.11,70.31 138.62,70.25 139.02,70.18C139.43,70.09 139.71,69.98 139.86,69.84C140.11,69.64 140.28,69.33 140.38,68.9C140.48,68.47 140.53,67.84 140.53,67.03C140.53,66.6 140.5,66.2 140.44,65.85C140.38,65.5 140.28,65.21 140.14,64.96C140.02,64.69 139.87,64.5 139.69,64.38C139.52,64.24 139.32,64.17 139.09,64.17C138.87,64.17 138.66,64.25 138.46,64.41C138.26,64.58 138.1,64.79 137.97,65.07C137.86,65.33 137.8,65.61 137.8,65.91C137.8,66.11 137.85,66.28 137.93,66.43C138.03,66.58 138.19,66.7 138.4,66.79C138.61,66.86 138.88,66.9 139.21,66.9C139.52,66.9 139.84,66.86 140.16,66.79C140.5,66.71 140.8,66.61 141.06,66.49L141.13,68.38C140.93,68.52 140.7,68.64 140.44,68.74C140.19,68.83 139.92,68.91 139.64,68.96C139.35,69.01 139.06,69.03 138.77,69.03C138.11,69.03 137.55,68.95 137.09,68.77C136.63,68.6 136.27,68.32 136.01,67.93C135.76,67.53 135.63,67.01 135.63,66.38C135.63,65.85 135.72,65.34 135.89,64.82C136.07,64.3 136.32,63.83 136.64,63.4C136.97,62.97 137.35,62.62 137.78,62.37C138.22,62.11 138.71,61.98 139.24,61.98C140.03,61.98 140.68,62.22 141.19,62.69C141.7,63.15 142.08,63.78 142.33,64.56C142.58,65.35 142.7,66.2 142.7,67.13C142.7,67.72 142.65,68.3 142.55,68.85C142.47,69.4 142.34,69.88 142.16,70.31C141.99,70.73 141.77,71.08 141.51,71.35C141.27,71.62 140.88,71.83 140.33,72.01C139.79,72.18 139.12,72.32 138.33,72.4C137.53,72.5 136.62,72.57 135.59,72.61C134.58,72.65 133.49,72.66 132.3,72.66ZM132.3,72.66C131.04,72.66 129.96,72.57 129.07,72.38C128.18,72.21 127.45,71.95 126.88,71.6C126.3,71.25 125.88,70.82 125.6,70.33C125.33,69.83 125.19,69.25 125.19,68.6C125.19,68.24 125.22,67.87 125.29,67.5C125.35,67.11 125.43,66.74 125.53,66.38C125.63,66 125.72,65.66 125.81,65.35L127.79,65.84C127.74,66.05 127.69,66.28 127.62,66.55C127.56,66.8 127.51,67.05 127.46,67.29C127.42,67.54 127.4,67.77 127.4,67.99C127.4,68.51 127.56,68.96 127.89,69.33C128.22,69.71 128.78,69.99 129.57,70.18C130.36,70.36 131.43,70.46 132.79,70.46L133.16,72.07L132.3,72.66ZM139.07,60.17C138.74,60.17 138.45,60.05 138.21,59.83C137.98,59.59 137.86,59.31 137.86,58.97C137.86,58.63 137.98,58.35 138.21,58.11C138.45,57.86 138.74,57.73 139.07,57.73C139.4,57.73 139.68,57.86 139.92,58.11C140.15,58.35 140.27,58.63 140.27,58.97C140.27,59.31 140.15,59.59 139.92,59.83C139.68,60.05 139.4,60.17 139.07,60.17Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M79.14,15.69C58.83,15.05 51.84,33.31 56.62,49.77C56.72,50.13 56.6,50.53 56.29,50.74C44.7,59.06 34.75,47.74 30.77,40.07C25.12,29.2 25.33,11.83 37.62,5.05C53.1,-3.49 74.77,3.56 79.99,14.51C80.26,15.09 79.78,15.71 79.14,15.69Z"/> + + <path android:fillColor="#D898FA" android:fillType="evenOdd" android:pathData="M62.69,2.34C70.72,4.41 77.48,8.92 80.12,14.45C80.44,15.14 79.86,15.86 79.14,15.84C69.03,15.51 62.25,19.89 58.59,26.39C54.93,32.89 54.37,41.53 56.76,49.73C56.88,50.15 56.73,50.61 56.37,50.86C53.45,52.95 50.63,53.82 47.97,53.81C45.31,53.79 42.83,52.91 40.6,51.52C36.14,48.76 32.64,43.99 30.64,40.14C27.8,34.67 26.44,27.58 27.33,21.01C28.21,14.43 31.36,8.35 37.55,4.93C45.33,0.64 54.66,0.27 62.69,2.34ZM62.62,2.61C54.64,0.55 45.39,0.93 37.69,5.18C31.59,8.54 28.49,14.53 27.61,21.04C26.73,27.56 28.08,34.59 30.89,40.01C32.88,43.83 36.35,48.55 40.75,51.28C42.95,52.65 45.38,53.51 47.97,53.52C50.56,53.53 53.33,52.69 56.21,50.63C56.46,50.45 56.57,50.12 56.48,49.81C54.09,41.55 54.64,32.83 58.35,26.25C62.06,19.66 68.94,15.23 79.14,15.55C79.7,15.57 80.08,15.04 79.86,14.57C77.28,9.15 70.6,4.67 62.62,2.61Z"/> + + <path android:fillColor="#ffffff" android:pathData="M49.09,24.47C49.08,24.68 49.1,24.87 49.15,25.06C49.19,25.22 49.25,25.35 49.32,25.45C49.39,25.54 49.46,25.61 49.52,25.67C49.59,25.72 49.64,25.75 49.66,25.78C49.84,25.88 49.95,26.01 49.99,26.15C49.99,26.18 50,26.25 50,26.38C49.99,26.59 49.9,26.77 49.72,26.91C49.56,27.03 49.27,27.14 48.87,27.25L43.76,28.59C43.46,28.67 43.21,28.69 43.01,28.63C42.83,28.57 42.72,28.46 42.67,28.28C42.65,28.2 42.65,28.1 42.66,27.99C42.67,27.86 42.71,27.76 42.77,27.68C42.83,27.59 42.93,27.48 43.05,27.35C43.25,27.16 43.39,26.97 43.5,26.78C43.6,26.58 43.65,26.29 43.66,25.9L43.74,23.9L40.38,24.79L40.12,26.17C40.01,26.76 40,27.21 40.08,27.52C40.12,27.69 40.19,27.82 40.27,27.92C40.36,28.01 40.47,28.09 40.62,28.18C40.75,28.27 40.84,28.35 40.89,28.43C40.95,28.49 40.99,28.59 40.99,28.73C40.99,28.96 40.91,29.14 40.74,29.27C40.59,29.39 40.32,29.5 39.93,29.6L36.72,30.45C36.39,30.53 36.12,30.54 35.92,30.47C35.72,30.39 35.59,30.25 35.53,30.05C35.47,29.82 35.51,29.61 35.65,29.44C35.77,29.25 35.98,29.04 36.27,28.79C36.64,28.47 36.93,28.17 37.14,27.9C37.34,27.61 37.49,27.26 37.57,26.84L39.33,17.88C39.6,16.49 40.06,15.41 40.71,14.66C41.36,13.89 42.35,13.33 43.65,12.98C45.12,12.6 46.33,12.6 47.29,12.99C48.25,13.37 48.87,14.09 49.14,15.16C49.26,15.6 49.31,16.08 49.29,16.59L49.09,24.47ZM43.82,21.58L43.97,17.48C43.99,17.3 43.97,17.11 43.92,16.92C43.85,16.65 43.72,16.47 43.53,16.38C43.34,16.28 43.12,16.26 42.84,16.33C42.5,16.42 42.23,16.6 42.04,16.86C41.85,17.13 41.7,17.55 41.59,18.13L40.81,22.37L43.82,21.58Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M143.43,111.19V84.11H143.71V111.19H143.43Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M154.83,97.91L132.31,97.85L132.31,97.57L154.83,97.63L154.83,97.91Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M148.13,102.46L138.72,93.07L138.92,92.87L148.34,102.26L148.13,102.46Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M138.92,102.46L148.34,93.07L148.13,92.87L138.72,102.26L138.92,102.46Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M11.29,78V50.92H11.57V78H11.29Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M22.69,64.72L0.17,64.66L0.17,64.38L22.7,64.44L22.69,64.72Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M16,69.27L6.58,59.88L6.78,59.68L16.2,69.07L16,69.27Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M6.78,69.27L16.2,59.88L16,59.68L6.58,69.07L6.78,69.27Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M14.06,45.68C15.1,45.68 15.94,44.78 15.94,43.68C15.94,42.58 15.1,41.69 14.06,41.69C13.02,41.69 12.18,42.58 12.18,43.68C12.18,44.78 13.02,45.68 14.06,45.68ZM14.06,45.4C14.93,45.4 15.65,44.65 15.65,43.68C15.65,42.72 14.93,41.97 14.06,41.97C13.2,41.97 12.47,42.72 12.47,43.68C12.47,44.65 13.2,45.4 14.06,45.4Z"/> + + <path android:fillColor="#ffffff" android:pathData="M3.93,50.92C3.93,52.02 3.08,52.92 2.05,52.92C1.01,52.92 0.17,52.02 0.17,50.92C0.17,49.82 1.01,48.92 2.05,48.92C3.08,48.92 3.93,49.82 3.93,50.92Z"/> + + <path android:fillColor="#ffffff" android:pathData="M154.21,108.07C155.24,108.07 156.08,107.18 156.08,106.07C156.08,104.97 155.24,104.08 154.21,104.08C153.17,104.08 152.33,104.97 152.33,106.07C152.33,107.18 153.17,108.07 154.21,108.07Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M151.83,118.55C151.83,120.07 150.6,121.29 149.08,121.29C147.56,121.29 146.32,120.07 146.32,118.55C146.32,117.03 147.56,115.81 149.08,115.81C150.6,115.81 151.83,117.03 151.83,118.55ZM151.55,118.55C151.55,119.91 150.44,121.01 149.08,121.01C147.71,121.01 146.61,119.91 146.61,118.55C146.61,117.19 147.71,116.09 149.08,116.09C150.44,116.09 151.55,117.19 151.55,118.55Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M22.61,54.66V43.68H22.9V54.66H22.61Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M27.2,49.32L18.19,49.29L18.19,49.01L27.2,49.03L27.2,49.32Z"/> + + </group> + +</vector> ===================================== mobile/android/fenix/app/src/main/res/drawable/illo_red_search.xml ===================================== @@ -0,0 +1,77 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="144dp" android:viewportHeight="144" android:viewportWidth="199" android:width="199dp"> + + <group> + + <clip-path android:pathData="M8.97,0L190.46,0A8,8 0,0 1,198.46 8L198.46,136A8,8 0,0 1,190.46 144L8.97,144A8,8 0,0 1,0.97 136L0.97,8A8,8 0,0 1,8.97 0z"/> + + <path android:fillColor="#1D1133" android:pathData="M8.97,0L190.46,0A8,8 0,0 1,198.46 8L198.46,136A8,8 0,0 1,190.46 144L8.97,144A8,8 0,0 1,0.97 136L0.97,8A8,8 0,0 1,8.97 0z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M153.93,33.4V22.78H154.22V33.4H153.93Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M158.43,28.24L149.6,28.22L149.6,27.92L158.43,27.94L158.43,28.24Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M40.59,125.46V101.47H40.89V125.46H40.59Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M50.67,113.72L30.8,113.67L30.8,113.37L50.68,113.42L50.67,113.72Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M44.75,117.74L36.44,109.42L36.65,109.21L44.96,117.53L44.75,117.74Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M36.65,117.74L44.96,109.42L44.75,109.21L36.44,117.53L36.65,117.74Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M143.94,17.65C145.08,17.65 146,16.72 146,15.59C146,14.45 145.08,13.53 143.94,13.53C142.81,13.53 141.89,14.45 141.89,15.59C141.89,16.72 142.81,17.65 143.94,17.65ZM143.94,17.35C144.91,17.35 145.7,16.56 145.7,15.59C145.7,14.61 144.91,13.82 143.94,13.82C142.97,13.82 142.18,14.61 142.18,15.59C142.18,16.56 142.97,17.35 143.94,17.35Z"/> + + <path android:fillColor="#ffffff" android:pathData="M49.91,96.62C49.91,97.36 49.31,97.95 48.58,97.95C47.85,97.95 47.26,97.36 47.26,96.62C47.26,95.89 47.85,95.3 48.58,95.3C49.31,95.3 49.91,95.89 49.91,96.62Z"/> + + <path android:fillColor="#FF6A75" android:pathData="M57.46,51.13C57.46,26.69 77.27,6.88 101.7,6.88C126.14,6.88 145.95,26.69 145.95,51.13V134.61C145.95,135.63 145.12,136.46 144.1,136.46H59.31C58.28,136.46 57.46,135.63 57.46,134.61V51.13Z"/> + + <path android:fillColor="#FF6A75" android:fillType="evenOdd" android:pathData="M146.24,51.13V134.61C146.24,135.79 145.28,136.75 144.1,136.75H59.31C58.12,136.75 57.17,135.79 57.17,134.61V51.13C57.17,26.53 77.11,6.59 101.7,6.59C126.3,6.59 146.24,26.53 146.24,51.13ZM101.7,6.88C77.27,6.88 57.46,26.69 57.46,51.13V134.61C57.46,135.63 58.28,136.46 59.31,136.46H144.1C145.12,136.46 145.95,135.63 145.95,134.61V51.13C145.95,26.69 126.14,6.88 101.7,6.88Z"/> + + <group> + + <clip-path android:pathData="M73.89,38.09h56.95v56.95h-56.95z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M102.37,84.36C108.27,84.36 113.05,79.58 113.05,73.69C113.05,67.79 108.27,63.01 102.37,63.01C96.47,63.01 91.69,67.79 91.69,73.69C91.69,79.58 96.47,84.36 102.37,84.36ZM102.37,87.92C110.23,87.92 116.61,81.55 116.61,73.69C116.61,65.82 110.23,59.45 102.37,59.45C94.5,59.45 88.13,65.82 88.13,73.69C88.13,81.55 94.5,87.92 102.37,87.92Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M102.37,77.24C104.33,77.24 105.93,75.65 105.93,73.69C105.93,71.72 104.33,70.13 102.37,70.13C100.4,70.13 98.81,71.72 98.81,73.69C98.81,75.65 100.4,77.24 102.37,77.24ZM102.37,80.8C106.3,80.8 109.49,77.62 109.49,73.69C109.49,69.75 106.3,66.57 102.37,66.57C98.44,66.57 95.25,69.75 95.25,73.69C95.25,77.62 98.44,80.8 102.37,80.8Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M116.61,57.77C120.98,61.68 123.73,67.36 123.73,73.69C123.73,85.48 114.16,95.04 102.37,95.04C90.57,95.04 81.01,85.48 81.01,73.69C81.01,67.36 83.76,61.68 88.13,57.77V52.33C88.13,44.46 94.5,38.09 102.37,38.09C110.23,38.09 116.61,44.46 116.61,52.33V57.77ZM92.58,54.7C95.51,53.18 98.84,52.33 102.37,52.33C105.9,52.33 109.22,53.18 112.16,54.7V52.33C112.16,46.92 107.78,42.54 102.37,42.54C96.96,42.54 92.58,46.92 92.58,52.33V54.7ZM120.17,73.69C120.17,83.51 112.2,91.48 102.37,91.48C92.54,91.48 84.57,83.51 84.57,73.69C84.57,63.86 92.54,55.89 102.37,55.89C112.2,55.89 120.17,63.86 120.17,73.69Z"/> + + </group> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M115.47,34.1V15.2H115.76V34.1H115.47Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M123.54,24.88L107.69,24.84L107.69,24.55L123.54,24.59L123.54,24.88Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M118.79,28.04L112.17,21.49L112.37,21.28L119,27.84L118.79,28.04Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M112.37,28.04L119,21.49L118.79,21.28L112.17,27.84L112.37,28.04Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M137.74,78.54V65.77H138.03V78.54H137.74Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M143.19,72.3L132.44,72.28L132.44,71.99L143.19,72.01L143.19,72.3Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M66.64,91.05V82.53H66.93V91.05H66.64Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M70.23,86.94L63.24,86.92L63.25,86.63L70.23,86.65L70.23,86.94Z"/> + + <path android:fillColor="#212529" android:pathData="M95.76,27.98C95.76,28.85 95.05,29.56 94.16,29.56C93.28,29.56 92.56,28.85 92.56,27.98C92.56,27.11 93.28,26.4 94.16,26.4C95.05,26.4 95.76,27.11 95.76,27.98ZM141.16,53.26C141.16,54.13 140.45,54.84 139.56,54.84C138.68,54.84 137.96,54.13 137.96,53.26C137.96,52.39 138.68,51.68 139.56,51.68C140.45,51.68 141.16,52.39 141.16,53.26ZM75.77,95.18C75.77,96.05 75.06,96.76 74.17,96.76C73.29,96.76 72.58,96.05 72.58,95.18C72.58,94.3 73.29,93.59 74.17,93.59C75.06,93.59 75.77,94.3 75.77,95.18Z" android:strokeColor="#212529" android:strokeWidth="0.563343"/> + + <path android:fillColor="#212529" android:pathData="M57.19,118.34H146.21V134.92C146.21,135.95 145.39,136.77 144.36,136.77H59.04C58.02,136.77 57.19,135.95 57.19,134.92V118.34Z"/> + + <path android:fillColor="#FF6A75" android:fillType="evenOdd" android:pathData="M145.93,118.63H57.48V134.92C57.48,135.79 58.18,136.49 59.04,136.49H144.36C145.23,136.49 145.93,135.79 145.93,134.92V118.63ZM57.19,118.34V134.92C57.19,135.95 58.02,136.77 59.04,136.77H144.36C145.39,136.77 146.21,135.95 146.21,134.92V118.34H57.19Z"/> + + <path android:fillColor="#212529" android:pathData="M73.66,101.33C73.66,100.82 74.07,100.41 74.58,100.41H146.21V118.54H73.66V101.33Z"/> + + <path android:fillColor="#FF6A75" android:fillType="evenOdd" android:pathData="M145.93,100.7H74.58C74.23,100.7 73.95,100.98 73.95,101.33V118.25H145.93V100.7ZM74.58,100.41C74.07,100.41 73.66,100.82 73.66,101.33V118.54H146.21V100.41H74.58Z"/> + + <path android:fillColor="#212529" android:pathData="M89.42,83.57C89.42,83.06 89.83,82.65 90.35,82.65H146.21V100.66H89.42V83.57Z"/> + + <path android:fillColor="#FF6A75" android:fillType="evenOdd" android:pathData="M145.93,82.94H90.35C89.99,82.94 89.71,83.22 89.71,83.57V100.37H145.93V82.94ZM90.35,82.65C89.83,82.65 89.42,83.06 89.42,83.57V100.66H146.21V82.65H90.35Z"/> + + <path android:fillColor="#FF6A75" android:pathData="M129.31,83.04H146.21V134.37C146.21,135.72 145.42,136.77 144.1,136.51H95.5V118.33H112.4V100.42H129.31V83.04Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M90.6,82.93L146.23,82.8L146.23,83.09L90.6,83.22L90.6,82.93Z"/> + + </group> + +</vector> ===================================== mobile/android/fenix/app/src/main/res/font/spacegrotesk_bold.ttf ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/font/spacegrotesk_bold.ttf differ ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_home.xml ===================================== @@ -53,7 +53,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="18dp" + android:layout_marginTop="8dp" android:layout_marginBottom="32dp" android:clickable="false" android:focusable="false" @@ -134,6 +134,12 @@ </com.google.android.material.appbar.AppBarLayout> + <androidx.compose.ui.platform.ComposeView + android:id="@+id/composeYec2024" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center"/> + <androidx.recyclerview.widget.RecyclerView android:id="@+id/sessionControlRecyclerView" android:layout_width="match_parent" ===================================== mobile/android/fenix/app/src/main/res/values/colors.xml ===================================== @@ -382,4 +382,10 @@ <color name="connect_button_purple">#9059FF</color> <color name="configure_connection_button_white">#E1E0E7</color> <color name="warning_yellow">#FFA436</color> + +  + <color name="YEC_2024_speak_purple">#D898FA</color> + <color name="YEC_2024_browse_green">#C1ED75</color> + <color name="YEC_2024_search_red">#FF6A75</color> + </resources> ===================================== mobile/android/fenix/app/src/main/res/values/preference_keys.xml ===================================== @@ -431,4 +431,5 @@ <string name="pref_key_tor_network_settings_bridges_enabled">pref_key_tor_network_settings_bridges_enabled</string> <string name="pref_key_spoof_english" translatable="false">pref_key_spoof_english</string> + <string name="pref_key_yec_style_index" translatable="false">pref_key_yec_style_index</string> </resources> ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -149,4 +149,26 @@ <string name="connection_assist_final_error_troubleshoot_connection_link">troubleshooting your connection</string>  <string name="connection_assist_final_error_learn_more_link">Learn more</string> + +  + <string name="YEC_2024_right_to_speak">You have a right to SPEAK without uninvited listeners.</string> +  + <string name="YEC_2024_right_to_BROWSE">You have a right to BROWSE without being watched.</string> +  + <string name="YEC_2024_right_to_SEARCH">You have a right to SEARCH without being followed.</string> + +  + <string name="YEC_2024_donation_encouragement">Join the thousands of Tor supporters building an internet powered by privacy. Make a donation today.</string> + +  + <string name="YEC_2024_donation_match_text">Through December 31, your gift will be matched, up to $300,000!</string> + +  + <string name="YEC_2024_tor_browser_for_android_will_always_be_free_no_donation_required">%1$s for Android will always be free to use—no donation is required to use this app.</string> + +  + <string name="YEC_2024_close">Close</string> + +  + <string name="YEC_2024_donate_now">Donate now</string> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/217346c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/217346c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.16.0esr-13.5-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 30 Sep '24

30 Sep '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 4dd63a60 by Pier Angelo Vendrame at 2024-09-30T22:07:38+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 42747: Discard unsupported updates earlier. Firefox's updater has a function to select updates, which checks mainly the version number. Therefore, a more recent update that is unsupported will be chosen over a compatible one. We patch this to be able to provide an alternative update path to Windows 7. - - - - - 1 changed file: - toolkit/mozapps/update/UpdateService.sys.mjs Changes: ===================================== toolkit/mozapps/update/UpdateService.sys.mjs ===================================== @@ -3680,18 +3680,20 @@ UpdateService.prototype = { switch (aUpdate.type) { case "major": - if (!majorUpdate) { + if (!majorUpdate || majorUpdate.unsupported) { majorUpdate = aUpdate; } else if ( + !aUpdate.unsupported && vc.compare(majorUpdate.appVersion, aUpdate.appVersion) <= 0 ) { majorUpdate = aUpdate; } break; case "minor": - if (!minorUpdate) { + if (!minorUpdate || minorUpdate.unsupported) { minorUpdate = aUpdate; } else if ( + !aUpdate.unsupported && vc.compare(minorUpdate.appVersion, aUpdate.appVersion) <= 0 ) { minorUpdate = aUpdate; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/4dd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/4dd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.16.0esr-13.5-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 30 Sep '24

30 Sep '24

Pier Angelo Vendrame pushed to branch base-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: b97760ca by Pier Angelo Vendrame at 2024-09-30T22:06:56+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 42747: Discard unsupported updates earlier. Firefox's updater has a function to select updates, which checks mainly the version number. Therefore, a more recent update that is unsupported will be chosen over a compatible one. We patch this to be able to provide an alternative update path to Windows 7. - - - - - 1 changed file: - toolkit/mozapps/update/UpdateService.sys.mjs Changes: ===================================== toolkit/mozapps/update/UpdateService.sys.mjs ===================================== @@ -3680,18 +3680,20 @@ UpdateService.prototype = { switch (aUpdate.type) { case "major": - if (!majorUpdate) { + if (!majorUpdate || majorUpdate.unsupported) { majorUpdate = aUpdate; } else if ( + !aUpdate.unsupported && vc.compare(majorUpdate.appVersion, aUpdate.appVersion) <= 0 ) { majorUpdate = aUpdate; } break; case "minor": - if (!minorUpdate) { + if (!minorUpdate || minorUpdate.unsupported) { minorUpdate = aUpdate; } else if ( + !aUpdate.unsupported && vc.compare(minorUpdate.appVersion, aUpdate.appVersion) <= 0 ) { minorUpdate = aUpdate; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b97760c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b97760c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.16.0esr-13.5-1] 2 commits: fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 30 Sep '24

30 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 1982c08d by Pier Angelo Vendrame at 2024-09-30T22:04:35+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 42747: Discard unsupported updates earlier. Firefox's updater has a function to select updates, which checks mainly the version number. Therefore, a more recent update that is unsupported will be chosen over a compatible one. We patch this to be able to provide an alternative update path to Windows 7. - - - - - ec92fd57 by Pier Angelo Vendrame at 2024-09-30T22:04:37+02:00 fixup! Bug 19121: reinstate the update.xml hash check Revert "Bug 19121: reinstate the update.xml hash check" This reverts commit 39a712fbaf18cb64b6dc601c71bac82718de1a01. - - - - - 3 changed files: - toolkit/mozapps/update/UpdateService.sys.mjs - toolkit/mozapps/update/UpdateTelemetry.sys.mjs - toolkit/mozapps/update/nsIUpdateService.idl Changes: ===================================== toolkit/mozapps/update/UpdateService.sys.mjs ===================================== @@ -2127,8 +2127,6 @@ function UpdatePatch(patch) { } break; case "finalURL": - case "hashFunction": - case "hashValue": case "state": case "type": case "URL": @@ -2148,8 +2146,6 @@ UpdatePatch.prototype = { // over writing nsIUpdatePatch attributes. _attrNames: [ "errorCode", - "hashFunction", - "hashValue", "finalURL", "selected", "size", @@ -2163,8 +2159,6 @@ UpdatePatch.prototype = { */ serialize: function UpdatePatch_serialize(updates) { var patch = updates.createElementNS(URI_UPDATE_NS, "patch"); - patch.setAttribute("hashFunction", this.hashFunction); - patch.setAttribute("hashValue", this.hashValue); patch.setAttribute("size", this.size); patch.setAttribute("type", this.type); patch.setAttribute("URL", this.URL); @@ -3737,18 +3731,20 @@ UpdateService.prototype = { switch (aUpdate.type) { case "major": - if (!majorUpdate) { + if (!majorUpdate || majorUpdate.unsupported) { majorUpdate = aUpdate; } else if ( + !aUpdate.unsupported && vc.compare(majorUpdate.appVersion, aUpdate.appVersion) <= 0 ) { majorUpdate = aUpdate; } break; case "minor": - if (!minorUpdate) { + if (!minorUpdate || minorUpdate.unsupported) { minorUpdate = aUpdate; } else if ( + !aUpdate.unsupported && vc.compare(minorUpdate.appVersion, aUpdate.appVersion) <= 0 ) { minorUpdate = aUpdate; @@ -5792,56 +5788,7 @@ Downloader.prototype = { } LOG("Downloader:_verifyDownload downloaded size == expected size."); - let fileStream = Cc[ - "@mozilla.org/network/file-input-stream;1" - ].createInstance(Ci.nsIFileInputStream); - fileStream.init( - destination, - FileUtils.MODE_RDONLY, - FileUtils.PERMS_FILE, - 0 - ); - - let digest; - try { - let hash = Cc["@mozilla.org/security/hash;1"].createInstance( - Ci.nsICryptoHash - ); - var hashFunction = - Ci.nsICryptoHash[this._patch.hashFunction.toUpperCase()]; - if (hashFunction == undefined) { - throw Components.Exception("", Cr.NS_ERROR_UNEXPECTED); - } - hash.init(hashFunction); - hash.updateFromStream(fileStream, -1); - // NOTE: For now, we assume that the format of _patch.hashValue is hex - // encoded binary (such as what is typically output by programs like - // sha1sum). In the future, this may change to base64 depending on how - // we choose to compute these hashes. - hash = hash.finish(false); - digest = Array.from(hash, (c, i) => - hash.charCodeAt(i).toString(16).padStart(2, "0") - ).join(""); - } catch (e) { - LOG( - "Downloader:_verifyDownload - failed to compute hash of the downloaded update archive" - ); - digest = ""; - } - - fileStream.close(); - - if (digest == this._patch.hashValue.toLowerCase()) { - LOG("Downloader:_verifyDownload hashes match."); - return true; - } - - LOG("Downloader:_verifyDownload hashes do not match. "); - AUSTLMY.pingDownloadCode( - this.isCompleteUpdate, - AUSTLMY.DWNLD_ERR_VERIFY_NO_HASH_MATCH - ); - return false; + return true; }, /** @@ -6477,9 +6424,6 @@ Downloader.prototype = { " is higher than patch size: " + this._patch.size ); - // It's important that we use a different code than - // NS_ERROR_CORRUPTED_CONTENT so that tests can verify the difference - // between a hash error and a wrong download error. AUSTLMY.pingDownloadCode( this.isCompleteUpdate, AUSTLMY.DWNLD_ERR_PATCH_SIZE_LARGER @@ -6498,9 +6442,6 @@ Downloader.prototype = { " is not equal to expected patch size: " + this._patch.size ); - // It's important that we use a different code than - // NS_ERROR_CORRUPTED_CONTENT so that tests can verify the difference - // between a hash error and a wrong download error. AUSTLMY.pingDownloadCode( this.isCompleteUpdate, AUSTLMY.DWNLD_ERR_PATCH_SIZE_NOT_EQUAL ===================================== toolkit/mozapps/update/UpdateTelemetry.sys.mjs ===================================== @@ -190,7 +190,6 @@ export var AUSTLMY = { DWNLD_ERR_VERIFY_NO_REQUEST: 13, DWNLD_ERR_VERIFY_PATCH_SIZE_NOT_EQUAL: 14, DWNLD_ERR_WRITE_FAILURE: 15, - DWNLD_ERR_VERIFY_NO_HASH_MATCH: 16, // Temporary failure code to see if there are failures without an update phase DWNLD_UNKNOWN_PHASE_ERR_WRITE_FAILURE: 40, ===================================== toolkit/mozapps/update/nsIUpdateService.idl ===================================== @@ -39,17 +39,6 @@ interface nsIUpdatePatch : nsISupports */ attribute AString finalURL; - /** - * The hash function to use when determining this file's integrity - */ - attribute AString hashFunction; - - /** - * The value of the hash function named above that should be computed if - * this file is not corrupt. - */ - attribute AString hashValue; - /** * The size of this file, in bytes. */ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ebb976… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ebb976… 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] Bug_43099: 2024 YEC
by ma1 (＠ma1) 30 Sep '24

30 Sep '24

ma1 pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: e895421b by clairehurst at 2024-09-30T11:44:49-06:00 Bug_43099: 2024 YEC - - - - - 15 changed files: - fenix/app/build.gradle - + fenix/app/jtorctl-0.2.jar - fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/home/HomeScreenViewModel.kt - fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - + fenix/app/src/main/res/drawable/heart.xml - + fenix/app/src/main/res/drawable/illo_green_browse.xml - + fenix/app/src/main/res/drawable/illo_purple_speak.xml - + fenix/app/src/main/res/drawable/illo_red_search.xml - + fenix/app/src/main/res/font/spacegrotesk_bold.ttf - fenix/app/src/main/res/layout/fragment_home.xml - fenix/app/src/main/res/values/colors.xml - fenix/app/src/main/res/values/preference_keys.xml - fenix/app/src/main/res/values/torbrowser_strings.xml - fenix/gradle/wrapper/gradle-wrapper.properties Changes: ===================================== fenix/app/build.gradle ===================================== @@ -700,7 +700,7 @@ dependencies { lintChecks project(":mozilla-lint-rules") // Tor Android Services Dependencies - implementation 'net.freehaven.tor.control:jtorctl:0.2' + implementation files('jtorctl-0.2.jar') implementation 'org.slf4j:slf4j-api:1.7.25' implementation 'org.slf4j:slf4j-android:1.7.25' ===================================== fenix/app/jtorctl-0.2.jar ===================================== Binary files /dev/null and b/fenix/app/jtorctl-0.2.jar differ ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -17,9 +17,57 @@ import android.view.ViewGroup import android.widget.Button import android.widget.LinearLayout import android.widget.PopupWindow +import androidx.annotation.ColorRes +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes import androidx.annotation.VisibleForTesting +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.Button +import androidx.compose.material.ButtonDefaults +import androidx.compose.material.Icon +import androidx.compose.material.IconButton +import androidx.compose.material.LocalTextStyle +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.draw.scale +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.ViewCompositionStrategy +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.TextLayoutResult +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat +import androidx.core.content.ContextCompat.getColor import androidx.core.view.children import androidx.core.view.doOnLayout import androidx.core.view.isGone @@ -64,6 +112,9 @@ import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.UserInteractionHandler import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged +import mozilla.components.support.locale.LocaleManager +import mozilla.components.ui.colors.PhotonColors +import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.GleanMetrics.HomeScreen import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcutCfr @@ -113,6 +164,8 @@ 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.SupportUtils +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 @@ -439,6 +492,8 @@ class HomeFragment : Fragment(), UserInteractionHandler { activity.themeManager.applyStatusBarTheme(activity) + setDonationScreen() + // FxNimbus.features.homescreen.recordExposure() // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! @@ -450,6 +505,19 @@ class HomeFragment : Fragment(), UserInteractionHandler { return binding.root } + private fun setDonationScreen() { + if (homeViewModel.shouldShowDonationScreen()) { + binding.exploreprivately.visibility = View.GONE + binding.onionPatternImage.visibility = View.GONE + binding.composeYec2024.apply { + setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) + setContent { + DonationScreen() + } + } + } + } + override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) @@ -1022,4 +1090,311 @@ class HomeFragment : Fragment(), UserInteractionHandler { requireActivity().finish() return true } + + @Composable + fun DonationScreen() { + BoxWithConstraints( + contentAlignment = Alignment.Center, + modifier = Modifier + .fillMaxWidth() + .wrapContentHeight() + ) { + val alternateLayout = this.maxWidth >= 500.dp + + YecLayout( + alternateLayout, + maxWidth = this.maxWidth, + getYecStyle(), + modifier = Modifier + .padding(top = 55.dp, bottom = 56.dp), + ) + } + } + + @Composable + private fun YecLayout( + alternateLayout: Boolean, + maxWidth: Dp, + yecStyle: YecStyle, + modifier: Modifier + ) { + Column( + modifier = modifier + .padding(horizontal = 22.dp) + .verticalScroll(rememberScrollState()) + .fillMaxWidth(getVariableWidth(maxWidth)), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + PurpleYecBox(alternateLayout, yecStyle, horizontalPadding = 16.dp) + AlwaysFreeText() + } + } + + private fun getVariableWidth(width: Dp): Float = (500.dp / width).coerceIn(0.75f, 1.0f) + + @Composable + private fun PurpleYecBox( + alternateLayout: Boolean, + yecStyle: YecStyle, + horizontalPadding: Dp, + ) { + Box( + modifier = Modifier.background(PhotonColors.Ink90, shape = RoundedCornerShape(8.dp)), + ) { + ExitIcon() + DynamicYecContent(alternateLayout, yecStyle, horizontalPadding) + } + } + + @Composable + private fun AlwaysFreeText() { + Text( + text = getString( + R.string.YEC_2024_tor_browser_for_android_will_always_be_free_no_donation_required, + getString(R.string.app_name), + ), + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 8.dp), + color = Color(0xFFFBFBFE), + fontSize = 12.5.sp, + textAlign = TextAlign.Center, + lineHeight = 18.75.sp, + ) + } + + @Composable + private fun ExitIcon() { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End, + ) { + IconButton( + onClick = { + binding.exploreprivately.visibility = View.VISIBLE + binding.onionPatternImage.visibility = View.VISIBLE + binding.composeYec2024.visibility = View.GONE + homeViewModel.yecDismissed = true + }, + ) { + Icon( + painter = painterResource(id = R.drawable.ic_close), + tint = Color( + getColor( + requireContext(), + R.color.photonWhite, + ), + ), + contentDescription = getString(R.string.YEC_2024_close), + modifier = Modifier + .size(48.dp) + .padding(8.dp) + .scale(0.65f), + ) + } + } + } + + @Composable + private fun DynamicYecContent( + alternateLayout: Boolean, + yecStyle: YecStyle, + horizontalPadding: Dp, + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column( + modifier = Modifier.fillMaxWidth(fraction = if (alternateLayout) .70f else 1f), + horizontalAlignment = if (alternateLayout) Alignment.Start else Alignment.CenterHorizontally, + ) { + if (!alternateLayout) { + IlloYecImage(yecStyle, false, horizontalPadding) + } + + YecRightsText(yecStyle, alternateLayout, horizontalPadding) + + DonationEncouragementText(alternateLayout, horizontalPadding) + + DonationMatchText(alternateLayout, horizontalPadding) + + DonateNowButton(alternateLayout, horizontalPadding) + } + if (alternateLayout) { + IlloYecImage(yecStyle, true, horizontalPadding) + } + } + } + + @Composable + private fun IlloYecImage(yecStyle: YecStyle, alternateLayout: Boolean, horizontalPadding: Dp) { + Image( + painter = painterResource(id = yecStyle.illo), + contentDescription = null, + modifier = Modifier + .fillMaxWidth() + .padding( + top = if (alternateLayout) 0.dp else 41.dp, + bottom = if (alternateLayout) 0.dp else 25.dp, + end = if (alternateLayout) horizontalPadding else 0.dp, + ), + ) + } + + @Composable + private fun YecRightsText( + yecStyle: YecStyle, + alternateLayout: Boolean, + horizontalPadding: Dp, + ) { + var textLayoutResult by remember { mutableStateOf<TextLayoutResult?>(null) } + + Text( + text = getString(yecStyle.text), + color = PhotonColors.Ink90, + textAlign = if (alternateLayout) TextAlign.Left else TextAlign.Center, + fontFamily = FontFamily(Font(R.font.spacegrotesk_bold, FontWeight.Bold)), + fontSize = 18.sp, + lineHeight = 30.sp, + onTextLayout = { textLayoutResult = it }, + modifier = Modifier + .padding( + top = if (alternateLayout) 24.dp else 0.dp, + start = horizontalPadding, + end = if (alternateLayout) 0.dp else horizontalPadding, + bottom = if (alternateLayout) 8.dp else 16.dp, + ) + .drawBehind { + textLayoutResult?.let { result -> + for (i in 0 until result.lineCount) { + val endOfLineSpacing = 4.dp + + val lineTop = result.getLineTop(i) + val lineBottom = result.getLineBottom(i) + val lineLeft = result.getLineLeft(i) - endOfLineSpacing.toPx() + val lineRight = result.getLineRight(i) + endOfLineSpacing.toPx() + + drawRoundRect( + color = Color(getColor(requireContext(), yecStyle.color)), + topLeft = Offset( + lineLeft, + lineTop + 4.dp.toPx(), + ), + size = Size( + lineRight - lineLeft, + lineBottom - lineTop - 4.dp.toPx(), + ), + cornerRadius = CornerRadius(2.dp.toPx(), 2.dp.toPx()), + ) + } + } + }, + ) + } + + @Composable + private fun DonationEncouragementText(alternateLayout: Boolean, horizontalPadding: Dp) { + Text( + text = getString(R.string.YEC_2024_donation_encouragement), + modifier = Modifier + .fillMaxWidth() + .padding( + start = horizontalPadding, + end = if (alternateLayout) 0.dp else horizontalPadding, + bottom = if (alternateLayout) 8.dp else 16.dp, + ), + color = Color(0xFFFBFBFE), + textAlign = TextAlign.Left, + ) + } + + @Composable + private fun DonationMatchText(alternateLayout: Boolean, horizontalPadding: Dp) { + Text( + text = getString(R.string.YEC_2024_donation_match_text), + modifier = Modifier + .fillMaxWidth() + .padding( + start = horizontalPadding, + end = if (alternateLayout) horizontalPadding else 0.dp, + bottom = 16.dp, + ), + color = Color(0xFFFBFBFE), + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Left, + ) + } + + @Composable + private fun DonateNowButton(alternateLayout: Boolean, horizontalPadding: Dp) { + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (locale.isNotEmpty()) { + locale += '-' + } + Button( + onClick = { + (activity as HomeActivity).openToBrowserAndLoad( + searchTermOrURL = "https://www.torproject.org/donate/donate-${locale}mobile-yec2024", + newTab = true, + from = BrowserDirection.FromHome, + ) + }, + modifier = Modifier + .padding(bottom = if (alternateLayout) 24.dp else 40.dp) + .padding(horizontal = horizontalPadding), + colors = ButtonDefaults.buttonColors( + backgroundColor = Color( + 0xFFFFBD4F, + ), + ), + shape = RoundedCornerShape(4.dp), + ) { + Text( + text = getString(R.string.YEC_2024_donate_now), + color = PhotonColors.DarkGrey80, + modifier = Modifier.padding( + horizontal = if (alternateLayout) 6.dp else 8.dp, + vertical = if (alternateLayout) 3.dp else 6.dp, + ), + fontSize = 16.sp, + fontWeight = FontWeight.Bold, + letterSpacing = 0.sp, + ) + Icon( + painter = painterResource(R.drawable.heart), + contentDescription = null, + modifier = Modifier.size(20.dp), + ) + } + } + + private fun getYecStyle(): YecStyle { + if (homeViewModel.firstYecLoad) { + homeViewModel.firstYecLoad = false + homeViewModel.yecStyleIndex = requireContext().settings().yecStyleIndex + requireContext().settings().yecStyleIndex = + (requireContext().settings().yecStyleIndex + 1) % 3 + } + return YecStyle.values()[homeViewModel.yecStyleIndex] + } + + enum class YecStyle( + @DrawableRes val illo: Int, + @StringRes val text: Int, + @ColorRes val color: Int, + ) { + PurpleSpeak( + illo = R.drawable.illo_purple_speak, + text = R.string.YEC_2024_right_to_speak, + color = R.color.YEC_2024_speak_purple, + ), + GreenBrowse( + illo = R.drawable.illo_green_browse, + text = R.string.YEC_2024_right_to_BROWSE, + color = R.color.YEC_2024_browse_green, + ), + RedSearch( + illo = R.drawable.illo_red_search, + text = R.string.YEC_2024_right_to_SEARCH, + color = R.color.YEC_2024_search_red, + ) + } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeScreenViewModel.kt ===================================== @@ -4,11 +4,35 @@ package org.mozilla.fenix.home +import android.annotation.SuppressLint +import androidx.annotation.IntRange import androidx.lifecycle.ViewModel +import org.mozilla.fenix.BuildConfig +import java.text.SimpleDateFormat +import java.util.Date class HomeScreenViewModel : ViewModel() { /** * Used to delete a specific session once the home screen is resumed */ var sessionToDelete: String? = null + + @IntRange(0, 2) + var yecStyleIndex: Int = 0 + var firstYecLoad: Boolean = true + var yecDismissed: Boolean = false + + fun shouldShowDonationScreen(): Boolean { + @SuppressLint("SimpleDateFormat") + val dateFormat = SimpleDateFormat("yyyy-MM-dd") + val startDate = dateFormat.parse("2024-10-14") // Change to a date in the past to test + val endDate = dateFormat.parse("2025-1-2") + val currentDate = Date() + + @Suppress("KotlinConstantConditions") + return !yecDismissed + && BuildConfig.BUILD_TYPE == "release" // Comment this line out to test + && currentDate.after(startDate) + && currentDate.before(endDate) + } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -335,6 +335,11 @@ class Settings(private val appContext: Context) : PreferencesHolder { default = false ) + var yecStyleIndex by intPreference( + appContext.getPreferenceKey(R.string.pref_key_yec_style_index), + default = 0 + ) + var defaultSearchEngineName by stringPreference( appContext.getPreferenceKey(R.string.pref_key_search_engine), default = "", ===================================== fenix/app/src/main/res/drawable/heart.xml ===================================== @@ -0,0 +1,8 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="16dp" android:viewportHeight="17" android:viewportWidth="17" android:width="16dp"> + + <path android:fillColor="#1C1B22" android:pathData="M8.5,6.5C8.5,6.5 8.5,2.5 12,2.5C15.5,2.5 15.5,5.5 15.5,6.5C15.5,11 8.5,15.5 8.5,15.5V6.5Z"/> + + <path android:fillColor="#1C1B22" android:pathData="M8.5,6.5C8.5,6.5 8.5,2.5 5,2.5C1.5,2.5 1.5,5.5 1.5,6.5C1.5,11 8.5,15.5 8.5,15.5L9.5,9.5L8.5,6.5Z"/> + +</vector> + ===================================== fenix/app/src/main/res/drawable/illo_green_browse.xml ===================================== @@ -0,0 +1,59 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="144dp" android:viewportHeight="144" android:viewportWidth="198" android:width="198dp"> + + <group> + + <clip-path android:pathData="M8.49,0L189.97,0A8,8 0,0 1,197.97 8L197.97,136A8,8 0,0 1,189.97 144L8.49,144A8,8 0,0 1,0.49 136L0.49,8A8,8 0,0 1,8.49 0z"/> + + <path android:fillColor="#1D1133" android:pathData="M8.49,0L189.97,0A8,8 0,0 1,197.97 8L197.97,136A8,8 0,0 1,189.97 144L8.49,144A8,8 0,0 1,0.49 136L0.49,8A8,8 0,0 1,8.49 0z"/> + + <path android:fillAlpha="0.7" android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M41.55,66.09C42.32,66.09 42.94,66.71 42.94,67.47V74.16H90.02C90.79,74.16 91.41,74.78 91.41,75.55V82.24H91.41V90.32H99.27V82.46H99.26V75.55C99.26,74.78 99.88,74.16 100.65,74.16H138.49C138.98,74.16 139.41,74.42 139.66,74.8V74.16H178.88C179.65,74.16 180.27,74.78 180.27,75.55V81.08C180.27,81.57 180.02,82 179.63,82.24H180.27V90.54H179.63C180.02,90.79 180.27,91.22 180.27,91.7V106.49H195.05C195.81,106.49 196.43,107.1 196.43,107.87V113.4C196.43,114.16 195.81,114.78 195.05,114.78H180.27V121.46C180.27,122.22 179.65,122.84 178.89,122.84H164.11V129.54C164.11,130.3 163.49,130.92 162.73,130.92H157.2C156.43,130.92 155.81,130.3 155.81,129.54V122.84H139.88V129.54C139.88,130.3 139.26,130.92 138.49,130.92H132.96C132.2,130.92 131.58,130.3 131.58,129.54V122.84L19.87,122.84C19.1,122.84 18.48,122.22 18.48,121.46V114.54H34.64V106.7H11.79C11.02,106.7 10.4,106.08 10.4,105.31V98.62H3.71C2.94,98.62 2.32,98 2.32,97.24V91.7C2.32,90.94 2.94,90.32 3.71,90.32H10.4V83.63C10.4,82.86 11.02,82.24 11.79,82.24H18.48V75.55C18.48,74.78 19.1,74.16 19.86,74.16H34.64V67.47C34.64,66.71 35.26,66.09 36.02,66.09H41.55ZM36.02,66.31H41.55C42.19,66.31 42.72,66.83 42.72,67.47V74.16H34.86V67.47C34.86,66.83 35.38,66.31 36.02,66.31ZM171.97,122.62V114.78H164.11L164.11,122.62H171.97ZM171.98,114.54V106.71H164.12V114.54H171.98ZM180.05,114.54H172.2V106.71H180.05V114.54ZM172.19,122.62H178.89C179.53,122.62 180.05,122.1 180.05,121.46V114.78H172.19L172.19,122.62ZM163.9,106.71V114.54H156.04V106.71H163.9ZM163.89,114.78V122.62H156.04V114.78H163.89ZM155.82,114.78V122.62H147.96L147.96,114.78H155.82ZM155.82,114.54V106.71H147.96V114.54H155.82ZM139.66,122.62V114.78H131.8L131.8,122.62H139.66ZM139.66,114.54L139.66,114.54V106.71H131.8V114.54L139.66,114.54ZM147.74,114.54H139.88V106.71H147.74V114.54ZM139.88,122.62H147.74V114.78H139.88L139.88,122.62ZM131.58,106.71V114.54H123.72V106.71H131.58ZM131.58,114.78V122.62H123.72L123.72,114.78H131.58ZM123.5,122.62V114.78H115.64L115.64,122.62H123.5ZM123.5,114.54L123.5,114.54V106.71H115.65V114.54L123.5,114.54ZM115.42,114.78V122.62H107.57V114.78L115.42,114.78ZM107.35,114.54L107.35,114.54V106.71H99.49V114.54L107.35,114.54ZM115.43,114.54H107.57V106.71H115.43V114.54ZM107.35,122.62H99.49L99.49,114.78L107.35,114.78V122.62ZM91.41,114.78H99.27V122.62H91.41L91.41,114.78ZM91.19,122.62V114.78H83.33L83.33,122.62H91.19ZM91.19,114.54V106.71H83.33V114.54H91.19ZM99.27,114.54H91.41V106.71H99.27V114.54ZM83.11,106.71V114.54H75.25V106.71H83.11ZM83.11,114.78V122.62H75.25V114.78H83.11ZM75.03,114.54L75.03,114.54V106.71H67.18V114.54L75.03,114.54ZM67.17,114.78V122.62H75.03V114.78H67.17ZM66.96,106.71V114.54H59.1V106.71H66.96ZM66.95,114.78V122.62H59.09V114.78H66.95ZM58.88,114.54V106.71H51.02V114.54H58.88ZM51.02,114.78V122.62H58.87V114.78H51.02ZM50.8,106.71V114.54H42.94V106.71H50.8ZM50.8,114.78V122.62H42.94V114.78L50.8,114.78ZM42.72,114.54V106.71H34.86V114.54H42.72ZM42.72,122.62H34.86L34.86,114.78H42.72V122.62ZM34.64,114.76V122.62H26.78V114.76H34.64ZM188.13,106.71H180.27V114.56H188.13V106.71ZM188.35,114.56H195.05C195.69,114.56 196.21,114.04 196.21,113.4V107.87C196.21,107.23 195.69,106.71 195.05,106.71H188.35V114.56ZM18.7,106.48L18.7,98.62H26.56L26.56,106.48H18.7ZM18.48,98.62H10.62V105.31C10.62,105.96 11.14,106.48 11.79,106.48H18.48L18.48,98.62ZM34.64,106.48H26.78L26.78,98.62H34.64V106.48ZM34.86,106.48H42.72L42.72,98.62L34.86,98.62V106.48ZM50.79,106.48H42.94V98.62H50.79V106.48ZM66.95,106.48H59.09V98.62L66.95,98.62L66.95,106.48ZM58.87,106.48H51.01V98.62L58.87,98.62L58.87,106.48ZM67.17,106.48H75.03L75.03,98.62L67.17,98.62V106.48ZM83.11,106.48H75.25V98.62L83.11,98.62L83.11,106.48ZM83.33,106.48H91.19L91.19,98.62L83.33,98.62V106.48ZM99.26,106.48H91.41V98.62H99.26V106.48ZM115.42,106.48H107.56V98.62L115.42,98.62L115.42,106.48ZM107.34,106.48H99.48V98.62L107.34,98.62L107.34,106.48ZM115.64,106.48H123.5L123.5,98.62L115.64,98.62V106.48ZM131.58,106.48H123.72V98.62L131.58,98.62L131.58,106.48ZM131.8,106.48H139.66V98.62H131.8V106.48ZM147.96,106.48H155.81L155.81,98.62L147.96,98.62V106.48ZM147.73,98.62L139.88,98.62V106.48H147.73L147.73,98.62ZM163.89,106.48H156.03V98.62L163.89,98.62L163.89,106.48ZM164.11,106.48H171.97L171.97,98.62L164.11,98.62V106.48ZM180.05,106.48H172.19V98.62H180.05V106.48ZM18.48,98.4H10.62V90.54H18.48V98.4ZM10.4,98.4V90.54H3.71C3.06,90.54 2.54,91.06 2.54,91.7V97.24C2.54,97.88 3.06,98.4 3.71,98.4H10.4ZM10.62,90.32V83.63C10.62,82.98 11.14,82.46 11.79,82.46H18.48V90.32H10.62ZM18.7,98.4V90.54H26.56V98.4H18.7ZM34.64,98.4H26.78V90.54H34.64L34.64,98.4ZM26.56,82.46V90.32H18.7V82.46H26.56ZM26.78,90.32V82.46H34.64V90.32H26.78ZM34.86,90.54V98.4H42.72L42.72,90.54H34.86ZM50.79,98.4H42.94V90.54H50.79V98.4ZM42.72,82.46V90.32H34.86V82.46H42.72ZM42.94,90.32V82.46L50.79,82.46L50.79,90.32H42.94ZM66.95,98.4H59.09V90.54H66.95L66.95,98.4ZM58.87,82.46L58.87,90.32H51.01V82.46L58.87,82.46ZM51.01,90.54V98.4H58.87L58.87,90.54H51.01ZM59.09,90.32V82.46H66.95V90.32H59.09ZM67.17,98.4H75.03L75.03,90.54H67.17V98.4ZM83.11,98.4H75.25V90.54L75.25,90.54H83.11L83.11,98.4ZM75.03,82.46V90.32L75.03,90.32H67.17V82.46L75.03,82.46ZM75.25,90.32L83.11,90.32L83.11,90.32L83.11,82.46L75.25,82.46V90.32ZM83.33,98.4H91.19L91.19,90.54H83.33L83.33,90.54V98.4ZM99.26,98.4H91.41V90.54L91.41,90.54L99.26,90.54V98.4ZM91.19,82.46V90.32L91.19,90.32L83.33,90.32V82.46H91.19ZM50.79,74.38H42.94V82.24H50.79V74.38ZM51.01,82.24H58.87V74.38H51.01V82.24ZM172.19,74.38H178.88C179.53,74.38 180.05,74.91 180.05,75.55V81.08C180.05,81.72 179.53,82.24 178.88,82.24H172.19V74.38ZM115.42,98.4H107.56V90.54L107.56,90.54H115.42L115.42,98.4ZM107.34,82.46L107.34,90.32L107.34,90.32L99.49,90.32V82.46L107.34,82.46ZM107.34,90.54L99.48,90.54V98.4H107.34L107.34,90.54ZM107.56,90.32L115.42,90.32L115.42,90.32L115.42,82.46L107.56,82.46V90.32ZM115.64,98.4H123.5L123.5,90.54H115.64L115.64,90.54V98.4ZM131.58,98.4H123.72V90.54L123.72,90.54H131.58L131.58,98.4ZM123.5,82.46V90.32L123.5,90.32L115.64,90.32V82.46H123.5ZM123.72,90.32L131.58,90.32L131.58,90.32V82.46L123.72,82.46V90.32ZM131.8,98.4H139.66L139.66,90.54H131.8L131.8,90.54V98.4ZM139.66,82.46V90.32L139.66,90.32L131.8,90.32V82.46H139.66ZM139.88,90.32L147.73,90.32L147.74,90.32L147.74,82.46L139.88,82.46V90.32ZM147.96,98.4H155.81L155.81,90.54H147.96L147.96,90.54V98.4ZM139.88,98.4H147.73L147.73,90.54H139.88L139.88,90.54V98.4ZM163.89,98.4H156.03V90.54L156.03,90.54H163.89L163.89,98.4ZM155.81,82.46L155.81,90.32L155.81,90.32L147.96,90.32V82.46L155.81,82.46ZM156.03,90.32L163.89,90.32L163.89,90.32L163.89,82.46L156.03,82.46V90.32ZM164.11,90.54L164.11,90.54V98.4H171.97L171.97,90.54H164.11ZM180.05,98.4H172.19V90.54L172.19,90.54H178.89C179.53,90.55 180.05,91.07 180.05,91.7V98.4ZM171.97,82.46L171.97,90.32L171.97,90.32L164.11,90.32V82.46L171.97,82.46ZM178.9,90.32L178.88,90.32L172.19,90.32V82.46H180.05V90.32H178.9ZM163.89,82.24L156.03,82.24L156.03,82.24V74.38H163.89V82.24ZM115.42,74.38H107.56V82.24H115.42V74.38ZM107.34,74.38H100.65C100,74.38 99.48,74.91 99.48,75.55V82.24H107.34V74.38ZM123.5,82.24H115.64V74.38H123.5V82.24ZM139.66,82.24H131.8V74.38H138.49C139.13,74.38 139.65,74.9 139.66,75.54L139.66,75.55V82.24ZM123.72,74.38H131.58V82.24H123.72V74.38ZM147.73,74.38H139.88V75.54L139.88,75.55L139.88,82.24H147.73V74.38ZM155.81,82.24H147.96V74.38H155.81V82.24ZM171.97,82.24H164.11V74.38H171.97V82.24ZM83.33,74.38H90.02C90.66,74.38 91.19,74.91 91.19,75.55V82.24H83.33V74.38ZM66.95,82.24H59.09V74.38H66.95V82.24ZM83.11,82.24H75.25V74.38H83.11V82.24ZM67.17,74.38H75.03V82.24H67.17V74.38ZM34.86,74.38H42.72V82.24H34.86V74.38ZM34.64,74.38H26.78V82.24H34.64V74.38ZM19.86,74.38H26.56V82.24H18.7V75.55C18.7,74.91 19.22,74.38 19.86,74.38ZM26.56,122.62H19.87C19.22,122.62 18.7,122.1 18.7,121.46L18.7,114.76H26.56V122.62ZM131.8,122.84V129.54C131.8,130.18 132.32,130.7 132.96,130.7H138.49C139.13,130.7 139.66,130.18 139.66,129.54V122.84H131.8ZM156.03,129.54V122.84H163.89V129.54C163.89,130.18 163.37,130.7 162.73,130.7H157.2C156.55,130.7 156.03,130.18 156.03,129.54Z" android:strokeAlpha="0.7"/> + + <path android:fillColor="#ffffff" android:pathData="M28.14,100.94a6.85,23.41 89.68,1 0,46.82 -0.26a6.85,23.41 89.68,1 0,-46.82 0.26z"/> + + <path android:fillColor="#ffffff" android:pathData="M121.77,100.94a6.85,23.41 89.68,1 0,46.82 -0.26a6.85,23.41 89.68,1 0,-46.82 0.26z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M144.92,14.5C144.92,15.23 144.33,15.82 143.6,15.82C142.87,15.82 142.27,15.23 142.27,14.5C142.27,13.76 142.87,13.17 143.6,13.17C144.33,13.17 144.92,13.76 144.92,14.5ZM144.4,14.5C144.4,14.94 144.04,15.3 143.6,15.3C143.15,15.3 142.79,14.94 142.79,14.5C142.79,14.05 143.15,13.69 143.6,13.69C144.04,13.69 144.4,14.05 144.4,14.5Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M143.6,16.82C144.88,16.82 145.92,15.78 145.92,14.5C145.92,13.21 144.88,12.17 143.6,12.17C142.32,12.17 141.28,13.21 141.28,14.5C141.28,15.78 142.32,16.82 143.6,16.82ZM143.6,16.3C144.59,16.3 145.4,15.49 145.4,14.5C145.4,13.5 144.59,12.69 143.6,12.69C142.6,12.69 141.8,13.5 141.8,14.5C141.8,15.49 142.6,16.3 143.6,16.3Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M143.6,17.81C145.43,17.81 146.91,16.33 146.91,14.5C146.91,12.66 145.43,11.18 143.6,11.18C141.77,11.18 140.29,12.66 140.29,14.5C140.29,16.33 141.77,17.81 143.6,17.81ZM143.6,17.29C145.14,17.29 146.39,16.04 146.39,14.5C146.39,12.95 145.14,11.7 143.6,11.7C142.05,11.7 140.8,12.95 140.8,14.5C140.8,16.04 142.05,17.29 143.6,17.29Z"/> + + <path android:fillColor="#ffffff" android:pathData="M126.45,45.24C127.77,45.93 129.4,45.66 130.28,44.46C130.93,43.58 131.52,42.71 131.98,42C132.62,41 132.59,39.73 131.9,38.77C128.1,33.47 114.83,16.71 98.94,16.71C83.24,16.71 69.93,33.06 65.88,38.57C65.1,39.63 65.15,41.06 65.96,42.11C66.38,42.66 66.89,43.29 67.43,43.95C68.37,45.1 69.99,45.38 71.31,44.71C79.89,40.36 88.77,37.93 98.77,37.93C108.84,37.93 117.82,40.78 126.45,45.24Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M130.04,44.28C130.69,43.41 131.27,42.54 131.73,41.84C132.3,40.94 132.27,39.81 131.65,38.94C129.76,36.3 125.51,30.81 119.76,25.98C114,21.14 106.78,17 98.94,17C91.19,17 84.01,21.04 78.23,25.8C72.46,30.56 68.14,36 66.13,38.74C65.42,39.7 65.46,40.98 66.19,41.92C66.62,42.47 67.12,43.11 67.66,43.76C68.5,44.8 69.97,45.05 71.17,44.44C79.79,40.07 88.72,37.63 98.77,37.63C108.9,37.63 117.93,40.49 126.59,44.98C127.8,45.6 129.26,45.35 130.04,44.28ZM130.28,44.46C129.4,45.66 127.77,45.93 126.45,45.24C117.82,40.78 108.84,37.93 98.77,37.93C88.77,37.93 79.89,40.36 71.31,44.71C69.99,45.38 68.37,45.1 67.43,43.95C66.89,43.29 66.38,42.66 65.96,42.11C65.15,41.06 65.1,39.63 65.88,38.57C69.93,33.06 83.24,16.71 98.94,16.71C114.83,16.71 128.1,33.47 131.9,38.77C132.59,39.73 132.62,41 131.98,42C131.52,42.71 130.93,43.58 130.28,44.46Z"/> + + <path android:fillColor="#212529" android:pathData="M107.52,34.94C109.36,34.94 110.94,33.86 111.68,32.3C112.69,34.16 113.31,36.26 113.43,38.49C108.65,37.37 103.71,36.79 98.68,36.79C93.74,36.79 88.88,37.35 84.18,38.43C84.63,30.74 91.01,24.63 98.81,24.63C101.18,24.63 103.42,25.2 105.4,26.21C103.92,26.97 102.9,28.52 102.9,30.31C102.9,32.87 104.96,34.94 107.52,34.94Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M132.12,102.6C129.93,102.6 128.16,100.82 128.16,98.63C128.16,82.31 114.9,69.04 98.6,69.04C82.3,69.04 69.04,82.31 69.04,98.63C69.04,100.82 67.27,102.6 65.08,102.6C62.9,102.6 61.12,100.82 61.12,98.63C61.12,77.94 77.93,61.11 98.6,61.11C119.27,61.11 136.08,77.94 136.08,98.63C136.08,100.82 134.31,102.6 132.12,102.6Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M128.46,98.63C128.46,100.65 130.1,102.3 132.12,102.3C134.14,102.3 135.78,100.65 135.78,98.63C135.78,78.11 119.1,61.41 98.6,61.41C78.1,61.41 61.42,78.11 61.42,98.63C61.42,100.65 63.06,102.3 65.08,102.3C67.1,102.3 68.74,100.65 68.74,98.63C68.74,82.15 82.13,68.74 98.6,68.74C115.07,68.74 128.46,82.15 128.46,98.63ZM128.16,98.63C128.16,100.82 129.93,102.6 132.12,102.6C134.31,102.6 136.08,100.82 136.08,98.63C136.08,77.94 119.27,61.11 98.6,61.11C77.93,61.11 61.12,77.94 61.12,98.63C61.12,100.82 62.9,102.6 65.08,102.6C67.27,102.6 69.04,100.82 69.04,98.63C69.04,82.31 82.3,69.04 98.6,69.04C114.9,69.04 128.16,82.31 128.16,98.63Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M158.51,102.6C156.33,102.6 154.55,100.82 154.55,98.63C154.55,67.74 129.46,42.61 98.6,42.61C67.75,42.61 42.65,67.74 42.65,98.63C42.65,100.82 40.87,102.6 38.69,102.6C36.5,102.6 34.73,100.82 34.73,98.63C34.73,81.55 41.37,65.49 53.44,53.42C65.5,41.34 81.54,34.69 98.6,34.69C115.66,34.69 131.7,41.34 143.76,53.42C155.83,65.49 162.47,81.55 162.47,98.63C162.47,100.82 160.7,102.6 158.51,102.6Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M154.85,98.63C154.85,100.65 156.49,102.3 158.51,102.3C160.53,102.3 162.18,100.65 162.18,98.63C162.18,81.63 155.56,65.65 143.55,53.63C131.55,41.61 115.58,34.99 98.6,34.99C81.62,34.99 65.66,41.61 53.65,53.63C41.64,65.65 35.03,81.63 35.03,98.63C35.03,100.65 36.67,102.3 38.69,102.3C40.71,102.3 42.35,100.65 42.35,98.63C42.35,67.58 67.58,42.32 98.6,42.32C129.62,42.32 154.85,67.58 154.85,98.63ZM154.55,98.63C154.55,100.82 156.33,102.6 158.51,102.6C160.7,102.6 162.47,100.82 162.47,98.63C162.47,81.55 155.83,65.49 143.76,53.42C131.7,41.34 115.66,34.69 98.6,34.69C81.54,34.69 65.5,41.34 53.44,53.42C41.37,65.49 34.73,81.55 34.73,98.63C34.73,100.82 36.5,102.6 38.69,102.6C40.87,102.6 42.65,100.82 42.65,98.63C42.65,67.74 67.75,42.61 98.6,42.61C129.46,42.61 154.55,67.74 154.55,98.63Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M145.32,102.6C143.13,102.6 141.36,100.82 141.36,98.63C141.36,75.03 122.18,55.83 98.6,55.83C75.02,55.83 55.84,75.03 55.84,98.63C55.84,100.82 54.07,102.6 51.88,102.6C49.7,102.6 47.92,100.82 47.92,98.63C47.92,70.66 70.66,47.9 98.6,47.9C126.54,47.9 149.28,70.66 149.28,98.63C149.28,100.82 147.5,102.6 145.32,102.6Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M141.66,98.63C141.66,100.65 143.3,102.3 145.32,102.3C147.34,102.3 148.98,100.65 148.98,98.63C148.98,70.82 126.38,48.2 98.6,48.2C70.82,48.2 48.22,70.82 48.22,98.63C48.22,100.65 49.86,102.3 51.88,102.3C53.9,102.3 55.54,100.65 55.54,98.63C55.54,74.86 74.86,55.53 98.6,55.53C122.34,55.53 141.66,74.86 141.66,98.63ZM141.36,98.63C141.36,100.82 143.13,102.6 145.32,102.6C147.5,102.6 149.28,100.82 149.28,98.63C149.28,70.66 126.54,47.9 98.6,47.9C70.66,47.9 47.92,70.66 47.92,98.63C47.92,100.82 49.7,102.6 51.88,102.6C54.07,102.6 55.84,100.82 55.84,98.63C55.84,75.03 75.02,55.83 98.6,55.83C122.18,55.83 141.36,75.03 141.36,98.63Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M166.69,66.45V55.84H166.99V66.45H166.69Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M171.2,61.3L162.37,61.27L162.37,60.97L171.2,61L171.2,61.3Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M37.89,31.19V7.2H38.19V31.19H37.89Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M47.98,19.45L28.1,19.4L28.1,19.1L47.98,19.15L47.98,19.45Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M42.05,23.48L33.74,15.15L33.95,14.94L42.26,23.26L42.05,23.48Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M33.95,23.48L42.26,15.15L42.05,14.94L33.74,23.26L33.95,23.48Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M168.11,43.01C168.11,43.75 167.52,44.34 166.79,44.34C166.05,44.34 165.46,43.75 165.46,43.01C165.46,42.28 166.05,41.69 166.79,41.69C167.52,41.69 168.11,42.28 168.11,43.01Z"/> + + <path android:fillColor="#C1ED75" android:fillType="evenOdd" android:pathData="M157.07,51.42C158.41,51.42 159.5,50.33 159.5,48.98C159.5,47.64 158.41,46.55 157.07,46.55C155.73,46.55 154.64,47.64 154.64,48.98C154.64,50.33 155.73,51.42 157.07,51.42ZM157.07,51.12C158.24,51.12 159.2,50.16 159.2,48.98C159.2,47.81 158.24,46.85 157.07,46.85C155.89,46.85 154.94,47.81 154.94,48.98C154.94,50.16 155.89,51.12 157.07,51.12Z"/> + + <path android:fillColor="#C1ED75" android:pathData="M33.84,62.47C33.84,63.2 33.25,63.8 32.52,63.8C31.79,63.8 31.19,63.2 31.19,62.47C31.19,61.74 31.79,61.14 32.52,61.14C33.25,61.14 33.84,61.74 33.84,62.47Z"/> + + </group> + +</vector> ===================================== fenix/app/src/main/res/drawable/illo_purple_speak.xml ===================================== @@ -0,0 +1,97 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="127.75595dp" android:viewportHeight="127" android:viewportWidth="168" android:width="169dp"> + + <group> + + <clip-path android:pathData="M0.17,0.74h167.66v126h-167.66z"/> + + <path android:fillColor="#D898FA" android:pathData="M66.66,57.55C68.64,60.1 70.08,62.41 70.99,64.47C72.26,67.35 71.75,70.57 71.59,73.71C71.31,78.94 72.47,86.11 81.99,86.11C97.83,86.11 108.25,38.11 90.46,25.38C78.73,16.99 70.37,21.54 64.51,30.96C58.22,41.07 62.15,51.71 66.66,57.55Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M70.96,32.96C73.91,29.73 78.49,27.95 84.17,29.71C90.36,31.63 93.43,37.78 94.41,44.69C95.39,51.6 94.26,59.22 92.13,64.02C92.1,64.09 92.13,64.17 92.2,64.2C92.27,64.23 92.35,64.2 92.39,64.13C94.55,59.28 95.67,51.6 94.69,44.65C93.71,37.7 90.61,31.41 84.25,29.44C78.47,27.64 73.77,29.46 70.75,32.76C67.74,36.06 66.4,40.84 67.3,44.97C67.73,46.95 68.41,48.23 69.24,49.06C70.07,49.9 71.04,50.29 72.02,50.51C72.51,50.62 73.01,50.68 73.5,50.75C73.57,50.75 73.64,50.76 73.71,50.77C74.12,50.82 74.53,50.87 74.92,50.94C75.83,51.11 76.65,51.39 77.29,52.03C77.87,52.61 78.15,53.52 78.16,54.49C78.17,55.47 77.91,56.49 77.44,57.28C76.97,58.08 76.29,58.63 75.46,58.71C74.64,58.79 73.62,58.4 72.46,57.2C72.41,57.15 72.32,57.15 72.26,57.2C72.21,57.25 72.2,57.34 72.26,57.4C73.45,58.63 74.55,59.08 75.49,58.99C76.43,58.9 77.18,58.27 77.68,57.43C78.19,56.58 78.46,55.51 78.44,54.49C78.43,53.47 78.14,52.48 77.49,51.83C76.79,51.13 75.91,50.84 74.97,50.67C74.57,50.59 74.16,50.54 73.74,50.49C73.67,50.48 73.6,50.47 73.53,50.46C73.05,50.4 72.56,50.34 72.08,50.23C71.13,50.02 70.22,49.65 69.44,48.87C68.66,48.08 68,46.86 67.58,44.91C66.7,40.87 68.01,36.19 70.96,32.96Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M74.66,44.44C73.27,45.39 72.11,47.19 71.47,49.96C71.46,50.04 71.5,50.11 71.58,50.13C71.66,50.15 71.73,50.1 71.75,50.02C72.37,47.29 73.51,45.57 74.82,44.68C76.13,43.79 77.63,43.71 79.03,44.3C81.82,45.48 84.21,49.38 83.6,54.86C83.4,56.56 82.67,57.58 81.97,58.42C81.9,58.51 81.83,58.59 81.76,58.67C81.14,59.41 80.57,60.1 80.57,61.09C80.57,61.21 80.62,61.32 80.7,61.43C80.77,61.53 80.88,61.65 81,61.77C81.13,61.89 81.27,62.02 81.43,62.17L81.44,62.17C81.6,62.32 81.78,62.48 81.96,62.65C82.71,63.36 83.62,64.34 84.25,65.74C84.55,66.4 84.42,67.45 83.96,68.46C83.49,69.47 82.7,70.41 81.74,70.86C80.79,71.3 79.66,71.27 78.45,70.32C77.23,69.36 75.94,67.46 74.71,64.15C74.69,64.07 74.61,64.04 74.53,64.06C74.46,64.09 74.42,64.17 74.45,64.25C75.68,67.57 76.99,69.53 78.27,70.54C79.56,71.56 80.81,71.6 81.86,71.11C82.9,70.63 83.73,69.63 84.21,68.58C84.69,67.53 84.86,66.39 84.51,65.63C83.86,64.18 82.92,63.17 82.16,62.45C81.97,62.27 81.79,62.11 81.63,61.96L81.62,61.96C81.46,61.81 81.32,61.68 81.2,61.56C81.08,61.45 80.99,61.35 80.93,61.26C80.87,61.18 80.85,61.12 80.85,61.09C80.85,60.2 81.35,59.6 81.99,58.84C82.05,58.76 82.12,58.69 82.18,58.6C82.9,57.74 83.68,56.68 83.88,54.89C84.5,49.33 82.08,45.29 79.14,44.04C77.66,43.41 76.06,43.49 74.66,44.44Z"/> + + <path android:fillColor="#D898FA" android:pathData="M63.18,74.94L63.62,76.88L70.34,96.04L51.86,108.67L23.05,89.16L27.26,79.04L58.45,68.17L63.18,74.94Z"/> + + <path android:fillColor="#ffffff" android:pathData="M27.27,80.09C47.15,81.57 57.64,73.32 60.39,69.01L53.37,63.05L33.93,69.24L27.27,80.09Z"/> + + <path android:fillColor="#ffffff" android:pathData="M57.31,95.39C58.88,94.84 63.78,89.37 66.04,86.7L68.09,93.95L60.83,103L42.92,99.83C47.06,98.58 55.73,95.94 57.31,95.39Z"/> + + <path android:fillColor="#8C3EB2" android:fillType="evenOdd" android:pathData="M22.96,89.15C23.89,83.54 25.28,72.35 25.27,69.69C25.26,66.31 30.23,60.72 37.4,62.07C41.88,62.92 44.65,61.26 47.2,59.75C48.73,58.83 50.17,57.97 51.86,57.73C55.74,57.19 64.52,58.88 63.59,76.2C63.77,76.35 63.9,76.65 64.19,77.33C64.8,78.79 66.13,81.96 70.24,89.06C78.29,102.96 70.79,108.38 57.8,112.21C44.81,116.04 31.76,100.93 30.36,98.29C29.01,95.71 24.96,91.31 23,89.32C22.99,89.31 22.98,89.3 22.98,89.28C22.96,89.24 22.96,89.19 22.96,89.15ZM23.24,89.17C24.88,87.75 26.63,85.76 28.47,83.18C29.08,82.33 29.63,81.03 30.24,79.58C31.54,76.5 33.13,72.75 36.09,71.41C37.47,70.79 38.88,71.08 40.34,71.38C42.56,71.84 44.89,72.32 47.36,69.7C51.47,65.35 55.73,66.43 56.92,68.47C57.77,69.95 61.38,74.16 63.38,76.22C62.69,77.2 62.22,82.56 65.85,90.59C70.58,101.09 47.2,103.75 39.32,97.04C36.53,94.65 26.77,89.67 23.24,89.17Z"/> + + <path android:fillColor="#D898FA" android:fillType="evenOdd" android:pathData="M28.73,64.22C30.84,62.59 33.84,61.54 37.38,62.21C41.9,63.07 44.72,61.39 47.26,59.87L47.27,59.87C48.8,58.95 50.23,58.11 51.88,57.87C53.79,57.61 56.9,57.89 59.43,60.37C61.95,62.84 63.9,67.52 63.46,76.1C62.46,75.07 61.08,73.52 59.83,72.04C58.57,70.54 57.46,69.13 57.04,68.4C55.79,66.25 51.41,65.21 47.26,69.6C46.04,70.89 44.87,71.41 43.74,71.56C42.59,71.7 41.48,71.47 40.37,71.24L40.35,71.24C38.9,70.94 37.45,70.64 36.04,71.28C34.52,71.97 33.36,73.27 32.42,74.77C31.49,76.27 30.76,77.98 30.11,79.52L30.11,79.53C29.49,80.98 28.95,82.27 28.36,83.1C26.52,85.67 24.78,87.66 23.15,89.06C23.13,89.07 23.12,89.08 23.12,89.1C23.58,86.29 24.15,82.13 24.61,78.33C25.07,74.5 25.42,71.03 25.41,69.69C25.41,68.06 26.61,65.85 28.73,64.22ZM23.1,89.19C23.1,89.2 23.1,89.2 23.1,89.21C23.11,89.22 23.11,89.23 23.12,89.25C23.12,89.24 23.11,89.23 23.1,89.23C23.1,89.22 23.1,89.21 23.1,89.19ZM23.16,89.28C23.18,89.29 23.2,89.3 23.22,89.31C24.09,89.43 25.35,89.83 26.8,90.4C28.25,90.98 29.88,91.72 31.5,92.52C34.73,94.13 37.85,95.96 39.23,97.14C41.23,98.85 44.19,99.95 47.43,100.48C50.68,101.01 54.2,100.98 57.34,100.41C60.47,99.84 63.23,98.72 64.91,97.07C65.75,96.25 66.32,95.28 66.53,94.19C66.74,93.09 66.58,91.87 65.97,90.54C64.17,86.53 63.38,83.2 63.14,80.75C63.01,79.52 63.02,78.52 63.11,77.76C63.19,77 63.34,76.52 63.49,76.3C63.5,76.3 63.5,76.3 63.5,76.3C63.5,76.3 63.5,76.3 63.5,76.3C63.57,76.36 63.64,76.46 63.72,76.63C63.81,76.81 63.91,77.05 64.06,77.39C64.67,78.85 66.01,82.02 70.12,89.13C74.13,96.06 74.24,100.83 71.79,104.33C69.33,107.86 64.26,110.16 57.76,112.07C51.33,113.97 44.86,111.18 39.82,107.56C37.29,105.75 35.13,103.74 33.52,102.02C31.9,100.3 30.83,98.87 30.49,98.22C29.8,96.92 28.44,95.17 27.02,93.49C25.61,91.85 24.14,90.28 23.16,89.28ZM28.56,63.99C26.4,65.66 25.12,67.94 25.13,69.69C25.14,71.01 24.79,74.46 24.33,78.3C23.87,82.13 23.29,86.33 22.82,89.13C22.81,89.19 22.82,89.27 22.84,89.34C22.86,89.37 22.87,89.4 22.9,89.42C23.88,90.41 25.38,92.01 26.8,93.68C28.23,95.35 29.57,97.08 30.24,98.36C30.6,99.03 31.68,100.49 33.31,102.21C34.94,103.95 37.11,105.97 39.65,107.79C44.72,111.43 51.28,114.28 57.84,112.34C64.33,110.43 69.5,108.11 72.02,104.49C74.56,100.86 74.4,95.96 70.36,88.99C66.26,81.9 64.93,78.73 64.32,77.28L64.32,77.27C64.17,76.94 64.07,76.69 63.98,76.5C63.9,76.35 63.83,76.23 63.74,76.14C64.19,67.5 62.23,62.72 59.63,60.17C57.02,57.61 53.81,57.32 51.84,57.59C50.13,57.83 48.66,58.71 47.14,59.62L47.12,59.63C44.58,61.14 41.85,62.77 37.43,61.93C33.8,61.25 30.72,62.32 28.56,63.99ZM36.15,71.54C37.48,70.94 38.84,71.22 40.31,71.52L40.32,71.52C41.42,71.75 42.58,71.99 43.77,71.84C44.98,71.68 46.21,71.13 47.46,69.8C51.54,65.48 55.67,66.62 56.79,68.54C57.23,69.29 58.35,70.73 59.61,72.22C60.84,73.68 62.21,75.21 63.2,76.24C63.04,76.54 62.9,77.05 62.82,77.73C62.74,78.51 62.73,79.53 62.85,80.77C63.1,83.26 63.9,86.62 65.72,90.65C66.3,91.94 66.45,93.1 66.25,94.13C66.06,95.16 65.52,96.08 64.71,96.87C63.09,98.47 60.4,99.56 57.29,100.13C54.19,100.7 50.69,100.73 47.48,100.2C44.27,99.67 41.36,98.58 39.41,96.93C38,95.73 34.85,93.88 31.62,92.27C30,91.46 28.36,90.72 26.9,90.14C25.6,89.63 24.43,89.24 23.56,89.08C25.14,87.67 26.82,85.73 28.59,83.26C29.2,82.4 29.76,81.09 30.36,79.65L30.37,79.64C31.02,78.09 31.74,76.4 32.66,74.92C33.59,73.44 34.71,72.19 36.15,71.54Z"/> + + <path android:fillColor="#ffffff" android:pathData="M128.88,24.35C119.46,24.35 110.89,32.44 107.28,37.1C106.97,37.49 107.07,38.05 107.47,38.33C112.04,41.53 119.8,46.43 128.88,46.43C137.97,46.43 144.99,41.51 149.13,38.31C149.49,38.03 149.58,37.52 149.32,37.15C146.16,32.49 138.33,24.35 128.88,24.35Z"/> + + <path android:fillColor="#D898FA" android:fillType="evenOdd" android:pathData="M115.98,29.09C112.22,31.69 109.19,34.87 107.39,37.19C107.13,37.51 107.21,37.98 107.55,38.22C112.12,41.41 119.85,46.29 128.88,46.29C137.92,46.29 144.91,41.39 149.04,38.2C149.35,37.96 149.42,37.54 149.2,37.23C147.63,34.91 144.89,31.72 141.37,29.12C137.85,26.51 133.56,24.49 128.88,24.49C124.21,24.49 119.74,26.5 115.98,29.09ZM115.82,28.86C119.6,26.25 124.13,24.21 128.88,24.21C133.64,24.21 137.99,26.26 141.54,28.89C145.09,31.52 147.85,34.73 149.44,37.07C149.74,37.51 149.63,38.1 149.21,38.42C145.08,41.62 138.02,46.57 128.88,46.57C119.75,46.57 111.96,41.65 107.39,38.45C106.92,38.12 106.81,37.47 107.16,37.01C108.98,34.67 112.04,31.48 115.82,28.86Z"/> + + <path android:fillColor="#D898FA" android:pathData="M128.17,41.65C134.28,41.65 139.24,36.71 139.24,30.61C139.24,29.42 139.05,28.27 138.7,27.19C135.76,25.5 132.43,24.35 128.88,24.35C124.78,24.35 120.85,25.88 117.42,27.99C117.21,28.83 117.1,29.71 117.1,30.61C117.1,36.71 122.06,41.65 128.17,41.65Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M128.8,10.35C128.88,10.35 128.94,10.41 128.94,10.49V21.45C128.94,21.53 128.88,21.59 128.8,21.59C128.72,21.59 128.66,21.53 128.66,21.45V10.49C128.66,10.41 128.72,10.35 128.8,10.35Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M101.93,22.96C101.98,22.9 102.07,22.9 102.13,22.96L109.9,30.71C109.96,30.76 109.96,30.85 109.9,30.91C109.84,30.96 109.75,30.96 109.7,30.91L101.93,23.16C101.87,23.1 101.87,23.01 101.93,22.96Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M155.43,22.96C155.38,22.9 155.29,22.9 155.23,22.96L147.46,30.71C147.41,30.76 147.41,30.85 147.46,30.91C147.52,30.96 147.61,30.96 147.66,30.91L155.43,23.16C155.49,23.1 155.49,23.01 155.43,22.96Z"/> + + <path android:fillColor="#D898FA" android:pathData="M124.8,105.07C124.8,116.65 115.39,126.04 103.78,126.04C92.17,126.04 82.76,116.65 82.76,105.07C82.76,93.5 92.17,84.11 103.78,84.11C115.39,84.11 124.8,93.5 124.8,105.07Z"/> + + <path android:fillColor="#D898FA" android:fillType="evenOdd" android:pathData="M125.08,105.07C125.08,116.81 115.54,126.32 103.78,126.32C92.01,126.32 82.47,116.81 82.47,105.07C82.47,93.34 92.01,83.83 103.78,83.83C115.54,83.83 125.08,93.34 125.08,105.07ZM103.78,126.04C115.39,126.04 124.8,116.65 124.8,105.07C124.8,93.5 115.39,84.11 103.78,84.11C92.17,84.11 82.76,93.5 82.76,105.07C82.76,116.65 92.17,126.04 103.78,126.04Z"/> + + <group> + + <clip-path android:pathData="M124.8,105.07C124.8,116.65 115.39,126.04 103.78,126.04C92.17,126.04 82.76,116.65 82.76,105.07C82.76,93.5 92.17,84.11 103.78,84.11C115.39,84.11 124.8,93.5 124.8,105.07Z"/> + + <path android:fillColor="#D898FA" android:pathData="M129.47,105.18C129.47,119.38 117.92,130.9 103.68,130.9C89.43,130.9 77.88,119.38 77.88,105.18C77.88,90.97 89.43,79.45 103.68,79.45C117.92,79.45 129.47,90.97 129.47,105.18Z"/> + + <path android:fillColor="#D898FA" android:pathData="M129.47,105.18C129.47,119.38 117.92,130.9 103.68,130.9C89.43,130.9 77.88,119.38 77.88,105.18C77.88,90.97 89.43,79.45 103.68,79.45C117.92,79.45 129.47,90.97 129.47,105.18Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M110.19,97.89C115.28,97.89 118.43,96.06 119.93,94.6C120.38,94.17 121.15,94.14 121.53,94.63L126.5,100.9C126.96,101.49 126.55,102.38 125.81,102.48C123.18,102.83 119.39,103.93 117.09,106.61C113.44,110.86 107.65,105.32 103.49,105.32C99.33,105.32 98.72,109.44 95.27,112.89C91.82,116.34 88.17,107.62 86.14,104.31C84.11,101 91.82,102.35 96.59,102.35C101.36,102.35 98.72,100.18 93.85,99.58C88.98,98.97 87.36,96.4 90.1,95.25C92.84,94.1 102.27,97.89 110.19,97.89Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M98.6,119.96C97.13,119.96 94.67,121.51 92.97,122.78C92.43,123.18 92.56,124.01 93.19,124.26L104.1,128.55C104.29,128.63 104.49,128.64 104.69,128.58L119.02,124.14C119.66,123.95 119.85,123.15 119.33,122.72C117.81,121.46 115.48,119.96 113.53,119.96C110.38,119.96 107.13,121.68 104.39,121.68C101.65,121.68 100.94,119.96 98.6,119.96Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M109.48,111.76C111.43,113.29 109.84,116.6 108.21,117.45C108.1,117.51 107.97,117.53 107.84,117.51C106.72,117.29 103.68,115.55 101.99,114.74C99.73,113.65 103.16,113.93 104.52,113.2C105.87,112.48 106.95,109.78 109.48,111.76Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M103.58,89.78C99.95,90.75 94.7,89.85 91.21,88.94C90.42,88.73 90.37,87.67 91.13,87.36L103.3,82.3C103.48,82.23 103.68,82.21 103.86,82.26C109.28,83.66 118.99,86.23 116.68,85.83C113.73,85.33 109.26,88.26 103.58,89.78Z"/> + + </group> + + <path android:fillColor="#D898FA" android:pathData="M103.78,66.64C103.78,59.47 109.59,53.66 116.76,53.66H154.62C161.79,53.66 167.6,59.47 167.6,66.64C167.6,73.81 161.79,79.62 154.62,79.62H116.76C109.59,79.62 103.78,73.81 103.78,66.64Z"/> + + <path android:fillColor="#ffffff" android:pathData="M132.3,72.66L132.79,70.46C133.74,70.46 134.61,70.45 135.41,70.44C136.21,70.41 136.9,70.38 137.5,70.34C138.11,70.31 138.62,70.25 139.02,70.18C139.43,70.09 139.71,69.98 139.86,69.84C140.11,69.64 140.28,69.33 140.38,68.9C140.48,68.47 140.53,67.84 140.53,67.03C140.53,66.6 140.5,66.2 140.44,65.85C140.38,65.5 140.28,65.21 140.14,64.96C140.02,64.69 139.87,64.5 139.69,64.38C139.52,64.24 139.32,64.17 139.09,64.17C138.87,64.17 138.66,64.25 138.46,64.41C138.26,64.58 138.1,64.79 137.97,65.07C137.86,65.33 137.8,65.61 137.8,65.91C137.8,66.11 137.85,66.28 137.93,66.43C138.03,66.58 138.19,66.7 138.4,66.79C138.61,66.86 138.88,66.9 139.21,66.9C139.52,66.9 139.84,66.86 140.16,66.79C140.5,66.71 140.8,66.61 141.06,66.49L141.13,68.38C140.93,68.52 140.7,68.64 140.44,68.74C140.19,68.83 139.92,68.91 139.64,68.96C139.35,69.01 139.06,69.03 138.77,69.03C138.11,69.03 137.55,68.95 137.09,68.77C136.63,68.6 136.27,68.32 136.01,67.93C135.76,67.53 135.63,67.01 135.63,66.38C135.63,65.85 135.72,65.34 135.89,64.82C136.07,64.3 136.32,63.83 136.64,63.4C136.97,62.97 137.35,62.62 137.78,62.37C138.22,62.11 138.71,61.98 139.24,61.98C140.03,61.98 140.68,62.22 141.19,62.69C141.7,63.15 142.08,63.78 142.33,64.56C142.58,65.35 142.7,66.2 142.7,67.13C142.7,67.72 142.65,68.3 142.55,68.85C142.47,69.4 142.34,69.88 142.16,70.31C141.99,70.73 141.77,71.08 141.51,71.35C141.27,71.62 140.88,71.83 140.33,72.01C139.79,72.18 139.12,72.32 138.33,72.4C137.53,72.5 136.62,72.57 135.59,72.61C134.58,72.65 133.49,72.66 132.3,72.66ZM132.3,72.66C131.04,72.66 129.96,72.57 129.07,72.38C128.18,72.21 127.45,71.95 126.88,71.6C126.3,71.25 125.88,70.82 125.6,70.33C125.33,69.83 125.19,69.25 125.19,68.6C125.19,68.24 125.22,67.87 125.29,67.5C125.35,67.11 125.43,66.74 125.53,66.38C125.63,66 125.72,65.66 125.81,65.35L127.79,65.84C127.74,66.05 127.69,66.28 127.62,66.55C127.56,66.8 127.51,67.05 127.46,67.29C127.42,67.54 127.4,67.77 127.4,67.99C127.4,68.51 127.56,68.96 127.89,69.33C128.22,69.71 128.78,69.99 129.57,70.18C130.36,70.36 131.43,70.46 132.79,70.46L133.16,72.07L132.3,72.66ZM139.07,60.17C138.74,60.17 138.45,60.05 138.21,59.83C137.98,59.59 137.86,59.31 137.86,58.97C137.86,58.63 137.98,58.35 138.21,58.11C138.45,57.86 138.74,57.73 139.07,57.73C139.4,57.73 139.68,57.86 139.92,58.11C140.15,58.35 140.27,58.63 140.27,58.97C140.27,59.31 140.15,59.59 139.92,59.83C139.68,60.05 139.4,60.17 139.07,60.17Z"/> + + <path android:fillColor="#8C3EB2" android:pathData="M79.14,15.69C58.83,15.05 51.84,33.31 56.62,49.77C56.72,50.13 56.6,50.53 56.29,50.74C44.7,59.06 34.75,47.74 30.77,40.07C25.12,29.2 25.33,11.83 37.62,5.05C53.1,-3.49 74.77,3.56 79.99,14.51C80.26,15.09 79.78,15.71 79.14,15.69Z"/> + + <path android:fillColor="#D898FA" android:fillType="evenOdd" android:pathData="M62.69,2.34C70.72,4.41 77.48,8.92 80.12,14.45C80.44,15.14 79.86,15.86 79.14,15.84C69.03,15.51 62.25,19.89 58.59,26.39C54.93,32.89 54.37,41.53 56.76,49.73C56.88,50.15 56.73,50.61 56.37,50.86C53.45,52.95 50.63,53.82 47.97,53.81C45.31,53.79 42.83,52.91 40.6,51.52C36.14,48.76 32.64,43.99 30.64,40.14C27.8,34.67 26.44,27.58 27.33,21.01C28.21,14.43 31.36,8.35 37.55,4.93C45.33,0.64 54.66,0.27 62.69,2.34ZM62.62,2.61C54.64,0.55 45.39,0.93 37.69,5.18C31.59,8.54 28.49,14.53 27.61,21.04C26.73,27.56 28.08,34.59 30.89,40.01C32.88,43.83 36.35,48.55 40.75,51.28C42.95,52.65 45.38,53.51 47.97,53.52C50.56,53.53 53.33,52.69 56.21,50.63C56.46,50.45 56.57,50.12 56.48,49.81C54.09,41.55 54.64,32.83 58.35,26.25C62.06,19.66 68.94,15.23 79.14,15.55C79.7,15.57 80.08,15.04 79.86,14.57C77.28,9.15 70.6,4.67 62.62,2.61Z"/> + + <path android:fillColor="#ffffff" android:pathData="M49.09,24.47C49.08,24.68 49.1,24.87 49.15,25.06C49.19,25.22 49.25,25.35 49.32,25.45C49.39,25.54 49.46,25.61 49.52,25.67C49.59,25.72 49.64,25.75 49.66,25.78C49.84,25.88 49.95,26.01 49.99,26.15C49.99,26.18 50,26.25 50,26.38C49.99,26.59 49.9,26.77 49.72,26.91C49.56,27.03 49.27,27.14 48.87,27.25L43.76,28.59C43.46,28.67 43.21,28.69 43.01,28.63C42.83,28.57 42.72,28.46 42.67,28.28C42.65,28.2 42.65,28.1 42.66,27.99C42.67,27.86 42.71,27.76 42.77,27.68C42.83,27.59 42.93,27.48 43.05,27.35C43.25,27.16 43.39,26.97 43.5,26.78C43.6,26.58 43.65,26.29 43.66,25.9L43.74,23.9L40.38,24.79L40.12,26.17C40.01,26.76 40,27.21 40.08,27.52C40.12,27.69 40.19,27.82 40.27,27.92C40.36,28.01 40.47,28.09 40.62,28.18C40.75,28.27 40.84,28.35 40.89,28.43C40.95,28.49 40.99,28.59 40.99,28.73C40.99,28.96 40.91,29.14 40.74,29.27C40.59,29.39 40.32,29.5 39.93,29.6L36.72,30.45C36.39,30.53 36.12,30.54 35.92,30.47C35.72,30.39 35.59,30.25 35.53,30.05C35.47,29.82 35.51,29.61 35.65,29.44C35.77,29.25 35.98,29.04 36.27,28.79C36.64,28.47 36.93,28.17 37.14,27.9C37.34,27.61 37.49,27.26 37.57,26.84L39.33,17.88C39.6,16.49 40.06,15.41 40.71,14.66C41.36,13.89 42.35,13.33 43.65,12.98C45.12,12.6 46.33,12.6 47.29,12.99C48.25,13.37 48.87,14.09 49.14,15.16C49.26,15.6 49.31,16.08 49.29,16.59L49.09,24.47ZM43.82,21.58L43.97,17.48C43.99,17.3 43.97,17.11 43.92,16.92C43.85,16.65 43.72,16.47 43.53,16.38C43.34,16.28 43.12,16.26 42.84,16.33C42.5,16.42 42.23,16.6 42.04,16.86C41.85,17.13 41.7,17.55 41.59,18.13L40.81,22.37L43.82,21.58Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M143.43,111.19V84.11H143.71V111.19H143.43Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M154.83,97.91L132.31,97.85L132.31,97.57L154.83,97.63L154.83,97.91Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M148.13,102.46L138.72,93.07L138.92,92.87L148.34,102.26L148.13,102.46Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M138.92,102.46L148.34,93.07L148.13,92.87L138.72,102.26L138.92,102.46Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M11.29,78V50.92H11.57V78H11.29Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M22.69,64.72L0.17,64.66L0.17,64.38L22.7,64.44L22.69,64.72Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M16,69.27L6.58,59.88L6.78,59.68L16.2,69.07L16,69.27Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M6.78,69.27L16.2,59.88L16,59.68L6.58,69.07L6.78,69.27Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M14.06,45.68C15.1,45.68 15.94,44.78 15.94,43.68C15.94,42.58 15.1,41.69 14.06,41.69C13.02,41.69 12.18,42.58 12.18,43.68C12.18,44.78 13.02,45.68 14.06,45.68ZM14.06,45.4C14.93,45.4 15.65,44.65 15.65,43.68C15.65,42.72 14.93,41.97 14.06,41.97C13.2,41.97 12.47,42.72 12.47,43.68C12.47,44.65 13.2,45.4 14.06,45.4Z"/> + + <path android:fillColor="#ffffff" android:pathData="M3.93,50.92C3.93,52.02 3.08,52.92 2.05,52.92C1.01,52.92 0.17,52.02 0.17,50.92C0.17,49.82 1.01,48.92 2.05,48.92C3.08,48.92 3.93,49.82 3.93,50.92Z"/> + + <path android:fillColor="#ffffff" android:pathData="M154.21,108.07C155.24,108.07 156.08,107.18 156.08,106.07C156.08,104.97 155.24,104.08 154.21,104.08C153.17,104.08 152.33,104.97 152.33,106.07C152.33,107.18 153.17,108.07 154.21,108.07Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M151.83,118.55C151.83,120.07 150.6,121.29 149.08,121.29C147.56,121.29 146.32,120.07 146.32,118.55C146.32,117.03 147.56,115.81 149.08,115.81C150.6,115.81 151.83,117.03 151.83,118.55ZM151.55,118.55C151.55,119.91 150.44,121.01 149.08,121.01C147.71,121.01 146.61,119.91 146.61,118.55C146.61,117.19 147.71,116.09 149.08,116.09C150.44,116.09 151.55,117.19 151.55,118.55Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M22.61,54.66V43.68H22.9V54.66H22.61Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M27.2,49.32L18.19,49.29L18.19,49.01L27.2,49.03L27.2,49.32Z"/> + + </group> + +</vector> ===================================== fenix/app/src/main/res/drawable/illo_red_search.xml ===================================== @@ -0,0 +1,77 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="144dp" android:viewportHeight="144" android:viewportWidth="199" android:width="199dp"> + + <group> + + <clip-path android:pathData="M8.97,0L190.46,0A8,8 0,0 1,198.46 8L198.46,136A8,8 0,0 1,190.46 144L8.97,144A8,8 0,0 1,0.97 136L0.97,8A8,8 0,0 1,8.97 0z"/> + + <path android:fillColor="#1D1133" android:pathData="M8.97,0L190.46,0A8,8 0,0 1,198.46 8L198.46,136A8,8 0,0 1,190.46 144L8.97,144A8,8 0,0 1,0.97 136L0.97,8A8,8 0,0 1,8.97 0z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M153.93,33.4V22.78H154.22V33.4H153.93Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M158.43,28.24L149.6,28.22L149.6,27.92L158.43,27.94L158.43,28.24Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M40.59,125.46V101.47H40.89V125.46H40.59Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M50.67,113.72L30.8,113.67L30.8,113.37L50.68,113.42L50.67,113.72Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M44.75,117.74L36.44,109.42L36.65,109.21L44.96,117.53L44.75,117.74Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M36.65,117.74L44.96,109.42L44.75,109.21L36.44,117.53L36.65,117.74Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M143.94,17.65C145.08,17.65 146,16.72 146,15.59C146,14.45 145.08,13.53 143.94,13.53C142.81,13.53 141.89,14.45 141.89,15.59C141.89,16.72 142.81,17.65 143.94,17.65ZM143.94,17.35C144.91,17.35 145.7,16.56 145.7,15.59C145.7,14.61 144.91,13.82 143.94,13.82C142.97,13.82 142.18,14.61 142.18,15.59C142.18,16.56 142.97,17.35 143.94,17.35Z"/> + + <path android:fillColor="#ffffff" android:pathData="M49.91,96.62C49.91,97.36 49.31,97.95 48.58,97.95C47.85,97.95 47.26,97.36 47.26,96.62C47.26,95.89 47.85,95.3 48.58,95.3C49.31,95.3 49.91,95.89 49.91,96.62Z"/> + + <path android:fillColor="#FF6A75" android:pathData="M57.46,51.13C57.46,26.69 77.27,6.88 101.7,6.88C126.14,6.88 145.95,26.69 145.95,51.13V134.61C145.95,135.63 145.12,136.46 144.1,136.46H59.31C58.28,136.46 57.46,135.63 57.46,134.61V51.13Z"/> + + <path android:fillColor="#FF6A75" android:fillType="evenOdd" android:pathData="M146.24,51.13V134.61C146.24,135.79 145.28,136.75 144.1,136.75H59.31C58.12,136.75 57.17,135.79 57.17,134.61V51.13C57.17,26.53 77.11,6.59 101.7,6.59C126.3,6.59 146.24,26.53 146.24,51.13ZM101.7,6.88C77.27,6.88 57.46,26.69 57.46,51.13V134.61C57.46,135.63 58.28,136.46 59.31,136.46H144.1C145.12,136.46 145.95,135.63 145.95,134.61V51.13C145.95,26.69 126.14,6.88 101.7,6.88Z"/> + + <group> + + <clip-path android:pathData="M73.89,38.09h56.95v56.95h-56.95z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M102.37,84.36C108.27,84.36 113.05,79.58 113.05,73.69C113.05,67.79 108.27,63.01 102.37,63.01C96.47,63.01 91.69,67.79 91.69,73.69C91.69,79.58 96.47,84.36 102.37,84.36ZM102.37,87.92C110.23,87.92 116.61,81.55 116.61,73.69C116.61,65.82 110.23,59.45 102.37,59.45C94.5,59.45 88.13,65.82 88.13,73.69C88.13,81.55 94.5,87.92 102.37,87.92Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M102.37,77.24C104.33,77.24 105.93,75.65 105.93,73.69C105.93,71.72 104.33,70.13 102.37,70.13C100.4,70.13 98.81,71.72 98.81,73.69C98.81,75.65 100.4,77.24 102.37,77.24ZM102.37,80.8C106.3,80.8 109.49,77.62 109.49,73.69C109.49,69.75 106.3,66.57 102.37,66.57C98.44,66.57 95.25,69.75 95.25,73.69C95.25,77.62 98.44,80.8 102.37,80.8Z"/> + + <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M116.61,57.77C120.98,61.68 123.73,67.36 123.73,73.69C123.73,85.48 114.16,95.04 102.37,95.04C90.57,95.04 81.01,85.48 81.01,73.69C81.01,67.36 83.76,61.68 88.13,57.77V52.33C88.13,44.46 94.5,38.09 102.37,38.09C110.23,38.09 116.61,44.46 116.61,52.33V57.77ZM92.58,54.7C95.51,53.18 98.84,52.33 102.37,52.33C105.9,52.33 109.22,53.18 112.16,54.7V52.33C112.16,46.92 107.78,42.54 102.37,42.54C96.96,42.54 92.58,46.92 92.58,52.33V54.7ZM120.17,73.69C120.17,83.51 112.2,91.48 102.37,91.48C92.54,91.48 84.57,83.51 84.57,73.69C84.57,63.86 92.54,55.89 102.37,55.89C112.2,55.89 120.17,63.86 120.17,73.69Z"/> + + </group> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M115.47,34.1V15.2H115.76V34.1H115.47Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M123.54,24.88L107.69,24.84L107.69,24.55L123.54,24.59L123.54,24.88Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M118.79,28.04L112.17,21.49L112.37,21.28L119,27.84L118.79,28.04Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M112.37,28.04L119,21.49L118.79,21.28L112.17,27.84L112.37,28.04Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M137.74,78.54V65.77H138.03V78.54H137.74Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M143.19,72.3L132.44,72.28L132.44,71.99L143.19,72.01L143.19,72.3Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M66.64,91.05V82.53H66.93V91.05H66.64Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M70.23,86.94L63.24,86.92L63.25,86.63L70.23,86.65L70.23,86.94Z"/> + + <path android:fillColor="#212529" android:pathData="M95.76,27.98C95.76,28.85 95.05,29.56 94.16,29.56C93.28,29.56 92.56,28.85 92.56,27.98C92.56,27.11 93.28,26.4 94.16,26.4C95.05,26.4 95.76,27.11 95.76,27.98ZM141.16,53.26C141.16,54.13 140.45,54.84 139.56,54.84C138.68,54.84 137.96,54.13 137.96,53.26C137.96,52.39 138.68,51.68 139.56,51.68C140.45,51.68 141.16,52.39 141.16,53.26ZM75.77,95.18C75.77,96.05 75.06,96.76 74.17,96.76C73.29,96.76 72.58,96.05 72.58,95.18C72.58,94.3 73.29,93.59 74.17,93.59C75.06,93.59 75.77,94.3 75.77,95.18Z" android:strokeColor="#212529" android:strokeWidth="0.563343"/> + + <path android:fillColor="#212529" android:pathData="M57.19,118.34H146.21V134.92C146.21,135.95 145.39,136.77 144.36,136.77H59.04C58.02,136.77 57.19,135.95 57.19,134.92V118.34Z"/> + + <path android:fillColor="#FF6A75" android:fillType="evenOdd" android:pathData="M145.93,118.63H57.48V134.92C57.48,135.79 58.18,136.49 59.04,136.49H144.36C145.23,136.49 145.93,135.79 145.93,134.92V118.63ZM57.19,118.34V134.92C57.19,135.95 58.02,136.77 59.04,136.77H144.36C145.39,136.77 146.21,135.95 146.21,134.92V118.34H57.19Z"/> + + <path android:fillColor="#212529" android:pathData="M73.66,101.33C73.66,100.82 74.07,100.41 74.58,100.41H146.21V118.54H73.66V101.33Z"/> + + <path android:fillColor="#FF6A75" android:fillType="evenOdd" android:pathData="M145.93,100.7H74.58C74.23,100.7 73.95,100.98 73.95,101.33V118.25H145.93V100.7ZM74.58,100.41C74.07,100.41 73.66,100.82 73.66,101.33V118.54H146.21V100.41H74.58Z"/> + + <path android:fillColor="#212529" android:pathData="M89.42,83.57C89.42,83.06 89.83,82.65 90.35,82.65H146.21V100.66H89.42V83.57Z"/> + + <path android:fillColor="#FF6A75" android:fillType="evenOdd" android:pathData="M145.93,82.94H90.35C89.99,82.94 89.71,83.22 89.71,83.57V100.37H145.93V82.94ZM90.35,82.65C89.83,82.65 89.42,83.06 89.42,83.57V100.66H146.21V82.65H90.35Z"/> + + <path android:fillColor="#FF6A75" android:pathData="M129.31,83.04H146.21V134.37C146.21,135.72 145.42,136.77 144.1,136.51H95.5V118.33H112.4V100.42H129.31V83.04Z"/> + + <path android:fillColor="#212529" android:fillType="evenOdd" android:pathData="M90.6,82.93L146.23,82.8L146.23,83.09L90.6,83.22L90.6,82.93Z"/> + + </group> + +</vector> ===================================== fenix/app/src/main/res/font/spacegrotesk_bold.ttf ===================================== Binary files /dev/null and b/fenix/app/src/main/res/font/spacegrotesk_bold.ttf differ ===================================== fenix/app/src/main/res/layout/fragment_home.xml ===================================== @@ -53,7 +53,7 @@ android:layout_width="wrap_content" android:layout_height="40dp" android:layout_marginStart="16dp" - android:layout_marginTop="18dp" + android:layout_marginTop="8dp" android:layout_marginBottom="32dp" android:clickable="false" android:focusable="false" @@ -128,6 +128,13 @@ </com.google.android.material.appbar.AppBarLayout> + <androidx.compose.ui.platform.ComposeView + android:id="@+id/composeYec2024" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center"/> + + <androidx.recyclerview.widget.RecyclerView android:id="@+id/sessionControlRecyclerView" android:layout_width="match_parent" ===================================== fenix/app/src/main/res/values/colors.xml ===================================== @@ -348,4 +348,9 @@ <color name="configure_connection_button_white">#E1E0E7</color> <color name="warning_yellow">#FFA436</color> +  + <color name="YEC_2024_speak_purple">#D898FA</color> + <color name="YEC_2024_browse_green">#C1ED75</color> + <color name="YEC_2024_search_red">#FF6A75</color> + </resources> ===================================== fenix/app/src/main/res/values/preference_keys.xml ===================================== @@ -394,4 +394,5 @@ <string name="pref_key_tor_network_settings_bridges_enabled">pref_key_tor_network_settings_bridges_enabled</string> <string name="pref_key_spoof_english" translatable="false">pref_key_spoof_english</string> + <string name="pref_key_yec_style_index" translatable="false">pref_key_yec_style_index</string> </resources> ===================================== fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -145,4 +145,26 @@ <string name="connection_assist_final_error_troubleshoot_connection_link">troubleshooting your connection</string>  <string name="connection_assist_final_error_learn_more_link">Learn more</string> + +  + <string name="YEC_2024_right_to_speak">You have a right to SPEAK without uninvited listeners.</string> +  + <string name="YEC_2024_right_to_BROWSE">You have a right to BROWSE without being watched.</string> +  + <string name="YEC_2024_right_to_SEARCH">You have a right to SEARCH without being followed.</string> + +  + <string name="YEC_2024_donation_encouragement">Join the thousands of Tor supporters building an internet powered by privacy. Make a donation today.</string> + +  + <string name="YEC_2024_donation_match_text">Through December 31, your gift will be matched, up to $300,000!</string> + +  + <string name="YEC_2024_tor_browser_for_android_will_always_be_free_no_donation_required">%1$s for Android will always be free to use—no donation is required to use this app.</string> + +  + <string name="YEC_2024_close">Close</string> + +  + <string name="YEC_2024_donate_now">Donate now</string> </resources> ===================================== fenix/gradle/wrapper/gradle-wrapper.properties ===================================== @@ -1,11 +1,7 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - +#Thu Sep 26 12:58:11 MDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip -# this is the network timeout default value in ms. +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/e89… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/e89… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.16.0esr-13.5-1] fixup! Bug 43098: Year End Campaign 2024.
by morgan (＠morgan) 30 Sep '24

30 Sep '24

morgan pushed to branch tor-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: ebb9762e by Henry Wilkes at 2024-09-30T17:59:03+00:00 fixup! Bug 43098: Year End Campaign 2024. Bug 43149: Use special YEC 2024 donate url. - - - - - 1 changed file: - browser/components/abouttor/content/aboutTor.js Changes: ===================================== browser/components/abouttor/content/aboutTor.js ===================================== @@ -277,8 +277,9 @@ const YecWidget = { } const donateLink = document.getElementById("yec-2024-donate-link"); const base = "https://www.torproject.org/donate"; - // TODO: Updated link for YEC (using _locale?). - donateLink.href = base; + donateLink.href = this._locale + ? `${base}/donate-${this._locale}-yec2024` + : base; }, /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ebb9762… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ebb9762… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! Bug 43098: Year End Campaign 2024.
by morgan (＠morgan) 30 Sep '24

30 Sep '24

morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 94cc83ed by Henry Wilkes at 2024-09-30T16:33:54+01:00 fixup! Bug 43098: Year End Campaign 2024. Bug 43149: Use special YEC 2024 donate url. - - - - - 1 changed file: - browser/components/abouttor/content/aboutTor.js Changes: ===================================== browser/components/abouttor/content/aboutTor.js ===================================== @@ -286,8 +286,9 @@ const YecWidget = { } const donateLink = document.getElementById("yec-2024-donate-link"); const base = "https://www.torproject.org/donate"; - // TODO: Updated link for YEC (using _locale?). - donateLink.href = base; + donateLink.href = this._locale + ? `${base}/donate-${this._locale}-yec2024` + : base; }, /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/94cc83e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/94cc83e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.16.0esr-13.5-1] Bug 43098: Year End Campaign 2024.
by morgan (＠morgan) 30 Sep '24

30 Sep '24

morgan pushed to branch tor-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: ddfe2217 by Henry Wilkes at 2024-09-30T17:55:42+00:00 Bug 43098: Year End Campaign 2024. Implements YEC 2024 for about:tor. - - - - - 14 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/abouttor/AboutTorChild.sys.mjs - browser/components/abouttor/AboutTorParent.sys.mjs - browser/components/abouttor/content/aboutTor.css - browser/components/abouttor/content/aboutTor.html - browser/components/abouttor/content/aboutTor.js - + browser/components/abouttor/content/yec-2024-browse.svg - + browser/components/abouttor/content/yec-2024-fonts.css - + browser/components/abouttor/content/yec-2024-heart.svg - + browser/components/abouttor/content/yec-2024-search.svg - + browser/components/abouttor/content/yec-2024-speak.svg - browser/components/abouttor/jar.mn - toolkit/content/license.html - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -493,6 +493,7 @@ let JSWINDOWACTORS = { events: { DOMContentLoaded: {}, SubmitSearchOnionize: { wantUntrusted: true }, + YECHidden: { wantUntrusted: true }, }, }, ===================================== browser/components/abouttor/AboutTorChild.sys.mjs ===================================== @@ -26,6 +26,11 @@ export class AboutTorChild extends JSWindowActorChild { case "SubmitSearchOnionize": this.sendAsyncMessage("AboutTor:SetSearchOnionize", !!event.detail); break; + case "YECHidden": + // YEC 2024 banner was closed. Persist this for the rest of this + // session. See tor-browser#43098 and tor-browser#42188. + this.sendAsyncMessage("AboutTor:HideYEC"); + break; } } } ===================================== browser/components/abouttor/AboutTorParent.sys.mjs ===================================== @@ -7,20 +7,66 @@ ChromeUtils.defineESModuleGetters(lazy, { TorConnect: "resource://gre/modules/TorConnect.sys.mjs", }); +/** + * Whether we should hide the Year end campaign (YEC) 2024 donation banner for + * new about:tor pages. Applied to all future about:tor pages within this + * session (i.e. new tabs, new windows, and after new identity). + * + * Will reset at the next full restart. + * + * See tor-browser#43098 and tor-browser#42188. + * + * @type {boolean} + */ +let hideYEC = AppConstants.MOZ_UPDATE_CHANNEL !== "release"; + +/** + * The YEC 2024 start date. + * + * @type {integer} + */ +const yecStart = Date.UTC(2024, 9, 14, 15); // 2024 October 14th 15:00. + +/** + * The YEC 2024 end date. + * + * @type {integer} + */ +const yecEnd = Date.UTC(2025, 0, 2); // 2025 January 2nd 00:00. + export class AboutTorParent extends JSWindowActorParent { receiveMessage(message) { const onionizePref = "torbrowser.homepage.search.onionize"; + const yecMessagePref = "torbrowser.homepage.yec2024.message"; + let yecMessageNumber = null; + let now; switch (message.name) { case "AboutTor:GetInitialData": + now = Date.now(); + if (!hideYEC && now >= yecStart && now < yecEnd) { + // Will show the banner. + yecMessageNumber = Services.prefs.getIntPref(yecMessagePref, 0); + // Increase the preference for the next about:tor load. + Services.prefs.setIntPref(yecMessagePref, (yecMessageNumber + 1) % 3); + } return Promise.resolve({ torConnectEnabled: lazy.TorConnect.enabled, messageData: lazy.AboutTorMessage.getNext(), isStable: AppConstants.MOZ_UPDATE_CHANNEL === "release", searchOnionize: Services.prefs.getBoolPref(onionizePref, false), + // Locale for YEC 2024. See tor-browser#43098. + yecMessageNumber, + appLocale: + Services.locale.appLocaleAsBCP47 === "ja-JP-macos" + ? "ja" + : Services.locale.appLocaleAsBCP47, }); case "AboutTor:SetSearchOnionize": Services.prefs.setBoolPref(onionizePref, message.data); break; + case "AboutTor:HideYEC": + hideYEC = true; + break; } return undefined; } ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -232,3 +232,300 @@ body:not(.show-tor-check) #tor-check { color: var(--purple-60); } } + +/* YEC 2024. + * See tor-browser#43098 */ +body:not([yec-2024-message-number]) #yec-2024-banner { + display: none; +} + +body { + --yec-heading-font-size: 32px; +} + +body[yec-2024-message-number] h1 { + /* Text of heading is still available to screen readers, but it does not + * contribute visually to the page or the body grid layout. */ + position: absolute; + clip-path: inset(50%); +} + +body:not([yec-2024-message-number="0"]) .yec-2024-message-0 { + display: none; +} + +body:not([yec-2024-message-number="1"]) .yec-2024-message-1 { + display: none; +} + +body:not([yec-2024-message-number="2"]) .yec-2024-message-2 { + display: none; +} + +#yec-2024-banner { + grid-area: heading; + border-radius: 8px; + border: 1px solid var(--in-content-box-border-color); + display: grid; + grid-template: + "yec-heading yec-image" auto + "yec-body yec-image" auto + "yec-matching yec-image" auto + "yec-donate yec-image" min-content + / 1fr min-content; + --yec-image-background: #1f0333; + /* Remove 1px from padding for border. */ + padding-block: 55px 55px; + padding-inline: 47px 47px; + box-sizing: border-box; + max-width: 850px; + margin-block-end: 40px; + /* Position for the close button. */ + position: relative; + gap: 0 24px; +} + +.yec-2024-image { + grid-area: yec-image; + align-self: center; + /* Center horizontally for small width layout. */ + justify-self: center; + /* background color and border radius only stands out when using a high + * contrast theme. */ + -moz-context-properties: fill; + fill: var(--yec-image-background); + border-radius: 8px; + height: 216px; + border: 1px solid transparent; + /* Remove border from layout size. */ + margin: -1px; +} + +.yec-2024-heading { + grid-area: yec-heading; + margin-block: 0 32px; + /* We want to draw a background block of color behind the text in the child + * <span> element. If this was en-US only text, we could just set a fixed + * line-height that works. However, this can cause problems for some scripts, + * like Burmese, where the normal line height is larger. + * Instead, in javascript we measure the "normal" line height of the + * .yec-2024-heading element using a copy .yec-2024-heading-measure element. + * The line height is recorded in `--yec-heading-line-height` and we set the + * line-height using this value, plus the amount of padding we would like. */ + --yec-heading-block-padding: calc(0.1 * var(--yec-heading-font-size)); + --yec-heading-inline-padding: calc(0.25 * var(--yec-heading-font-size)); + margin-inline: calc(-1 * var(--yec-heading-inline-padding)); + line-height: calc(var(--yec-heading-line-height) + 4 * var(--yec-heading-block-padding)); +} + +.yec-2024-heading, +.yec-2024-heading-measure { + font-family: "Space Grotesk", sans-serif; + font-size: var(--yec-heading-font-size); + font-weight: 700; +} + +/* Element used to measure the line height for .yec-2024-heading. + * Not visually shown, but should mimic the font size of the corresponding + * .yec-2024-heading. */ +.yec-2024-heading-measure { + position: absolute; + visibility: hidden; + /* Measure a single line height. */ + white-space: nowrap; +} + +.yec-2024-heading > * { + /* Paint a block of color behind the text. + * NOTE: For some scripts, like Burmese, the background of the inline element + * is smaller than the actual script height. + * So in javascript we measure the difference as `--yec-heading-gap-top` and + * `--yec-heading-gap-bottom` and add this to the block padding, so that the + * padding matches the highest and lowest points of the script. */ + border-radius: 2px; + background: transparent; + padding-inline: var(--yec-heading-inline-padding); + padding-block-start: calc( + var(--yec-heading-gap-top) + + var(--yec-heading-block-padding) + ); + padding-block-end: calc( + var(--yec-heading-gap-bottom) + + var(--yec-heading-block-padding) + ); + /* Each line has the padding applied separately. */ + box-decoration-break: clone; +} + +#yec-2024-body { + grid-area: yec-body; + margin-block: 0 8px; +} + +#yec-2024-matching { + grid-area: yec-matching; + font-weight: 600; + margin-block: 0 32px; +} + +#yec-2024-body, #yec-2024-matching { + font-size: 1.2em; +} + +#yec-2024-donate-link { + grid-area: yec-donate; + justify-self: start; + font-weight: 700; + /* Style like a button. */ + color: var(--in-content-button-text-color); + border: 1px solid var(--in-content-button-border-color); + border-radius: 4px; + background-color: var(--in-content-button-background); + padding-block: 12px; + padding-inline: 16px; + text-decoration: none; + display: flex; + align-items: center; + gap: 10px; +} + +#yec-2024-donate-link > * { + flex: 0 0 auto; +} + +#yec-2024-donate-link:hover { + background-color: var(--in-content-button-background-hover); + color: var(--in-content-button-text-color-hover); + border-color: var(--in-content-button-border-color-hover); +} + +#yec-2024-donate-link:hover:active { + background-color: var(--in-content-button-background-active); + color: var(--in-content-button-text-color-active); + border-color: var(--in-content-button-border-color-active); +} + +#yec-2024-close { + position: absolute; + inset-block-start: 16px; + inset-inline-end: 16px; + padding: 8px; + min-width: auto; + min-height: auto; + width: 16px; + height: 16px; + box-sizing: content-box; + /* Transparent background when neither hover nor active. */ + background-color: transparent; + border-color: transparent; +} + +#yec-2024-close:hover { + background-color: var(--in-content-button-background-hover); + border-color: var(--in-content-button-border-color-hover); +} + +#yec-2024-close:hover:active { + background-color: var(--in-content-button-background-active); + border-color: var(--in-content-button-border-color-active); +} + +.yec-2024-icon { + -moz-context-properties: fill; + fill: currentColor; +} + +@media (max-width: 768px) { + body { + --yec-heading-font-size: 1.45rem; + } + + /* Small width layout. */ + #yec-2024-banner { + grid-template: + "yec-image" min-content + "yec-heading" auto + "yec-body" auto + "yec-matching" auto + "yec-donate" min-content + / 1fr; + padding: 31px; + /* Match max-width of the form. */ + max-width: 600px; + margin-block-end: 32px; + } + + .yec-2024-image { + height: 168px; + } + + .yec-2024-heading { + margin-block: 16px 24px; + text-align: center; + /* stylelint-disable-next-line property-no-unknown */ + text-wrap-style: balance; + } + + #yec-2024-body, #yec-2024-matching { + font-size: 1.05em; + } + + #yec-2024-donate-link { + justify-self: center; + } +} + +@media ((prefers-contrast) or (forced-colors)) and (prefers-color-scheme: dark) { + .yec-2024-image { + /* Give the dark image a light border to separate from background. */ + border-color: var(--in-content-box-border-color); + } +} + +@media not ((prefers-contrast) or (forced-colors)) { + #yec-2024-banner { + background-color: var(--yec-image-background); + border-color: transparent; + --acorn-yellow-40: #ffbd4f; + --acorn-yellow-50: #ffa436; + --acorn-yellow-60: #e27f2e; + /* color-gray-100 and color-gray-05 not in ESR 115 */ + --color-gray-100: #15141a; + --color-gray-05: #fbfbfe; + } + + .yec-2024-heading { + color: var(--color-gray-100); + } + + .yec-2024-heading.yec-2024-message-0 > * { + /* YEC purple */ + background: #d898fa; + } + + .yec-2024-heading.yec-2024-message-1 > * { + /* YEC green */ + background: #c1ed75; + } + + .yec-2024-heading.yec-2024-message-2 > * { + /* YEC red */ + background: #ff6a75; + } + + #yec-2024-donate-link { + --in-content-button-text-color: var(--color-gray-100); + --in-content-button-text-color-hover: var(--color-gray-100); + --in-content-button-text-color-active: var(--color-gray-100); + --in-content-button-background: var(--acorn-yellow-40); + --in-content-button-background-hover: var(--acorn-yellow-50); + --in-content-button-background-active: var(--acorn-yellow-60); + } + + #yec-2024-close { + /* Rules for #yec-2024-close */ + --in-content-button-text-color: var(--color-gray-05); + --in-content-button-text-color-hover: var(--color-gray-05); + --in-content-button-text-color-active: var(--color-gray-05); + } +} ===================================== browser/components/abouttor/content/aboutTor.html ===================================== @@ -4,7 +4,7 @@ <head> <meta http-equiv="Content-Security-Policy" - content="default-src chrome:; object-src 'none'" + content="default-src chrome:; font-src data:; object-src 'none'" /> <title data-l10n-id="newtab-page-title"></title> <link @@ -18,6 +18,10 @@ rel="stylesheet" href="chrome://browser/content/abouttor/aboutTor.css" /> + <link + rel="stylesheet" + href="chrome://browser/content/abouttor/yec-2024-fonts.css" + /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="localization" href="toolkit/global/tor-browser.ftl" /> @@ -29,6 +33,50 @@ <script src="chrome://browser/content/abouttor/aboutTor.js"></script> </head> <body> +  + <article id="yec-2024-banner"> + <img + class="yec-2024-image yec-2024-message-0" + alt="" + src="chrome://browser/content/abouttor/yec-2024-speak.svg" + /> + <img + class="yec-2024-image yec-2024-message-1" + alt="" + src="chrome://browser/content/abouttor/yec-2024-browse.svg" + /> + <img + class="yec-2024-image yec-2024-message-2" + alt="" + src="chrome://browser/content/abouttor/yec-2024-search.svg" + /> + <h2 class="yec-2024-heading yec-2024-message-0"> + <span data-l10n-id="yec-2024-introduction-0"></span> + </h2> + <h2 class="yec-2024-heading yec-2024-message-1"> + <span data-l10n-id="yec-2024-introduction-1"></span> + </h2> + <h2 class="yec-2024-heading yec-2024-message-2"> + <span data-l10n-id="yec-2024-introduction-2"></span> + </h2> + <p id="yec-2024-body" data-l10n-id="yec-2024-please-donate"></p> + <p id="yec-2024-matching" data-l10n-id="yec-2024-matched-donation"></p> + <a id="yec-2024-donate-link"> + <span data-l10n-id="yec-2024-donate-button"></span> + <img + class="yec-2024-icon" + alt="" + src="chrome://browser/content/abouttor/yec-2024-heart.svg" + /> + </a> + <button id="yec-2024-close" data-l10n-id="yec-2024-close-button"> + <img + class="yec-2024-icon" + alt="" + src="chrome://global/skin/icons/close.svg" + /> + </button> + </article> <h1> <img id="tor-browser-logo" ===================================== browser/components/abouttor/content/aboutTor.js ===================================== @@ -181,3 +181,123 @@ window.addEventListener("InitialData", event => { SearchWidget.setOnionizeState(!!searchOnionize); MessageArea.setMessageData(messageData, !!isStable, !!torConnectEnabled); }); + +// YEC 2024 (year end campaign). +// See tor-browser#42072 +const YecWidget = { + _initialized: false, + _locale: null, + + /** + * Initialize the widget. + */ + init() { + this._initialized = true; + + document.getElementById("yec-2024-close").addEventListener("click", () => { + dispatchEvent(new CustomEvent("YECHidden", { bubbles: true })); + this.messageNumber = null; + }); + + // Create mimics of the .yec-2024-heading elements to measure a single line + // and pass on the measurements to be used in CSS. + for (const heading of document.querySelectorAll(".yec-2024-heading")) { + const measureEl = heading.cloneNode(true); + measureEl.classList.add("yec-2024-heading-measure"); + // Remove classes that would style or hide the mimic. + measureEl.classList.remove( + "yec-2024-heading", + "yec-2024-message-0", + "yec-2024-message-1", + "yec-2024-message-2" + ); + measureEl.setAttribute("aria-hidden", "true"); + + const sizeObserver = new ResizeObserver(() => { + // The parent block rect measures the space that the single line + // occupies. + const blockRect = measureEl.getBoundingClientRect(); + // The child span measures the space that the inline element occupies. + // I.e. the space that would be coloured if we set a `background`. This + // may be smaller than the parent block, and not center-aligned if the + // text content contains certain non-ascii characters. E.g. Burmese. + const inlineRect = measureEl.firstElementChild.getBoundingClientRect(); + heading.style.setProperty( + "--yec-heading-line-height", + `${blockRect.height}px` + ); + heading.style.setProperty( + "--yec-heading-gap-top", + `${inlineRect.top - blockRect.top}px` + ); + heading.style.setProperty( + "--yec-heading-gap-bottom", + `${blockRect.bottom - inlineRect.bottom}px` + ); + }); + sizeObserver.observe(measureEl); + document.body.append(measureEl); + } + + this._updateDonateLocale(); + }, + + _messageNumber: null, + + /** + * The version of the YEC message to show, or null if no version should be + * shown. + * + * @type {?integer} + */ + get messageNumber() { + return this._messageNumber; + }, + + set messageNumber(number) { + this._messageNumber = number; + this._updateShown(); + }, + + _updateShown() { + if (!this._initialized) { + return; + } + + if (this.messageNumber === null) { + document.body.removeAttribute("yec-2024-message-number"); + } else { + document.body.setAttribute("yec-2024-message-number", this.messageNumber); + } + }, + + _updateDonateLocale() { + if (!this._initialized) { + return; + } + const donateLink = document.getElementById("yec-2024-donate-link"); + const base = "https://www.torproject.org/donate"; + // TODO: Updated link for YEC (using _locale?). + donateLink.href = base; + }, + + /** + * Set the locale to use for the donation link. + * + * @param {string} locale - The new locale, as BCP47. + */ + setDonateLocale(locale) { + this._locale = locale; + this._updateDonateLocale(); + }, +}; + +window.addEventListener("DOMContentLoaded", () => { + YecWidget.init(); +}); + +window.addEventListener("InitialData", event => { + const { appLocale, yecMessageNumber } = event.detail; + YecWidget.messageNumber = yecMessageNumber; + YecWidget.setDonateLocale(appLocale); +}); ===================================== browser/components/abouttor/content/yec-2024-browse.svg ===================================== @@ -0,0 +1,29 @@ +<svg width="384" height="280" viewBox="0 0 384 280" fill="none" xmlns="http://www.w3.org/2000/svg"> +<rect width="384" height="280" fill="context-fill"/> +<g opacity="0.7"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M79.8497 128.5C81.3358 128.5 82.5406 129.705 82.5406 131.191V144.208H174.099C175.584 144.208 176.789 145.412 176.789 146.898V159.916H176.791V175.624H192.071V160.345H192.068V146.898C192.068 145.412 193.273 144.208 194.758 144.208H268.346C269.295 144.208 270.129 144.699 270.608 145.441V144.208H346.888C348.373 144.208 349.577 145.412 349.577 146.897V157.654C349.577 158.603 349.086 159.437 348.344 159.916H349.579V176.053H348.344C349.086 176.532 349.577 177.366 349.577 178.315V207.054H378.313C379.799 207.054 381.003 208.258 381.003 209.744V220.499C381.003 221.985 379.799 223.19 378.313 223.19H349.582V236.17C349.582 237.656 348.378 238.86 346.893 238.86H318.16V251.877C318.16 253.363 316.956 254.568 315.47 254.568H304.715C303.229 254.568 302.024 253.363 302.024 251.877V238.86H271.036V251.877C271.036 253.363 269.832 254.568 268.346 254.568H257.591C256.105 254.568 254.9 253.363 254.9 251.877V238.86L37.6824 238.86C36.1971 238.86 34.993 237.656 34.993 236.17L34.993 222.723H66.4142V207.469H21.9709C20.4848 207.469 19.2801 206.264 19.2801 204.778V191.761H6.26293C4.77683 191.761 3.57211 190.556 3.57211 189.07V178.315C3.57211 176.829 4.77683 175.624 6.26293 175.624H19.2823V162.607C19.2823 161.121 20.487 159.916 21.9731 159.916H34.988V146.897C34.988 145.412 36.1921 144.208 37.6774 144.208H66.4041V131.191C66.4041 129.705 67.6088 128.5 69.0949 128.5H79.8497ZM69.0949 128.928H79.8497C81.0992 128.928 82.1121 129.941 82.1121 131.191V144.208H66.8325V131.191C66.8325 129.941 67.8454 128.928 69.0949 128.928ZM333.446 238.431V223.19H318.166L318.166 238.431H333.446ZM333.451 222.723V207.482H318.171V222.723H333.451ZM349.159 222.723H333.879V207.482H349.159V222.723ZM333.874 238.431H346.893C348.141 238.431 349.154 237.419 349.154 236.17V223.19H333.874L333.874 238.431ZM317.743 207.482V222.723H302.463V207.482H317.743ZM317.737 223.19V238.431H302.458V223.19H317.737ZM302.029 223.19V238.431H286.75L286.75 223.19H302.029ZM302.035 222.723V207.482H286.755V222.723H302.035ZM270.613 238.431V223.19H255.334L255.334 238.431H270.613ZM270.613 222.723L270.619 222.723V207.482H255.339V222.723L270.613 222.723ZM286.327 222.723H271.047V207.482H286.327V222.723ZM271.042 238.431H286.321V223.19H271.042L271.042 238.431ZM254.911 207.482V222.723H239.631V207.482H254.911ZM254.905 223.19V238.431H239.626L239.626 223.19H254.905ZM239.197 238.431V223.19H223.918L223.918 238.431H239.197ZM239.197 222.723L239.203 222.723V207.482H223.923V222.723L239.197 222.723ZM223.49 223.19V238.431H208.21V223.19L223.49 223.19ZM207.781 222.723L207.787 222.723V207.482H192.507V222.723L207.781 222.723ZM223.495 222.723H208.215V207.482H223.495V222.723ZM207.781 238.431H192.502L192.502 223.19L207.781 223.19V238.431ZM176.794 223.19H192.073V238.431H176.794L176.794 223.19ZM176.365 238.431V223.19H161.086L161.086 238.431H176.365ZM176.371 222.723V207.482H161.091V222.723H176.371ZM192.079 222.723H176.799V207.482H192.079V222.723ZM160.663 207.482V222.723H145.383V207.482H160.663ZM160.657 223.19V238.431H145.378V223.19H160.657ZM144.949 222.723L144.955 222.723V207.482H129.675V222.723L144.949 222.723ZM129.67 223.19V238.431H144.949V223.19H129.67ZM129.246 207.482V222.723H113.967V207.482H129.246ZM129.241 223.19V238.431H113.962V223.19H129.241ZM113.538 222.723V207.482H98.2591V222.723H113.538ZM98.2539 223.19V238.431H113.533V223.19H98.2539ZM97.8305 207.482V222.723H82.5509V207.482H97.8305ZM97.8251 223.19V238.431H82.5458V223.19L97.8251 223.19ZM82.1222 222.723V207.482H66.8427V222.723H82.1222ZM82.1171 238.431H66.8376L66.8376 223.19H82.1171V238.431ZM66.4092 223.152V238.431H51.1296V223.152H66.4092ZM364.867 207.482H349.587V222.762H364.867V207.482ZM365.295 222.762H378.313C379.562 222.762 380.575 221.749 380.575 220.499V209.744C380.575 208.495 379.562 207.482 378.313 207.482H365.295V222.762ZM35.4165 207.04L35.4166 191.761H50.696L50.6961 207.04H35.4165ZM34.9881 191.761H19.7086V204.778C19.7086 206.027 20.7214 207.04 21.9709 207.04H34.9881L34.9881 191.761ZM66.4041 207.04H51.1245L51.1246 191.761H66.4041V207.04ZM66.8325 207.04H82.1121L82.112 191.761L66.8325 191.761V207.04ZM97.8201 207.04H82.5405V191.761H97.8201V207.04ZM129.236 207.04H113.957V191.761L129.236 191.761L129.236 207.04ZM113.528 207.04H98.2487V191.761L113.528 191.761L113.528 207.04ZM129.665 207.04H144.944L144.944 191.761L129.665 191.761V207.04ZM160.652 207.04H145.373V191.761L160.652 191.761L160.652 207.04ZM161.081 207.04H176.36L176.36 191.761L161.081 191.761V207.04ZM192.068 207.04H176.789V191.761H192.068V207.04ZM223.484 207.04H208.205V191.761L223.484 191.761L223.484 207.04ZM207.776 207.04H192.497V191.761L207.776 191.761L207.776 207.04ZM223.913 207.04H239.192L239.192 191.761L223.913 191.761V207.04ZM254.9 207.04H239.621V191.761L254.9 191.761L254.9 207.04ZM255.329 207.04H270.608V191.761H255.329V207.04ZM286.745 207.04H302.025L302.025 191.761L286.745 191.761V207.04ZM286.317 191.761L271.037 191.761V207.04H286.317L286.317 191.761ZM317.733 207.04H302.453V191.761L317.732 191.761L317.733 207.04ZM318.161 207.04H333.44L333.44 191.761L318.161 191.761V207.04ZM349.148 207.04H333.869V191.761H349.148V207.04ZM34.9881 191.332H19.7086V176.053H34.9881V191.332ZM19.2801 191.332V176.052H6.26293C5.01347 176.052 4.00059 177.065 4.00059 178.315V189.07C4.00059 190.319 5.01347 191.332 6.26293 191.332H19.2801ZM19.7108 175.624V162.607C19.7108 161.357 20.7237 160.345 21.9731 160.345H34.9903V175.624H19.7108ZM35.4166 191.332V176.053H50.696V191.332H35.4166ZM66.4041 191.332H51.1246V176.053H66.4041L66.4041 191.332ZM50.6984 160.345V175.624H35.4188V160.345H50.6984ZM51.1269 175.624V160.345H66.4064V175.624H51.1269ZM66.8325 176.053V191.332H82.1121L82.112 176.053H66.8325ZM97.8201 191.332H82.5405V176.053H97.8201V191.332ZM82.1145 160.345V175.624H66.8349V160.345H82.1145ZM82.5429 175.624V160.345L97.8225 160.345L97.8225 175.624H82.5429ZM129.236 191.332H113.957V176.053H129.236L129.236 191.332ZM113.53 160.345L113.531 175.624H98.251V160.345L113.53 160.345ZM98.2487 176.053V191.332H113.528L113.528 176.053H98.2487ZM113.959 175.624V160.345H129.239V175.624H113.959ZM129.665 191.332H144.944L144.944 176.053H129.665V191.332ZM160.652 191.332H145.373V176.052L145.375 176.053H160.652L160.652 191.332ZM144.947 160.345V175.624L144.944 175.624H129.667V160.345L144.947 160.345ZM145.375 175.624L160.652 175.624L160.655 175.624L160.655 160.345L145.375 160.345V175.624ZM161.081 191.332H176.36L176.36 176.053H161.083L161.081 176.052V191.332ZM192.068 191.332H176.789V176.052L176.791 176.053L192.068 176.052V191.332ZM176.363 160.345V175.624L176.36 175.624L161.083 175.624V160.345H176.363ZM97.8201 144.637H82.5406V159.916H97.8201V144.637ZM98.2486 159.916H113.528V144.637H98.2486V159.916ZM333.869 144.637H346.888C348.136 144.637 349.148 145.649 349.148 146.897V157.654C349.148 158.903 348.136 159.916 346.886 159.916H333.869V144.637ZM223.484 191.332H208.205V176.052L208.207 176.053H223.484L223.484 191.332ZM207.779 160.345L207.779 175.624L207.776 175.624L192.499 175.624V160.345L207.779 160.345ZM207.776 176.053L192.497 176.052V191.332H207.776L207.776 176.053ZM208.207 175.624L223.484 175.624L223.487 175.624L223.487 160.345L208.207 160.345V175.624ZM223.913 191.332H239.192L239.192 176.053H223.915L223.913 176.052V191.332ZM254.9 191.332H239.621V176.052L239.623 176.053H254.9L254.9 191.332ZM239.195 160.345V175.624L239.192 175.624L223.915 175.624V160.345H239.195ZM239.623 175.624L254.9 175.624L254.903 175.624V160.345L239.623 160.345V175.624ZM255.329 191.332H270.608L270.609 176.053H255.331L255.329 176.052V191.332ZM270.611 160.345V175.624L270.609 175.624L255.331 175.624V160.345H270.611ZM271.039 175.624L286.317 175.624L286.319 175.624L286.319 160.345L271.039 160.345V175.624ZM286.745 191.332H302.025L302.025 176.053H286.747L286.745 176.052V191.332ZM271.037 191.332H286.317L286.317 176.053H271.039L271.037 176.052V191.332ZM317.733 191.332H302.453V176.052L302.455 176.053H317.732L317.733 191.332ZM302.027 160.345L302.027 175.624L302.025 175.624L286.747 175.624V160.345L302.027 160.345ZM302.455 175.624L317.732 175.624L317.735 175.624L317.735 160.345L302.455 160.345V175.624ZM318.163 176.053L318.161 176.052V191.332H333.44L333.44 176.053H318.163ZM349.148 191.332H333.869V176.052L333.871 176.053H346.905C348.146 176.063 349.148 177.072 349.148 178.315V191.332ZM333.443 160.345L333.443 175.624L333.44 175.624L318.163 175.624V160.345L333.443 160.345ZM346.907 175.624L346.886 175.624L333.871 175.624V160.345H349.151V175.624H346.907ZM317.733 159.916L302.455 159.916L302.453 159.916V144.637H317.733V159.916ZM223.484 144.637H208.205V159.916H223.484V144.637ZM207.776 144.637H194.758C193.509 144.637 192.497 145.649 192.497 146.898V159.916H207.776V144.637ZM239.192 159.916H223.913V144.637H239.192V159.916ZM270.608 159.916H255.329V144.637H268.346C269.592 144.637 270.602 145.643 270.608 146.887L270.608 146.899V159.916ZM239.621 144.637H254.9V159.916H239.621V144.637ZM286.316 144.637H271.037V146.886L271.037 146.899L271.037 159.916H286.316V144.637ZM302.024 159.916H286.745V144.637H302.024V159.916ZM333.44 159.916H318.161V144.637H333.44V159.916ZM161.081 144.637H174.099C175.348 144.637 176.36 145.649 176.36 146.898V159.916H161.081V144.637ZM129.236 159.916H113.957V144.637H129.236V159.916ZM160.652 159.916H145.373V144.637H160.652V159.916ZM129.665 144.637H144.944V159.916H129.665V144.637ZM66.8325 144.637H82.1121V159.916H66.8325V144.637ZM66.404 144.637H51.1245V159.916H66.404V144.637ZM37.6774 144.637H50.696V159.916H35.4165V146.897C35.4165 145.649 36.4287 144.637 37.6774 144.637ZM50.7011 238.431H37.6824C36.4338 238.431 35.4215 237.419 35.4215 236.17L35.4215 223.152H50.7011V238.431ZM255.328 238.86V251.877C255.328 253.127 256.341 254.139 257.591 254.139H268.346C269.595 254.139 270.608 253.127 270.608 251.877V238.86H255.328ZM302.452 251.877V238.86H317.732V251.877C317.732 253.127 316.719 254.139 315.47 254.139H304.715C303.465 254.139 302.452 253.127 302.452 251.877Z" fill="white"/> +</g> +<ellipse cx="45.5158" cy="13.3261" rx="45.5158" ry="13.3261" transform="matrix(0.999984 -0.00561916 0.00560665 0.999984 53.6995 182.94)" fill="white"/> +<ellipse cx="45.5158" cy="13.3261" rx="45.5158" ry="13.3261" transform="matrix(0.999984 -0.00561916 0.00560665 0.999984 235.763 182.94)" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M280.849 28.1858C280.849 29.6103 279.696 30.7651 278.273 30.7651C276.85 30.7651 275.696 29.6103 275.696 28.1858C275.696 26.7614 276.85 25.6066 278.273 25.6066C279.696 25.6066 280.849 26.7614 280.849 28.1858ZM279.843 28.1858C279.843 29.0539 279.14 29.7576 278.273 29.7576C277.406 29.7576 276.703 29.0539 276.703 28.1858C276.703 27.3178 277.406 26.6141 278.273 26.6141C279.14 26.6141 279.843 27.3178 279.843 28.1858Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M278.273 32.6995C280.763 32.6995 282.781 30.6787 282.781 28.1858C282.781 25.693 280.763 23.6722 278.273 23.6722C275.783 23.6722 273.764 25.693 273.764 28.1858C273.764 30.6787 275.783 32.6995 278.273 32.6995ZM278.273 31.692C280.207 31.692 281.775 30.1222 281.775 28.1858C281.775 26.2494 280.207 24.6797 278.273 24.6797C276.339 24.6797 274.771 26.2494 274.771 28.1858C274.771 30.1222 276.339 31.692 278.273 31.692Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M278.273 34.6339C281.83 34.6339 284.714 31.747 284.714 28.1858C284.714 24.6246 281.83 21.7377 278.273 21.7377C274.716 21.7377 271.832 24.6246 271.832 28.1858C271.832 31.747 274.716 34.6339 278.273 34.6339ZM278.273 33.6264C281.274 33.6264 283.707 31.1906 283.707 28.1858C283.707 25.1811 281.274 22.7452 278.273 22.7452C275.271 22.7452 272.838 25.1811 272.838 28.1858C272.838 31.1906 275.271 33.6264 278.273 33.6264Z" fill="#C1ED75"/> +<path d="M244.935 87.9729C247.499 89.2993 250.664 88.7757 252.38 86.4549C253.648 84.7404 254.785 83.047 255.675 81.6637C256.923 79.7247 256.861 77.257 255.518 75.3827C248.133 65.0756 222.339 32.4846 191.438 32.4846C160.917 32.4846 135.023 64.279 127.164 74.9925C125.643 77.067 125.728 79.8408 127.306 81.8725C128.137 82.9415 129.116 84.1806 130.166 85.4659C131.99 87.6988 135.142 88.2303 137.713 86.9272C154.397 78.4741 171.659 73.7524 191.106 73.7524C210.688 73.7524 228.146 79.2859 244.935 87.9729Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M251.914 86.1097C253.172 84.408 254.302 82.7255 255.187 81.3496C256.306 79.6108 256.25 77.4016 255.046 75.7208C251.367 70.5867 243.105 59.9053 231.923 50.513C220.731 41.1125 206.688 33.0651 191.438 33.0651C176.375 33.0651 162.401 40.9162 151.172 50.169C139.953 59.4138 131.548 69.9984 127.633 75.3358C126.27 77.1937 126.34 79.682 127.765 81.5163C128.593 82.5825 129.569 83.8177 130.616 85.0987C132.252 87.102 135.101 87.6002 137.451 86.4093C154.206 77.92 171.557 73.1719 191.106 73.1719C210.805 73.1719 228.355 78.7399 245.202 87.4573C247.547 88.671 250.39 88.1708 251.914 86.1097ZM252.38 86.4549C250.664 88.7757 247.499 89.2993 244.935 87.9729C228.146 79.2859 210.688 73.7524 191.106 73.7524C171.659 73.7524 154.397 78.4741 137.713 86.9272C135.142 88.2303 131.99 87.6988 130.166 85.4659C129.116 84.1806 128.137 82.9415 127.306 81.8725C125.728 79.8408 125.643 77.067 127.164 74.9925C135.023 64.279 160.917 32.4846 191.438 32.4846C222.339 32.4846 248.133 65.0756 255.518 75.3827C256.861 77.257 256.923 79.7247 255.675 81.6637C254.785 83.047 253.648 84.7404 252.38 86.4549Z" fill="white"/> +<path d="M208.117 67.9359C211.7 67.9359 214.779 65.8397 216.221 62.8083C218.184 66.4209 219.388 70.5052 219.623 74.8486C210.328 72.6581 200.713 71.5323 190.925 71.5323C181.319 71.5323 171.88 72.6165 162.747 74.7272C163.619 59.7645 176.017 47.8983 191.181 47.8983C195.795 47.8983 200.152 49.0029 204.007 50.9553C201.117 52.4504 199.136 55.4612 199.136 58.9447C199.136 63.913 203.155 67.9359 208.117 67.9359Z" fill="#212529"/> +<path d="M255.956 199.49C251.706 199.49 248.258 196.038 248.258 191.784C248.258 160.052 222.474 134.24 190.778 134.24C159.082 134.24 133.299 160.052 133.299 191.784C133.299 196.038 129.85 199.49 125.6 199.49C121.351 199.49 117.902 196.038 117.902 191.784C117.902 151.554 150.594 118.826 190.778 118.826C230.963 118.826 263.654 151.554 263.654 191.784C263.654 196.038 260.205 199.49 255.956 199.49Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M248.838 191.784C248.838 195.718 252.028 198.91 255.956 198.91C259.884 198.91 263.073 195.718 263.073 191.784C263.073 151.874 230.641 119.407 190.778 119.407C150.915 119.407 118.483 151.874 118.483 191.784C118.483 195.718 121.672 198.91 125.6 198.91C129.529 198.91 132.718 195.718 132.718 191.784C132.718 159.732 158.761 133.659 190.778 133.659C222.795 133.659 248.838 159.732 248.838 191.784ZM248.258 191.784C248.258 196.038 251.706 199.49 255.956 199.49C260.205 199.49 263.654 196.038 263.654 191.784C263.654 151.554 230.963 118.826 190.778 118.826C150.594 118.826 117.902 151.554 117.902 191.784C117.902 196.038 121.351 199.49 125.6 199.49C129.85 199.49 133.299 196.038 133.299 191.784C133.299 160.052 159.082 134.24 190.778 134.24C222.474 134.24 248.258 160.052 248.258 191.784Z" fill="#C1ED75"/> +<path d="M307.277 199.49C303.028 199.49 299.579 196.038 299.579 191.784C299.579 131.722 250.773 82.8617 190.778 82.8617C130.784 82.8617 81.9776 131.722 81.9776 191.784C81.9776 196.038 78.5289 199.49 74.2795 199.49C70.0301 199.49 66.5813 196.038 66.5813 191.784C66.5813 158.573 79.4988 127.35 102.958 103.865C126.417 80.3801 157.604 67.4482 190.778 67.4482C223.952 67.4482 255.14 80.3801 278.599 103.865C302.058 127.35 314.975 158.573 314.975 191.784C314.975 196.038 311.526 199.49 307.277 199.49Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M300.159 191.784C300.159 195.718 303.349 198.91 307.277 198.91C311.205 198.91 314.395 195.718 314.395 191.784C314.395 158.726 301.538 127.651 278.188 104.275C254.838 80.8993 223.798 68.0287 190.778 68.0287C157.758 68.0287 126.718 80.8993 103.368 104.275C80.0184 127.651 67.1619 158.726 67.1619 191.784C67.1619 195.718 70.3513 198.91 74.2795 198.91C78.2076 198.91 81.3971 195.718 81.3971 191.784C81.3971 131.402 130.463 82.2812 190.778 82.2812C251.094 82.2812 300.159 131.402 300.159 191.784ZM299.579 191.784C299.579 196.038 303.028 199.49 307.277 199.49C311.526 199.49 314.975 196.038 314.975 191.784C314.975 158.573 302.058 127.35 278.599 103.865C255.14 80.3801 223.952 67.4482 190.778 67.4482C157.604 67.4482 126.417 80.3801 102.958 103.865C79.4988 127.35 66.5813 158.573 66.5813 191.784C66.5813 196.038 70.0301 199.49 74.2795 199.49C78.5289 199.49 81.9776 196.038 81.9776 191.784C81.9776 131.722 130.784 82.8617 190.778 82.8617C250.773 82.8617 299.579 131.722 299.579 191.784Z" fill="#C1ED75"/> +<path d="M281.616 199.49C277.367 199.49 273.918 196.038 273.918 191.784C273.918 145.887 236.623 108.551 190.778 108.551C144.933 108.551 107.638 145.887 107.638 191.784C107.638 196.038 104.189 199.49 99.9399 199.49C95.6905 199.49 92.2418 196.038 92.2418 191.784C92.2418 137.389 136.445 93.1374 190.778 93.1374C245.112 93.1374 289.314 137.389 289.314 191.784C289.314 196.038 285.866 199.49 281.616 199.49Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M274.499 191.784C274.499 195.718 277.688 198.91 281.616 198.91C285.544 198.91 288.734 195.718 288.734 191.784C288.734 137.709 244.79 93.7179 190.778 93.7179C136.766 93.7179 92.8223 137.709 92.8223 191.784C92.8223 195.718 96.0118 198.91 99.9399 198.91C103.868 198.91 107.058 195.718 107.058 191.784C107.058 145.567 144.612 107.97 190.778 107.97C236.944 107.97 274.499 145.567 274.499 191.784ZM273.918 191.784C273.918 196.038 277.367 199.49 281.616 199.49C285.866 199.49 289.314 196.038 289.314 191.784C289.314 137.389 245.112 93.1374 190.778 93.1374C136.445 93.1374 92.2418 137.389 92.2418 191.784C92.2418 196.038 95.6905 199.49 99.9399 199.49C104.189 199.49 107.638 196.038 107.638 191.784C107.638 145.887 144.933 108.551 190.778 108.551C236.623 108.551 273.918 145.887 273.918 191.784Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M323.181 129.206V108.572H323.762V129.206H323.181Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M331.946 119.186L314.77 119.141L314.772 118.56L331.948 118.606L331.946 119.186Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M72.732 60.6413V14H73.3125V60.6413H72.732Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M92.3442 37.8212L53.6987 37.7184L53.7002 37.1378L92.3458 37.2407L92.3442 37.8212Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M80.8209 45.6462L64.6586 29.4659L65.0689 29.0551L81.2312 45.2355L80.8209 45.6462Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M65.0689 45.6462L81.2312 29.4659L80.8209 29.0551L64.6586 45.2355L65.0689 45.6462Z" fill="#C1ED75"/> +<path d="M325.935 83.6395C325.935 85.064 324.782 86.2187 323.359 86.2187C321.936 86.2187 320.783 85.064 320.783 83.6395C320.783 82.215 321.936 81.0602 323.359 81.0602C324.782 81.0602 325.935 82.215 325.935 83.6395Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M304.466 99.9747C307.074 99.9747 309.189 97.8576 309.189 95.2461C309.189 92.6345 307.074 90.5175 304.466 90.5175C301.857 90.5175 299.742 92.6345 299.742 95.2461C299.742 97.8576 301.857 99.9747 304.466 99.9747ZM304.466 99.3941C306.753 99.3941 308.609 97.5376 308.609 95.2461C308.609 92.9545 306.753 91.098 304.466 91.098C302.178 91.098 300.323 92.9545 300.323 95.2461C300.323 97.5376 302.178 99.3941 304.466 99.3941Z" fill="#C1ED75"/> +<path d="M64.8637 121.468C64.8637 122.893 63.7103 124.048 62.2874 124.048C60.8645 124.048 59.711 122.893 59.711 121.468C59.711 120.044 60.8645 118.889 62.2874 118.889C63.7103 118.889 64.8637 120.044 64.8637 121.468Z" fill="#C1ED75"/> +</svg> ===================================== browser/components/abouttor/content/yec-2024-fonts.css ===================================== @@ -0,0 +1,105 @@ +/** + * The embedded "Space Grotesk" font is under the following copyright: + * + * Copyright 2020 The Space Grotesk Project Authors (https://github.com/floriankarsten/space-grotesk) + * + * This Font Software is licensed under the SIL Open Font License, Version 1.1. + * This license is copied below, and is also available with a FAQ at: + * https://openfontlicense.org + * + * + * ----------------------------------------------------------- + * SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + * ----------------------------------------------------------- + * + * PREAMBLE + * The goals of the Open Font License (OFL) are to stimulate worldwide + * development of collaborative font projects, to support the font creation + * efforts of academic and linguistic communities, and to provide a free and + * open framework in which fonts may be shared and improved in partnership + * with others. + * + * The OFL allows the licensed fonts to be used, studied, modified and + * redistributed freely as long as they are not sold by themselves. The + * fonts, including any derivative works, can be bundled, embedded, + * redistributed and/or sold with any software provided that any reserved + * names are not used by derivative works. The fonts and derivatives, + * however, cannot be released under any other type of license. The + * requirement for fonts to remain under this license does not apply + * to any document created using the fonts or their derivatives. + * + * DEFINITIONS + * "Font Software" refers to the set of files released by the Copyright + * Holder(s) under this license and clearly marked as such. This may + * include source files, build scripts and documentation. + * + * "Reserved Font Name" refers to any names specified as such after the + * copyright statement(s). + * + * "Original Version" refers to the collection of Font Software components as + * distributed by the Copyright Holder(s). + * + * "Modified Version" refers to any derivative made by adding to, deleting, + * or substituting -- in part or in whole -- any of the components of the + * Original Version, by changing formats or by porting the Font Software to a + * new environment. + * + * "Author" refers to any designer, engineer, programmer, technical + * writer or other person who contributed to the Font Software. + * + * PERMISSION & CONDITIONS + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of the Font Software, to use, study, copy, merge, embed, modify, + * redistribute, and sell modified and unmodified copies of the Font + * Software, subject to the following conditions: + * + * 1) Neither the Font Software nor any of its individual components, + * in Original or Modified Versions, may be sold by itself. + * + * 2) Original or Modified Versions of the Font Software may be bundled, + * redistributed and/or sold with any software, provided that each copy + * contains the above copyright notice and this license. These can be + * included either as stand-alone text files, human-readable headers or + * in the appropriate machine-readable metadata fields within text or + * binary files as long as those fields can be easily viewed by the user. + * + * 3) No Modified Version of the Font Software may use the Reserved Font + * Name(s) unless explicit written permission is granted by the corresponding + * Copyright Holder. This restriction only applies to the primary font name as + * presented to the users. + * + * 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + * Software shall not be used to promote, endorse or advertise any + * Modified Version, except to acknowledge the contribution(s) of the + * Copyright Holder(s) and the Author(s) or with their explicit written + * permission. + * + * 5) The Font Software, modified or unmodified, in part or in whole, + * must be distributed entirely under this license, and must not be + * distributed under any other license. The requirement for fonts to + * remain under this license does not apply to any document created + * using the Font Software. + * + * TERMINATION + * This license becomes null and void if any of the above conditions are + * not met. + * + * DISCLAIMER + * THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + * OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + * DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM + * OTHER DEALINGS IN THE FONT SOFTWARE. + */ + +@font-face { + font-family: "Space Grotesk"; + font-weight: 700 700; + font-style: normal; + /* woff2 stream */ + src: url("data:font/woff2;base64,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"); +} ===================================== browser/components/abouttor/content/yec-2024-heart.svg ===================================== @@ -0,0 +1,4 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg"> + <path d="M8 6C8 6 8 2 11.5 2C15 2 15 5 15 6C15 10.5 8 15 8 15V6Z"/> + <path d="M8 6C8 6 8 2 4.5 2C1 2 1 5 1 6C1 10.5 8 15 8 15L9 9L8 6Z"/> +</svg> ===================================== browser/components/abouttor/content/yec-2024-search.svg ===================================== @@ -0,0 +1,33 @@ +<svg width="384" height="280" viewBox="0 0 384 280" fill="none" xmlns="http://www.w3.org/2000/svg"> +<rect width="384" height="280" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M297.41 64.935V44.301H297.99V64.935H297.41Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M306.175 54.9151L288.999 54.8694L289.001 54.2889L306.176 54.3346L306.175 54.9151Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M77.0325 243.942V197.301H77.613V243.942H77.0325Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M96.6447 221.122L57.9992 221.019L58.0007 220.439L96.6463 220.542L96.6447 221.122Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M85.1215 228.947L68.9591 212.767L69.3694 212.356L85.5317 228.537L85.1215 228.947Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M69.3694 228.947L85.5317 212.767L85.1215 212.356L68.9591 228.537L69.3694 228.947Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M278 34.3099C280.209 34.3099 282 32.5171 282 30.3055C282 28.0939 280.209 26.301 278 26.301C275.791 26.301 274 28.0939 274 30.3055C274 32.5171 275.791 34.3099 278 34.3099ZM278 33.7294C279.888 33.7294 281.419 32.1971 281.419 30.3055C281.419 28.4139 279.888 26.8816 278 26.8816C276.112 26.8816 274.581 28.4139 274.581 30.3055C274.581 32.1971 276.112 33.7294 278 33.7294Z" fill="white"/> +<path d="M95.1527 187.88C95.1527 189.305 93.9993 190.46 92.5764 190.46C91.1535 190.46 90 189.305 90 187.88C90 186.456 91.1535 185.301 92.5764 185.301C93.9993 185.301 95.1527 186.456 95.1527 187.88Z" fill="white"/> +<path d="M109.829 99.4117C109.829 51.8944 148.349 13.3738 195.867 13.3738C243.384 13.3738 281.905 51.8943 281.905 99.4117V261.743C281.905 263.731 280.293 265.342 278.306 265.342H113.427C111.44 265.342 109.829 263.731 109.829 261.743V99.4117Z" fill="#FF6A75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M282.468 99.4117V261.743C282.468 264.042 280.604 265.905 278.306 265.905H113.427C111.129 265.905 109.266 264.042 109.266 261.743V99.4117C109.266 51.5832 148.038 12.8105 195.867 12.8105C243.695 12.8105 282.468 51.5831 282.468 99.4117ZM195.867 13.3738C148.349 13.3738 109.829 51.8943 109.829 99.4117V261.743C109.829 263.731 111.44 265.342 113.427 265.342H278.306C280.293 265.342 281.904 263.731 281.904 261.743V99.4117C281.904 51.8943 243.384 13.3738 195.867 13.3738Z" fill="#FF6A75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M197.16 164.041C208.629 164.041 217.925 154.744 217.925 143.277C217.925 131.809 208.629 122.513 197.16 122.513C185.692 122.513 176.396 131.809 176.396 143.277C176.396 154.744 185.692 164.041 197.16 164.041ZM197.16 170.962C212.451 170.962 224.847 158.567 224.847 143.277C224.847 127.986 212.451 115.591 197.16 115.591C181.87 115.591 169.474 127.986 169.474 143.277C169.474 158.567 181.87 170.962 197.16 170.962Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M197.16 150.198C200.983 150.198 204.082 147.099 204.082 143.277C204.082 139.454 200.983 136.355 197.16 136.355C193.338 136.355 190.239 139.454 190.239 143.277C190.239 147.099 193.338 150.198 197.16 150.198ZM197.16 157.119C204.806 157.119 211.004 150.922 211.004 143.277C211.004 135.631 204.806 129.434 197.16 129.434C189.515 129.434 183.317 135.631 183.317 143.277C183.317 150.922 189.515 157.119 197.16 157.119Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M224.847 112.323C233.343 119.927 238.69 130.977 238.69 143.277C238.69 166.212 220.096 184.805 197.16 184.805C174.224 184.805 155.631 166.212 155.631 143.277C155.631 130.977 160.978 119.927 169.474 112.323V101.749C169.474 86.4583 181.87 74.0631 197.16 74.0631C212.451 74.0631 224.847 86.4583 224.847 101.749V112.323ZM178.126 106.357C183.828 103.412 190.3 101.749 197.16 101.749C204.021 101.749 210.493 103.412 216.195 106.357V101.749C216.195 91.2365 207.673 82.7148 197.16 82.7148C186.648 82.7148 178.126 91.2365 178.126 101.749V106.357ZM231.768 143.277C231.768 162.389 216.274 177.883 197.16 177.883C178.047 177.883 162.553 162.389 162.553 143.277C162.553 124.164 178.047 108.67 197.16 108.67C216.274 108.67 231.768 124.164 231.768 143.277Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M222.638 66.3009V29.5596H223.201V66.3009H222.638Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M238.327 48.3784L207.51 48.2965L207.511 47.7332L238.329 47.815L238.327 48.3784Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M229.102 54.5249L216.213 41.779L216.614 41.3828L229.502 54.1288L229.102 54.5249Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M216.614 54.5249L229.502 41.779L229.102 41.3828L216.213 54.1288L216.614 54.5249Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M265.939 152.721V127.881H266.503V152.721H265.939Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M276.531 140.592L255.637 140.536L255.639 139.973L276.532 140.028L276.531 140.592Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M127.685 177.042V160.483H128.249V177.042H127.685Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M134.668 169.049L121.087 169.013L121.089 168.45L134.669 168.486L134.668 169.049Z" fill="#212529"/> +<path d="M184.58 54.3988C184.58 56.2413 183.071 57.7395 181.205 57.7395C179.339 57.7395 177.83 56.2413 177.83 54.3988C177.83 52.5562 179.339 51.058 181.205 51.058C183.071 51.058 184.58 52.5562 184.58 54.3988ZM272.855 103.56C272.855 105.402 271.346 106.9 269.48 106.9C267.614 106.9 266.105 105.402 266.105 103.56C266.105 101.717 267.614 100.219 269.48 100.219C271.346 100.219 272.855 101.717 272.855 103.56ZM145.714 185.063C145.714 186.906 144.206 188.404 142.339 188.404C140.473 188.404 138.965 186.906 138.965 185.063C138.965 183.221 140.473 181.723 142.339 181.723C144.206 181.723 145.714 183.221 145.714 185.063Z" fill="#212529" stroke="#212529" stroke-width="0.563343"/> +<path d="M109.317 230.101H282.417V262.352C282.417 264.339 280.806 265.95 278.818 265.95H112.915C110.928 265.95 109.317 264.339 109.317 262.352V230.101Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M281.853 230.664H109.88V262.352C109.88 264.028 111.239 265.387 112.915 265.387H278.818C280.494 265.387 281.853 264.028 281.853 262.352V230.664ZM109.317 230.101V262.352C109.317 264.339 110.928 265.95 112.915 265.95H278.818C280.806 265.95 282.417 264.339 282.417 262.352V230.101H109.317Z" fill="#FF6A75"/> +<path d="M141.33 197.038C141.33 196.044 142.136 195.239 143.13 195.239H282.417V230.486H141.33V197.038Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M281.853 195.802H143.13C142.447 195.802 141.894 196.355 141.894 197.038V229.922H281.853V195.802ZM143.13 195.239C142.136 195.239 141.33 196.044 141.33 197.038V230.486H282.417V195.239H143.13Z" fill="#FF6A75"/> +<path d="M171.983 162.499C171.983 161.505 172.789 160.699 173.782 160.699H282.417V195.72H171.983V162.499Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M281.853 161.263H173.782C173.1 161.263 172.546 161.816 172.546 162.499V195.157H281.853V161.263ZM173.782 160.699C172.789 160.699 171.983 161.505 171.983 162.499V195.72H282.417V160.699H173.782Z" fill="#FF6A75"/> +<path d="M249.543 161.476H282.417V261.279C282.417 263.902 280.88 265.95 278.308 265.438H183.797V230.081H216.67V195.264H249.543V161.476Z" fill="#FF6A75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M174.269 161.26L282.44 161.001L282.442 161.565L174.27 161.823L174.269 161.26Z" fill="#212529"/> +</svg> ===================================== browser/components/abouttor/content/yec-2024-speak.svg ===================================== @@ -0,0 +1,49 @@ +<svg width="384" height="280" viewBox="0 0 384 280" fill="none" xmlns="http://www.w3.org/2000/svg"> +<rect width="384" height="280" fill="context-fill"/> +<path d="M158.29 127.451C162.136 132.416 164.939 136.917 166.704 140.911C169.175 146.505 168.181 152.767 167.862 158.874C167.33 169.051 169.58 182.987 188.087 182.987C218.89 182.987 239.158 89.6662 204.553 64.9086C181.745 48.591 165.499 57.436 154.095 75.7638C141.871 95.4101 149.508 116.111 158.29 127.451Z" fill="#D898FA"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M166.652 79.6356C172.385 73.3614 181.295 69.8973 192.326 73.324C204.374 77.0667 210.343 89.0084 212.244 102.449C214.143 115.881 211.958 130.703 207.804 140.031C207.742 140.169 207.804 140.332 207.943 140.394C208.082 140.456 208.244 140.393 208.306 140.254C212.507 130.824 214.7 115.896 212.788 102.372C210.877 88.8569 204.845 76.6371 192.489 72.7988C181.245 69.306 172.116 72.84 166.246 79.2647C160.387 85.6761 157.775 94.9658 159.53 103C160.371 106.847 161.69 109.33 163.301 110.959C164.914 112.59 166.795 113.339 168.711 113.764C169.667 113.976 170.635 114.108 171.581 114.227C171.718 114.244 171.854 114.261 171.99 114.278C172.797 114.379 173.585 114.477 174.346 114.615C176.122 114.938 177.706 115.473 178.948 116.72C180.076 117.854 180.623 119.615 180.645 121.512C180.668 123.406 180.165 125.393 179.244 126.94C178.323 128.487 177.005 129.561 175.402 129.713C173.798 129.865 171.821 129.104 169.564 126.784C169.458 126.675 169.284 126.673 169.175 126.779C169.066 126.885 169.064 127.059 169.17 127.168C171.488 129.55 173.619 130.435 175.454 130.26C177.289 130.086 178.74 128.861 179.717 127.221C180.694 125.58 181.219 123.492 181.195 121.506C181.172 119.524 180.601 117.602 179.338 116.332C177.979 114.967 176.262 114.404 174.444 114.074C173.667 113.933 172.862 113.832 172.055 113.732C171.92 113.715 171.785 113.699 171.65 113.682C170.705 113.562 169.759 113.433 168.83 113.227C166.976 112.816 165.205 112.102 163.692 110.572C162.176 109.04 160.893 106.663 160.067 102.883C158.352 95.033 160.907 85.9231 166.652 79.6356Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M173.841 101.974C171.138 103.815 168.875 107.31 167.643 112.703C167.609 112.851 167.701 112.998 167.849 113.032C167.998 113.066 168.145 112.973 168.179 112.825C169.392 107.517 171.599 104.166 174.151 102.428C176.695 100.696 179.615 100.542 182.329 101.691C187.769 103.996 192.41 111.579 191.216 122.222C190.843 125.543 189.409 127.507 188.045 129.159C187.914 129.317 187.783 129.473 187.653 129.628C186.441 131.074 185.321 132.409 185.321 134.339C185.321 134.574 185.433 134.796 185.576 134.998C185.723 135.205 185.928 135.424 186.169 135.658C186.41 135.893 186.697 136.152 187.012 136.436L187.024 136.447C187.337 136.729 187.679 137.038 188.04 137.379C189.501 138.76 191.259 140.667 192.492 143.39C193.07 144.667 192.825 146.699 191.913 148.675C191.007 150.64 189.479 152.466 187.612 153.335C185.767 154.194 183.558 154.137 181.206 152.284C178.836 150.417 176.319 146.719 173.944 140.286C173.892 140.144 173.733 140.071 173.591 140.123C173.448 140.176 173.376 140.334 173.428 140.477C175.817 146.947 178.378 150.756 180.866 152.717C183.372 154.691 185.802 154.784 187.844 153.834C189.863 152.893 191.47 150.95 192.412 148.906C193.35 146.873 193.669 144.656 192.993 143.164C191.719 140.348 189.903 138.383 188.418 136.979C188.052 136.634 187.706 136.321 187.394 136.04L187.381 136.028C187.064 135.742 186.785 135.49 186.552 135.264C186.318 135.037 186.142 134.845 186.025 134.68C185.905 134.511 185.871 134.403 185.871 134.339C185.871 132.62 186.855 131.443 188.087 129.968C188.212 129.818 188.34 129.666 188.469 129.51C189.859 127.826 191.372 125.761 191.762 122.284C192.975 111.475 188.272 103.612 182.543 101.185C179.672 99.9687 176.553 100.127 173.841 101.974Z" fill="white"/> +<path d="M151.507 161.263L152.377 165.048L165.435 202.294L129.506 226.859L73.4887 188.917L81.671 169.254L142.327 148.108L151.507 161.263Z" fill="#D898FA"/> +<path d="M81.6991 171.289C120.352 174.169 140.738 158.127 146.099 149.746L132.44 138.152L94.6338 150.196L81.6991 171.289Z" fill="white"/> +<path d="M140.098 201.039C143.158 199.971 152.688 189.325 157.07 184.136L161.06 198.237L146.953 215.831L112.114 209.668C120.167 207.236 137.037 202.106 140.098 201.039Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M73.3169 188.905C75.1248 178.002 77.8246 156.239 77.8068 151.065C77.7842 144.485 87.4513 133.619 101.395 136.254C110.096 137.898 115.492 134.68 120.435 131.731C123.414 129.955 126.228 128.276 129.503 127.818C137.042 126.762 154.128 130.054 152.322 163.715C152.671 164.015 152.92 164.605 153.474 165.925C154.662 168.751 157.255 174.919 165.248 188.729C180.892 215.759 166.312 226.294 141.054 233.737C115.796 241.18 90.4176 211.815 87.7094 206.675C85.07 201.666 77.1996 193.102 73.3893 189.238C73.3667 189.215 73.3505 189.19 73.3402 189.163C73.3091 189.084 73.3029 188.99 73.3169 188.905ZM73.8543 188.933C77.0432 186.19 80.4408 182.312 84.0316 177.29C85.2053 175.649 86.2758 173.117 87.4648 170.304C90.0024 164.301 93.0795 157.022 98.8505 154.405C101.518 153.196 104.265 153.765 107.111 154.353C111.415 155.244 115.943 156.181 120.757 151.084C128.752 142.618 137.031 144.729 139.335 148.696C141.004 151.569 148.021 159.758 151.903 163.764C150.57 165.661 149.646 176.081 156.699 191.71C165.912 212.123 120.443 217.298 105.128 204.237C99.6978 199.606 80.7279 189.908 73.8543 188.933Z" fill="#8C3EB2"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M84.532 140.421C88.6336 137.254 94.4579 135.223 101.344 136.524C110.148 138.188 115.621 134.924 120.568 131.973L120.577 131.967C123.564 130.185 126.331 128.539 129.541 128.09C133.254 127.57 139.314 128.122 144.224 132.944C149.117 137.748 152.922 146.847 152.057 163.528C150.125 161.531 147.427 158.511 145 155.628C142.548 152.718 140.393 149.97 139.573 148.559C137.139 144.369 128.623 142.354 120.556 150.896C118.19 153.402 115.911 154.409 113.707 154.691C111.489 154.976 109.326 154.531 107.167 154.084L107.126 154.076C104.311 153.493 101.485 152.909 98.7364 154.155C95.7806 155.495 93.5327 158.021 91.7116 160.939C89.8922 163.855 88.4816 167.192 87.2155 170.187L87.2113 170.197C86.0174 173.021 84.9595 175.52 83.8077 177.13C80.2245 182.141 76.8413 186 73.6746 188.725C73.6494 188.747 73.6288 188.772 73.6133 188.8C74.5138 183.344 75.6289 175.255 76.5197 167.87C77.4177 160.426 78.0909 153.672 78.082 151.065C78.0711 147.889 80.4157 143.6 84.532 140.421ZM73.585 188.989C73.5865 188.996 73.5883 189.003 73.5904 189.01C73.5986 189.038 73.6109 189.064 73.6268 189.087C73.6154 189.076 73.6042 189.064 73.5929 189.053C73.5878 189.036 73.5847 189.013 73.585 188.989ZM73.696 189.158C73.731 189.182 73.7719 189.199 73.816 189.205C75.5004 189.444 77.9495 190.223 80.7761 191.34C83.5969 192.455 86.7749 193.9 89.9101 195.46C96.1892 198.584 102.262 202.154 104.95 204.446C108.831 207.756 114.6 209.894 120.898 210.931C127.202 211.969 134.065 211.908 140.161 210.796C146.25 209.686 151.612 207.519 154.875 204.311C156.51 202.704 157.623 200.83 158.027 198.696C158.431 196.561 158.121 194.19 156.95 191.597C153.435 183.807 151.911 177.324 151.43 172.56C151.19 170.178 151.21 168.229 151.371 166.763C151.535 165.283 151.837 164.336 152.128 163.922C152.13 163.92 152.132 163.917 152.133 163.914C152.136 163.918 152.14 163.921 152.143 163.923C152.275 164.037 152.405 164.219 152.575 164.56C152.745 164.9 152.942 165.367 153.221 166.031C154.413 168.867 157.011 175.046 165.01 188.866C172.81 202.343 173.02 211.607 168.263 218.421C163.477 225.277 153.607 229.751 140.976 233.473C128.47 237.158 115.903 231.738 106.086 224.701C101.183 221.187 96.9805 217.279 93.8357 213.93C90.6847 210.575 88.6119 207.798 87.9529 206.547C86.6175 204.013 83.9718 200.599 81.1977 197.349C78.4722 194.155 75.6062 191.101 73.696 189.158ZM84.1951 139.986C79.9975 143.227 77.52 147.661 77.5317 151.066C77.5405 153.632 76.8727 160.347 75.9733 167.804C75.0749 175.252 73.9485 183.414 73.0455 188.86C73.0247 188.985 73.032 189.13 73.084 189.263C73.1082 189.325 73.1451 189.382 73.1934 189.431C75.0947 191.359 78.0103 194.461 80.7792 197.705C83.5527 200.955 86.1619 204.328 87.466 206.803C88.161 208.122 90.2762 210.943 93.4346 214.306C96.5991 217.676 100.828 221.609 105.765 225.148C115.629 232.218 128.38 237.758 141.132 234.001C153.759 230.28 163.808 225.765 168.715 218.736C173.652 211.664 173.33 202.145 165.486 188.592C157.502 174.796 154.913 168.638 153.729 165.822L153.724 165.808C153.45 165.157 153.246 164.673 153.067 164.315C152.917 164.014 152.774 163.781 152.604 163.604C153.483 146.812 149.664 137.515 144.61 132.552C139.543 127.576 133.291 127.01 129.464 127.546C126.134 128.012 123.279 129.715 120.319 131.481L120.294 131.495C115.356 134.441 110.039 137.608 101.446 135.984C94.3886 134.65 88.4073 136.734 84.1951 139.986ZM98.9645 154.656C101.537 153.489 104.193 154.03 107.056 154.623L107.076 154.627C109.215 155.069 111.461 155.534 113.778 155.237C116.118 154.936 118.51 153.864 120.957 151.273C128.882 142.881 136.922 145.09 139.097 148.834C139.946 150.295 142.134 153.078 144.579 155.982C146.968 158.819 149.621 161.792 151.556 163.801C151.235 164.38 150.971 165.372 150.824 166.703C150.658 168.213 150.639 170.201 150.883 172.615C151.37 177.442 152.911 183.983 156.449 191.822C157.581 194.332 157.865 196.588 157.486 198.593C157.107 200.598 156.06 202.375 154.488 203.919C151.338 207.016 146.103 209.154 140.062 210.256C134.028 211.356 127.229 211.416 120.987 210.389C114.741 209.361 109.083 207.248 105.307 204.028C102.564 201.688 96.4368 198.094 90.1549 194.968C87.0095 193.403 83.8168 191.951 80.9779 190.829C78.4442 189.827 76.1771 189.082 74.4728 188.758C77.5555 186.023 80.8206 182.254 84.2556 177.45C85.447 175.784 86.5268 173.23 87.706 170.44L87.7183 170.411C88.9887 167.406 90.3843 164.106 92.1787 161.23C93.9732 158.355 96.1494 155.932 98.9645 154.656Z" fill="#D898FA"/> +<path d="M279.26 62.9004C260.943 62.9004 244.295 78.6326 237.256 87.6944C236.666 88.4547 236.848 89.5374 237.637 90.0892C246.531 96.3121 261.617 105.831 279.26 105.831C296.948 105.831 310.597 96.2644 318.637 90.0427C319.339 89.4992 319.513 88.5195 319.014 87.7852C312.86 78.7381 297.639 62.9004 279.26 62.9004Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M254.185 72.1255C246.88 77.1728 240.978 83.3507 237.474 87.8631C236.983 88.4948 237.13 89.3991 237.794 89.8639C246.684 96.084 261.709 105.556 279.26 105.556C296.85 105.556 310.435 96.042 318.469 89.8252C319.06 89.3673 319.201 88.5494 318.786 87.9399C315.724 83.4377 310.401 77.2403 303.558 72.1711C296.714 67.1013 288.37 63.1754 279.26 63.1754C270.179 63.1754 261.492 67.0767 254.185 72.1255ZM253.872 71.673C261.229 66.5901 270.025 62.6254 279.26 62.6254C288.529 62.6254 296.986 66.6183 303.885 71.7291C310.786 76.8406 316.15 83.0857 319.241 87.6306C319.825 88.4896 319.618 89.6312 318.805 90.2602C310.759 96.4869 297.046 106.106 279.26 106.106C261.525 106.106 246.377 96.5402 237.479 90.3146C236.566 89.6758 236.349 88.4145 237.039 87.5258C240.573 82.9764 246.514 76.7572 253.872 71.673Z" fill="#D898FA"/> +<path d="M277.887 96.5447C289.774 96.5447 299.41 86.9343 299.41 75.0793C299.41 72.7566 299.04 70.52 298.356 68.425C292.648 65.1441 286.178 62.9004 279.26 62.9004C271.299 62.9004 263.653 65.8722 256.975 69.9765C256.575 71.6121 256.363 73.321 256.363 75.0793C256.363 86.9343 265.999 96.5447 277.887 96.5447Z" fill="#D898FA"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M279.108 35.6794C279.26 35.6794 279.383 35.8026 279.383 35.9544V57.2676C279.383 57.4195 279.26 57.5426 279.108 57.5426C278.956 57.5426 278.833 57.4195 278.833 57.2676V35.9544C278.833 35.8026 278.956 35.6794 279.108 35.6794Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M226.859 60.1946C226.966 60.0874 227.141 60.0874 227.248 60.1946L242.36 75.2653C242.468 75.3726 242.468 75.5464 242.36 75.6537C242.252 75.7609 242.078 75.7609 241.971 75.6537L226.859 60.583C226.751 60.4758 226.751 60.3019 226.859 60.1946Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M330.898 60.1946C330.79 60.0874 330.616 60.0874 330.508 60.1946L315.397 75.2653C315.289 75.3726 315.289 75.5464 315.397 75.6537C315.504 75.7609 315.679 75.7609 315.786 75.6537L330.898 60.583C331.005 60.4758 331.005 60.3019 330.898 60.1946Z" fill="white"/> +<path d="M271.336 219.866C271.336 242.378 253.035 260.627 230.46 260.627C207.885 260.627 189.584 242.378 189.584 219.866C189.584 197.354 207.885 179.105 230.46 179.105C253.035 179.105 271.336 197.354 271.336 219.866Z" fill="#D898FA"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M271.886 219.866C271.886 242.683 253.337 261.177 230.46 261.177C207.582 261.177 189.034 242.683 189.034 219.866C189.034 197.049 207.582 178.555 230.46 178.555C253.337 178.555 271.886 197.049 271.886 219.866ZM230.46 260.627C253.035 260.627 271.336 242.378 271.336 219.866C271.336 197.354 253.035 179.105 230.46 179.105C207.885 179.105 189.584 197.354 189.584 219.866C189.584 242.378 207.885 260.627 230.46 260.627Z" fill="#D898FA"/> +<mask id="mask0_219_16308" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="189" y="179" width="83" height="82"> +<path d="M271.336 219.866C271.336 242.378 253.035 260.627 230.46 260.627C207.885 260.627 189.584 242.378 189.584 219.866C189.584 197.354 207.885 179.105 230.46 179.105C253.035 179.105 271.336 197.354 271.336 219.866Z" fill="black"/> +</mask> +<g mask="url(#mask0_219_16308)"> +<path d="M280.419 220.063C280.419 247.686 257.963 270.079 230.262 270.079C202.561 270.079 180.105 247.686 180.105 220.063C180.105 192.44 202.561 170.047 230.262 170.047C257.963 170.047 280.419 192.44 280.419 220.063Z" fill="#D898FA"/> +<path d="M280.419 220.063C280.419 247.686 257.963 270.079 230.262 270.079C202.561 270.079 180.105 247.686 180.105 220.063C180.105 192.44 202.561 170.047 230.262 170.047C257.963 170.047 280.419 192.44 280.419 220.063Z" fill="#D898FA"/> +<path d="M242.924 205.893C252.813 205.893 258.951 202.333 261.871 199.502C262.733 198.667 264.232 198.608 264.977 199.549L274.642 211.758C275.541 212.893 274.733 214.634 273.297 214.824C268.179 215.498 260.812 217.635 256.342 222.843C249.238 231.122 237.99 220.347 229.9 220.347C221.809 220.347 220.625 228.362 213.916 235.064C207.206 241.765 200.102 224.814 196.156 218.376C192.209 211.937 207.206 214.565 216.481 214.565C225.756 214.565 220.625 210.36 211.153 209.178C201.681 207.995 198.524 203.002 203.852 200.768C209.18 198.534 227.532 205.893 242.924 205.893Z" fill="#8C3EB2"/> +<path d="M220.389 248.813C217.525 248.813 212.756 251.83 209.446 254.298C208.392 255.083 208.646 256.685 209.868 257.166L231.079 265.524C231.445 265.669 231.85 265.684 232.226 265.568L260.096 256.948C261.343 256.563 261.714 255.007 260.705 254.178C257.732 251.733 253.214 248.813 249.417 248.813C243.295 248.813 236.976 252.16 231.645 252.16C226.313 252.16 224.931 248.813 220.389 248.813Z" fill="#8C3EB2"/> +<path d="M241.545 232.871C245.336 235.846 242.248 242.268 239.084 243.924C238.86 244.042 238.605 244.092 238.356 244.044C236.185 243.627 230.271 240.232 226.98 238.654C222.593 236.551 229.261 237.077 231.894 235.675C234.526 234.273 236.631 229.016 241.545 232.871Z" fill="#8C3EB2"/> +<path d="M230.065 190.132C223.01 192.016 212.808 190.269 206.027 188.485C204.482 188.079 204.395 186.029 205.87 185.416L229.529 175.586C229.877 175.441 230.256 175.413 230.621 175.507C241.147 178.235 260.039 183.226 255.538 182.452C249.812 181.468 241.123 187.178 230.065 190.132Z" fill="#8C3EB2"/> +</g> +<path d="M230.46 145.137C230.46 131.201 241.757 119.904 255.693 119.904H329.314C343.25 119.904 354.547 131.201 354.547 145.137V145.137C354.547 159.073 343.25 170.37 329.314 170.37H255.693C241.757 170.37 230.46 159.073 230.46 145.137V145.137Z" fill="#D898FA"/> +<path d="M285.92 156.847L286.866 152.554C288.709 152.554 290.407 152.542 291.959 152.518C293.511 152.469 294.869 152.409 296.033 152.336C297.222 152.263 298.204 152.154 298.98 152.009C299.78 151.839 300.326 151.621 300.617 151.354C301.102 150.966 301.442 150.359 301.636 149.535C301.83 148.686 301.927 147.473 301.927 145.897C301.927 145.048 301.866 144.284 301.745 143.605C301.624 142.926 301.43 142.344 301.163 141.859C300.92 141.349 300.629 140.973 300.29 140.731C299.95 140.464 299.562 140.331 299.126 140.331C298.689 140.331 298.277 140.488 297.889 140.804C297.501 141.119 297.185 141.543 296.943 142.077C296.725 142.586 296.615 143.132 296.615 143.714C296.615 144.102 296.7 144.442 296.87 144.733C297.064 145.024 297.367 145.254 297.78 145.424C298.192 145.569 298.713 145.642 299.344 145.642C299.95 145.642 300.569 145.569 301.199 145.424C301.854 145.278 302.436 145.084 302.945 144.842L303.091 148.516C302.703 148.783 302.254 149.013 301.745 149.207C301.26 149.401 300.738 149.547 300.181 149.644C299.623 149.741 299.065 149.789 298.507 149.789C297.222 149.789 296.13 149.62 295.233 149.28C294.336 148.941 293.632 148.395 293.123 147.643C292.638 146.867 292.395 145.86 292.395 144.624C292.395 143.605 292.565 142.598 292.905 141.604C293.244 140.585 293.729 139.664 294.36 138.839C294.99 137.99 295.73 137.323 296.579 136.838C297.428 136.329 298.374 136.074 299.417 136.074C300.945 136.074 302.206 136.535 303.2 137.457C304.194 138.354 304.934 139.567 305.419 141.095C305.904 142.623 306.147 144.284 306.147 146.079C306.147 147.243 306.05 148.359 305.856 149.426C305.686 150.493 305.431 151.439 305.092 152.263C304.752 153.088 304.328 153.767 303.819 154.301C303.358 154.81 302.594 155.234 301.527 155.574C300.484 155.913 299.186 156.168 297.634 156.338C296.082 156.532 294.311 156.665 292.323 156.738C290.358 156.811 288.224 156.847 285.92 156.847ZM285.92 156.847C283.47 156.847 281.372 156.665 279.626 156.301C277.904 155.962 276.485 155.453 275.37 154.773C274.254 154.094 273.429 153.27 272.896 152.3C272.362 151.33 272.096 150.214 272.096 148.953C272.096 148.249 272.156 147.534 272.277 146.806C272.399 146.054 272.556 145.327 272.75 144.624C272.944 143.896 273.126 143.229 273.296 142.623L277.152 143.569C277.055 143.981 276.946 144.442 276.825 144.951C276.704 145.436 276.594 145.921 276.497 146.406C276.425 146.891 276.388 147.34 276.388 147.752C276.388 148.771 276.704 149.644 277.334 150.372C277.989 151.099 279.08 151.645 280.608 152.009C282.136 152.372 284.222 152.554 286.866 152.554L287.593 155.683L285.92 156.847ZM299.089 132.546C298.434 132.546 297.877 132.327 297.416 131.891C296.955 131.43 296.725 130.872 296.725 130.217C296.725 129.562 296.955 129.005 297.416 128.544C297.877 128.059 298.434 127.816 299.089 127.816C299.72 127.816 300.265 128.059 300.726 128.544C301.187 129.005 301.417 129.562 301.417 130.217C301.417 130.872 301.187 131.43 300.726 131.891C300.265 132.327 299.72 132.546 299.089 132.546Z" fill="white"/> +<path d="M182.55 46.0718C143.053 44.8138 129.465 80.3323 138.762 112.336C138.965 113.033 138.713 113.803 138.124 114.226C115.576 130.397 96.2419 108.391 88.4924 93.4759C77.5036 72.3258 77.9269 38.5583 101.814 25.382C131.918 8.77654 174.059 22.4791 184.198 43.7736C184.734 44.8993 183.796 46.1115 182.55 46.0718Z" fill="#8C3EB2"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M150.561 20.099C166.169 24.1215 179.328 32.9058 184.446 43.6554C185.087 45.0017 183.954 46.3916 182.542 46.3466C162.89 45.7207 149.717 54.2368 142.598 66.8658C135.47 79.5108 134.394 96.3123 139.026 112.26C139.26 113.064 138.972 113.956 138.284 114.449C132.606 118.522 127.114 120.201 121.945 120.178C116.779 120.156 111.957 118.434 107.614 115.742C98.9357 110.362 92.1357 101.085 88.2483 93.6027C82.7286 82.9788 80.0763 69.1924 81.8022 56.402C83.5287 43.6078 89.6419 31.7822 101.681 25.1412C116.808 16.7973 134.944 16.0739 150.561 20.099ZM150.424 20.6316C134.91 16.6332 116.924 17.3612 101.947 25.6228C90.0991 32.1581 84.0571 43.8044 82.3473 56.4756C80.6369 69.1505 83.2674 82.823 88.7364 93.3491C92.5985 100.783 99.3406 109.966 107.904 115.275C112.182 117.927 116.905 119.607 121.948 119.628C126.987 119.65 132.368 118.016 137.963 114.002C138.455 113.65 138.669 113.002 138.498 112.413C133.834 96.3563 134.903 79.3964 142.119 66.5957C149.344 53.779 162.713 45.1648 182.559 45.7969C183.639 45.8313 184.38 44.7968 183.95 43.8918C178.929 33.3469 165.948 24.6327 150.424 20.6316Z" fill="#D898FA"/> +<path d="M124.117 63.1457C124.1 63.5382 124.139 63.9161 124.234 64.2793C124.314 64.5867 124.425 64.841 124.567 65.0425C124.702 65.216 124.83 65.3616 124.95 65.4792C125.091 65.5616 125.182 65.627 125.225 65.6756C125.577 65.8815 125.789 66.1241 125.862 66.4035C125.877 66.4594 125.885 66.6064 125.888 66.8446C125.878 67.2651 125.7 67.6107 125.352 67.8812C125.026 68.1164 124.472 68.3369 123.69 68.5427L113.764 71.1553C113.177 71.3097 112.691 71.3331 112.305 71.2258C111.947 71.111 111.724 70.8861 111.637 70.5508C111.593 70.3832 111.588 70.1905 111.62 69.9729C111.646 69.7274 111.714 69.5304 111.824 69.3819C111.955 69.1981 112.139 68.9856 112.374 68.7445C112.755 68.3755 113.045 68.0005 113.244 67.6197C113.444 67.2389 113.55 66.6736 113.563 65.9237L113.712 62.033L107.178 63.7527L106.671 66.4391C106.465 67.5977 106.439 68.4704 106.592 69.0571C106.68 69.3924 106.809 69.6571 106.979 69.8512C107.141 70.0173 107.363 70.1828 107.645 70.3475C107.899 70.5196 108.075 70.682 108.175 70.835C108.295 70.9526 108.36 71.1445 108.37 71.4107C108.368 71.8591 108.207 72.2149 107.887 72.4781C107.589 72.706 107.063 72.9192 106.309 73.1176L100.068 74.7601C99.4259 74.9292 98.9082 74.946 98.5148 74.8107C98.1142 74.6475 97.8629 74.3703 97.7609 73.9791C97.6443 73.5321 97.7207 73.1388 97.9902 72.7992C98.2245 72.4389 98.6227 72.0206 99.1847 71.5443C99.9131 70.9047 100.478 70.3233 100.878 69.7998C101.271 69.2485 101.555 68.5618 101.728 67.7399L105.151 50.3139C105.669 47.6099 106.557 45.5249 107.816 44.0591C109.095 42.5579 111.006 41.473 113.547 40.8042C116.395 40.0546 118.753 40.0607 120.623 40.8225C122.485 41.5564 123.686 42.9571 124.225 45.0245C124.451 45.8906 124.545 46.8214 124.506 47.8168L124.117 63.1457ZM113.876 57.5116L114.172 49.5516C114.196 49.187 114.161 48.823 114.066 48.4598C113.928 47.929 113.672 47.5783 113.299 47.4077C112.947 47.2018 112.506 47.1687 111.975 47.3083C111.305 47.4847 110.784 47.8309 110.411 48.347C110.039 48.8631 109.746 49.6865 109.534 50.8172L108.012 59.0549L113.876 57.5116Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M307.557 231.755V179.105H308.107V231.755H307.557Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M329.729 205.942L285.934 205.826L285.935 205.276L329.731 205.392L329.729 205.942Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M316.708 214.79L298.392 196.525L298.781 196.137L317.097 214.402L316.708 214.79Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M298.781 214.79L317.097 196.525L316.708 196.137L298.392 214.402L298.781 214.79Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M50.6228 167.216V114.566H51.1728V167.216H50.6228Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M72.7949 141.403L28.9993 141.287L29.0007 140.737L72.7964 140.853L72.7949 141.403Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M59.7736 150.251L41.4573 131.986L41.8468 131.598L60.163 149.863L59.7736 150.251Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M41.8468 150.251L60.163 131.986L59.7736 131.598L41.4573 149.863L41.8468 150.251Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M56.0073 104.375C58.0229 104.375 59.6569 102.637 59.6569 100.493C59.6569 98.3493 58.0229 96.6113 56.0073 96.6113C53.9917 96.6113 52.3577 98.3493 52.3577 100.493C52.3577 102.637 53.9917 104.375 56.0073 104.375ZM56.0073 103.825C57.6877 103.825 59.1069 102.366 59.1069 100.493C59.1069 98.6206 57.6877 97.1613 56.0073 97.1613C54.3269 97.1613 52.9077 98.6206 52.9077 100.493C52.9077 102.366 54.3269 103.825 56.0073 103.825Z" fill="white"/> +<path d="M36.2993 114.566C36.2993 116.71 34.6653 118.448 32.6496 118.448C30.634 118.448 29 116.71 29 114.566C29 112.422 30.634 110.684 32.6496 110.684C34.6653 110.684 36.2993 112.422 36.2993 114.566Z" fill="white"/> +<path d="M328.513 225.689C330.529 225.689 332.163 223.951 332.163 221.807C332.163 219.663 330.529 217.925 328.513 217.925C326.498 217.925 324.864 219.663 324.864 221.807C324.864 223.951 326.498 225.689 328.513 225.689Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M323.891 246.07C323.891 249.018 321.494 251.408 318.538 251.408C315.581 251.408 313.185 249.018 313.185 246.07C313.185 243.122 315.581 240.732 318.538 240.732C321.494 240.732 323.891 243.122 323.891 246.07ZM323.341 246.07C323.341 248.713 321.192 250.858 318.538 250.858C315.884 250.858 313.735 248.713 313.735 246.07C313.735 243.427 315.884 241.282 318.538 241.282C321.192 241.282 323.341 243.427 323.341 246.07Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M72.6351 121.845V100.493H73.1851V121.845H72.6351Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M81.554 111.451L64.0358 111.404L64.0372 110.854L81.5555 110.901L81.554 111.451Z" fill="white"/> +</svg> ===================================== browser/components/abouttor/jar.mn ===================================== @@ -8,3 +8,8 @@ browser.jar: content/browser/abouttor/2728-sparkles.svg (content/2728-sparkles.svg) content/browser/abouttor/2764-red-heart.svg (content/2764-red-heart.svg) content/browser/abouttor/onion-pattern.svg (content/onion-pattern.svg) + content/browser/abouttor/yec-2024-browse.svg (content/yec-2024-browse.svg) + content/browser/abouttor/yec-2024-fonts.css (content/yec-2024-fonts.css) + content/browser/abouttor/yec-2024-heart.svg (content/yec-2024-heart.svg) + content/browser/abouttor/yec-2024-search.svg (content/yec-2024-search.svg) + content/browser/abouttor/yec-2024-speak.svg (content/yec-2024-speak.svg) ===================================== toolkit/content/license.html ===================================== @@ -176,6 +176,7 @@ <li><a href="about:license#snappy">Snappy License</a></li> <li><a href="about:license#socket.io-parser">Socket.IO Parser License</a></li> <li><a href="about:license#sockjs-client">SockJS-Client License</a></li> + <li><a href="about:license#spacegrotesk">Space Grotesk Font License</a></li> <li><a href="about:license#sprintf.js">sprintf.js License</a></li> <li><a href="about:license#stompjs">stompjs License</a></li> <li><a href="about:license#sunsoft">SunSoft License</a></li> @@ -5596,6 +5597,110 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </pre> + + <hr> + + <h1><a id="spacegrotesk"></a>Space Grotesk Font License</h1> + + <p>This license applies to embedded "Space Grotesk" font in <code>browser/components/abouttor/content/yec-2024-fonts.css</code>.</p> + +<pre> +Copyright 2020 The Space Grotesk Project Authors (https://github.com/floriankarsten/space-grotesk) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. +</pre> + + <hr> <h1><a id="socket.io-parser"></a>Socket.IO Parser License</h1> ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -645,3 +645,23 @@ dropped-support-notification-macos-version-less-than-10-15-extended-13-5 = { -br # "13.5" refers to the browser version number. # "Windows" is a brand name, and "Windows 10" is the version. dropped-support-notification-win-os-version-less-than-10-extended-13-5 = { -brand-short-name } 13.5 will only receive security updates for a limited time. Please upgrade to Windows 10 or later to receive the latest version of { -brand-short-name }. + +## Year end campaign 2024. + +# In English the "SPEAK" is in all-capitals. If your locale does not use capitals, or all-capitals does not work, you may ignore this. +yec-2024-introduction-0 = You have a right to SPEAK without uninvited listeners. +# In English the "BROWSE" is in all-capitals. If your locale does not use capitals, or all-capitals does not work, you may ignore this. +yec-2024-introduction-1 = You have a right to BROWSE without being watched. +# In English the "SEARCH" is in all-capitals. If your locale does not use capitals, or all-capitals does not work, you may ignore this. +yec-2024-introduction-2 = You have a right to SEARCH without being followed. + +yec-2024-please-donate = Join the thousands of Tor supporters building an internet powered by privacy. Make a donation today. + +# The end date should match the end of the year 2024. +# The "$300,000" should be localised: it should be shown as USD (United States dollar) currency, but you may use numbers and formatting appropriate to your locale. +yec-2024-matched-donation = Through December 31, your gift will be matched, up to $300,000! + +yec-2024-donate-button = Donate now +# Here "Close" is a verb, referring to closing the banner. +yec-2024-close-button = + .title = Close View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ddfe221… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ddfe221… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.16.0esr-13.5-1] Bug 42832: Download spam prevention exemption for browser extensions.
by morgan (＠morgan) 30 Sep '24

30 Sep '24

morgan pushed to branch mullvad-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 8cd00587 by hackademix at 2024-09-30T17:15:07+00:00 Bug 42832: Download spam prevention exemption for browser extensions. - - - - - 1 changed file: - uriloader/exthandler/nsExternalHelperAppService.cpp Changes: ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -1895,6 +1895,12 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) { nsCOMPtr<nsIPermissionManager> permissionManager = mozilla::services::GetPermissionManager(); nsCOMPtr<nsIPrincipal> principal = loadInfo->TriggeringPrincipal(); + + // Always allow WebExtensions + if (principal && principal->SchemeIs("moz-extension")) { + return false; + } + bool exactHostMatch = false; constexpr auto type = "automatic-download"_ns; nsCOMPtr<nsIPermission> permission; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.16.0esr-13.5-1] Bug 42832: Download spam prevention exemption for browser extensions.
by morgan (＠morgan) 30 Sep '24

30 Sep '24

morgan pushed to branch base-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: c34335af by hackademix at 2024-09-30T17:13:43+00:00 Bug 42832: Download spam prevention exemption for browser extensions. - - - - - 1 changed file: - uriloader/exthandler/nsExternalHelperAppService.cpp Changes: ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -1895,6 +1895,12 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) { nsCOMPtr<nsIPermissionManager> permissionManager = mozilla::services::GetPermissionManager(); nsCOMPtr<nsIPrincipal> principal = loadInfo->TriggeringPrincipal(); + + // Always allow WebExtensions + if (principal && principal->SchemeIs("moz-extension")) { + return false; + } + bool exactHostMatch = false; constexpr auto type = "automatic-download"_ns; nsCOMPtr<nsIPermission> permission; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c34335a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c34335a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.16.0esr-13.5-1] Bug 42832: Download spam prevention exemption for browser extensions.
by morgan (＠morgan) 30 Sep '24

30 Sep '24

morgan pushed to branch tor-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 9dfb89a9 by hackademix at 2024-09-30T17:12:48+00:00 Bug 42832: Download spam prevention exemption for browser extensions. - - - - - 1 changed file: - uriloader/exthandler/nsExternalHelperAppService.cpp Changes: ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -1895,6 +1895,12 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) { nsCOMPtr<nsIPermissionManager> permissionManager = mozilla::services::GetPermissionManager(); nsCOMPtr<nsIPrincipal> principal = loadInfo->TriggeringPrincipal(); + + // Always allow WebExtensions + if (principal && principal->SchemeIs("moz-extension")) { + return false; + } + bool exactHostMatch = false; constexpr auto type = "automatic-download"_ns; nsCOMPtr<nsIPermission> permission; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9dfb89a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9dfb89a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] Remove 13.5a10 watershed rewrite rules from update_pre13.5a10
by boklm (＠boklm) 30 Sep '24

30 Sep '24

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 694b6c28 by Nicolas Vigier at 2024-09-30T17:29:29+02:00 Remove 13.5a10 watershed rewrite rules from update_pre13.5a10 - - - - - 1 changed file: - update_pre13.5a10/alpha/.htaccess Changes: ===================================== update_pre13.5a10/alpha/.htaccess ===================================== @@ -2,11 +2,6 @@ RewriteEngine On # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] -# tor-browser#42747: Make 13.5a10 a watershed alpha release -RewriteRule ^[^/]+/\d\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] -RewriteRule ^[^/]+/1[012]\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] -RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] -RewriteRule ^[^/]+/13\.5a\d/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] RewriteRule ^[^/]+/13.5a10/ no-update.xml [last] RewriteRule ^Linux_x86-gcc3/13.5a7/ALL 13.5a7-13.5a10-linux-i686-ALL.xml [last] RewriteRule ^Linux_x86-gcc3/13.5a8/ALL 13.5a8-13.5a10-linux-i686-ALL.xml [last] 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-128.3.0esr-14.0-1] fixup! Bug 41803: Add some developer tools for working on tor-browser.
by Pier Angelo Vendrame (＠pierov) 30 Sep '24

30 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 38fb3e3e by Henry Wilkes at 2024-09-30T15:40:40+01:00 fixup! Bug 41803: Add some developer tools for working on tor-browser. Bug 43157: Move tb-dev to base browser and add support for working in mullvad-browser. Also improve error handling and lint the file. - - - - - 2 changed files: - tools/torbrowser/git-rebase-fixup-preprocessor → tools/base-browser/git-rebase-fixup-preprocessor - tools/torbrowser/tb-dev → tools/base-browser/tb-dev Changes: ===================================== tools/torbrowser/git-rebase-fixup-preprocessor → tools/base-browser/git-rebase-fixup-preprocessor ===================================== ===================================== tools/torbrowser/tb-dev → tools/base-browser/tb-dev ===================================== @@ -4,27 +4,38 @@ Useful tools for working on tor-browser repository. """ -import sys -import termios -import os +import argparse import atexit -import tempfile -import subprocess -import re import json +import os +import re +import subprocess +import sys +import tempfile +import termios import urllib.request -import argparse + import argcomplete GIT_PATH = "/usr/bin/git" -UPSTREAM_URLS = [ - "https://gitlab.torproject.org/tpo/applications/tor-browser.git", - "git@gitlab.torproject.org:tpo/applications/tor-browser.git", -] +UPSTREAM_URLS = { + "tor-browser": [ + "https://gitlab.torproject.org/tpo/applications/tor-browser.git", + "git@gitlab.torproject.org:tpo/applications/tor-browser.git", + ], + "mullvad-browser": [ + "https://gitlab.torproject.org/tpo/applications/mullvad-browser.git", + "git@gitlab.torproject.org:tpo/applications/mullvad-browser.git", + ], +} FIXUP_PREPROCESSOR_EDITOR = "git-rebase-fixup-preprocessor" USER_EDITOR_ENV_NAME = "GIT_REBASE_FIXUP_PREPROCESSOR_USER_EDITOR" +class TbDevException(Exception): + pass + + def git_run(args, check=True, env=None): """ Run a git command with output sent to stdout. @@ -34,16 +45,22 @@ def git_run(args, check=True, env=None): for key, value in env.items(): tmp_env[key] = value env = tmp_env - subprocess.run([GIT_PATH, *args], check=check, env=env) + try: + subprocess.run([GIT_PATH, *args], check=check, env=env) + except subprocess.CalledProcessError as err: + raise TbDevException(str(err)) from err def git_get(args): """ Run a git command with each non-empty line returned in a list. """ - git_process = subprocess.run( - [GIT_PATH, *args], text=True, stdout=subprocess.PIPE, check=True - ) + try: + git_process = subprocess.run( + [GIT_PATH, *args], text=True, stdout=subprocess.PIPE, check=True + ) + except subprocess.CalledProcessError as err: + raise TbDevException(str(err)) from err return [line for line in git_process.stdout.split("\n") if line] @@ -57,35 +74,68 @@ def get_local_root(): global local_root if local_root is None: try: - # Make sure we have a matching remote in this git repository. Should raise Exception if we don't. - get_upstream_name() - git_root = git_get(["rev-parse", "--show-toplevel"])[0] - except Exception: - git_root = None - if git_root is None: + # Make sure we have a matching remote in this git repository. + if get_upstream_details()["is-browser-repo"]: + local_root = git_get(["rev-parse", "--show-toplevel"])[0] + else: + local_root = "" + except TbDevException: local_root = "" - else: - local_root = git_root return local_root -upstream_name = None +def determine_upstream_details(): + """ + Determine details about the upstream. + """ + remote_urls = { + remote: git_get(["remote", "get-url", remote])[0] + for remote in git_get(["remote"]) + } + + matches = { + remote: repo + for repo, url_list in UPSTREAM_URLS.items() + for url in url_list + for remote, fetch_url in remote_urls.items() + if fetch_url == url + } + + is_browser_repo = len(matches) > 0 + details = {"is-browser-repo": is_browser_repo} + origin_remote_repo = matches.get("origin", None) + upstream_remote_repo = matches.get("upstream", None) -def get_upstream_name(): + if origin_remote_repo is not None: + if upstream_remote_repo is None: + details["remote"] = "origin" + details["repo-name"] = origin_remote_repo + # Else, both "upstream" and "origin" point to a remote repo. Not clear + # which should be used. + elif upstream_remote_repo is not None: + details["remote"] = "upstream" + details["repo-name"] = upstream_remote_repo + elif len(matches) == 1: + remote = next(iter(matches.keys())) + details["remote"] = remote + details["repo-name"] = matches[remote] + # Else, the upstream is ambiguous. + + return details + + +cached_upstream_details = None + + +def get_upstream_details(): """ - Get the name of the upstream remote. + Get details about the upstream repository. """ - global upstream_name - if upstream_name is None: - for remote in git_get(["remote"]): - fetch_url = git_get(["remote", "get-url", remote])[0] - if fetch_url in UPSTREAM_URLS: - upstream_name = remote - break - if upstream_name is None: - raise Exception("No upstream remote found.") - return upstream_name + global cached_upstream_details + if cached_upstream_details is None: + cached_upstream_details = determine_upstream_details() + return cached_upstream_details class Reference: @@ -139,7 +189,7 @@ def get_nearest_ref(ref_type, name_start, search_from): if commit == ref.commit: return ref - raise Exception(f"No {name_start} commit found in the last 1000 commits") + raise TbDevException(f"No {name_start} commit found in the last 1000 commits") def get_firefox_ref(search_from): @@ -167,7 +217,7 @@ def get_upstream_basis_commit(search_from): upstream_firefox = get_firefox_ref(upstream_branch).commit search_firefox = get_firefox_ref(search_from).commit if upstream_firefox != search_firefox: - raise Exception( + raise TbDevException( f"Upstream of {search_from} has a different FIREFOX base. " "You might want to set the upstream tracking branch to a new value." ) @@ -210,12 +260,15 @@ def get_gitlab_default(): """ Get the name of the default branch on gitlab. """ - query = """ - query { - project(fullPath: "tpo/applications/tor-browser") { - repository { rootRef } - } - } + repo_name = get_upstream_details().get("repo-name", None) + if repo_name is None: + raise TbDevException("Cannot determine the repository name") + query = f""" + query {{ + project(fullPath: "tpo/applications/{repo_name}") {{ + repository {{ rootRef }} + }} + }} """ request_data = {"query": re.sub(r"\s+", "", query)} gitlab_request = urllib.request.Request( @@ -231,7 +284,7 @@ def get_gitlab_default(): return json.load(response)["data"]["project"]["repository"]["rootRef"] -def within_tor_browser_root(): +def within_browser_root(): """ Whether we are with the tor browser root. """ @@ -279,7 +332,7 @@ def show_files_containing(args): try: regex = re.compile(args.regex) except re.error as err: - raise Exception(f"{args.regex} is not a valid python regex") from err + raise TbDevException(f"{args.regex} is not a valid python regex") from err file_list = get_changed_files(get_firefox_ref("HEAD").commit) @@ -428,7 +481,7 @@ def auto_fixup(_args): staged_files = get_changed_files("HEAD", staged=True) if staged_files: - raise Exception(f"Have already staged files: {staged_files}") + raise TbDevException(f"Have already staged files: {staged_files}") fixups = {} for filename in get_changed_files("HEAD"): @@ -475,7 +528,9 @@ def show_default(_args): Print the default branch name from gitlab. """ default_branch = get_gitlab_default() - upstream = get_upstream_name() + upstream = get_upstream_details().get("remote", None) + if upstream is None: + raise TbDevException("Cannot determine the upstream remote") print(f"{upstream}/{default_branch}") @@ -484,10 +539,20 @@ def branch_from_default(args): Fetch the default gitlab branch from upstream and create a new local branch. """ default_branch = get_gitlab_default() - upstream = get_upstream_name() + upstream = get_upstream_details().get("remote", None) + if upstream is None: + raise TbDevException("Cannot determine the upstream remote") git_run(["fetch", upstream, default_branch]) - git_run(["switch", "--create", args.branchname, "--track", f"{upstream}/{default_branch}"]) + git_run( + [ + "switch", + "--create", + args.branchname, + "--track", + f"{upstream}/{default_branch}", + ] + ) def move_to_default(args): @@ -504,17 +569,21 @@ def move_to_default(args): try: branch_name = git_get(["branch", "--show-current"])[0] except IndexError: - raise Exception("No current branch") + raise TbDevException("No current branch") current_upstream_branch = get_upstream_tracking_branch(branch_name) default_branch = get_gitlab_default() - upstream = get_upstream_name() + upstream = get_upstream_details().get("remote", None) + if upstream is None: + raise TbDevException("Cannot determine the upstream remote") git_run(["fetch", upstream, default_branch]) new_upstream_branch = f"{upstream}/{default_branch}" if current_upstream_branch == new_upstream_branch: - print(f"{branch_name} is already set to track the default branch {new_upstream_branch}.") + print( + f"{branch_name} is already set to track the default branch {new_upstream_branch}." + ) return # We want to avoid checking out the old branch because this can cause @@ -560,7 +629,7 @@ def show_diff_diff(args): """ config_res = git_get(["config", "--get", "diff.tool"]) if not config_res: - raise Exception("No diff.tool configured for git") + raise TbDevException("No diff.tool configured for git") diff_tool = config_res[0] # Filter out parts of the diff we expect to be different. @@ -590,13 +659,13 @@ def show_diff_diff(args): lines_match = lines_regex.match(line) if lines_match: # Fake data that will match. - file.write("@@ ?,? ?,? @@" + lines_match.group('rest')) + file.write("@@ ?,? ?,? @@" + lines_match.group("rest")) continue file.write(line) status = diff_process.poll() if status != 0: - raise Exception(f"git diff exited with status {status}") + raise TbDevException(f"git diff exited with status {status}") return file_name @@ -614,7 +683,7 @@ def branch_complete(prefix, parsed_args, **kwargs): """ Complete the argument with a branch name. """ - if not within_tor_browser_root(): + if not within_browser_root(): return [] try: branches = [ref.name for ref in get_refs("head", "")] @@ -738,8 +807,11 @@ for name, details in { argcomplete.autocomplete(parser) -if not within_tor_browser_root(): - raise Exception("Must be within a tor-browser directory") -parsed_args = parser.parse_args() +try: + if not within_browser_root(): + raise TbDevException("Must be within a browser directory") + parsed_args = parser.parse_args() -parsed_args.func(parsed_args) + parsed_args.func(parsed_args) +except TbDevException as err: + print(f"\x1b[1m{err}\x1b[0m", file=sys.stderr) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/38fb3e3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/38fb3e3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] alpha: new version, 14.0a7
by morgan (＠morgan) 27 Sep '24

27 Sep '24

morgan pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: 4fda84c5 by Morgan at 2024-09-27T20:32:12+00:00 alpha: new version, 14.0a7 - - - - - 29 changed files: - update_1/alpha/.htaccess - − update_1/alpha/14.0a3-14.0a6-linux-x86_64-ALL.xml - − update_1/alpha/14.0a3-14.0a6-macos-ALL.xml - − update_1/alpha/14.0a3-14.0a6-windows-x86_64-ALL.xml - − update_1/alpha/14.0a4-14.0a6-linux-x86_64-ALL.xml - − update_1/alpha/14.0a4-14.0a6-macos-ALL.xml - − update_1/alpha/14.0a4-14.0a6-windows-x86_64-ALL.xml - + update_1/alpha/14.0a4-14.0a7-linux-x86_64-ALL.xml - + update_1/alpha/14.0a4-14.0a7-macos-ALL.xml - + update_1/alpha/14.0a4-14.0a7-windows-x86_64-ALL.xml - − update_1/alpha/14.0a5-14.0a6-linux-x86_64-ALL.xml - − update_1/alpha/14.0a5-14.0a6-macos-ALL.xml - − update_1/alpha/14.0a5-14.0a6-windows-x86_64-ALL.xml - + update_1/alpha/14.0a5-14.0a7-linux-x86_64-ALL.xml - + update_1/alpha/14.0a5-14.0a7-macos-ALL.xml - + update_1/alpha/14.0a5-14.0a7-windows-x86_64-ALL.xml - + update_1/alpha/14.0a6-14.0a7-linux-x86_64-ALL.xml - + update_1/alpha/14.0a6-14.0a7-macos-ALL.xml - + update_1/alpha/14.0a6-14.0a7-windows-x86_64-ALL.xml - − update_1/alpha/14.0a6-linux-x86_64-ALL.xml - − update_1/alpha/14.0a6-macos-ALL.xml - − update_1/alpha/14.0a6-windows-x86_64-ALL.xml - + update_1/alpha/14.0a7-linux-x86_64-ALL.xml - + update_1/alpha/14.0a7-macos-ALL.xml - + update_1/alpha/14.0a7-windows-x86_64-ALL.xml - update_1/alpha/download-linux-x86_64.json - update_1/alpha/download-macos.json - update_1/alpha/download-windows-x86_64.json - update_1/alpha/downloads.json Changes: ===================================== update_1/alpha/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/14.0a6/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a3/ALL 14.0a3-14.0a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a4/ALL 14.0a4-14.0a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a5/ALL 14.0a5-14.0a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 14.0a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 14.0a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a3/ALL 14.0a3-14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a4/ALL 14.0a4-14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a5/ALL 14.0a5-14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a3/ALL 14.0a3-14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a4/ALL 14.0a4-14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a5/ALL 14.0a5-14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 14.0a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 14.0a6-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a3/ALL 14.0a3-14.0a6-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a4/ALL 14.0a4-14.0a6-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a5/ALL 14.0a5-14.0a6-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 14.0a6-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 14.0a6-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/14.0a7/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.0a4/ALL 14.0a4-14.0a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.0a5/ALL 14.0a5-14.0a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.0a6/ALL 14.0a6-14.0a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 14.0a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 14.0a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.0a4/ALL 14.0a4-14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.0a5/ALL 14.0a5-14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.0a6/ALL 14.0a6-14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.0a4/ALL 14.0a4-14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.0a5/ALL 14.0a5-14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.0a6/ALL 14.0a6-14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 14.0a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 14.0a7-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a4/ALL 14.0a4-14.0a7-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a5/ALL 14.0a5-14.0a7-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a6/ALL 14.0a6-14.0a7-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 14.0a7-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 14.0a7-windows-x86_64-ALL.xml [last] ===================================== update_1/alpha/14.0a3-14.0a6-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64-14.0a6_…" hashFunction="SHA512" hashValue="728af318754aa5720f8d35493908b722ebdd4431c9206f9a820bfa1a3836fa86a595f7e6ed78b27bce54174901fbfcdae85f2a6b1bdc7ffeb02fb58a4462f18f" size="113929961" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64--14.0a3…" hashFunction="SHA512" hashValue="5a6404cd5683eaafaf806738a0d0e23b12c62de8606754f4547efd896c79251cc5e174769b4b782ddd05b962298a558c850a38be601438d5a16717892a8c2ef8" size="4767116" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a3-14.0a6-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos-14.0a6_ALL.mar" hashFunction="SHA512" hashValue="92a2cf5ebd8ac30ec1cc0705fc44b0098ca2e920b67f041bd8ad3eda1a5de63a5e171ebffe25c9f9f1677496d3e068fee844e7117bc653737dcc2db645445cc3" size="128974870" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos--14.0a3-14.0a6…" hashFunction="SHA512" hashValue="9b63c6e974157c07752748b854a147927f52bbd529d41e577a93447768775901352aaaaa6b88d0c0ad8340fa58537623ad7f0fb325b9bd516e0ae4d61a8b3e90" size="8393928" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a3-14.0a6-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64-14.0a…" hashFunction="SHA512" hashValue="f661ba58880dcd3b1051217366c7b4d8d80dfb7b95c76608684c3fd0fd1aa5c5feee505d51ccbbed264e940b1c7f0b99af9279c67479bfb2ca198a3c7536262e" size="94937312" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64--14.0…" hashFunction="SHA512" hashValue="46a79f5897baf136bdada04a5276d45b08c2c5fd8a128f520f9f7d305ba673a387118154d4b1bb6dbb2542fae6bb09bb03a9a3bfcc14b1ce5f348aedae90bf19" size="4062221" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a4-14.0a6-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64-14.0a6_…" hashFunction="SHA512" hashValue="728af318754aa5720f8d35493908b722ebdd4431c9206f9a820bfa1a3836fa86a595f7e6ed78b27bce54174901fbfcdae85f2a6b1bdc7ffeb02fb58a4462f18f" size="113929961" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64--14.0a4…" hashFunction="SHA512" hashValue="6a3bf5489f260df27b1511edc7e3ed301ca59059e6e99db5a8e505e11a638a825520aa615271d39f1aef2a614557ea1a618f15ee9acf1f2a94f9ba9275763e4a" size="3694112" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a4-14.0a6-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos-14.0a6_ALL.mar" hashFunction="SHA512" hashValue="92a2cf5ebd8ac30ec1cc0705fc44b0098ca2e920b67f041bd8ad3eda1a5de63a5e171ebffe25c9f9f1677496d3e068fee844e7117bc653737dcc2db645445cc3" size="128974870" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos--14.0a4-14.0a6…" hashFunction="SHA512" hashValue="6c7ce7e77f8b27d8725ad6c5d33f1d3a3aa6d10251763878a3ba0ff7df09a146b24508283dba77315ceeab7390bde7a29dddbee89cded64fa319ece399a62dda" size="6880236" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a4-14.0a6-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64-14.0a…" hashFunction="SHA512" hashValue="f661ba58880dcd3b1051217366c7b4d8d80dfb7b95c76608684c3fd0fd1aa5c5feee505d51ccbbed264e940b1c7f0b99af9279c67479bfb2ca198a3c7536262e" size="94937312" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64--14.0…" hashFunction="SHA512" hashValue="199aefa66d3dd82dc51802eab654dfca462f25c2d545f223c59f2da9edd7164fe697c032c57c145594b227c495a66b3e03186bcbbdb390e8a5df8e4a311d4769" size="3513113" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a4-14.0a7-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64-14.0a7_…" hashFunction="SHA512" hashValue="5e24cd984455df47644007d7f8a46327edf70af4d8f7c551723d90774a7c420d744bbd2d454431ff914a02aa0235daac2091a6b1d8f97e835658dc262080c9c6" size="113987869" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64--14.0a4…" hashFunction="SHA512" hashValue="3fdd50f5537a528acd621f1150fd6c4680fcb0992614c0e1df8d838feb9060582f2ec1c2ac219552c45757d7bd7ab6bc34d2f28b438630b7715cd327127fbcf4" size="7001267" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a4-14.0a7-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos-14.0a7_ALL.mar" hashFunction="SHA512" hashValue="d6fccf821566ed85c7937bc689f314cc6cfbcbaa12ec0c160982682df40376ca5037b6bb042d49131eabc7f989f90286ba12cd00f44b9971618d3fa3c0dc2b6c" size="129029378" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos--14.0a4-14.0a7…" hashFunction="SHA512" hashValue="e5e387581a008386320d64a8b55943e519a3e164c8117be5e109de32785d19a8278dadd6ec1a21c421ed77f79075f821dea17548e0d0bee5750935af57fe788d" size="12008441" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a4-14.0a7-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64-14.0a…" hashFunction="SHA512" hashValue="7c151dfcd7be3a8e5ad43a4ff3402a1bfcc7813ace5f4ee735e0d20c0e491b7ad2c1c7580c67db02ff049f71ab71ed26adb67233fcc25e8131086d3280e57923" size="95008024" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64--14.0…" hashFunction="SHA512" hashValue="5e5b5965a268a50b83521a6a88e627a72a72ade2c47b19763a8c312474e47a79f052c10192340c7a646e8066b0caee2f06dee95cf0dba25feabce60d2f709bbe" size="7472142" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a5-14.0a6-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64-14.0a6_…" hashFunction="SHA512" hashValue="728af318754aa5720f8d35493908b722ebdd4431c9206f9a820bfa1a3836fa86a595f7e6ed78b27bce54174901fbfcdae85f2a6b1bdc7ffeb02fb58a4462f18f" size="113929961" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64--14.0a5…" hashFunction="SHA512" hashValue="79f6c4cf63fafe2b040e91faba00bf321e59be4ff73d08bc949e1fa9a6f7cedc34e389c262f3e920a5991273c771dd775884f24310ee95d37d00fb2696e8b095" size="3470667" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a5-14.0a6-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos-14.0a6_ALL.mar" hashFunction="SHA512" hashValue="92a2cf5ebd8ac30ec1cc0705fc44b0098ca2e920b67f041bd8ad3eda1a5de63a5e171ebffe25c9f9f1677496d3e068fee844e7117bc653737dcc2db645445cc3" size="128974870" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos--14.0a5-14.0a6…" hashFunction="SHA512" hashValue="09807c2236505e60d8d30021cac6593a767f214088a043f06aa64c44120393c7626e8c4999edcf0a67dfcea2f6be3b87d04dc5bb3304316e4750bb29cde1db30" size="6626368" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a5-14.0a6-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64-14.0a…" hashFunction="SHA512" hashValue="f661ba58880dcd3b1051217366c7b4d8d80dfb7b95c76608684c3fd0fd1aa5c5feee505d51ccbbed264e940b1c7f0b99af9279c67479bfb2ca198a3c7536262e" size="94937312" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64--14.0…" hashFunction="SHA512" hashValue="7189899321271075586a6292330e49e608b1ccc005601d14ceb961b19c481a9fdb881f8bb94d7c9e131914cfa8dbcb4f2bdfd88813d890aaa189029bf1c5762b" size="3273844" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a5-14.0a7-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64-14.0a7_…" hashFunction="SHA512" hashValue="5e24cd984455df47644007d7f8a46327edf70af4d8f7c551723d90774a7c420d744bbd2d454431ff914a02aa0235daac2091a6b1d8f97e835658dc262080c9c6" size="113987869" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64--14.0a5…" hashFunction="SHA512" hashValue="7950fbaa6f2e2558468c22d9b058de4a45ec7b11643911f33c1043a2a1c628865c157ad140bb358359cafc3fc3c6cec51a7543cfd389ef8d19dd59bf4e3a0219" size="6865471" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a5-14.0a7-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos-14.0a7_ALL.mar" hashFunction="SHA512" hashValue="d6fccf821566ed85c7937bc689f314cc6cfbcbaa12ec0c160982682df40376ca5037b6bb042d49131eabc7f989f90286ba12cd00f44b9971618d3fa3c0dc2b6c" size="129029378" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos--14.0a5-14.0a7…" hashFunction="SHA512" hashValue="9cab93fc5292d65acf454414cfe56325f0bf1531a60b7b61a33cde6a2ad1a51adf630b71b3a0c4cd213c5ecf215511a211e4ba3ecd8be5e9952064e68550c46f" size="11855125" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a5-14.0a7-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64-14.0a…" hashFunction="SHA512" hashValue="7c151dfcd7be3a8e5ad43a4ff3402a1bfcc7813ace5f4ee735e0d20c0e491b7ad2c1c7580c67db02ff049f71ab71ed26adb67233fcc25e8131086d3280e57923" size="95008024" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64--14.0…" hashFunction="SHA512" hashValue="47b7a57ca5b7b1eb77f39718d1ddc2dcfd1aa87449cee0c5933b5c3cfabd74bb034f0b277196bc1baba24661d19c618fefed62459cf1d48ef7b3c18e3486a9e5" size="7329762" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a6-14.0a7-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64-14.0a7_…" hashFunction="SHA512" hashValue="5e24cd984455df47644007d7f8a46327edf70af4d8f7c551723d90774a7c420d744bbd2d454431ff914a02aa0235daac2091a6b1d8f97e835658dc262080c9c6" size="113987869" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64--14.0a6…" hashFunction="SHA512" hashValue="74f4065215a7825ca7fadba68db150bedadcb9527333bde5eaec2508a74bab57ec48335a73f144ce9bb1a8a33105b73ac0691480390ef9984f9591b7fa79fb40" size="6838327" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a6-14.0a7-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos-14.0a7_ALL.mar" hashFunction="SHA512" hashValue="d6fccf821566ed85c7937bc689f314cc6cfbcbaa12ec0c160982682df40376ca5037b6bb042d49131eabc7f989f90286ba12cd00f44b9971618d3fa3c0dc2b6c" size="129029378" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos--14.0a6-14.0a7…" hashFunction="SHA512" hashValue="c3c199a7f54bd103194aaabafd7b10ce17873c6b491a8b77edb3a4d75e8853c626958d54dd2f735ddbd388c7750d202153650e35fb65db1c756141897a53aa31" size="11712465" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a6-14.0a7-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64-14.0a…" hashFunction="SHA512" hashValue="7c151dfcd7be3a8e5ad43a4ff3402a1bfcc7813ace5f4ee735e0d20c0e491b7ad2c1c7580c67db02ff049f71ab71ed26adb67233fcc25e8131086d3280e57923" size="95008024" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64--14.0…" hashFunction="SHA512" hashValue="16ee78b84b979dc7071812e059443beb1216b322ccd2c17e6ecfd47a9b1e40eaf24d5d3bd82dd3eb223c4f991f8d3e3bcc05696c27229f7db451377215ff2b78" size="7154414" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a6-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64-14.0a6_…" hashFunction="SHA512" hashValue="728af318754aa5720f8d35493908b722ebdd4431c9206f9a820bfa1a3836fa86a595f7e6ed78b27bce54174901fbfcdae85f2a6b1bdc7ffeb02fb58a4462f18f" size="113929961" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.0a6-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos-14.0a6_ALL.mar" hashFunction="SHA512" hashValue="92a2cf5ebd8ac30ec1cc0705fc44b0098ca2e920b67f041bd8ad3eda1a5de63a5e171ebffe25c9f9f1677496d3e068fee844e7117bc653737dcc2db645445cc3" size="128974870" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.0a6-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a6" appVersion="14.0a6" platformVersion="128.2.0" buildID="20240919190333" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a6" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64-14.0a…" hashFunction="SHA512" hashValue="f661ba58880dcd3b1051217366c7b4d8d80dfb7b95c76608684c3fd0fd1aa5c5feee505d51ccbbed264e940b1c7f0b99af9279c67479bfb2ca198a3c7536262e" size="94937312" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.0a7-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64-14.0a7_…" hashFunction="SHA512" hashValue="5e24cd984455df47644007d7f8a46327edf70af4d8f7c551723d90774a7c420d744bbd2d454431ff914a02aa0235daac2091a6b1d8f97e835658dc262080c9c6" size="113987869" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.0a7-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos-14.0a7_ALL.mar" hashFunction="SHA512" hashValue="d6fccf821566ed85c7937bc689f314cc6cfbcbaa12ec0c160982682df40376ca5037b6bb042d49131eabc7f989f90286ba12cd00f44b9971618d3fa3c0dc2b6c" size="129029378" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.0a7-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.0a7" appVersion="14.0a7" platformVersion="128.3.0" buildID="20240927001933" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a7" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64-14.0a…" hashFunction="SHA512" hashValue="7c151dfcd7be3a8e5ad43a4ff3402a1bfcc7813ace5f4ee735e0d20c0e491b7ad2c1c7580c67db02ff049f71ab71ed26adb67233fcc25e8131086d3280e57923" size="95008024" type="complete"></patch></update></updates> ===================================== update_1/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64-14.0a6.…","git_tag":"mb-14.0a6-build1","sig":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64-14.0a6.…","version":"14.0a6"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64-14.0a7.…","git_tag":"mb-14.0a7-build1","sig":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64-14.0a7.…","version":"14.0a7"} \ No newline at end of file ===================================== update_1/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos-14.0a6.dmg","git_tag":"mb-14.0a6-build1","sig":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos-14.0a6.dmg.asc","version":"14.0a6"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos-14.0a7.dmg","git_tag":"mb-14.0a7-build1","sig":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos-14.0a7.dmg.asc","version":"14.0a7"} \ No newline at end of file ===================================== update_1/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64-14.0a…","git_tag":"mb-14.0a6-build1","sig":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64-14.0a…","version":"14.0a6"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64-14.0a…","git_tag":"mb-14.0a7-build1","sig":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64-14.0a…","version":"14.0a7"} \ No newline at end of file ===================================== update_1/alpha/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64-14.0a6.…","sig":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-linux-x86_64-14.0a6.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos-14.0a6.dmg","sig":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-macos-14.0a6.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64-14.0a…","sig":"https://cdn.mullvad.net/browser/14.0a6/mullvad-browser-windows-x86_64-14.0a…"}}},"tag":"mb-14.0a6-build1","version":"14.0a6"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64-14.0a7.…","sig":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-linux-x86_64-14.0a7.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos-14.0a7.dmg","sig":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-macos-14.0a7.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64-14.0a…","sig":"https://cdn.mullvad.net/browser/14.0a7/mullvad-browser-windows-x86_64-14.0a…"}}},"tag":"mb-14.0a7-build1","version":"14.0a7"} \ 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/tor-browser-update-responses][main] alpha: new version, 14.0a7
by morgan (＠morgan) 27 Sep '24

27 Sep '24

morgan pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 4481519f by Morgan at 2024-09-27T20:02:52+00:00 alpha: new version, 14.0a7 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/14.0a3-14.0a6-linux-i686-ALL.xml - − update_3/alpha/14.0a3-14.0a6-linux-x86_64-ALL.xml - − update_3/alpha/14.0a3-14.0a6-macos-ALL.xml - − update_3/alpha/14.0a3-14.0a6-windows-i686-ALL.xml - − update_3/alpha/14.0a3-14.0a6-windows-x86_64-ALL.xml - − update_3/alpha/14.0a4-14.0a6-linux-i686-ALL.xml - − update_3/alpha/14.0a4-14.0a6-linux-x86_64-ALL.xml - − update_3/alpha/14.0a4-14.0a6-macos-ALL.xml - − update_3/alpha/14.0a4-14.0a6-windows-i686-ALL.xml - − update_3/alpha/14.0a4-14.0a6-windows-x86_64-ALL.xml - + update_3/alpha/14.0a4-14.0a7-linux-i686-ALL.xml - + update_3/alpha/14.0a4-14.0a7-linux-x86_64-ALL.xml - + update_3/alpha/14.0a4-14.0a7-macos-ALL.xml - + update_3/alpha/14.0a4-14.0a7-windows-i686-ALL.xml - + update_3/alpha/14.0a4-14.0a7-windows-x86_64-ALL.xml - − update_3/alpha/14.0a5-14.0a6-linux-i686-ALL.xml - − update_3/alpha/14.0a5-14.0a6-linux-x86_64-ALL.xml - − update_3/alpha/14.0a5-14.0a6-macos-ALL.xml - − update_3/alpha/14.0a5-14.0a6-windows-i686-ALL.xml - − update_3/alpha/14.0a5-14.0a6-windows-x86_64-ALL.xml - + update_3/alpha/14.0a5-14.0a7-linux-i686-ALL.xml - + update_3/alpha/14.0a5-14.0a7-linux-x86_64-ALL.xml - + update_3/alpha/14.0a5-14.0a7-macos-ALL.xml - + update_3/alpha/14.0a5-14.0a7-windows-i686-ALL.xml - + update_3/alpha/14.0a5-14.0a7-windows-x86_64-ALL.xml - + update_3/alpha/14.0a6-14.0a7-linux-i686-ALL.xml - + update_3/alpha/14.0a6-14.0a7-linux-x86_64-ALL.xml - + update_3/alpha/14.0a6-14.0a7-macos-ALL.xml - + update_3/alpha/14.0a6-14.0a7-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-build] Pushed new tag mb-14.0a7-build1
by morgan (＠morgan) 27 Sep '24

27 Sep '24

morgan pushed new tag mb-14.0a7-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] Pushed new tag tbb-14.0a7-build1
by morgan (＠morgan) 27 Sep '24

27 Sep '24

morgan pushed new tag tbb-14.0a7-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][main] Bug 41241, 41242: Prepare Tor, Mullvad Browser 14.0a7
by morgan (＠morgan) 27 Sep '24

27 Sep '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: afae53db by Morgan at 2024-09-27T00:23:09+00:00 Bug 41241,41242: Prepare Tor,Mullvad Browser 14.0a7 - - - - - 7 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,18 @@ +Mullvad Browser 14.0a7 - September 27 2024 + * All Platforms + * Updated Firefox to 128.3.0esr + * Updated NoScript to 11.4.40 + * Bug 355: Rebase Mullvad Browser Alpha onto Firefox 128.3.0esr [mullvad-browser] + * Bug 42070: Backport Bugzilla 1834307 and hide smooth-scroll UX [tor-browser] + * Bug 42362: "New window" missing from File menu [tor-browser] + * Bug 42742: Inconsistent use of "New private window" vs "New window" [tor-browser] + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43163: Disable offscreen canvas until verified it is not fingerprintable [tor-browser] + * Bug 41248: Check and update bundled font versions [tor-browser-build] + * Build System + * All Platforms + * Bug 41236: Remove binutils when not needed [tor-browser-build] + Mullvad Browser 14.0a6 - September 19 2024 * All Platforms * Bug 344: set media.navigator.enabled = true [mullvad-browser] ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,36 @@ +Tor Browser 14.0a7 - September 27 2024 + * All Platforms + * Updated NoScript to 11.4.40 + * Bug 42832: Download spam prevention should not affect browser extensions [tor-browser] + * Bug 43163: Disable offscreen canvas until verified it is not fingerprintable [tor-browser] + * Bug 43166: Rebase Tor Browser alpha onto Firefox 128.3.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 128.3.0esr + * Bug 42070: Backport Bugzilla 1834307 and hide smooth-scroll UX [tor-browser] + * Bug 42362: "New window" missing from File menu [tor-browser] + * Bug 42742: Inconsistent use of "New private window" vs "New window" [tor-browser] + * Bug 41248: Check and update bundled font versions [tor-browser-build] + * Android + * Updated GeckoView to 128.3.0esr + * Bug 43172: remove remote settings and SERPTelemetry [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.23.1 + * Bug 41236: Remove binutils when not needed [tor-browser-build] + * Windows + macOS + Linux + * Bug 41246: Add updater rewriterules to make 13.5a10 a watershed [tor-browser-build] + +Tor Browser 13.5a10 - September 25 2024 + * Windows + macOS + Linux + * Updated Firefox to 115.15.0esr + * Updated NoScript to 11.4.37 + * Updated OpenSSL to 3.0.15 + * Windows + macOS + * Bug 42747: Windows 7/8 and macOS 10.12-10.14 Legacy/Maintenance [tor-browser] + * Build System + * Windows + macOS + Linux + * Updated Go to 1.21.12 + Tor Browser 14.0a6 - September 19 2024 * All Platforms * Bug 42831: Remove the shopping components [tor-browser] ===================================== projects/browser/config ===================================== @@ -108,9 +108,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4349514/noscript-11.4.37.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4357325/noscript-11.4.40.… name: noscript - sha256sum: 5e9921599c63e0b357851ea7ca1354554b3af2c676bbbfff5687cafce4396c18 + sha256sum: 242ead426159d871480a13062cbee08abc97da746cdc5c643aee2692e9adbbb2 - URL: https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.5… name: ublock-origin sha256sum: 1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14 ===================================== projects/firefox/config ===================================== @@ -14,12 +14,12 @@ container: use_container: 1 var: - firefox_platform_version: '128.2.0' + firefox_platform_version: '128.3.0' firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '14.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 6 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' @@ -107,7 +107,7 @@ targets: gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' nightly_updates_publish_dir_prefix: mullvadbrowser- - browser_build: 4 + browser_build: 1 linux-x86_64: var: ===================================== projects/geckoview/config ===================================== @@ -16,12 +16,12 @@ container: build_apk: 1 var: - firefox_platform_version: '128.2.0' + firefox_platform_version: '128.3.0' geckoview_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '14.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 6 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/translation/config ===================================== @@ -18,13 +18,13 @@ steps: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 92b97bec9c21cc8881bee506bd75e05bab7578a3 + git_hash: 816fcde248e0e25c8ad921d25ec97a374a59ed94 targets: nightly: git_hash: 'tor-browser' mullvad-browser: mullvad-browser: '[% INCLUDE build %]' - git_hash: bff8092bbe5ae93b2c162ade300d739b2cd9e92d + git_hash: 78212a3da2439e436ac5f73d8e3eb908145c3ece targets: nightly: git_hash: 'mullvad-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: 0f1821e7e70c8ae3d8d59b9d889d95c135913bd9 + git_hash: 12b033e4192448315794f5fe8203fe91dcc29a8c compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '14.0a6' + torbrowser_version: '14.0a7' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/09/19 19:03:33' + browser_release_date: '2024/09/27 00:19:33' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 14.0a6 - 14.0a5 - 14.0a4 - - 14.0a3 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… 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-128.3.0esr-14.0-1-build1
by morgan (＠morgan) 27 Sep '24

27 Sep '24

morgan pushed new tag mullvad-browser-128.3.0esr-14.0-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/tor-browser] Pushed new tag tor-browser-128.3.0esr-14.0-1-build2
by morgan (＠morgan) 27 Sep '24

27 Sep '24

morgan pushed new tag tor-browser-128.3.0esr-14.0-1-build2 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/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] 24 commits: MB 38: Mullvad Browser configuration
by morgan (＠morgan) 27 Sep '24

27 Sep '24

morgan pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 8fc39062 by Pier Angelo Vendrame at 2024-09-26T23:15:10+02:00 MB 38: Mullvad Browser configuration - - - - - a2cba9dd by Morgan at 2024-09-26T23:15:14+02:00 fixup! MB 38: Mullvad Browser configuration - - - - - c5afee5d by Richard Pospesel at 2024-09-26T23:15:15+02:00 fixup! MB 38: Mullvad Browser configuration Bug 222: Hide 'List all tabs' when the tabs don't overflow - - - - - 2a24e82a by Pier Angelo Vendrame at 2024-09-26T23:15:15+02:00 fixup! MB 38: Mullvad Browser configuration MB 344: Remove media.navigator.enabled = false on MB. RFP spoof the values protected by this preference. We do not do the same on Tor Browser because this functionality depends on WebRTC, which is disabled at build time on TBB. - - - - - 23191f67 by Pier Angelo Vendrame at 2024-09-26T23:15:15+02: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 - - - - - 1d865fd0 by Pier Angelo Vendrame at 2024-09-26T23:15:16+02: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. - - - - - 4d3ac4fa by Pier Angelo Vendrame at 2024-09-26T23:15:16+02:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 15b4f467 by Pier Angelo Vendrame at 2024-09-26T23:15:16+02:00 MB 37: Customization for the about dialog - - - - - e8e6652d by Henry Wilkes at 2024-09-26T23:15:17+02:00 MB 39: Add home page about:mullvad-browser - - - - - 45b7ca93 by hackademix at 2024-09-26T23:15:17+02:00 MB 97: Remove UI cues to install new extensions. - - - - - 00d91791 by hackademix at 2024-09-26T23:15:17+02:00 MB 47: uBlock Origin customization - - - - - 07bf113a by Pier Angelo Vendrame at 2024-09-26T23:15:18+02: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. - - - - - 79a49471 by Pier Angelo Vendrame at 2024-09-26T23:15:18+02:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 94842cc1 by Nicolas Vigier at 2024-09-26T23:15:19+02:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - dae4c978 by Pier Angelo Vendrame at 2024-09-26T23:15:19+02: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. - - - - - 6f59241f by Pier Angelo Vendrame at 2024-09-27T00:00:26+00: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. - - - - - e84a20e4 by hackademix at 2024-09-27T00:00:26+00:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - 350b19e0 by Richard Pospesel at 2024-09-27T00:00:27+00:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - cbec5612 by rui hildt at 2024-09-27T00:00:27+00:00 MB 213: Customize the search engines list - - - - - 79721f60 by Pier Angelo Vendrame at 2024-09-27T00:00:28+00:00 squash! MB 213: Customize the search engines list MB 328: Refactor the search engine patch. Upstream switched to a completely different search engine configuration between ESR 115 and ESR 128. We moved our configuration to a couple of JSON files that do not follow upstream's schemas, as they are overcomplicated for our needs. Also, we keep the old search engine extensions for now, as upstream also kept them, and planned of removing them with Bug 1885953. - - - - - 832f998a by hackademix at 2024-09-27T00:00:28+00:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 151ac295 by Pier Angelo Vendrame at 2024-09-27T00:00:28+00:00 MB 80: Enable Mullvad Browser as a default browser - - - - - 57d2cd5a by Pier Angelo Vendrame at 2024-09-27T00:00:29+00:00 MB 320: Temporarily disable WebRTC and WDBA on Windows. WebRTC should be re-enabled when tor-browser#42758 is resolved, and and the default browser agent when in general we make this feature work again. - - - - - 564c9f37 by Henry Wilkes at 2024-09-27T00:00:29+00:00 MB 329: Customize toolbar for mullvad-browser. - - - - - 30 changed files: - .gitlab/issue_templates/Emergency Security Issue.md - + .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 The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/46… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/46… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41248: Updated bundled fonts.
by morgan (＠morgan) 26 Sep '24

26 Sep '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d4ed8d75 by Pier Angelo Vendrame at 2024-09-26T20:03:12+02:00 Bug 41248: Updated bundled fonts. - - - - - 1 changed file: - projects/fonts/config Changes: ===================================== projects/fonts/config ===================================== @@ -5,8 +5,8 @@ container: # We just copy files around, no need to use a container. use_container: 0 var: - # noto-monthly-release-23.9.1 - noto_git_hash: c890f6fec6fa37740f23fffdd2a28e156f3837a3 + # noto-monthly-release-24.9.1 + noto_git_hash: eeb71fdda20300eb0891badeed5e64850e2cbc64 # Use this way so that the script that downloads the fonts can access the # lists of all the targets. noto_fonts_common: 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/tor-browser-update-responses][main] alpha: new version, 13.5a10
by morgan (＠morgan) 26 Sep '24

26 Sep '24

morgan pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: e14f898f by Morgan at 2024-09-26T20:58:45+00:00 alpha: new version, 13.5a10 - - - - - 28 changed files: - + update_pre13.5a10/alpha/.htaccess - + update_pre13.5a10/alpha/13.5a10-linux-i686-ALL.xml - + update_pre13.5a10/alpha/13.5a10-linux-x86_64-ALL.xml - + update_pre13.5a10/alpha/13.5a10-macos-ALL.xml - + update_pre13.5a10/alpha/13.5a10-windows-i686-ALL.xml - + update_pre13.5a10/alpha/13.5a10-windows-x86_64-ALL.xml - + update_pre13.5a10/alpha/13.5a7-13.5a10-linux-i686-ALL.xml - + update_pre13.5a10/alpha/13.5a7-13.5a10-linux-x86_64-ALL.xml - + update_pre13.5a10/alpha/13.5a7-13.5a10-macos-ALL.xml - + update_pre13.5a10/alpha/13.5a7-13.5a10-windows-i686-ALL.xml - + update_pre13.5a10/alpha/13.5a7-13.5a10-windows-x86_64-ALL.xml - + update_pre13.5a10/alpha/13.5a8-13.5a10-linux-i686-ALL.xml - + update_pre13.5a10/alpha/13.5a8-13.5a10-linux-x86_64-ALL.xml - + update_pre13.5a10/alpha/13.5a8-13.5a10-macos-ALL.xml - + update_pre13.5a10/alpha/13.5a8-13.5a10-windows-i686-ALL.xml - + update_pre13.5a10/alpha/13.5a8-13.5a10-windows-x86_64-ALL.xml - + update_pre13.5a10/alpha/13.5a9-13.5a10-linux-i686-ALL.xml - + update_pre13.5a10/alpha/13.5a9-13.5a10-linux-x86_64-ALL.xml - + update_pre13.5a10/alpha/13.5a9-13.5a10-macos-ALL.xml - + update_pre13.5a10/alpha/13.5a9-13.5a10-windows-i686-ALL.xml - + update_pre13.5a10/alpha/13.5a9-13.5a10-windows-x86_64-ALL.xml - + update_pre13.5a10/alpha/download-linux-i686.json - + update_pre13.5a10/alpha/download-linux-x86_64.json - + update_pre13.5a10/alpha/download-macos.json - + update_pre13.5a10/alpha/download-windows-i686.json - + update_pre13.5a10/alpha/download-windows-x86_64.json - + update_pre13.5a10/alpha/downloads.json - + update_pre13.5a10/alpha/no-update.xml Changes: ===================================== update_pre13.5a10/alpha/.htaccess ===================================== @@ -0,0 +1,50 @@ +RewriteEngine On +# bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory +RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] +RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] +# tor-browser#42747: Make 13.5a10 a watershed alpha release +RewriteRule ^[^/]+/\d\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] +RewriteRule ^[^/]+/1[012]\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] +RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] +RewriteRule ^[^/]+/13\.5a\d/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] +RewriteRule ^[^/]+/13.5a10/ no-update.xml [last] +RewriteRule ^Linux_x86-gcc3/13.5a7/ALL 13.5a7-13.5a10-linux-i686-ALL.xml [last] +RewriteRule ^Linux_x86-gcc3/13.5a8/ALL 13.5a8-13.5a10-linux-i686-ALL.xml [last] +RewriteRule ^Linux_x86-gcc3/13.5a9/ALL 13.5a9-13.5a10-linux-i686-ALL.xml [last] +RewriteRule ^Linux_x86-gcc3/[^/]+/ALL 13.5a10-linux-i686-ALL.xml [last] +RewriteRule ^Linux_x86-gcc3/ 13.5a10-linux-i686-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a7/ALL 13.5a7-13.5a10-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a8/ALL 13.5a8-13.5a10-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a9/ALL 13.5a9-13.5a10-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a10-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.5a10-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a7/ALL 13.5a7-13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a8/ALL 13.5a8-13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a9/ALL 13.5a9-13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a7/ALL 13.5a7-13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a8/ALL 13.5a8-13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a9/ALL 13.5a9-13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a10-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.5a10-macos-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/13.5a7/ALL 13.5a7-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/13.5a8/ALL 13.5a8-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/13.5a9/ALL 13.5a9-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/[^/]+/ALL 13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/ 13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/13.5a7/ALL 13.5a7-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/13.5a8/ALL 13.5a8-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/13.5a9/ALL 13.5a9-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/[^/]+/ALL 13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/ 13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/13.5a7/ALL 13.5a7-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/13.5a8/ALL 13.5a8-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/13.5a9/ALL 13.5a9-13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/[^/]+/ALL 13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/ 13.5a10-windows-i686-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a7/ALL 13.5a7-13.5a10-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a8/ALL 13.5a8-13.5a10-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a9/ALL 13.5a9-13.5a10-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a10-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a10-windows-x86_64-ALL.xml [last] ===================================== update_pre13.5a10/alpha/13.5a10-linux-i686-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-i686-1…" hashFunction="SHA512" hashValue="edfb7526e3dcc0f4f9ba7166d23434afb7e7dce1ac6461c8dc9143f92f390dca277b13f583565c7c9e8ef268f765fdc58cbb7d4426a0ebe0bc1921531a5b33af" size="124083210" type="complete"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a10-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-x86_64…" hashFunction="SHA512" hashValue="c2ff0201b31068f71fdba5c5504f86dc4690c53bb9aa97c6bce215948b32903c23db19806093b860fb1338cf7c7a694f8f5d28de6d61f34c1d9cbdf928fe3c3e" size="123334114" type="complete"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a10-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-macos-13.5a1…" hashFunction="SHA512" hashValue="ea3230d16c22c685e4a3db6e7269b9cf128d07a8e7bdc8fb77a8c34f9d7f46ebedbfb7f3dc245e7942616d167880e43550122d0c217e0204ca5ca464a764e797" size="169506998" type="complete"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a10-windows-i686-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-i686…" hashFunction="SHA512" hashValue="50d4390a9a64a1d3c399fabb257288e44c4ffbcafb8088e0abb186d3cc470e8bfd398d28411a6bc974035464804a24e762b0519bffb3752c8f2fc4cec8d8c316" size="110859181" type="complete"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a10-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-x86_…" hashFunction="SHA512" hashValue="163bc2d179b2193e45b9d067b80bbff91d686de330242c4ad4ef1e2ff4b2b0dba0fad6100a0278449660823c291146e8317628f18bfd55353b235f83a96f1d81" size="110988859" type="complete"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a7-13.5a10-linux-i686-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-i686-1…" hashFunction="SHA512" hashValue="edfb7526e3dcc0f4f9ba7166d23434afb7e7dce1ac6461c8dc9143f92f390dca277b13f583565c7c9e8ef268f765fdc58cbb7d4426a0ebe0bc1921531a5b33af" size="124083210" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-i686--…" hashFunction="SHA512" hashValue="e8ad4085b15d823193ee575a8c26b5cb8025e1eb5ced1019e0bbf4764be0654cdfdb19273f779d778cefaa45512833597d023075297b2b629c432689a7f2252e" size="19670490" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a7-13.5a10-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-x86_64…" hashFunction="SHA512" hashValue="c2ff0201b31068f71fdba5c5504f86dc4690c53bb9aa97c6bce215948b32903c23db19806093b860fb1338cf7c7a694f8f5d28de6d61f34c1d9cbdf928fe3c3e" size="123334114" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-x86_64…" hashFunction="SHA512" hashValue="ee8290f473649b70c9be857a721478c0cbb43f715ba2413235d91c2120b4336e34903a126aff9bf9617bfedb788f86497cda79a7d4a88cec9edd618d1eb50777" size="20116582" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a7-13.5a10-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-macos-13.5a1…" hashFunction="SHA512" hashValue="ea3230d16c22c685e4a3db6e7269b9cf128d07a8e7bdc8fb77a8c34f9d7f46ebedbfb7f3dc245e7942616d167880e43550122d0c217e0204ca5ca464a764e797" size="169506998" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-macos--13.5a…" hashFunction="SHA512" hashValue="07e350dc8f23d88c19fb372ad8ecf7ad8169a7c047cf499eaf930dda932dfaba2cf2503904cd49fbc1a311a3539e945147e98b1336ed402052770a39b55d88aa" size="47451164" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a7-13.5a10-windows-i686-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-i686…" hashFunction="SHA512" hashValue="50d4390a9a64a1d3c399fabb257288e44c4ffbcafb8088e0abb186d3cc470e8bfd398d28411a6bc974035464804a24e762b0519bffb3752c8f2fc4cec8d8c316" size="110859181" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-i686…" hashFunction="SHA512" hashValue="90c81c42c050395f41ea127bb9d0dc8ad01fdd30c229b66adff9ec87ff28e915c14ae0efe9e522b819fd6d006ec5412a945278b01b1f10c1fb3fb2cfb7edcbf1" size="20213456" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a7-13.5a10-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-x86_…" hashFunction="SHA512" hashValue="163bc2d179b2193e45b9d067b80bbff91d686de330242c4ad4ef1e2ff4b2b0dba0fad6100a0278449660823c291146e8317628f18bfd55353b235f83a96f1d81" size="110988859" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-x86_…" hashFunction="SHA512" hashValue="19e4ba365089a62ec3194b93a8149c7167e9b8b092299c37f0d1506983427ade158ce2d9b6172f399935cf4834c86e8f80a1712337ad9d0c1ccbe40528aa5538" size="19289614" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a8-13.5a10-linux-i686-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-i686-1…" hashFunction="SHA512" hashValue="edfb7526e3dcc0f4f9ba7166d23434afb7e7dce1ac6461c8dc9143f92f390dca277b13f583565c7c9e8ef268f765fdc58cbb7d4426a0ebe0bc1921531a5b33af" size="124083210" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-i686--…" hashFunction="SHA512" hashValue="32cb1678ac18656136f755690c7042a1767216fa831bc99bcf289cefce266530986791d4548ce7598ef14f0485fcc85d48cfb05a48670f1c09a70ad8dba92be9" size="16734894" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a8-13.5a10-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-x86_64…" hashFunction="SHA512" hashValue="c2ff0201b31068f71fdba5c5504f86dc4690c53bb9aa97c6bce215948b32903c23db19806093b860fb1338cf7c7a694f8f5d28de6d61f34c1d9cbdf928fe3c3e" size="123334114" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-x86_64…" hashFunction="SHA512" hashValue="dc83bc81b2acfbd8145d7e612d64a8190d1da56d4f311f5484f78d870777f96dede70c3fd4784815268fea2b17e2e7351f245f4d2cfd340fdc24e835bbf01e2a" size="17142726" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a8-13.5a10-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-macos-13.5a1…" hashFunction="SHA512" hashValue="ea3230d16c22c685e4a3db6e7269b9cf128d07a8e7bdc8fb77a8c34f9d7f46ebedbfb7f3dc245e7942616d167880e43550122d0c217e0204ca5ca464a764e797" size="169506998" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-macos--13.5a…" hashFunction="SHA512" hashValue="1cc0ed2a1c6e11f4f85ecca341b4c7c3786bdc3744495501dcd4bc92c3784ff72b3ae713b2b8d1ed93ebeb752f2361c9424a964de13514a190cf778ae6fd5e0b" size="44347421" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a8-13.5a10-windows-i686-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-i686…" hashFunction="SHA512" hashValue="50d4390a9a64a1d3c399fabb257288e44c4ffbcafb8088e0abb186d3cc470e8bfd398d28411a6bc974035464804a24e762b0519bffb3752c8f2fc4cec8d8c316" size="110859181" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-i686…" hashFunction="SHA512" hashValue="f2d76946fe94d4edd71b33639c1535e4d22f84e11861cfc1eb54dfd80418b7de56adaf98dd00acd60c7c52fdedee4dcf355b34b1124e10971911eff057e962f3" size="17259300" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a8-13.5a10-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-x86_…" hashFunction="SHA512" hashValue="163bc2d179b2193e45b9d067b80bbff91d686de330242c4ad4ef1e2ff4b2b0dba0fad6100a0278449660823c291146e8317628f18bfd55353b235f83a96f1d81" size="110988859" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-x86_…" hashFunction="SHA512" hashValue="d33c854195bcfcc034f1b888e675072306dda8e7abcf14a2894c07f62268e63c6f8c1618766dce87ebe22220e2e16614b9f5ff8ac3feeb8ce798f61659d56849" size="16156606" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a9-13.5a10-linux-i686-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-i686-1…" hashFunction="SHA512" hashValue="edfb7526e3dcc0f4f9ba7166d23434afb7e7dce1ac6461c8dc9143f92f390dca277b13f583565c7c9e8ef268f765fdc58cbb7d4426a0ebe0bc1921531a5b33af" size="124083210" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-i686--…" hashFunction="SHA512" hashValue="822493c835c76d9503c7e21c2f0b002679ba82a5aa75527b34e658dfb33a320b78cdaa2e26039678f52bb5b6db56100cbc38c7247ecbbab09a78d42c1f8461df" size="16038909" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a9-13.5a10-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-x86_64…" hashFunction="SHA512" hashValue="c2ff0201b31068f71fdba5c5504f86dc4690c53bb9aa97c6bce215948b32903c23db19806093b860fb1338cf7c7a694f8f5d28de6d61f34c1d9cbdf928fe3c3e" size="123334114" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-linux-x86_64…" hashFunction="SHA512" hashValue="5b584eb6eca26f5451a2305169b31d81520b5ea0ffca4a42e420dc9b37a232fbcd1e557254a393228a7bbda41bb757c5addebcaf0f0b5d364976aada6d43776b" size="16316153" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a9-13.5a10-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-macos-13.5a1…" hashFunction="SHA512" hashValue="ea3230d16c22c685e4a3db6e7269b9cf128d07a8e7bdc8fb77a8c34f9d7f46ebedbfb7f3dc245e7942616d167880e43550122d0c217e0204ca5ca464a764e797" size="169506998" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-macos--13.5a…" hashFunction="SHA512" hashValue="3f589fb75d8ddbf55232dad2835cba3a8a274e1af4ac48d9e4997481d3b892a7742c3ed6b2331f16631602ae36d48cd1f33734569ae39694352c461879acf10f" size="43229892" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a9-13.5a10-windows-i686-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-i686…" hashFunction="SHA512" hashValue="50d4390a9a64a1d3c399fabb257288e44c4ffbcafb8088e0abb186d3cc470e8bfd398d28411a6bc974035464804a24e762b0519bffb3752c8f2fc4cec8d8c316" size="110859181" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-i686…" hashFunction="SHA512" hashValue="4c2f5583deae1c73ca739f9e03a27498f20f98eec0d1b14a880247d9da197ffa49e7df8b27cbdd0e342dd2ca1a11c7f787fba1847c9be706fce4d6c97e59bba3" size="16631559" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/13.5a9-13.5a10-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a10" appVersion="13.5a10" platformVersion="115.15.0" buildID="20240925170000" detailsURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" actions="showURL" openURL="https://blog.torproject.org/new-alpha-release-tor-browser-135a10" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-x86_…" hashFunction="SHA512" hashValue="163bc2d179b2193e45b9d067b80bbff91d686de330242c4ad4ef1e2ff4b2b0dba0fad6100a0278449660823c291146e8317628f18bfd55353b235f83a96f1d81" size="110988859" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/13.5a10/tor-browser-windows-x86_…" hashFunction="SHA512" hashValue="20e0a6e32485adbe727828aa8f8917a42c278f659e8305c2c4fc68029d460010a59e5e1c96e44d96623cd230bc93263df7a509df5200acd64ccbe21bf8414d3b" size="15434669" type="partial"></patch></update></updates> ===================================== update_pre13.5a10/alpha/download-linux-i686.json ===================================== @@ -0,0 +1 @@ +{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-linux-i686-13.5a…","git_tag":"tbb-13.5a10-build1","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-linux-i686-13.5a…","version":"13.5a10"} \ No newline at end of file ===================================== update_pre13.5a10/alpha/download-linux-x86_64.json ===================================== @@ -0,0 +1 @@ +{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-linux-x86_64-13.…","git_tag":"tbb-13.5a10-build1","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-linux-x86_64-13.…","version":"13.5a10"} \ No newline at end of file ===================================== update_pre13.5a10/alpha/download-macos.json ===================================== @@ -0,0 +1 @@ +{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-macos-13.5a10.dmg","git_tag":"tbb-13.5a10-build1","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-macos-13.5a10.dm…","version":"13.5a10"} \ No newline at end of file ===================================== update_pre13.5a10/alpha/download-windows-i686.json ===================================== @@ -0,0 +1 @@ +{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-windows-i686-por…","git_tag":"tbb-13.5a10-build1","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-windows-i686-por…","version":"13.5a10"} \ No newline at end of file ===================================== update_pre13.5a10/alpha/download-windows-x86_64.json ===================================== @@ -0,0 +1 @@ +{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-windows-x86_64-p…","git_tag":"tbb-13.5a10-build1","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-windows-x86_64-p…","version":"13.5a10"} \ No newline at end of file ===================================== update_pre13.5a10/alpha/downloads.json ===================================== @@ -0,0 +1 @@ +{"downloads":{"linux-i686":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-linux-i686-13.5a…","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-linux-i686-13.5a…"}},"linux-x86_64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-linux-x86_64-13.…","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-linux-x86_64-13.…"}},"macos":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-macos-13.5a10.dmg","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-macos-13.5a10.dm…"}},"win32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-windows-i686-por…","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-windows-i686-por…"}},"win64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-windows-x86_64-p…","sig":"https://dist.torproject.org/torbrowser/13.5a10/tor-browser-windows-x86_64-p…"}}},"tag":"tbb-13.5a10-build1","version":"13.5a10"} \ No newline at end of file ===================================== update_pre13.5a10/alpha/no-update.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates></updates> 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-update-responses][main] release: new version, 13.5.5
by morgan (＠morgan) 26 Sep '24

26 Sep '24

morgan pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: cfcb8317 by Morgan at 2024-09-26T20:06:05+00:00 release: new version, 13.5.5 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/13.5.1-13.5.4-linux-i686-ALL.xml - − update_3/release/13.5.1-13.5.4-linux-x86_64-ALL.xml - − update_3/release/13.5.1-13.5.4-macos-ALL.xml - − update_3/release/13.5.1-13.5.4-windows-i686-ALL.xml - − update_3/release/13.5.1-13.5.4-windows-x86_64-ALL.xml - − update_3/release/13.5.2-13.5.4-linux-i686-ALL.xml - − update_3/release/13.5.2-13.5.4-linux-x86_64-ALL.xml - − update_3/release/13.5.2-13.5.4-macos-ALL.xml - − update_3/release/13.5.2-13.5.4-windows-i686-ALL.xml - − update_3/release/13.5.2-13.5.4-windows-x86_64-ALL.xml - + update_3/release/13.5.2-13.5.5-linux-i686-ALL.xml - + update_3/release/13.5.2-13.5.5-linux-x86_64-ALL.xml - + update_3/release/13.5.2-13.5.5-macos-ALL.xml - + update_3/release/13.5.2-13.5.5-windows-i686-ALL.xml - + update_3/release/13.5.2-13.5.5-windows-x86_64-ALL.xml - − update_3/release/13.5.3-13.5.4-linux-i686-ALL.xml - − update_3/release/13.5.3-13.5.4-linux-x86_64-ALL.xml - − update_3/release/13.5.3-13.5.4-macos-ALL.xml - − update_3/release/13.5.3-13.5.4-windows-i686-ALL.xml - − update_3/release/13.5.3-13.5.4-windows-x86_64-ALL.xml - + update_3/release/13.5.3-13.5.5-linux-i686-ALL.xml - + update_3/release/13.5.3-13.5.5-linux-x86_64-ALL.xml - + update_3/release/13.5.3-13.5.5-macos-ALL.xml - + update_3/release/13.5.3-13.5.5-windows-i686-ALL.xml - + update_3/release/13.5.3-13.5.5-windows-x86_64-ALL.xml - + update_3/release/13.5.4-13.5.5-linux-i686-ALL.xml - + update_3/release/13.5.4-13.5.5-linux-x86_64-ALL.xml - + update_3/release/13.5.4-13.5.5-macos-ALL.xml - + update_3/release/13.5.4-13.5.5-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-build][maint-13.5a10] Bug 41244: Update update_responses directory
by morgan (＠morgan) 26 Sep '24

26 Sep '24

morgan pushed to branch maint-13.5a10 at The Tor Project / Applications / tor-browser-build Commits: f53f6f22 by Nicolas Vigier at 2024-09-26T17:04:02+02:00 Bug 41244: Update update_responses directory https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/4… - - - - - 1 changed file: - tools/signing/upload-update_responses-to-staticiforme Changes: ===================================== tools/signing/upload-update_responses-to-staticiforme ===================================== @@ -23,7 +23,7 @@ git checkout main git pull --ff-only test -n "$(git status --porcelain=v1 | grep -v '^?')" \ && exit_error 'update_responses_repository_dir has modified files' -is_project torbrowser && cd update_3 +is_project torbrowser && mkdir -p update_pre13.5a10 && cd update_pre13.5a10 is_project mullvadbrowser && cd update_1 old_ur=$(mktemp -d) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… 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.16.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed new tag mullvad-browser-115.16.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.16.0esr-13.5-1] 21 commits: MB 38: Mullvad Browser configuration
by morgan (＠morgan) 26 Sep '24

26 Sep '24

morgan pushed to branch mullvad-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: a7f08a59 by Pier Angelo Vendrame at 2024-09-25T22:05:22+02:00 MB 38: Mullvad Browser configuration - - - - - 893df0db by Pier Angelo Vendrame at 2024-09-25T22:05:27+02: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 - - - - - 314bdeba by Pier Angelo Vendrame at 2024-09-25T22:05:28+02: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. - - - - - dcddfc59 by Pier Angelo Vendrame at 2024-09-25T22:05:28+02:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - e9b6775e by Pier Angelo Vendrame at 2024-09-25T22:05:29+02:00 MB 37: Customization for the about dialog - - - - - 9df5c932 by Henry Wilkes at 2024-09-25T22:05:30+02:00 MB 39: Add home page about:mullvad-browser - - - - - 801f75f4 by hackademix at 2024-09-25T22:05:31+02:00 MB 97: Remove UI cues to install new extensions. - - - - - 8fdca813 by hackademix at 2024-09-25T22:05:32+02:00 MB 47: uBlock Origin customization - - - - - a1228f46 by Pier Angelo Vendrame at 2024-09-25T22:05:34+02: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. - - - - - 644ddf98 by Pier Angelo Vendrame at 2024-09-25T22:05:36+02:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 79fb91d8 by Nicolas Vigier at 2024-09-25T22:05:37+02:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - 2c34fb25 by Pier Angelo Vendrame at 2024-09-25T22:05:38+02: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. - - - - - d03f64ff by Pier Angelo Vendrame at 2024-09-25T22:05:40+02: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. - - - - - 0ad06a41 by hackademix at 2024-09-25T22:05:41+02:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - b0d9e065 by Richard Pospesel at 2024-09-25T22:05:44+02:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - db158a92 by rui hildt at 2024-09-25T22:05:45+02:00 MB 213: Customize the search engines list - - - - - 60fdb61a by hackademix at 2024-09-25T22:05:47+02:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - db5a9f1e by Pier Angelo Vendrame at 2024-09-25T22:05:48+02:00 MB 234: Disable OS spoofing in HTTP User-Agent. This commits makes it possible to disable OS spoofing in the HTTP User-Agent header, to see if matching header and JS property improve usability. - - - - - f32c051f by Pier Angelo Vendrame at 2024-09-25T22:05:50+02:00 MB 80: Enable Mullvad Browser as a default browser - - - - - 78dbae29 by Dan Ballard at 2024-09-25T22:05:51+02:00 MB 290: Add default bookmarks in alpha channel for testing - - - - - d637f1ef by june wilde at 2024-09-25T22:05:51+02:00 MB 305: Disable setting default browser on Windows Until we can pull in upstream changes to fix breakage in setting the Mullvad Browser as default in Windows 10/11 we're disabling the ability to do so via about:preferences as well as via the startup query dialog - - - - - 30 changed files: - .gitlab/issue_templates/Emergency Security Issue.md - + .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 The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ac… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ac… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! [android] Disable features and functionality
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 264c385b by Dan Ballard at 2024-09-26T17:20:57+00:00 fixup! [android] Disable features and functionality Bug 43113: remove remote settings and SERPTelemetry - - - - - 4 changed files: - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/BaseSearchTelemetryTest.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepositoryTest.kt - mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt Changes: ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt ===================================== @@ -8,7 +8,7 @@ import mozilla.appservices.remotesettings.RemoteSettingsResponse import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.ktx.android.org.json.asSequence import mozilla.components.support.ktx.android.org.json.toList -import mozilla.components.support.remotesettings.RemoteSettingsClient +//import mozilla.components.support.remotesettings.RemoteSettingsClient import mozilla.components.support.remotesettings.RemoteSettingsResult import org.jetbrains.annotations.VisibleForTesting import org.json.JSONArray @@ -23,22 +23,22 @@ internal const val REMOTE_ENDPOINT_BUCKET_NAME = "main" * Parse SERP Telemetry json from remote config. */ class SerpTelemetryRepository( - rootStorageDirectory: File, +// rootStorageDirectory: File, private val readJson: () -> JSONObject, - collectionName: String, - serverUrl: String = REMOTE_PROD_ENDPOINT_URL, - bucketName: String = REMOTE_ENDPOINT_BUCKET_NAME, +// collectionName: String, +// serverUrl: String = REMOTE_PROD_ENDPOINT_URL, +// bucketName: String = REMOTE_ENDPOINT_BUCKET_NAME, ) { val logger = Logger("SerpTelemetryRepository") private var providerList: List<SearchProviderModel> = emptyList() - @VisibleForTesting - internal var remoteSettingsClient = RemoteSettingsClient( - serverUrl = serverUrl, - bucketName = bucketName, - collectionName = collectionName, - storageRootDirectory = rootStorageDirectory, - ) +// @VisibleForTesting +// internal var remoteSettingsClient = RemoteSettingsClient( +// serverUrl = serverUrl, +// bucketName = bucketName, +// collectionName = collectionName, +// storageRootDirectory = rootStorageDirectory, +// ) /** * Provides list of search providers from cache or dump and fetches from remotes server . @@ -65,7 +65,7 @@ class SerpTelemetryRepository( val remoteResponse = fetchRemoteResponse() if (remoteResponse.lastModified > cacheLastModified) { providerList = parseRemoteResponse(remoteResponse) - writeToCache(remoteResponse) + //writeToCache(remoteResponse) } } @@ -73,8 +73,9 @@ class SerpTelemetryRepository( * Writes data to local cache. */ @VisibleForTesting - internal suspend fun writeToCache(records: RemoteSettingsResponse): RemoteSettingsResult { - return remoteSettingsClient.write(records) + internal suspend fun writeToCache(/*records: RemoteSettingsResponse*/): RemoteSettingsResult { + return RemoteSettingsResult.NetworkFailure(Exception("Bug-43113: no remote fetching")) +// return remoteSettingsClient.write(records) } /** @@ -104,12 +105,12 @@ class SerpTelemetryRepository( */ @VisibleForTesting internal suspend fun fetchRemoteResponse(): RemoteSettingsResponse { - val result = remoteSettingsClient.fetch() - return if (result is RemoteSettingsResult.Success) { - result.response - } else { - RemoteSettingsResponse(emptyList(), 0u) - } +// val result = remoteSettingsClient.fetch() +// return if (result is RemoteSettingsResult.Success) { +// result.response +// } else { + return RemoteSettingsResponse(emptyList(), 0u) +// } } /** @@ -117,16 +118,16 @@ class SerpTelemetryRepository( */ @VisibleForTesting internal suspend fun loadProvidersFromCache(): Pair<ULong, List<SearchProviderModel>> { - val result = remoteSettingsClient.read() - return if (result is RemoteSettingsResult.Success) { - val response = result.response.records.mapNotNull { - it.fields.toSearchProviderModel() - } - val lastModified = result.response.lastModified - Pair(lastModified, response) - } else { - Pair(0u, emptyList()) - } +// val result = remoteSettingsClient.read() +// return if (result is RemoteSettingsResult.Success) { +// val response = result.response.records.mapNotNull { +// it.fields.toSearchProviderModel() +// } +// val lastModified = result.response.lastModified +// Pair(lastModified, response) +// } else { + return Pair(0u, emptyList()) +// } } } ===================================== mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/BaseSearchTelemetryTest.kt ===================================== @@ -27,161 +27,161 @@ import java.io.File @RunWith(AndroidJUnit4::class) class BaseSearchTelemetryTest { - private lateinit var baseTelemetry: BaseSearchTelemetry - private lateinit var handler: BaseSearchTelemetry.SearchTelemetryMessageHandler - - @Mock - private lateinit var mockRepo: SerpTelemetryRepository - - private val mockReadJson: () -> JSONObject = mock() - private val mockRootStorageDirectory: File = mock() - - private fun createMockProviderList(): List<SearchProviderModel> = listOf( - SearchProviderModel( - schema = 1698656464939, - taggedCodes = listOf("monline_7_dg"), - telemetryId = "baidu", - organicCodes = emptyList(), - codeParamName = "tn", - queryParamNames = listOf("wd"), - searchPageRegexp = "^https://(?:m|www)\\\\.baidu\\\\.com/(?:s|baidu)", - followOnParamNames = listOf("oq"), - extraAdServersRegexps = listOf("^https?://www\\\\.baidu\\\\.com/baidu\\\\.php?"), - expectedOrganicCodes = emptyList(), - ), - ) - - private val rawJson = """ - { - "data": [ - { - "schema": 1698656464939, - "taggedCodes": [ - "monline_7_dg" - ], - "telemetryId": "baidu", - "organicCodes": [], - "codeParamName": "tn", - "queryParamNames": [ - "wd" - ], - "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)", - "followOnParamNames": [ - "oq" - ], - "extraAdServersRegexps": [ - "^https?://www\\.baidu\\.com/baidu\\.php?" - ], - "id": "19c434a3-d173-4871-9743-290ac92a3f6a", - "last_modified": 1698666532326 - }], - "timestamp": 16 -} - """.trimIndent() - - @Before - fun setup() { - baseTelemetry = spy( - object : BaseSearchTelemetry() { - override suspend fun install( - engine: Engine, - store: BrowserStore, - providerList: List<SearchProviderModel>, - ) { - // mock, do nothing - } - - override fun processMessage(message: JSONObject) { - // mock, do nothing - } - }, - ) - handler = baseTelemetry.SearchTelemetryMessageHandler() - mockRepo = spy(SerpTelemetryRepository(mockRootStorageDirectory, mockReadJson, "test")) - } - - @Test - fun `GIVEN an engine WHEN installWebExtension is called THEN the provided extension is installed in engine`() { - val engine: Engine = mock() - val store: BrowserStore = mock() - val id = "id" - val resourceUrl = "resourceUrl" - val messageId = "messageId" - val extensionInfo = ExtensionInfo(id, resourceUrl, messageId) - - baseTelemetry.installWebExtension(engine, store, extensionInfo) - - verify(engine).installBuiltInWebExtension( - id = eq(id), - url = eq(resourceUrl), - onSuccess = any(), - onError = any(), - ) - } - - @Test - fun `GIVEN a search provider does not exist for the url WHEN getProviderForUrl is called THEN return null`() { - val url = "https://www.mozilla.com/search?q=firefox" - baseTelemetry.providerList = createMockProviderList() - - assertEquals(null, baseTelemetry.getProviderForUrl(url)) - } - - @Test(expected = IllegalStateException::class) - fun `GIVEN an extension message WHEN that cannot be processed THEN throw IllegalStateException`() { - val message = "message" - - handler.onMessage(message, mock()) - } - - @Test - fun `GIVEN an extension message WHEN received THEN pass it to processMessage`() { - val message = JSONObject() - - handler.onMessage(message, mock()) - - verify(baseTelemetry).processMessage(message) - } - - @Test - fun `GIVEN empty cacheResponse WHEN initializeProviderList is called THEN update providerList`(): Unit = - runBlocking { - val localResponse = JSONObject(rawJson) - val cacheResponse: Pair<ULong, List<SearchProviderModel>> = Pair(0u, emptyList()) - - `when`(mockRepo.loadProvidersFromCache()).thenReturn(cacheResponse) - doAnswer { - localResponse - }.`when`(mockReadJson)() - - `when`(mockRepo.parseLocalPreinstalledData(localResponse)).thenReturn(createMockProviderList()) - doReturn(Unit).`when`(mockRepo).fetchRemoteResponse(any()) - - baseTelemetry.setProviderList(mockRepo.updateProviderList()) - - assertEquals(baseTelemetry.providerList.toString(), createMockProviderList().toString()) - } - - @Test - fun `GIVEN non-empty cacheResponse WHEN initializeProviderList is called THEN update providerList`(): Unit = - runBlocking { - val localResponse = JSONObject(rawJson) - val cacheResponse: Pair<ULong, List<SearchProviderModel>> = Pair(123u, createMockProviderList()) - - `when`(mockRepo.loadProvidersFromCache()).thenReturn(cacheResponse) - doAnswer { - localResponse - }.`when`(mockReadJson)() - doReturn(Unit).`when`(mockRepo).fetchRemoteResponse(any()) - - baseTelemetry.setProviderList(mockRepo.updateProviderList()) - - assertEquals(baseTelemetry.providerList.toString(), createMockProviderList().toString()) - } - - fun getProviderForUrl(url: String): SearchProviderModel? { - return createMockProviderList().find { provider -> - provider.searchPageRegexp.pattern.toRegex().containsMatchIn(url) - } - } +// private lateinit var baseTelemetry: BaseSearchTelemetry +// private lateinit var handler: BaseSearchTelemetry.SearchTelemetryMessageHandler +// +// @Mock +// private lateinit var mockRepo: SerpTelemetryRepository +// +// private val mockReadJson: () -> JSONObject = mock() +// private val mockRootStorageDirectory: File = mock() +// +// private fun createMockProviderList(): List<SearchProviderModel> = listOf( +// SearchProviderModel( +// schema = 1698656464939, +// taggedCodes = listOf("monline_7_dg"), +// telemetryId = "baidu", +// organicCodes = emptyList(), +// codeParamName = "tn", +// queryParamNames = listOf("wd"), +// searchPageRegexp = "^https://(?:m|www)\\\\.baidu\\\\.com/(?:s|baidu)", +// followOnParamNames = listOf("oq"), +// extraAdServersRegexps = listOf("^https?://www\\\\.baidu\\\\.com/baidu\\\\.php?"), +// expectedOrganicCodes = emptyList(), +// ), +// ) +// +// private val rawJson = """ +// { +// "data": [ +// { +// "schema": 1698656464939, +// "taggedCodes": [ +// "monline_7_dg" +// ], +// "telemetryId": "baidu", +// "organicCodes": [], +// "codeParamName": "tn", +// "queryParamNames": [ +// "wd" +// ], +// "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)", +// "followOnParamNames": [ +// "oq" +// ], +// "extraAdServersRegexps": [ +// "^https?://www\\.baidu\\.com/baidu\\.php?" +// ], +// "id": "19c434a3-d173-4871-9743-290ac92a3f6a", +// "last_modified": 1698666532326 +// }], +// "timestamp": 16 +//} +// """.trimIndent() +// +// @Before +// fun setup() { +// baseTelemetry = spy( +// object : BaseSearchTelemetry() { +// override suspend fun install( +// engine: Engine, +// store: BrowserStore, +// providerList: List<SearchProviderModel>, +// ) { +// // mock, do nothing +// } +// +// override fun processMessage(message: JSONObject) { +// // mock, do nothing +// } +// }, +// ) +// handler = baseTelemetry.SearchTelemetryMessageHandler() +// mockRepo = spy(SerpTelemetryRepository(mockRootStorageDirectory, mockReadJson, "test")) +// } +// +// @Test +// fun `GIVEN an engine WHEN installWebExtension is called THEN the provided extension is installed in engine`() { +// val engine: Engine = mock() +// val store: BrowserStore = mock() +// val id = "id" +// val resourceUrl = "resourceUrl" +// val messageId = "messageId" +// val extensionInfo = ExtensionInfo(id, resourceUrl, messageId) +// +// baseTelemetry.installWebExtension(engine, store, extensionInfo) +// +// verify(engine).installBuiltInWebExtension( +// id = eq(id), +// url = eq(resourceUrl), +// onSuccess = any(), +// onError = any(), +// ) +// } +// +// @Test +// fun `GIVEN a search provider does not exist for the url WHEN getProviderForUrl is called THEN return null`() { +// val url = "https://www.mozilla.com/search?q=firefox" +// baseTelemetry.providerList = createMockProviderList() +// +// assertEquals(null, baseTelemetry.getProviderForUrl(url)) +// } +// +// @Test(expected = IllegalStateException::class) +// fun `GIVEN an extension message WHEN that cannot be processed THEN throw IllegalStateException`() { +// val message = "message" +// +// handler.onMessage(message, mock()) +// } +// +// @Test +// fun `GIVEN an extension message WHEN received THEN pass it to processMessage`() { +// val message = JSONObject() +// +// handler.onMessage(message, mock()) +// +// verify(baseTelemetry).processMessage(message) +// } +// +// @Test +// fun `GIVEN empty cacheResponse WHEN initializeProviderList is called THEN update providerList`(): Unit = +// runBlocking { +// val localResponse = JSONObject(rawJson) +// val cacheResponse: Pair<ULong, List<SearchProviderModel>> = Pair(0u, emptyList()) +// +// `when`(mockRepo.loadProvidersFromCache()).thenReturn(cacheResponse) +// doAnswer { +// localResponse +// }.`when`(mockReadJson)() +// +// `when`(mockRepo.parseLocalPreinstalledData(localResponse)).thenReturn(createMockProviderList()) +// doReturn(Unit).`when`(mockRepo).fetchRemoteResponse(any()) +// +// baseTelemetry.setProviderList(mockRepo.updateProviderList()) +// +// assertEquals(baseTelemetry.providerList.toString(), createMockProviderList().toString()) +// } +// +// @Test +// fun `GIVEN non-empty cacheResponse WHEN initializeProviderList is called THEN update providerList`(): Unit = +// runBlocking { +// val localResponse = JSONObject(rawJson) +// val cacheResponse: Pair<ULong, List<SearchProviderModel>> = Pair(123u, createMockProviderList()) +// +// `when`(mockRepo.loadProvidersFromCache()).thenReturn(cacheResponse) +// doAnswer { +// localResponse +// }.`when`(mockReadJson)() +// doReturn(Unit).`when`(mockRepo).fetchRemoteResponse(any()) +// +// baseTelemetry.setProviderList(mockRepo.updateProviderList()) +// +// assertEquals(baseTelemetry.providerList.toString(), createMockProviderList().toString()) +// } +// +// fun getProviderForUrl(url: String): SearchProviderModel? { +// return createMockProviderList().find { provider -> +// provider.searchPageRegexp.pattern.toRegex().containsMatchIn(url) +// } +// } } ===================================== mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepositoryTest.kt ===================================== @@ -23,70 +23,70 @@ import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class SerpTelemetryRepositoryTest { - @Mock - private lateinit var mockRemoteSettingsClient: RemoteSettingsClient - - private lateinit var serpTelemetryRepository: SerpTelemetryRepository - - @Before - fun setup() { - MockitoAnnotations.openMocks(this) - serpTelemetryRepository = SerpTelemetryRepository( - rootStorageDirectory = mock(), - readJson = mock(), - collectionName = "", - serverUrl = "https://test.server", - bucketName = "", - ) - - serpTelemetryRepository.remoteSettingsClient = mockRemoteSettingsClient - } - - @Test - fun `GIVEN non-empty response WHEN writeToCache is called THEN the result is a success`() = runBlocking { - val records = listOf( - RemoteSettingsRecord("1", 123u, false, null, JSONObject()), - RemoteSettingsRecord("2", 456u, true, null, JSONObject()), - ) - val response = RemoteSettingsResponse(records, 125614567U) - - `when`(mockRemoteSettingsClient.write(response)) - .thenReturn(RemoteSettingsResult.Success(response)) - - val result = serpTelemetryRepository.writeToCache(response) - - assertTrue(result is RemoteSettingsResult.Success) - assertEquals(response, (result as RemoteSettingsResult.Success).response) - } - - @Test - fun `GIVEN non-empty response WHEN fetchRemoteResponse is called THEN the result is equal to the response`() = runBlocking { - val records = listOf( - RemoteSettingsRecord("1", 123u, false, null, JSONObject()), - RemoteSettingsRecord("2", 456u, true, null, JSONObject()), - ) - val response = RemoteSettingsResponse(records, 125614567U) - `when`(mockRemoteSettingsClient.fetch()) - .thenReturn(RemoteSettingsResult.Success(response)) - - val result = serpTelemetryRepository.fetchRemoteResponse() - - assertEquals(response, result) - } - - @Test - fun `GIVEN non-empty response WHEN loadProvidersFromCache is called THEN the result is equal to the response`() = runBlocking { - val records = listOf( - RemoteSettingsRecord("1", 123u, false, null, JSONObject()), - RemoteSettingsRecord("2", 456u, true, null, JSONObject()), - ) - val response = RemoteSettingsResponse(records, 125614567U) - `when`(mockRemoteSettingsClient.read()) - .thenReturn(RemoteSettingsResult.Success(response)) - - val result = serpTelemetryRepository.loadProvidersFromCache() - - assertEquals(response.lastModified, result.first) - assertEquals(response.records.mapNotNull { it.fields.toSearchProviderModel() }, result.second) - } +// @Mock +// private lateinit var mockRemoteSettingsClient: RemoteSettingsClient +// +// private lateinit var serpTelemetryRepository: SerpTelemetryRepository +// +// @Before +// fun setup() { +// MockitoAnnotations.openMocks(this) +// serpTelemetryRepository = SerpTelemetryRepository( +// rootStorageDirectory = mock(), +// readJson = mock(), +// collectionName = "", +// serverUrl = "https://test.server", +// bucketName = "", +// ) +// +// serpTelemetryRepository.remoteSettingsClient = mockRemoteSettingsClient +// } +// +// @Test +// fun `GIVEN non-empty response WHEN writeToCache is called THEN the result is a success`() = runBlocking { +// val records = listOf( +// RemoteSettingsRecord("1", 123u, false, null, JSONObject()), +// RemoteSettingsRecord("2", 456u, true, null, JSONObject()), +// ) +// val response = RemoteSettingsResponse(records, 125614567U) +// +// `when`(mockRemoteSettingsClient.write(response)) +// .thenReturn(RemoteSettingsResult.Success(response)) +// +// val result = serpTelemetryRepository.writeToCache(response) +// +// assertTrue(result is RemoteSettingsResult.Success) +// assertEquals(response, (result as RemoteSettingsResult.Success).response) +// } +// +// @Test +// fun `GIVEN non-empty response WHEN fetchRemoteResponse is called THEN the result is equal to the response`() = runBlocking { +// val records = listOf( +// RemoteSettingsRecord("1", 123u, false, null, JSONObject()), +// RemoteSettingsRecord("2", 456u, true, null, JSONObject()), +// ) +// val response = RemoteSettingsResponse(records, 125614567U) +// `when`(mockRemoteSettingsClient.fetch()) +// .thenReturn(RemoteSettingsResult.Success(response)) +// +// val result = serpTelemetryRepository.fetchRemoteResponse() +// +// assertEquals(response, result) +// } +// +// @Test +// fun `GIVEN non-empty response WHEN loadProvidersFromCache is called THEN the result is equal to the response`() = runBlocking { +// val records = listOf( +// RemoteSettingsRecord("1", 123u, false, null, JSONObject()), +// RemoteSettingsRecord("2", 456u, true, null, JSONObject()), +// ) +// val response = RemoteSettingsResponse(records, 125614567U) +// `when`(mockRemoteSettingsClient.read()) +// .thenReturn(RemoteSettingsResult.Success(response)) +// +// val result = serpTelemetryRepository.loadProvidersFromCache() +// +// assertEquals(response.lastModified, result.first) +// assertEquals(response.records.mapNotNull { it.fields.toSearchProviderModel() }, result.second) +// } } ===================================== mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt ===================================== @@ -64,18 +64,20 @@ class RemoteSettingsClient( */ @Suppress("TooGenericExceptionCaught") suspend fun fetch(): RemoteSettingsResult = withContext(Dispatchers.IO) { - try { - val serverRecords = RemoteSettings(config).use { - it.getRecords() - } - RemoteSettingsResult.Success(serverRecords) - } catch (e: RemoteSettingsException) { - Logger.error(e.message.toString()) - RemoteSettingsResult.NetworkFailure(e) - } catch (e: NullPointerException) { - Logger.error(e.message.toString()) - RemoteSettingsResult.NetworkFailure(e) - } +// try { +// val serverRecords = RemoteSettings(config).use { +// it.getRecords() +// } +// RemoteSettingsResult.Success(serverRecords) +// } catch (e: RemoteSettingsException) { +// Logger.error(e.message.toString()) +// RemoteSettingsResult.NetworkFailure(e) +// } catch (e: NullPointerException) { +// Logger.error(e.message.toString()) +// RemoteSettingsResult.NetworkFailure(e) +// } + RemoteSettingsResult.NetworkFailure(Exception("tb-43113: no remote fetching")) + } /** @@ -123,7 +125,8 @@ class RemoteSettingsClient( suspend fun RemoteSettingsClient.readOrFetch(): RemoteSettingsResult { val readResult = read() return if (readResult is RemoteSettingsResult.DiskFailure) { - fetch() + //fetch() + RemoteSettingsResult.NetworkFailure(Exception("tb-43113: no remote fetching")) } else { readResult } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/264c385… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/264c385… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41246: Add updater RewriteRules to make 13.5a10 a watershed.
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 12330fab by Pier Angelo Vendrame at 2024-09-26T12:17:46+02:00 Bug 41246: Add updater RewriteRules to make 13.5a10 a watershed. This will not be an actual watershed, as users that are already up to date in the alpha channel might have skipped it, but it will help us to test everything for when we do the watershed update that allows us to have parallel Windows 7 builds from the 13.5 series with 14.0. - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -82,6 +82,11 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + # tor-browser#42747: Make 13.5a10 a watershed alpha release + RewriteRule ^[^/]+/\d\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/1[012]\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/13\.5a\d/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-128.3.0esr-14.0-1-build1
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

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

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-115.16.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed new tag base-browser-115.16.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/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 4657541e by Morgan at 2024-09-26T10:28:23+02:00 fixup! Firefox preference overrides. Bug 43163: Disable offscreen canvas until verified it is not fingerprintable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -383,6 +383,8 @@ pref("webgl.disable-fail-if-major-performance-caveat", true); // tor-browser#16404: disable until we investigate it further (#22333) pref("webgl.enable-webgl2", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) +// tor-browser#42767: Disable offscreen canvas until verified it is not fingerprintable +pref("gfx.offscreencanvas.enabled", false); // Prevent scripts from moving and resizing open windows pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/465… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/465… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 4657541e by Morgan at 2024-09-26T10:28:23+02:00 fixup! Firefox preference overrides. Bug 43163: Disable offscreen canvas until verified it is not fingerprintable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -383,6 +383,8 @@ pref("webgl.disable-fail-if-major-performance-caveat", true); // tor-browser#16404: disable until we investigate it further (#22333) pref("webgl.enable-webgl2", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) +// tor-browser#42767: Disable offscreen canvas until verified it is not fingerprintable +pref("gfx.offscreencanvas.enabled", false); // Prevent scripts from moving and resizing open windows pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4657541… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4657541… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 45d15cbc by Morgan at 2024-09-26T10:26:43+02:00 fixup! Firefox preference overrides. Bug 43163: Disable offscreen canvas until verified it is not fingerprintable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -383,6 +383,8 @@ pref("webgl.disable-fail-if-major-performance-caveat", true); // tor-browser#16404: disable until we investigate it further (#22333) pref("webgl.enable-webgl2", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) +// tor-browser#42767: Disable offscreen canvas until verified it is not fingerprintable +pref("gfx.offscreencanvas.enabled", false); // Prevent scripts from moving and resizing open windows pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/45d15cb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/45d15cb… 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.5a10-build1
by morgan (＠morgan) 25 Sep '24

25 Sep '24

morgan pushed new tag tbb-13.5a10-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.5a10] Bug 41244: Prepare Tor Browser 13.5a10.
by morgan (＠morgan) 25 Sep '24

25 Sep '24

morgan pushed to branch maint-13.5a10 at The Tor Project / Applications / tor-browser-build Commits: 2d07612b by Pier Angelo Vendrame at 2024-09-25T19:33:21+02:00 Bug 41244: Prepare Tor Browser 13.5a10. This is a release to test that the updater changes work as expected also in 115.x and the changes needed for a watershed release. - - - - - 5 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox/config - projects/release/update_responses_config.yml - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,35 @@ +Tor Browser 13.5a10 - September 25 2024 + * Windows + macOS + Linux + * Updated Firefox to 115.15.0esr + * Updated NoScript to 11.4.37 + * Updated OpenSSL to 3.0.15 + * Windows + macOS + * Bug 42747: Windows 7/8 and macOS 10.12-10.14 Legacy/Maintenance [tor-browser] + * Build System + * Windows + macOS + Linux + * Updated Go to 1.21.12 + +Tor Browser 14.0a6 - September 19 2024 + * All Platforms + * Bug 42831: Remove the shopping components [tor-browser] + * Bug 43144: Ensure non-privacy browsing also sets the GPC header [tor-browser] + * Windows + macOS + Linux + * Bug 42698: Bridge card background contrast is low for bridge-moji [tor-browser] + * Bug 42718: Remove the firefox-view button from UI, even when always-on private-browsing mode is disabled [tor-browser] + * Bug 42740: Stop trying to hide "Restore previous session" [tor-browser] + * Bug 43072: moz-message-bar does not get announced on Orca screen-reader [tor-browser] + * Bug 43083: Backport fix for Mozilla 1436462 [tor-browser] + * Linux + * Bug 43141: Hardcode Arimo as a system-ui font [tor-browser] + * Bug 41237: Add some aliases to our Linux font config for compatibility [tor-browser-build] + * Android + * Bug 41550: Remove unused extensions from Tor Browser for Android [tor-browser] + * Bug 43052: Remove non private tabs icon and "other device tabs" from tab view [tor-browser] + * Bug 43129: about:neterror cannot display SVG on Android with Security Level Safest [tor-browser] + * Bug 43145: Backport Android security fix from 130.0.1 [tor-browser] + * Bug 43146: Update the icon of DuckDuckGo onion search engine on Android [tor-browser] + * Bug 43147: Remove unused search plugins from the apk files [tor-browser] + Tor Browser 13.5.4 - September 16 2024 * All Platforms * Updated NoScript to 11.4.37 ===================================== projects/firefox/config ===================================== @@ -17,9 +17,9 @@ var: firefox_platform_version: 115.15.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' - browser_rebase: 1 + browser_rebase: 2 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 4 + 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/release/update_responses_config.yml ===================================== @@ -84,6 +84,11 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + # tor-browser#42747: Make 13.5a10 a watershed alpha release + RewriteRule ^[^/]+/\d\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/1[012]\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/13\.5a\d/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] ===================================== projects/translation/config ===================================== @@ -12,19 +12,19 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: d69ac083437e60d681fdefce6aa1fde96e2f1eaf + git_hash: 16446c485b3be4198a7e79bfcac6510784a18506 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 022b7eea73017cd3a1fae66b8c4bd8d7b867107f + git_hash: a2bf4c2f45736958ac99f60e60b9f6d0e94454c3 targets: nightly: git_hash: 'tor-browser' mullvad-browser: mullvad-browser: '[% INCLUDE build %]' - git_hash: bff8092bbe5ae93b2c162ade300d739b2cd9e92d + git_hash: 78212a3da2439e436ac5f73d8e3eb908145c3ece targets: nightly: git_hash: 'mullvad-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: 2a9884fadf15e57f6a661f12ede1312cc71602c1 + git_hash: 12b033e4192448315794f5fe8203fe91dcc29a8c compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5.4' + torbrowser_version: '13.5a10' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/09/16 20:57:05' + browser_release_date: '2024/09/25 17:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: - - 13.5.3 - - 13.5.2 - - 13.5.1 + - 13.5a9 + - 13.5a8 + - 13.5a7 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-115.16.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new branch mullvad-browser-115.16.0esr-13.5-1 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/tor-browser-build] Pushed new tag tbb-13.5.5-build1
by morgan (＠morgan) 25 Sep '24

25 Sep '24

morgan pushed new tag tbb-13.5.5-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/mullvad-browser] Pushed new branch mullvad-browser-128.3.0esr-14.0-1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new branch mullvad-browser-128.3.0esr-14.0-1 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/tor-browser] Pushed new tag base-browser-128.3.0esr-14.0-1-build1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new tag base-browser-128.3.0esr-14.0-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-128.3.0esr-14.0-1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new branch base-browser-128.3.0esr-14.0-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-128.3.0esr-14.0-1-build1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new tag tor-browser-128.3.0esr-14.0-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][maint-13.5] 2 commits: Fix bug in relprep.py where mullvad browser was enabled even if no --mullvad-browser command given
by morgan (＠morgan) 25 Sep '24

25 Sep '24

morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: fc6a9c48 by Morgan at 2024-09-25T17:37:07+00:00 Fix bug in relprep.py where mullvad browser was enabled even if no --mullvad-browser command given - - - - - 583571d0 by Morgan at 2024-09-25T17:51:02+00:00 Bug 41240: Prepare Tor Browser 13.5.5 (Desktop-only) - - - - - 7 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/firefox/config - projects/geckoview/config - projects/translation/config - rbm.conf - tools/relprep.py Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,30 @@ +Tor Browser 13.5.5 - September 25 2024 + * Windows + macOS + * Bug 43125: Update message for legacy OS (windows ≤8.1, macOS ≤10.14) users [tor-browser] + * Linux + * Bug 334: When set as default browser on Linux in standard mode, links don't open correctly [mullvad-browser] + +Tor Browser 14.0a6 - September 19 2024 + * All Platforms + * Bug 42831: Remove the shopping components [tor-browser] + * Bug 43144: Ensure non-privacy browsing also sets the GPC header [tor-browser] + * Windows + macOS + Linux + * Bug 42698: Bridge card background contrast is low for bridge-moji [tor-browser] + * Bug 42718: Remove the firefox-view button from UI, even when always-on private-browsing mode is disabled [tor-browser] + * Bug 42740: Stop trying to hide "Restore previous session" [tor-browser] + * Bug 43072: moz-message-bar does not get announced on Orca screen-reader [tor-browser] + * Bug 43083: Backport fix for Mozilla 1436462 [tor-browser] + * Linux + * Bug 43141: Hardcode Arimo as a system-ui font [tor-browser] + * Bug 41237: Add some aliases to our Linux font config for compatibility [tor-browser-build] + * Android + * Bug 41550: Remove unused extensions from Tor Browser for Android [tor-browser] + * Bug 43052: Remove non private tabs icon and "other device tabs" from tab view [tor-browser] + * Bug 43129: about:neterror cannot display SVG on Android with Security Level Safest [tor-browser] + * Bug 43145: Backport Android security fix from 130.0.1 [tor-browser] + * Bug 43146: Update the icon of DuckDuckGo onion search engine on Android [tor-browser] + * Bug 43147: Remove unused search plugins from the apk files [tor-browser] + Tor Browser 13.5.4 - September 16 2024 * All Platforms * Updated NoScript to 11.4.37 ===================================== 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": 1193962, + "average_daily_users": 1198801, "categories": { "firefox": [ "web-development", @@ -47,7 +47,7 @@ "name": { "en-US": "The MIT License" }, - "url": "http://www.opensource.org/license/mit" + "url": "https://www.opensource.org/license/mit" }, "release_notes": { "en-US": "- Detect website's dark theme by default.\n- Use Filter mode for particular websites by default (Google Docs, Microsoft Office).\n- Fixed breaking on default selection color.\n- Users' fixes for websites." @@ -218,10 +218,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5273, - "bayesian_average": 4.526224812542353, - "count": 5845, - "text_count": 1836 + "average": 4.5264, + "bayesian_average": 4.525326004974587, + "count": 5857, + "text_count": 1842 }, "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": 28283 + "weekly_downloads": 27576 }, "notes": null }, @@ -334,7 +334,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 256725, + "average_daily_users": 256931, "categories": { "firefox": [ "privacy-security" @@ -362,7 +362,7 @@ "name": { "en-US": "Mozilla Public License 2.0" }, - "url": "http://www.mozilla.org/MPL/2.0/" + "url": "https://www.mozilla.org/MPL/2.0/" }, "release_notes": { "en-US": "<i>Enhancements:</i>\n\n- Added additional resources to the staging environment.\n\n<i>Other changes:</i>\n\n- Implemented mobile extension signing-related changes.\n- Improved and extended the resource audit tool." @@ -547,9 +547,9 @@ "category": "recommended" }, "ratings": { - "average": 4.7945, - "bayesian_average": 4.789878349264025, - "count": 1455, + "average": 4.7942, + "bayesian_average": 4.789582900272357, + "count": 1458, "text_count": 263 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", @@ -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": 3102 + "weekly_downloads": 2895 }, "notes": null }, @@ -651,7 +651,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1263479, + "average_daily_users": 1266195, "categories": { "firefox": [ "privacy-security" @@ -679,7 +679,7 @@ "name": { "en-US": "GNU General Public License v3.0" }, - "url": "http://www.gnu.org/licenses/gpl-3.0.html" + "url": "https://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { "en-US": "<ul><li>Disabled Google's \"Privacy Sandbox\" ad tracking by default. We previously disabled Google's Topics API; we now also disable \"site-suggested ads\" (ad targeting) and \"ad measurement\" (ad attribution reporting) APIs.</li><li>Improved widget replacement for Spotify, SoundCloud, Twitch and YouTube embeds. To try out our widget replacement for YouTube embeds, move the toggle for <code><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/577585700e711c66b2f847…" rel=\"nofollow\">youtube.com</a></code> to red (full blocking).</li><li>Updated the new user welcome page to ask Chrome users to pin Privacy Badger to the browser toolbar</li><li>Fixed various site breakages</li><li>Improved Esperanto, Greek, Polish, Russian and Swedish translations. Removed Arabic and Bulgarian translations due to lack of updates.</li></ul>" @@ -1170,10 +1170,10 @@ "category": "recommended" }, "ratings": { - "average": 4.803, - "bayesian_average": 4.800311779877251, - "count": 2508, - "text_count": 473 + "average": 4.8028, + "bayesian_average": 4.800114682839264, + "count": 2515, + "text_count": 474 }, "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": 23724 + "weekly_downloads": 23651 }, "notes": null }, @@ -1213,7 +1213,7 @@ "picture_url": null } ], - "average_daily_users": 8309629, + "average_daily_users": 8366519, "categories": { "firefox": [ "privacy-security" @@ -1241,7 +1241,7 @@ "name": { "en-US": "GNU General Public License v3.0" }, - "url": "http://www.gnu.org/licenses/gpl-3.0.html" + "url": "https://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/80b2790a8885a0b371688e…" rel=\"nofollow\">1.59.0</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/6f83c9bda4f606ac9bbe35…" rel=\"nofollow\">Improve <code>href-sanitizer</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d0d6b2f1f271a0d381506e…" rel=\"nofollow\">Improve <code>trusted-replace-node-text</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/18c0e51ef9410419195c6e…" rel=\"nofollow\">Improve <code>set-constant</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e38598350ca70d0096b727…" rel=\"nofollow\">Improve <code>prevent-fetch</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/b2f1192d91916d9f53c322…" rel=\"nofollow\">Improve <code>href-sanitizer</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4eaf7905cc1ecc0d0b268c…" rel=\"nofollow\">Fix CSP/PP header injection in non-document resources</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/0b52bf6abea7f8af3a2faa…" rel=\"nofollow\">Add <code>trusted-suppress-native-method</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4fbb70518c5f7736e2ed4b…" rel=\"nofollow\">Add support for <code>$currentISODate$</code> in <code>trusted-set-cookie</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/538a174f02f8d558ca0f5b…" rel=\"nofollow\">Add <code>essential</code> and <code>nonessential</code> to set-cookie</a> (by @ryanbr)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d6b47c7cfc6d2abc6c1a8b…" rel=\"nofollow\">Fix distance calculation in picker</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a02b298b0f42bb71b36867…" rel=\"nofollow\">Fix bad serialization of Date objects</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/330dc362ee41d31a57d0e0…" rel=\"nofollow\">Fix race condition when loading redirect/scriptlet resources</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/00e93fa50af7f5c5895646…" rel=\"nofollow\">Improve logging in <code>prevent-addEventListener</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/78f7bf362410d635808ede…" rel=\"nofollow\">Add <code>:matches-prop()</code> pseudo CSS operator</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/baa90372ba1da6634be302…" rel=\"nofollow\">Improve <code>set-cookie</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d99eea5acba1727b919417…" rel=\"nofollow\">Improve <code>trusted-replace-node-text</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8be2ab0eb327f71c51905e…" rel=\"nofollow\">Improve <code>trusted-replace-(fetch|xhr)-response</code> scriptlets</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/89370fd730d3d9455aac72…" rel=\"nofollow\">Improve <code>prevent-addEventListener</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/236700044cc2a32d0781b5…" rel=\"nofollow\">Add <code>isodate</code> as available placeholder for auto-comment</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/10972836780f44474b7796…" rel=\"nofollow\">Improve <code>trusted-replace-outbound-text</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3bd285b223548309af7fd4…" rel=\"nofollow\">Classify generic cosmetic filters with comma as highly generic</a></li><li>...</li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/474b57891d21c28971ba3f…" rel=\"nofollow\">Commits history since last version</a>" @@ -1378,7 +1378,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-09-15T13:50:37Z", + "last_updated": "2024-09-22T16:00:37Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1523,10 +1523,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7905, - "bayesian_average": 4.790134246767273, - "count": 18397, - "text_count": 4805 + "average": 4.7907, + "bayesian_average": 4.79033490555104, + "count": 18453, + "text_count": 4820 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1589,7 +1589,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": 193086 + "weekly_downloads": 200561 }, "notes": null }, @@ -1605,7 +1605,7 @@ "picture_url": null } ], - "average_daily_users": 184356, + "average_daily_users": 185437, "categories": { "firefox": [ "photos-music-videos", @@ -1634,7 +1634,7 @@ "name": { "en-US": "The MIT License" }, - "url": "http://www.opensource.org/license/mit" + "url": "https://www.opensource.org/license/mit" }, "release_notes": { "de": "Neue \u00dcbersetzungen erg\u00e4nzt", @@ -1701,10 +1701,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4561, - "bayesian_average": 4.451276485748058, - "count": 1276, - "text_count": 494 + "average": 4.4547, + "bayesian_average": 4.449884980099753, + "count": 1280, + "text_count": 495 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1726,7 +1726,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": 348 + "weekly_downloads": 383 }, "notes": null }, @@ -1742,7 +1742,7 @@ "picture_url": null } ], - "average_daily_users": 63521, + "average_daily_users": 63093, "categories": { "firefox": [ "privacy-security", @@ -1771,7 +1771,7 @@ "name": { "en-US": "GNU General Public License v3.0" }, - "url": "http://www.gnu.org/licenses/gpl-3.0.html" + "url": "https://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { "en-US": "First update in a while! Sorry, having a full-time job does that. I welcome all the help I can get at <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/602e8bbf1bf2ebf94898d7…" rel=\"nofollow\">https://github.com/cowlicks/privacypossum</a>\n\nI'm always happy to help folk contribute at any skill level. There is always some way to help.\n\nThis is mostly a release that improves testing and developer workflow stuff, which should help me make more frequent releases in the future.\n\nThere are also several minor bugfixes and updates." @@ -1877,7 +1877,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": 303 + "weekly_downloads": 315 }, "notes": null }, @@ -1893,7 +1893,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 361067, + "average_daily_users": 362010, "categories": { "firefox": [ "search-tools", @@ -1923,7 +1923,7 @@ "name": { "en-US": "GNU General Public License v3.0" }, - "url": "http://www.gnu.org/licenses/gpl-3.0.html" + "url": "https://www.gnu.org/licenses/gpl-3.0.html" }, "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>." @@ -2110,10 +2110,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6204, - "bayesian_average": 4.616225871818597, - "count": 1541, - "text_count": 308 + "average": 4.6193, + "bayesian_average": 4.615135958292723, + "count": 1547, + "text_count": 309 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2136,7 +2136,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": 5811 + "weekly_downloads": 5685 }, "notes": null }, @@ -2159,7 +2159,7 @@ "picture_url": null } ], - "average_daily_users": 121865, + "average_daily_users": 122255, "categories": { "firefox": [ "search-tools", @@ -2184,7 +2184,7 @@ "name": { "en-US": "Mozilla Public License 2.0" }, - "url": "http://www.mozilla.org/MPL/2.0/" + "url": "https://www.mozilla.org/MPL/2.0/" }, "release_notes": { "en-US": "This version features improves the performance and reliability of the add-on,\nand allows the Desktop mode to behave as intended." @@ -2440,9 +2440,9 @@ "category": "recommended" }, "ratings": { - "average": 4.3853, - "bayesian_average": 4.3809603183078645, - "count": 1391, + "average": 4.3811, + "bayesian_average": 4.3767733606543135, + "count": 1396, "text_count": 392 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", @@ -2463,7 +2463,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": 17 + "weekly_downloads": 35 }, "notes": null }, @@ -2479,7 +2479,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 290230, + "average_daily_users": 289757, "categories": { "firefox": [ "privacy-security", @@ -2508,7 +2508,7 @@ "name": { "en-US": "GNU General Public License v2.0" }, - "url": "http://www.gnu.org/licenses/gpl-2.0.html" + "url": "https://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { "en-US": "v 11.4.37\n============================================================\nx [nscl] Do not patch windows with WebGLHook if webgl is\n globally disabled\nx [nscl] Do not patch workers if webgl is globally disabled\nx [L10n] Updated uk\nx [nscl] Workers-aware WebGL Hook" @@ -2593,7 +2593,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-09-11T21:25:21Z", + "last_updated": "2024-09-21T23:20:33Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2665,10 +2665,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4081, - "bayesian_average": 4.405428009528521, - "count": 2274, - "text_count": 866 + "average": 4.409, + "bayesian_average": 4.406329174495118, + "count": 2279, + "text_count": 867 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2712,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": 7945 + "weekly_downloads": 7547 }, "notes": null }, @@ -2728,7 +2728,7 @@ "picture_url": null } ], - "average_daily_users": 162749, + "average_daily_users": 163291, "categories": { "firefox": [ "photos-music-videos", @@ -2756,9 +2756,9 @@ "id": 12, "is_custom": false, "name": { - "en-US": "GNU Library General Public License v3.0" + "en-US": "GNU Lesser General Public License v3.0" }, - "url": "http://www.gnu.org/licenses/lgpl-3.0.html" + "url": "https://www.gnu.org/licenses/lgpl-3.0.html" }, "release_notes": { "en-US": "Manifest V3 Support" @@ -2838,10 +2838,10 @@ "category": "recommended" }, "ratings": { - "average": 3.8384, - "bayesian_average": 3.834405527869751, - "count": 1281, - "text_count": 463 + "average": 3.8362, + "bayesian_average": 3.832209285841853, + "count": 1282, + "text_count": 464 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2860,7 +2860,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": 1750 + "weekly_downloads": 1740 }, "notes": null } ===================================== projects/firefox/config ===================================== @@ -19,7 +19,7 @@ var: browser_series: '13.5' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 4 + browser_build: 5 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -16,7 +16,7 @@ container: var: geckoview_version: 115.15.0esr browser_branch: 13.5-1 - browser_build: 4 + browser_build: 5 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/translation/config ===================================== @@ -12,19 +12,19 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: d69ac083437e60d681fdefce6aa1fde96e2f1eaf + git_hash: 16446c485b3be4198a7e79bfcac6510784a18506 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 022b7eea73017cd3a1fae66b8c4bd8d7b867107f + git_hash: a2bf4c2f45736958ac99f60e60b9f6d0e94454c3 targets: nightly: git_hash: 'tor-browser' mullvad-browser: mullvad-browser: '[% INCLUDE build %]' - git_hash: bff8092bbe5ae93b2c162ade300d739b2cd9e92d + git_hash: 78212a3da2439e436ac5f73d8e3eb908145c3ece targets: nightly: git_hash: 'mullvad-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: 2a9884fadf15e57f6a661f12ede1312cc71602c1 + git_hash: 12b033e4192448315794f5fe8203fe91dcc29a8c compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,19 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5.4' + torbrowser_version: '13.5.5' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/09/16 20:57:05' + browser_release_date: '2024/09/25 17:40:27' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - '[% IF c("var/tor-browser") %]13.5.4[% END %]' - 13.5.3 - 13.5.2 - - 13.5.1 + - '[% IF c("var/mullvad-browser") %]13.5.1[% END %]' mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing ===================================== tools/relprep.py ===================================== @@ -94,7 +94,7 @@ class ReleasePreparation: self.repo = Repo(self.base_path) self.tor_browser = bool(kwargs.get("tor_browser", True)) - self.mullvad_browser = bool(kwargs.get("tor_browser", True)) + self.mullvad_browser = bool(kwargs.get("mullvad_browser", True)) if not self.tor_browser and not self.mullvad_browser: raise ValueError("Nothing to do") self.android = kwargs.get("android", self.tor_browser) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… 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.16.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new tag base-browser-115.16.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.16.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new branch base-browser-115.16.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.16.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new tag tor-browser-115.16.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