October 2025 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] Bug 1989986 - enable mlkem768x25519 in beta and release on Android. r=nkulatova
by Pier Angelo Vendrame (＠pierov) 08 Oct '25

08 Oct '25

Pier Angelo Vendrame pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: dc86ff0c by John M. Schanck at 2025-10-08T14:14:49+02:00 Bug 1989986 - enable mlkem768x25519 in beta and release on Android. r=nkulatova Differential Revision: https://phabricator.services.mozilla.com/D265640 - - - - - 1 changed file: - modules/libpref/init/StaticPrefList.yaml Changes: ===================================== modules/libpref/init/StaticPrefList.yaml ===================================== @@ -15007,11 +15007,7 @@ # Has no effect unless security.tls.enable_kyber is true. - name: network.http.http3.enable_kyber type: RelaxedAtomicBool -#ifdef ANDROID - value: @IS_NIGHTLY_BUILD@ -#else value: true -#endif mirror: always rust: true @@ -17069,11 +17065,7 @@ - name: security.tls.enable_kyber type: RelaxedAtomicBool -#ifdef ANDROID - value: @IS_NIGHTLY_BUILD@ -#else value: true -#endif mirror: always rust: true View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dc86ff0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dc86ff0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] 2 commits: fixup! BB 19741: Fix FPI with OpenSearch.
by Pier Angelo Vendrame (＠pierov) 08 Oct '25

08 Oct '25

Pier Angelo Vendrame pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: c92ea31b by Pier Angelo Vendrame at 2025-10-08T14:13:16+02:00 fixup! BB 19741: Fix FPI with OpenSearch. This reverts commit 55015024a190faf1b69c4b7962ae9c6d5a4fed9c. This reverts commit 771d640c9a037885731802bf868addd68fd678a1. - - - - - e8920121 by Pier Angelo Vendrame at 2025-10-08T14:13:18+02:00 Bug 1987600 - Add origin attributes to OpenSearch. r=search-reviewers,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D265878 - - - - - 3 changed files: - toolkit/components/search/OpenSearchLoader.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs - tools/(a)types/generated/lib.gecko.xpcom.d.ts Changes: ===================================== toolkit/components/search/OpenSearchLoader.sys.mjs ===================================== @@ -98,8 +98,9 @@ const MOZSEARCH_LOCALNAME = "SearchPlugin"; * @param {string} [lastModified] * The UTC date when the engine was last updated, if any. * @param {object} [originAttributes] - * The first party domain of the site loading that manifest. The domain of the - * manifest will be used if not provided. + * The origin attributes of the site loading the manifest. If none are + * specified, the origin attributes will be formed of the first party domain + * based on the domain of the manifest. * @returns {Promise<OpenSearchProperties>} * The properties of the loaded OpenSearch engine. */ @@ -165,7 +166,8 @@ function loadEngineXML(sourceURI, lastModified, originAttributes = null) { sourceURI, // OpenSearchEngine is loading a definition file for a search engine, // TYPE_DOCUMENT captures that load best. - Ci.nsIContentPolicy.TYPE_DOCUMENT + Ci.nsIContentPolicy.TYPE_DOCUMENT, + originAttributes ); // we collect https telemetry for all top-level (document) loads. @@ -173,17 +175,6 @@ function loadEngineXML(sourceURI, lastModified, originAttributes = null) { ? Ci.nsILoadInfo.ALREADY_HTTPS : Ci.nsILoadInfo.NO_UPGRADE; - if (!originAttributes) { - originAttributes = {}; - try { - originAttributes.firstPartyDomain = - Services.eTLD.getSchemelessSite(sourceURI); - } catch (ex) { - console.error("Failed to get first party domain for the manifest", ex); - } - } - chan.loadInfo.originAttributes = originAttributes; - if (lastModified && chan instanceof Ci.nsIHttpChannel) { chan.setRequestHeader("If-Modified-Since", lastModified, false); } ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -244,10 +244,12 @@ export var SearchUtils = { * The URL string from which to create an nsIChannel. * @param {nsContentPolicyType} contentPolicyType * The type of document being loaded. + * @param {object} [originAttributes] + * The origin attributes to associate to this channel. * @returns {nsIChannel} * an nsIChannel object, or null if the url is invalid. */ - makeChannel(url, contentPolicyType) { + makeChannel(url, contentPolicyType, originAttributes = null) { if (!contentPolicyType) { throw new Error("makeChannel called with invalid content policy type"); } @@ -260,11 +262,13 @@ export var SearchUtils = { {} ); } else { - let originAttributes = {}; - try { - originAttributes.firstPartyDomain = - Services.eTLD.getSchemelessSite(uri); - } catch {} + if (!originAttributes) { + originAttributes = {}; + try { + originAttributes.firstPartyDomain = + Services.eTLD.getSchemelessSite(uri); + } catch {} + } principal = Services.scriptSecurityManager.createNullPrincipal(originAttributes); } ===================================== tools/(a)types/generated/lib.gecko.xpcom.d.ts ===================================== @@ -11613,7 +11613,7 @@ interface nsISearchService extends nsISupports, Enums<typeof nsISearchService_Op readonly hasSuccessfullyInitialized: boolean; runBackgroundChecks(): Promise<any>; resetToAppDefaultEngine(): void; - addOpenSearchEngine(engineURL: string, iconURL: string): Promise<any>; + addOpenSearchEngine(engineURL: string, iconURL: string, originAttributes?: any): Promise<any>; addUserEngine(formInfo: any): Promise<any>; addEnginesFromExtension(extension: any): Promise<any>; restoreDefaultEngines(): void; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3ffcb9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3ffcb9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.3.0esr-15.0-1] 4 commits: Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin
by Pier Angelo Vendrame (＠pierov) 08 Oct '25

08 Oct '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 674b578f by Jeff Boek at 2025-10-08T13:33:33+02:00 Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D261670 - - - - - f5305069 by Valentin Gosu at 2025-10-08T13:33:34+02:00 Bug 1881258 - Make HTML mimesniffing match the spec r=necko-reviewers,jesup,devtools-reviewers,nchevobbe Differential Revision: https://phabricator.services.mozilla.com/D255120 - - - - - a48b7f46 by Ryan VanderMeulen at 2025-10-08T13:33:35+02:00 Bug 1944726 - Update Android public suffix list. r=android-reviewers,nalexander,skhan Differential Revision: https://phabricator.services.mozilla.com/D260093 - - - - - 8247ba2a by Rhodwell Malicdem at 2025-10-08T13:33:35+02:00 Bug 1980808 - Show search toolbar after returning to Firefox r=android-reviewers,skhan Differential Revision: https://phabricator.services.mozilla.com/D260395 Resolved conflict in mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - - - - - 16 changed files: - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_async_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js - devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js - devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js - devtools/shared/commands/resource/tests/browser_resources_css_messages.js - dom/tests/browser/set-samesite-cookies-and-redirect.sjs - mobile/android/android-components/components/lib/publicsuffixlist/src/main/assets/publicsuffixes - mobile/android/android-components/components/lib/publicsuffixlist/src/test/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListTest.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - modules/libpref/init/StaticPrefList.yaml - netwerk/ipc/DocumentLoadListener.cpp - netwerk/streamconv/converters/nsUnknownDecoder.cpp - uriloader/exthandler/nsExternalHelperAppService.cpp - uriloader/exthandler/nsExternalHelperAppService.h The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/e5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/e5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.3.0esr-15.0-1] 4 commits: Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin
by Pier Angelo Vendrame (＠pierov) 08 Oct '25

08 Oct '25

Pier Angelo Vendrame pushed to branch base-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 9200869b by Jeff Boek at 2025-10-08T13:32:11+02:00 Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D261670 - - - - - 873803b6 by Valentin Gosu at 2025-10-08T13:32:15+02:00 Bug 1881258 - Make HTML mimesniffing match the spec r=necko-reviewers,jesup,devtools-reviewers,nchevobbe Differential Revision: https://phabricator.services.mozilla.com/D255120 - - - - - f371cd06 by Ryan VanderMeulen at 2025-10-08T13:32:15+02:00 Bug 1944726 - Update Android public suffix list. r=android-reviewers,nalexander,skhan Differential Revision: https://phabricator.services.mozilla.com/D260093 - - - - - a818d712 by Rhodwell Malicdem at 2025-10-08T13:32:54+02:00 Bug 1980808 - Show search toolbar after returning to Firefox r=android-reviewers,skhan Differential Revision: https://phabricator.services.mozilla.com/D260395 Resolved conflict in mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - - - - - 16 changed files: - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_async_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js - devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js - devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js - devtools/shared/commands/resource/tests/browser_resources_css_messages.js - dom/tests/browser/set-samesite-cookies-and-redirect.sjs - mobile/android/android-components/components/lib/publicsuffixlist/src/main/assets/publicsuffixes - mobile/android/android-components/components/lib/publicsuffixlist/src/test/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListTest.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - modules/libpref/init/StaticPrefList.yaml - netwerk/ipc/DocumentLoadListener.cpp - netwerk/streamconv/converters/nsUnknownDecoder.cpp - uriloader/exthandler/nsExternalHelperAppService.cpp - uriloader/exthandler/nsExternalHelperAppService.h The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b8be17… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b8be17… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] 4 commits: Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin
by Pier Angelo Vendrame (＠pierov) 08 Oct '25

08 Oct '25

Pier Angelo Vendrame pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 4452eac9 by Jeff Boek at 2025-10-08T10:35:24+02:00 Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D261670 - - - - - 52e56952 by Valentin Gosu at 2025-10-08T10:35:30+02:00 Bug 1881258 - Make HTML mimesniffing match the spec r=necko-reviewers,jesup,devtools-reviewers,nchevobbe Differential Revision: https://phabricator.services.mozilla.com/D255120 - - - - - d3e131a7 by Ryan VanderMeulen at 2025-10-08T10:35:31+02:00 Bug 1944726 - Update Android public suffix list. r=android-reviewers,nalexander,skhan Differential Revision: https://phabricator.services.mozilla.com/D260093 - - - - - 3ffcb9d9 by Rhodwell Malicdem at 2025-10-08T10:35:33+02:00 Bug 1980808 - Show search toolbar after returning to Firefox r=android-reviewers,skhan Differential Revision: https://phabricator.services.mozilla.com/D260395 Resolved conflict in mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - - - - - 16 changed files: - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_async_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js - devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js - devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js - devtools/shared/commands/resource/tests/browser_resources_css_messages.js - dom/tests/browser/set-samesite-cookies-and-redirect.sjs - mobile/android/android-components/components/lib/publicsuffixlist/src/main/assets/publicsuffixes - mobile/android/android-components/components/lib/publicsuffixlist/src/test/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListTest.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - modules/libpref/init/StaticPrefList.yaml - netwerk/ipc/DocumentLoadListener.cpp - netwerk/streamconv/converters/nsUnknownDecoder.cpp - uriloader/exthandler/nsExternalHelperAppService.cpp - uriloader/exthandler/nsExternalHelperAppService.h The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b56248… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b56248… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.14.0esr-14.5-1] 17 commits: Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin
by Pier Angelo Vendrame (＠pierov) 08 Oct '25

08 Oct '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.14.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: de1a3574 by Jeff Boek at 2025-10-08T10:00:47+02:00 Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D261670 - - - - - 4295122a by Valentin Gosu at 2025-10-08T10:00:51+02:00 Bug 1881258 - Make HTML mimesniffing match the spec r=necko-reviewers,jesup,devtools-reviewers,nchevobbe Differential Revision: https://phabricator.services.mozilla.com/D255120 - - - - - a8aa7a8e by Ryan VanderMeulen at 2025-10-08T10:00:51+02:00 Bug 1944726 - Update Android public suffix list. r=android-reviewers,nalexander,skhan Differential Revision: https://phabricator.services.mozilla.com/D260093 - - - - - 0b4e2ca0 by Olli Pettay at 2025-10-08T10:00:52+02:00 Bug 1973699, modernize nsDocShell accesses a bit, a=RyanVM DONTBUILD Original Revision: https://phabricator.services.mozilla.com/D265021 Differential Revision: https://phabricator.services.mozilla.com/D266240 - - - - - 80845f6a by Rhodwell Malicdem at 2025-10-08T10:00:52+02:00 Bug 1980808 - Show search toolbar after returning to Firefox r=android-reviewers,skhan Differential Revision: https://phabricator.services.mozilla.com/D260395 Resolved conflict in mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - - - - - 4236d923 by Jonathan Kew at 2025-10-08T10:00:52+02:00 Bug 1988244 - Guard the space-features bit vectors with the feature-info mutex. a=RyanVM DONTBUILD Original Revision: https://phabricator.services.mozilla.com/D266136 Differential Revision: https://phabricator.services.mozilla.com/D267025 - - - - - 6fc3660a by Karl Tomlinson at 2025-10-08T10:00:53+02:00 Bug 1988931 use GetInstanceIfExists() from MediaTrackGraphImpl::GetInstance() a=dmeehan DONTBUILD Original Revision: https://phabricator.services.mozilla.com/D265213 Differential Revision: https://phabricator.services.mozilla.com/D265874 - - - - - 0b14f6c1 by Lee Salzman at 2025-10-08T10:00:53+02:00 Bug 1989127. r=ahale a=dmeehan Differential Revision: https://phabricator.services.mozilla.com/D265372 - - - - - ae0e99d8 by alwu at 2025-10-08T10:00:54+02:00 Bug 1989734 - use the index to find the first SPS. r=media-playback-reviewers,karlt a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D265908 Resolved conflicts: dom/media/platforms/agnostic/bytestreams/H265.cpp - - - - - e99cf32c by Lee Salzman at 2025-10-08T10:00:54+02:00 Bug 1989899. r=ahale a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D266060 - - - - - 9225d7fb by Lee Salzman at 2025-10-08T10:00:55+02:00 Bug 1989945. r=ahale a=dmeehan Differential Revision: https://phabricator.services.mozilla.com/D265664 - - - - - 1d30f94d by Iain Ireland at 2025-10-08T10:00:55+02:00 Bug 1989978: Don't support unwritable iterator indices a=RyanVM Original Revision: https://phabricator.services.mozilla.com/D266023 Differential Revision: https://phabricator.services.mozilla.com/D266473 - - - - - 5901e49a by Christian Holler (:decoder) at 2025-10-08T10:00:56+02:00 Bug 1990085 - Improve enum serialization in gfx. r=lsalzman a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D266443 - - - - - 40581f92 by Lee Salzman at 2025-10-08T10:00:56+02:00 Bug 1990970. r=gfx-reviewers,ahale a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D266513 Resolved conflicts in gfx/2d/HelpersSkia.h - - - - - 1630e635 by Lee Salzman at 2025-10-08T10:00:57+02:00 Bug 1991040. r=gfx-reviewers,aosmond,ahale a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D266457 - - - - - 985eb36b by Lee Salzman at 2025-10-08T10:00:57+02:00 Bug 1992113. r=aosmond a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D267348 - - - - - 708ac207 by Dennis Jackson at 2025-10-08T10:00:58+02:00 Bug 1992388 - Release NSS 3.112.2 for ESR. r=jschanck a=RyanVM. UPGRADE_NSS_RELEASE Differential Revision: https://phabricator.services.mozilla.com/D267406 - - - - - 43 changed files: - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_async_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js - devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js - devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js - devtools/shared/commands/resource/tests/browser_resources_css_messages.js - docshell/base/nsDSURIContentListener.cpp - docshell/base/nsDSURIContentListener.h - docshell/base/nsDocShellEditorData.cpp - docshell/base/nsDocShellEditorData.h - dom/canvas/DrawTargetWebgl.cpp - dom/canvas/QueueParamTraits.h - dom/canvas/TexUnpackBlob.cpp - dom/media/MediaTrackGraph.cpp - dom/media/platforms/agnostic/bytestreams/H265.cpp - dom/tests/browser/set-samesite-cookies-and-redirect.sjs - gfx/2d/DrawTargetSkia.cpp - gfx/2d/HelpersSkia.h - gfx/2d/RecordedEventImpl.h - gfx/2d/RecordingTypes.h - gfx/2d/SourceSurfaceSkia.cpp - gfx/thebes/gfxFont.cpp - gfx/thebes/gfxFontEntry.h - js/src/vm/Iteration.cpp - mobile/android/android-components/components/lib/publicsuffixlist/src/main/assets/publicsuffixes - mobile/android/android-components/components/lib/publicsuffixlist/src/test/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListTest.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - modules/libpref/init/StaticPrefList.yaml - netwerk/ipc/DocumentLoadListener.cpp - netwerk/streamconv/converters/nsUnknownDecoder.cpp - security/nss/doc/rst/releases/index.rst - + security/nss/doc/rst/releases/nss_3_112_2.rst - security/nss/gtests/der_gtest/der_gtest.gyp - + security/nss/gtests/der_gtest/secasn1decode_unittest.cc - security/nss/lib/nss/nss.h - security/nss/lib/pkcs12/p12d.c - security/nss/lib/softoken/softkver.h - security/nss/lib/util/nssutil.h - security/nss/lib/util/secasn1d.c - + security/nss/moz.yaml - uriloader/exthandler/nsExternalHelperAppService.cpp - uriloader/exthandler/nsExternalHelperAppService.h The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/bd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/bd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.14.0esr-14.5-1] 17 commits: Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin
by Pier Angelo Vendrame (＠pierov) 08 Oct '25

08 Oct '25

Pier Angelo Vendrame pushed to branch base-browser-128.14.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 059f511e by Jeff Boek at 2025-10-08T09:57:37+02:00 Bug 1818679 - Decide when to call GeckoView r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D261670 - - - - - ba8a7c7a by Valentin Gosu at 2025-10-08T09:57:41+02:00 Bug 1881258 - Make HTML mimesniffing match the spec r=necko-reviewers,jesup,devtools-reviewers,nchevobbe Differential Revision: https://phabricator.services.mozilla.com/D255120 - - - - - 9866caf4 by Ryan VanderMeulen at 2025-10-08T09:57:42+02:00 Bug 1944726 - Update Android public suffix list. r=android-reviewers,nalexander,skhan Differential Revision: https://phabricator.services.mozilla.com/D260093 - - - - - 69b2d31e by Olli Pettay at 2025-10-08T09:57:42+02:00 Bug 1973699, modernize nsDocShell accesses a bit, a=RyanVM DONTBUILD Original Revision: https://phabricator.services.mozilla.com/D265021 Differential Revision: https://phabricator.services.mozilla.com/D266240 - - - - - 9d0e9a7b by Rhodwell Malicdem at 2025-10-08T09:58:27+02:00 Bug 1980808 - Show search toolbar after returning to Firefox r=android-reviewers,skhan Differential Revision: https://phabricator.services.mozilla.com/D260395 Resolved conflict in mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - - - - - 1ec1cd6e by Jonathan Kew at 2025-10-08T09:58:33+02:00 Bug 1988244 - Guard the space-features bit vectors with the feature-info mutex. a=RyanVM DONTBUILD Original Revision: https://phabricator.services.mozilla.com/D266136 Differential Revision: https://phabricator.services.mozilla.com/D267025 - - - - - 40cc6060 by Karl Tomlinson at 2025-10-08T09:58:34+02:00 Bug 1988931 use GetInstanceIfExists() from MediaTrackGraphImpl::GetInstance() a=dmeehan DONTBUILD Original Revision: https://phabricator.services.mozilla.com/D265213 Differential Revision: https://phabricator.services.mozilla.com/D265874 - - - - - 2b76cedd by Lee Salzman at 2025-10-08T09:58:34+02:00 Bug 1989127. r=ahale a=dmeehan Differential Revision: https://phabricator.services.mozilla.com/D265372 - - - - - 1a2371f0 by alwu at 2025-10-08T09:58:35+02:00 Bug 1989734 - use the index to find the first SPS. r=media-playback-reviewers,karlt a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D265908 Resolved conflicts: dom/media/platforms/agnostic/bytestreams/H265.cpp - - - - - 198f1a34 by Lee Salzman at 2025-10-08T09:58:35+02:00 Bug 1989899. r=ahale a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D266060 - - - - - 94469bab by Lee Salzman at 2025-10-08T09:58:36+02:00 Bug 1989945. r=ahale a=dmeehan Differential Revision: https://phabricator.services.mozilla.com/D265664 - - - - - 862ba546 by Iain Ireland at 2025-10-08T09:58:36+02:00 Bug 1989978: Don't support unwritable iterator indices a=RyanVM Original Revision: https://phabricator.services.mozilla.com/D266023 Differential Revision: https://phabricator.services.mozilla.com/D266473 - - - - - 13590eea by Christian Holler (:decoder) at 2025-10-08T09:58:37+02:00 Bug 1990085 - Improve enum serialization in gfx. r=lsalzman a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D266443 - - - - - 0929bdcb by Lee Salzman at 2025-10-08T09:58:37+02:00 Bug 1990970. r=gfx-reviewers,ahale a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D266513 Resolved conflicts in gfx/2d/HelpersSkia.h - - - - - 28e9f42a by Lee Salzman at 2025-10-08T09:58:38+02:00 Bug 1991040. r=gfx-reviewers,aosmond,ahale a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D266457 - - - - - 9eea272c by Lee Salzman at 2025-10-08T09:58:38+02:00 Bug 1992113. r=aosmond a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D267348 - - - - - a5ddfedc by Dennis Jackson at 2025-10-08T09:58:39+02:00 Bug 1992388 - Release NSS 3.112.2 for ESR. r=jschanck a=RyanVM. UPGRADE_NSS_RELEASE Differential Revision: https://phabricator.services.mozilla.com/D267406 - - - - - 43 changed files: - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_async_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js - devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js - devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js - devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js - devtools/shared/commands/resource/tests/browser_resources_css_messages.js - docshell/base/nsDSURIContentListener.cpp - docshell/base/nsDSURIContentListener.h - docshell/base/nsDocShellEditorData.cpp - docshell/base/nsDocShellEditorData.h - dom/canvas/DrawTargetWebgl.cpp - dom/canvas/QueueParamTraits.h - dom/canvas/TexUnpackBlob.cpp - dom/media/MediaTrackGraph.cpp - dom/media/platforms/agnostic/bytestreams/H265.cpp - dom/tests/browser/set-samesite-cookies-and-redirect.sjs - gfx/2d/DrawTargetSkia.cpp - gfx/2d/HelpersSkia.h - gfx/2d/RecordedEventImpl.h - gfx/2d/RecordingTypes.h - gfx/2d/SourceSurfaceSkia.cpp - gfx/thebes/gfxFont.cpp - gfx/thebes/gfxFontEntry.h - js/src/vm/Iteration.cpp - mobile/android/android-components/components/lib/publicsuffixlist/src/main/assets/publicsuffixes - mobile/android/android-components/components/lib/publicsuffixlist/src/test/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListTest.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - modules/libpref/init/StaticPrefList.yaml - netwerk/ipc/DocumentLoadListener.cpp - netwerk/streamconv/converters/nsUnknownDecoder.cpp - security/nss/doc/rst/releases/index.rst - + security/nss/doc/rst/releases/nss_3_112_2.rst - security/nss/gtests/der_gtest/der_gtest.gyp - + security/nss/gtests/der_gtest/secasn1decode_unittest.cc - security/nss/lib/nss/nss.h - security/nss/lib/pkcs12/p12d.c - security/nss/lib/softoken/softkver.h - security/nss/lib/util/nssutil.h - security/nss/lib/util/secasn1d.c - + security/nss/moz.yaml - uriloader/exthandler/nsExternalHelperAppService.cpp - uriloader/exthandler/nsExternalHelperAppService.h The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dcd9d7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dcd9d7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] fixup! TB 44027 [android]: Update PBM lockscreen
by clairehurst (＠clairehurst) 08 Oct '25

08 Oct '25

clairehurst pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: b562482b by clairehurst at 2025-10-08T00:04:45-06:00 fixup! TB 44027 [android]: Update PBM lockscreen - - - - - 2 changed files: - mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/annotation/FlexibleWindowLightDarkPreview.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/biometricauthentication/UnlockPrivateTabsScreen.kt Changes: ===================================== mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/annotation/FlexibleWindowLightDarkPreview.kt ===================================== @@ -62,4 +62,8 @@ private const val MEDIUM_WINDOW_WIDTH = 700 device = Devices.PIXEL_TABLET, uiMode = Configuration.UI_MODE_NIGHT_YES, ) +@Preview( + name = "Large text", + fontScale = 2.5f, +) annotation class FlexibleWindowLightDarkPreview ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/biometricauthentication/UnlockPrivateTabsScreen.kt ===================================== @@ -94,9 +94,9 @@ private fun Header() { text = stringResource(R.string.app_name), color = FirefoxTheme.colors.textPrimary, fontWeight = FontWeight.Bold, - fontSize = 29.sp, + fontSize = 30.sp, letterSpacing = 0.18.sp, - lineHeight = 52.sp, + lineHeight = 30.sp, ) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b562482… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b562482… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] 3 commits: fixup! [android] Modify UI/UX
by clairehurst (＠clairehurst) 08 Oct '25

08 Oct '25

clairehurst pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: eae57191 by clairehurst at 2025-10-07T14:09:43-06:00 fixup! [android] Modify UI/UX - - - - - 087dca19 by clairehurst at 2025-10-07T16:20:15-06:00 fixup! TB 44031 [android]: 2025 YEC - - - - - 0e2ad060 by clairehurst at 2025-10-07T16:20:15-06:00 fixup! TB 44031 [android]: 2025 YEC preview - - - - - 5 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/tor/CampaignCompose.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorCampaignViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorHomePage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorHomePagePreview.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -161,9 +161,9 @@ import org.mozilla.fenix.wallpapers.Wallpaper import org.mozilla.fenix.GleanMetrics.TabStrip as TabStripMetrics import org.mozilla.fenix.components.toolbar.ToolbarPosition +import org.mozilla.fenix.tor.TorCampaignViewModel import org.mozilla.fenix.tor.TorHomePage import org.mozilla.fenix.tor.UrlQuickLoadViewModel -import org.mozilla.fenix.tor.shouldInitiallyShowPromo import java.util.Locale @Suppress("TooManyFunctions", "LargeClass") @@ -179,6 +179,7 @@ class HomeFragment : Fragment(), UserInteractionHandler { internal val binding get() = _binding!! private val snackbarBinding = ViewBoundFeatureWrapper<SnackbarBinding>() + private val torCampaignViewModel: TorCampaignViewModel by activityViewModels() private val homeViewModel: HomeScreenViewModel by activityViewModels() private val urlQuickLoadViewModel: UrlQuickLoadViewModel by activityViewModels() @@ -558,9 +559,7 @@ class HomeFragment : Fragment(), UserInteractionHandler { listenForMicrosurveyMessage(requireContext()) } - binding.torHomepageView.setContent { - initComposeTorHomePageView() - } + initComposeTorHomePageView() disableAppBarDragging() @@ -978,7 +977,7 @@ class HomeFragment : Fragment(), UserInteractionHandler { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { TorHomePage( - shouldInitiallyShowPromo(), + torCampaignViewModel.shouldInitiallyShowPromo, onClicked = { val baseUrl = "https://www.torproject.org/donate" val locale = Locale.getDefault().getLanguage() ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/CampaignCompose.kt ===================================== @@ -272,22 +272,3 @@ private fun DonateButton(onDonateButtonClicked: () -> Unit) { ) } } - - - -fun shouldInitiallyShowPromo(): Boolean { -// return true // uncomment to test - - val dateFormat = SimpleDateFormat("yyyy-MM-dd-hh-zzz") - val startDate = dateFormat.parse("2025-10-14-15-UTC") // from https://gitlab.torproject.org/tpo/web/team/-/issues/66 - val endDate = dateFormat.parse("2026-01-02-00-UTC") // from https://gitlab.torproject.org/tpo/web/team/-/issues/66#note_3257224 - val currentDate = Date() - - if (currentDate.before(startDate) || currentDate.after(endDate)) { - return false - } - if (BuildConfig.BUILD_TYPE == "release") { - return true - } - return false -} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorCampaignViewModel.kt ===================================== @@ -0,0 +1,34 @@ +package org.mozilla.fenix.tor + +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateOf +import androidx.lifecycle.ViewModel +import java.text.SimpleDateFormat +import java.util.Date +import kotlin.getValue +import org.mozilla.geckoview.BuildConfig + +class TorCampaignViewModel : ViewModel() { + val shouldInitiallyShowPromo: MutableState<Boolean> by lazy { + mutableStateOf(shouldInitiallyShowPromo()) + } + + fun shouldInitiallyShowPromo(): Boolean { +// return true // uncomment to test + + val dateFormat = SimpleDateFormat("yyyy-MM-dd-hh-zzz") + val startDate = + dateFormat.parse("2025-10-14-15-UTC") // from https://gitlab.torproject.org/tpo/web/team/-/issues/66 + val endDate = + dateFormat.parse("2026-01-02-00-UTC") // from https://gitlab.torproject.org/tpo/web/team/-/issues/66#note_3257224 + val currentDate = Date() + + if (currentDate.before(startDate) || currentDate.after(endDate)) { + return false + } + if (BuildConfig.BUILD_TYPE == "release") { + return true + } + return false + } +} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorHomePage.kt ===================================== @@ -12,6 +12,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment @@ -36,19 +37,19 @@ import org.mozilla.fenix.R @Composable @FlexibleWindowLightDarkPreview fun TorHomePage( - shouldInitiallyShowPromo: Boolean = false, + shouldInitiallyShowPromo: MutableState<Boolean> = mutableStateOf(false), onClicked: () -> Unit = {}, toolBarAtTop: Boolean = true, ) { val shouldShowPromo = rememberSaveable { - mutableStateOf(shouldInitiallyShowPromo) + shouldInitiallyShowPromo } Column( modifier = Modifier .fillMaxSize() .padding( - top = if (toolBarAtTop) dimensionResource(R.dimen.tab_strip_height) else 0.dp, - bottom = if (!toolBarAtTop) dimensionResource(R.dimen.tab_strip_height) else 0.dp, + top = if (toolBarAtTop) dimensionResource(R.dimen.browser_navbar_height) else 0.dp, + bottom = if (!toolBarAtTop) dimensionResource(R.dimen.browser_navbar_height) else 0.dp, ) .paint( BrushPainter( ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorHomePagePreview.kt ===================================== @@ -1,8 +1,10 @@ package org.mozilla.fenix.tor +import android.annotation.SuppressLint import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.PreviewParameter @@ -10,6 +12,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider import mozilla.components.compose.base.annotation.FlexibleWindowPreviewPortraitLandscapeEnglishArabicGerman import org.mozilla.fenix.home.ui.SearchBarPreview +@SuppressLint("UnrememberedMutableState") @FlexibleWindowPreviewPortraitLandscapeEnglishArabicGerman @Composable /** @@ -26,7 +29,7 @@ private fun TorHomePagePreview( SearchBarPreview() // unrestricted vertically so will follow contentAlignment TorHomePage( // restricted vertically so will not follow contentAlignment - shouldInitiallyShowPromo = booleanMatrix.first, + shouldInitiallyShowPromo = mutableStateOf(booleanMatrix.first), toolBarAtTop = toolbarAtTop, ) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/18f6af… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/18f6af… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] 7 commits: fixup! TB 40597: Implement TorSettings module
by clairehurst (＠clairehurst) 07 Oct '25

07 Oct '25

clairehurst pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: e2c37c35 by Henry Wilkes at 2025-10-07T18:06:10+01:00 fixup! TB 40597: Implement TorSettings module TB 44068: Migrate from "meek-azure" to "meek" name for built-in bridge types. - - - - - 90bf16d7 by Henry Wilkes at 2025-10-07T18:06:11+01:00 fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js TB 44068: Migrate from "meek-azure" to "meek" name for built-in bridge types. - - - - - 65eb80ce by Henry Wilkes at 2025-10-07T18:06:11+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 44068: Migrate from "meek-azure" to "meek" name for built-in bridge types. - - - - - 9ebd40f1 by Henry Wilkes at 2025-10-07T18:06:12+01:00 fixup! TB 42247: Android helpers for the TorProvider TB 44068: Migrate from "meek-azure" to "meek" name for built-in bridge types. - - - - - a696660b by Henry Wilkes at 2025-10-07T18:06:13+01:00 fixup! TB 40041 [android]: Implement Tor Network Settings TB 44068: Migrate from "meek-azure" to "meek" name for built-in bridge types. - - - - - b3c3b0a1 by Henry Wilkes at 2025-10-07T18:06:14+01:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap TB 44068: Migrate from "meek-azure" to "meek" name for built-in bridge types. - - - - - 18f6af85 by Henry Wilkes at 2025-10-07T18:06:15+01:00 fixup! TB 40041 [android]: Implement Tor Network Settings TB 44068: Add a note about the legacy meek_azure name. - - - - - 10 changed files: - browser/app/profile/000-tor-browser.js - browser/components/torpreferences/content/builtinBridgeDialog.xhtml - browser/components/torpreferences/content/connectionPane.js - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - mobile/android/fenix/app/src/main/res/values/preference_keys.xml - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorSettings.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/TorLegacyAndroidSettings.java - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -62,7 +62,7 @@ pref("torbrowser.settings.bridges.enabled", false); // TorBridgeSource. Initially TorBridgeSource.Invalid = -1. pref("torbrowser.settings.bridges.source", -1); pref("torbrowser.settings.bridges.lox_id", ""); -// obfs4|meek-azure|snowflake|etc. +// obfs4|meek|snowflake|etc. pref("torbrowser.settings.bridges.builtin_type", ""); // torbrowser.settings.bridges.bridge_strings.0 // torbrowser.settings.bridges.bridge_strings.1 ===================================== browser/components/torpreferences/content/builtinBridgeDialog.xhtml ===================================== @@ -76,7 +76,7 @@ <vbox class="builtin-bridges-option"> <hbox> <radio - value="meek-azure" + value="meek" data-l10n-id="built-in-dialog-meek-radio-option2" /> <html:span class="bridge-status-badge"> ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1079,7 +1079,7 @@ const gBuiltinBridgesArea = { name: "tor-bridges-built-in-snowflake-name", description: "tor-bridges-built-in-snowflake-description", }, - "meek-azure": { + meek: { name: "tor-bridges-built-in-meek-name", description: "tor-bridges-built-in-meek-description", }, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt ===================================== @@ -33,10 +33,10 @@ class TorBridgeConfigFragment : PreferenceFragmentCompat() { // Initialize radio button group for built-in bridge transport types val radioObfs4 = bindBridgeTransportRadio(TorBridgeTransportConfig.BUILTIN_OBFS4) - val radioMeekAzure = bindBridgeTransportRadio(TorBridgeTransportConfig.BUILTIN_MEEK_AZURE) + val radioMeek = bindBridgeTransportRadio(TorBridgeTransportConfig.BUILTIN_MEEK) val radioSnowflake = bindBridgeTransportRadio(TorBridgeTransportConfig.BUILTIN_SNOWFLAKE) - builtinBridgeRadioGroups.addAll(mutableListOf(radioObfs4, radioMeekAzure, radioSnowflake)) + builtinBridgeRadioGroups.addAll(mutableListOf(radioObfs4, radioMeek, radioSnowflake)) // `*` is Kotlin's "spread" operator, for expanding an Array as a vararg. addToRadioGroup(*builtinBridgeRadioGroups.toTypedArray()) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt ===================================== @@ -19,7 +19,7 @@ enum class TorBridgeTransportConfig( preferenceKey = R.string.pref_key_tor_network_settings_bridge_config_builtin_bridge_obfs4, transportName = "obfs4" ), - BUILTIN_MEEK_AZURE( + BUILTIN_MEEK( preferenceKey = R.string.pref_key_tor_network_settings_bridge_config_builtin_bridge_meek_azure, transportName = "meek" ), @@ -38,8 +38,8 @@ object TorBridgeTransportConfigUtil { return when (bridge) { TorBridgeTransportConfig.BUILTIN_OBFS4.transportName -> TorBridgeTransportConfig.BUILTIN_OBFS4 - TorBridgeTransportConfig.BUILTIN_MEEK_AZURE.transportName -> - TorBridgeTransportConfig.BUILTIN_MEEK_AZURE + TorBridgeTransportConfig.BUILTIN_MEEK.transportName -> + TorBridgeTransportConfig.BUILTIN_MEEK TorBridgeTransportConfig.BUILTIN_SNOWFLAKE.transportName -> TorBridgeTransportConfig.BUILTIN_SNOWFLAKE else -> TorBridgeTransportConfig.USER_PROVIDED ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -65,7 +65,7 @@ class TorControllerGV( BridgeSource.BuiltIn -> { when (getTorSettings()?.bridgesBuiltinType) { BridgeBuiltinType.Obfs4 -> TorBridgeTransportConfig.BUILTIN_OBFS4 - BridgeBuiltinType.MeekAzure -> TorBridgeTransportConfig.BUILTIN_MEEK_AZURE + BridgeBuiltinType.Meek -> TorBridgeTransportConfig.BUILTIN_MEEK BridgeBuiltinType.Snowflake -> TorBridgeTransportConfig.BUILTIN_SNOWFLAKE else -> TorBridgeTransportConfig.USER_PROVIDED } @@ -87,7 +87,7 @@ class TorControllerGV( it.bridgesSource = BridgeSource.BuiltIn val bbt: BridgeBuiltinType = when (value) { TorBridgeTransportConfig.BUILTIN_OBFS4 -> BridgeBuiltinType.Obfs4 - TorBridgeTransportConfig.BUILTIN_MEEK_AZURE -> BridgeBuiltinType.MeekAzure + TorBridgeTransportConfig.BUILTIN_MEEK -> BridgeBuiltinType.Meek TorBridgeTransportConfig.BUILTIN_SNOWFLAKE -> BridgeBuiltinType.Snowflake else -> BridgeBuiltinType.Invalid } ===================================== mobile/android/fenix/app/src/main/res/values/preference_keys.xml ===================================== @@ -496,6 +496,8 @@ <string name="pref_key_tor_network_settings_bridge_config_explanation" translatable="false">pref_key_tor_network_settings_bridge_config_explanation</string> <string name="pref_key_tor_network_settings_bridge_config_toggle" translatable="false">pref_key_tor_network_settings_bridge_config_toggle</string> <string name="pref_key_tor_network_settings_bridge_config_builtin_bridge_obfs4" translatable="false">pref_key_tor_network_settings_bridge_config_builtin_bridge_obfs4</string> +  <string name="pref_key_tor_network_settings_bridge_config_builtin_bridge_meek_azure" translatable="false">pref_key_tor_network_settings_bridge_config_builtin_bridge_meek_azure</string> <string name="pref_key_tor_network_settings_bridge_config_builtin_bridge_snowflake" translatable="false">pref_key_tor_network_settings_bridge_config_builtin_bridge_snowflake</string> <string name="pref_key_tor_network_settings_bridge_config_user_provided_bridge" translatable="false">pref_key_tor_network_settings_bridge_config_user_provided_bridge</string> ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorSettings.java ===================================== @@ -68,10 +68,10 @@ public class TorSettings { } public enum BridgeBuiltinType { - /* TorSettings.sys.mjs ~ln43: string: obfs4|meek-azure|snowflake|etc */ + /* TorSettings.sys.mjs ~ln43: string: obfs4|meek|snowflake|etc */ Invalid("invalid"), Obfs4("obfs4"), - MeekAzure("meek-azure"), + Meek("meek"), Snowflake("snowflake"); private String type; @@ -88,8 +88,8 @@ public class TorSettings { switch (s) { case "obfs4": return Obfs4; - case "meek-azure": - return MeekAzure; + case "meek": + return Meek; case "snowflake": return Snowflake; } ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/TorLegacyAndroidSettings.java ===================================== @@ -49,7 +49,7 @@ public class TorLegacyAndroidSettings { TorSettings.BridgeBuiltinType.fromString(userDefinedBridgeList); break; case "meek": - settings.bridgesBuiltinType = TorSettings.BridgeBuiltinType.MeekAzure; + settings.bridgesBuiltinType = TorSettings.BridgeBuiltinType.Meek; break; default: settings.bridgesSource = TorSettings.BridgeSource.Invalid; ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -36,7 +36,7 @@ const TorSettingsPrefs = Object.freeze({ source: "torbrowser.settings.bridges.source", /* string: output of crypto.randomUUID() */ lox_id: "torbrowser.settings.bridges.lox_id", - /* string: obfs4|meek-azure|snowflake|etc */ + /* string: obfs4|meek|snowflake|etc */ builtin_type: "torbrowser.settings.bridges.builtin_type", /* preference branch: each child branch should be a bridge string */ bridge_strings: "torbrowser.settings.bridges.bridge_strings", @@ -534,6 +534,13 @@ class TorSettingsImpl { const req = await fetch("chrome://global/content/pt_config.json"); const config = await req.json(); lazy.logger.debug("Loaded pt_config.json", config); + if ("meek-azure" in config.bridges) { + // Convert the meek-azure name to meek. tor-browser#44068. + // NOTE: no need to convert recommendedDefault since it is not meek. + lazy.logger.debug("Converting pt_config type from meek-azure to meek"); + config.bridges.meek = config.bridges["meek-azure"]; + delete config.bridges["meek-azure"]; + } this.#recommendedPT = config.recommendedDefault; this.#builtinBridges = config.bridges; for (const type in this.#builtinBridges) { @@ -687,13 +694,26 @@ class TorSettingsImpl { ) ); break; - case TorBridgeSource.BuiltIn: + case TorBridgeSource.BuiltIn: { // bridge_strings is set via builtin_type. - bridges.builtin_type = Services.prefs.getStringPref( + let builtinType = Services.prefs.getStringPref( TorSettingsPrefs.bridges.builtin_type, "" ); + if (builtinType === "meek-azure") { + lazy.logger.debug( + "Converting builtin-bridge setting value from meek-azure to meek" + ); + builtinType = "meek"; + // Store the new value. + Services.prefs.setStringPref( + TorSettingsPrefs.bridges.builtin_type, + builtinType + ); + } + bridges.builtin_type = builtinType; break; + } case TorBridgeSource.Lox: // bridge_strings is set via lox id. bridges.lox_id = Services.prefs.getStringPref( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/045793… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/045793… You're receiving this email because of your account on gitlab.torproject.org.

1 0