- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 41691: Update lyrebird to v0.8.1
by morgan (＠morgan) 21 Jan '26

21 Jan '26

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: df2e6b94 by Shelikhoo at 2026-01-15T19:23:04+00:00 Bug 41691: Update lyrebird to v0.8.1 - - - - - 1 changed file: - projects/lyrebird/config Changes: ===================================== projects/lyrebird/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.7.0 +version: 0.8.1 git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyre… git_hash: 'lyrebird-[% c("version") %]' tag_gpg_id: 1 @@ -9,7 +9,7 @@ container: use_container: 1 var: - go_vendor_sha256sum: fbdd6dc8f88fdcb971d437f7b45c27472f821b42cd4633002edab0870ab525e3 + go_vendor_sha256sum: 3b7d4188283c1f2b781002187d3f38be29aececae3921f319464e4068193d5ff targets: nightly: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] 3 commits: fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation
by brizental (＠brizental) 21 Jan '26

21 Jan '26

brizental pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: a2a92281 by Beatriz Rizental at 2026-01-20T10:00:51-03:00 fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation When building with tests enabled, the current patch was breaking the generated Makefile. This commit fixes it. - - - - - dd0afa6b by Beatriz Rizental at 2026-01-20T10:01:03-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser We don't want to bootstrap OONX. It's a ML tool, not used. - - - - - b595c149 by Beatriz Rizental at 2026-01-20T10:01:15-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser Use our MacOS SDK mirror when bootstrapping for Mac. - - - - - 3 changed files: - browser/Makefile.in - build/moz.configure/bootstrap.configure - toolkit/moz.configure Changes: ===================================== browser/Makefile.in ===================================== @@ -7,6 +7,7 @@ include $(topsrcdir)/config/rules.mk ifdef MAKENSISU ifdef ENABLE_TESTS +libs:: $(MAKE) -C installer/windows install_deps endif #ENABLE_TESTS ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -165,6 +165,7 @@ def bootstrap_path(path, **kwargs): when=when, ) @imports("os") + @imports("re") @imports("subprocess") @imports("sys") @imports("mozbuild.tbbutils") @@ -354,6 +355,23 @@ def bootstrap_path(path, **kwargs): + command["arguments"] + [path_parts[0]] ) + + # BIG HACK: Replace the Apple CDN link with our mirror, + # otherwise bootstrapping will fail whenever a new MacOS SDK + # is released, since Apple seems to retire the previous link everytime. + # Our mirror serves an _unmodified_ version of the file. + macosx_sdk_match = re.match(r"^MacOSX(.*)\.sdk$", path_parts[0]) + if macosx_sdk_match: + version = macosx_sdk_match.group(1) + command = [ + re.sub( + r"https://swcdn\.apple\.com/.*/CLTools_macOSNMOS_SDK\.pkg", + f"https://build-sources.tbb.torproject.org/CLTools_macOSNMOS_SDK-{version}.pkg", + c, + ) + for c in command + ] + # Clean up anything that was bootstrapped previously before going # forward. In other cases, that's taken care of by mach artifact toolchain. rmtree( ===================================== toolkit/moz.configure ===================================== @@ -4241,9 +4241,8 @@ with only_when(~artifact_builds): @depends("--with-onnx-runtime") def need_boostrap_onnxruntime(with_onnx_runtime): - return (with_onnx_runtime and len(with_onnx_runtime) == 0) or ( - with_onnx_runtime.origin == "default" - ) + # tor-browser#44412: Prevent ONNX from ever getting bootstrapped. + return False @depends( "--with-onnx-runtime", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/29… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/29… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] 3 commits: fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation
by brizental (＠brizental) 20 Jan '26

20 Jan '26

brizental pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: c4d774af by Beatriz Rizental at 2026-01-20T09:58:59-03:00 fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation When building with tests enabled, the current patch was breaking the generated Makefile. This commit fixes it. - - - - - fb2c2a1d by Beatriz Rizental at 2026-01-20T09:59:06-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser We don't want to bootstrap OONX. It's a ML tool, not used. - - - - - 6055fdc6 by Beatriz Rizental at 2026-01-20T09:59:16-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser Use our MacOS SDK mirror when bootstrapping for Mac. - - - - - 3 changed files: - browser/Makefile.in - build/moz.configure/bootstrap.configure - toolkit/moz.configure Changes: ===================================== browser/Makefile.in ===================================== @@ -7,6 +7,7 @@ include $(topsrcdir)/config/rules.mk ifdef MAKENSISU ifdef ENABLE_TESTS +libs:: $(MAKE) -C installer/windows install_deps endif #ENABLE_TESTS ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -165,6 +165,7 @@ def bootstrap_path(path, **kwargs): when=when, ) @imports("os") + @imports("re") @imports("subprocess") @imports("sys") @imports("mozbuild.tbbutils") @@ -354,6 +355,23 @@ def bootstrap_path(path, **kwargs): + command["arguments"] + [path_parts[0]] ) + + # BIG HACK: Replace the Apple CDN link with our mirror, + # otherwise bootstrapping will fail whenever a new MacOS SDK + # is released, since Apple seems to retire the previous link everytime. + # Our mirror serves an _unmodified_ version of the file. + macosx_sdk_match = re.match(r"^MacOSX(.*)\.sdk$", path_parts[0]) + if macosx_sdk_match: + version = macosx_sdk_match.group(1) + command = [ + re.sub( + r"https://swcdn\.apple\.com/.*/CLTools_macOSNMOS_SDK\.pkg", + f"https://build-sources.tbb.torproject.org/CLTools_macOSNMOS_SDK-{version}.pkg", + c, + ) + for c in command + ] + # Clean up anything that was bootstrapped previously before going # forward. In other cases, that's taken care of by mach artifact toolchain. rmtree( ===================================== toolkit/moz.configure ===================================== @@ -4241,9 +4241,8 @@ with only_when(~artifact_builds): @depends("--with-onnx-runtime") def need_boostrap_onnxruntime(with_onnx_runtime): - return (with_onnx_runtime and len(with_onnx_runtime) == 0) or ( - with_onnx_runtime.origin == "default" - ) + # tor-browser#44412: Prevent ONNX from ever getting bootstrapped. + return False @depends( "--with-onnx-runtime", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/017f6c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/017f6c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] 3 commits: fixup! Mullvad Browser strings
by henry (＠henry) 20 Jan '26

20 Jan '26

henry pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 1c53419e by Henry Wilkes at 2026-01-19T15:40:24+00:00 fixup! Mullvad Browser strings MB 489: Drop about:rights strings. - - - - - d4dac903 by Henry Wilkes at 2026-01-19T15:40:26+00:00 fixup! MB 63: Customize some about pages for Mullvad Browser MB 489: Drop about:rights for mullvad browser. - - - - - 29183696 by Henry Wilkes at 2026-01-19T15:40:29+00:00 BB 43901: Modify about:license. We also drop about:rights. - - - - - 7 changed files: - browser/base/moz.build - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - − toolkit/content/aboutRightsMullvad.xhtml - toolkit/content/jar.mn - toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - toolkit/themes/shared/aboutLicense.css Changes: ===================================== browser/base/moz.build ===================================== @@ -79,7 +79,8 @@ PERFTESTS_MANIFESTS += ["content/test/perftest.toml"] DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"] DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"] -DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR +# Do not include the Firefox app-license.html in about:license. +# tor-browser#43901. if CONFIG["BASE_BROWSER_UPDATE"]: DEFINES["BASE_BROWSER_UPDATE"] = True ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -97,9 +97,7 @@ static const RedirEntry kRedirMap[] = { {"profiling", "chrome://devtools/content/performance-new/aboutprofiling/index.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"rights", "chrome://global/content/aboutRights.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD}, +// Drop about:rights. tor-browser#43901. #ifndef BASE_BROWSER_VERSION {"robots", "chrome://browser/content/aboutRobots.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | ===================================== browser/components/about/components.conf ===================================== @@ -23,7 +23,7 @@ pages = [ 'profiling', 'reader', 'restartrequired', - 'rights', + # Removed 'rights'. tor-browser#43901. # Removed 'robots'. tor-browser#42831. 'sessionrestore', 'settings', ===================================== toolkit/content/aboutRightsMullvad.xhtml deleted ===================================== @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html [ <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -%htmlDTD; ]> - - - -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta - http-equiv="Content-Security-Policy" - content="default-src chrome:; object-src 'none'" - /> - <meta name="color-scheme" content="light dark" /> - <title data-l10n-id="rights-title"></title> - <link - rel="stylesheet" - href="chrome://global/skin/in-content/info-pages.css" - type="text/css" - /> - <link rel="localization" href="branding/brand.ftl" /> - <link rel="localization" href="toolkit/about/aboutRights.ftl" /> - <link rel="localization" href="toolkit/global/mullvad-browser.ftl" /> - </head> - - <body id="your-rights" class="aboutPageWideContainer"> - <div class="container"> - <h1 data-l10n-id="rights-title"></h1> - - <p data-l10n-id="rights-mullvad-intro"></p> - <p data-l10n-id="rights-mullvad-you-should-know"></p> - - <ul> - <li data-l10n-id="rights-intro-point-1"> - <a - href="http://www.mozilla.org/MPL/" - data-l10n-name="mozilla-public-license-link" - ></a> - </li> - <li data-l10n-id="rights-mullvad-trademarks"></li> - </ul> - </div> - </body> -</html> ===================================== toolkit/content/jar.mn ===================================== @@ -212,5 +212,3 @@ toolkit.jar: content/global/vendor/react-transition-group.js (vendor/react/react-transition-group.js) content/global/vendor/redux.js (vendor/react/redux.js) content/global/vendor/react-redux.js (vendor/react/react-redux.js) - - content/global/aboutRights.xhtml (aboutRightsMullvad.xhtml) ===================================== toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl ===================================== @@ -27,15 +27,6 @@ about-mullvad-browser-update-message = { -brand-short-name } has been updated t 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. telemetry-title = Telemetry Information ===================================== toolkit/themes/shared/aboutLicense.css ===================================== @@ -5,13 +5,9 @@ /* License Illustration */ .license-header { - background-image: url("chrome://global/skin/illustrations/about-license.svg"); - background-repeat: no-repeat; - background-position: right center; - min-height: 300px; - display: flex; - align-items: center; - padding-inline-end: 320px; + /* Adjust the header to remove the background, which is out of place without + * the app-license.html content. */ + align-self: start; } td:nth-child(1), View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/c4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/c4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! BB 43525: Skip Remote Settings for search engine customization.
by Pier Angelo Vendrame (＠pierov) 20 Jan '26

20 Jan '26

Pier Angelo Vendrame pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 017f6c6a by Pier Angelo Vendrame at 2026-01-20T08:12:40+01:00 fixup! BB 43525: Skip Remote Settings for search engine customization. Linted. - - - - - 1 changed file: - toolkit/components/search/content/base-browser-search-engines.json Changes: ===================================== toolkit/components/search/content/base-browser-search-engines.json ===================================== @@ -63,11 +63,7 @@ "orders": [ { "environment": { "allRegionsAndLocales": true }, - "order": [ - "ddg", - "ddg-noai", - "startpage" - ] + "order": ["ddg", "ddg-noai", "startpage"] } ] } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/017f6c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/017f6c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] BB 43901: Modify about:license.
by henry (＠henry) 20 Jan '26

20 Jan '26

henry pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 0f8c1a1a by henry at 2026-01-19T15:50:13+00:00 BB 43901: Modify about:license. We also drop about:rights. (cherry picked from commit d15d1ad113c2caba2815e46ab5d90e686ca494e5) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 4 changed files: - browser/base/moz.build - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - toolkit/themes/shared/aboutLicense.css Changes: ===================================== browser/base/moz.build ===================================== @@ -79,7 +79,8 @@ PERFTESTS_MANIFESTS += ["content/test/perftest.toml"] DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"] DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"] -DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR +# Do not include the Firefox app-license.html in about:license. +# tor-browser#43901. if CONFIG["BASE_BROWSER_UPDATE"]: DEFINES["BASE_BROWSER_UPDATE"] = True ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -95,9 +95,7 @@ static const RedirEntry kRedirMap[] = { {"profiling", "chrome://devtools/content/performance-new/aboutprofiling/index.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"rights", "https://www.mozilla.org/about/legal/terms/firefox/", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD}, +// Drop about:rights. tor-browser#43901. #ifndef BASE_BROWSER_VERSION {"robots", "chrome://browser/content/aboutRobots.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | ===================================== browser/components/about/components.conf ===================================== @@ -24,7 +24,7 @@ pages = [ 'profiling', 'reader', 'restartrequired', - 'rights', + # Removed 'rights'. tor-browser#43901. # Removed 'robots'. tor-browser#42831. 'sessionrestore', 'settings', ===================================== toolkit/themes/shared/aboutLicense.css ===================================== @@ -5,13 +5,9 @@ /* License Illustration */ .license-header { - background-image: url("chrome://global/skin/illustrations/about-license.svg"); - background-repeat: no-repeat; - background-position: right center; - min-height: 300px; - display: flex; - align-items: center; - padding-inline-end: 320px; + /* Adjust the header to remove the background, which is out of place without + * the app-license.html content. */ + align-self: start; } td:nth-child(1), View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0f8c1a1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0f8c1a1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] 2 commits: dropme! TB 43901: Modify about:license for Tor Browser.
by henry (＠henry) 20 Jan '26

20 Jan '26

henry pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: baab94df by Henry Wilkes at 2026-01-19T15:37:22+00:00 dropme! TB 43901: Modify about:license for Tor Browser. MB 489: Revert the TB patch entirely by reverting f53f82ba5eaa6b4a5b011608e81c7b3887873c3b and 66d6a1e876bd80274edb7b0225dc81dfbb39bc30. - - - - - d15d1ad1 by Henry Wilkes at 2026-01-19T15:37:22+00:00 BB 43901: Modify about:license. We also drop about:rights. - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b208f8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b208f8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] fixup! BB 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 20 Jan '26

20 Jan '26

Pier Angelo Vendrame pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: c43f2216 by Pier Angelo Vendrame at 2026-01-19T16:14:40+01:00 fixup! BB 43140: Tighten up fonts on Linux. BB 44410: Use UI system font size. After tor-browser#44286, the browser UI font size is too small in some system. So, hardcode only a few properties, but still query the system for the font size. - - - - - 1 changed file: - widget/gtk/nsLookAndFeel.cpp Changes: ===================================== widget/gtk/nsLookAndFeel.cpp ===================================== @@ -1268,13 +1268,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, gfxFontStyle* aFontStyle) { aFontStyle->style = FontSlantStyle::NORMAL; -#ifdef BASE_BROWSER_VERSION - *aFontName = u"\"Arimo\""; - aFontStyle->systemFont = true; - aFontStyle->weight = FontWeight::NORMAL; - aFontStyle->stretch = FontStretch::NORMAL; - aFontStyle->size = 14; -#else // As in // https://git.gnome.org/browse/gtk+/tree/gtk/gtkwidget.c?h=3.22.19#n10333 PangoFontDescription* desc; @@ -1283,6 +1276,16 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->systemFont = true; +#ifdef BASE_BROWSER_VERSION + // tor-browser#44410: Set a few properties (especially the font name), but not + // the size, as strange scale methods might be in use in the system. + // We normalize the font size with RFP anyway, so this should not enable + // fingerprinting. + *aFontName = u"\"Arimo\""; + aFontStyle->systemFont = true; + aFontStyle->weight = FontWeight::NORMAL; + aFontStyle->stretch = FontStretch::NORMAL; +#else constexpr auto quote = u"\""_ns; NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc)); *aFontName = quote + family + quote; @@ -1292,6 +1295,7 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, // FIXME: Set aFontStyle->stretch correctly! aFontStyle->stretch = FontStretch::NORMAL; +#endif float size = float(pango_font_description_get_size(desc)) / PANGO_SCALE; @@ -1309,7 +1313,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->size = size; pango_font_description_free(desc); -#endif } bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName, View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/c43… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/c43… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! BB 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 20 Jan '26

20 Jan '26

Pier Angelo Vendrame pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: c2820657 by Pier Angelo Vendrame at 2026-01-19T16:13:59+01:00 fixup! BB 43140: Tighten up fonts on Linux. BB 44410: Use UI system font size. After tor-browser#44286, the browser UI font size is too small in some system. So, hardcode only a few properties, but still query the system for the font size. - - - - - 1 changed file: - widget/gtk/nsLookAndFeel.cpp Changes: ===================================== widget/gtk/nsLookAndFeel.cpp ===================================== @@ -1268,13 +1268,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, gfxFontStyle* aFontStyle) { aFontStyle->style = FontSlantStyle::NORMAL; -#ifdef BASE_BROWSER_VERSION - *aFontName = u"\"Arimo\""; - aFontStyle->systemFont = true; - aFontStyle->weight = FontWeight::NORMAL; - aFontStyle->stretch = FontStretch::NORMAL; - aFontStyle->size = 14; -#else // As in // https://git.gnome.org/browse/gtk+/tree/gtk/gtkwidget.c?h=3.22.19#n10333 PangoFontDescription* desc; @@ -1283,6 +1276,16 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->systemFont = true; +#ifdef BASE_BROWSER_VERSION + // tor-browser#44410: Set a few properties (especially the font name), but not + // the size, as strange scale methods might be in use in the system. + // We normalize the font size with RFP anyway, so this should not enable + // fingerprinting. + *aFontName = u"\"Arimo\""; + aFontStyle->systemFont = true; + aFontStyle->weight = FontWeight::NORMAL; + aFontStyle->stretch = FontStretch::NORMAL; +#else constexpr auto quote = u"\""_ns; NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc)); *aFontName = quote + family + quote; @@ -1292,6 +1295,7 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, // FIXME: Set aFontStyle->stretch correctly! aFontStyle->stretch = FontStretch::NORMAL; +#endif float size = float(pango_font_description_get_size(desc)) / PANGO_SCALE; @@ -1309,7 +1313,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->size = size; pango_font_description_free(desc); -#endif } bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c282065… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c282065… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] fixup! BB 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 20 Jan '26

20 Jan '26

Pier Angelo Vendrame pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: b208f8bb by Pier Angelo Vendrame at 2026-01-19T11:31:32+01:00 fixup! BB 43140: Tighten up fonts on Linux. BB 44410: Use UI system font size. After tor-browser#44286, the browser UI font size is too small in some system. So, hardcode only a few properties, but still query the system for the font size. - - - - - 1 changed file: - widget/gtk/nsLookAndFeel.cpp Changes: ===================================== widget/gtk/nsLookAndFeel.cpp ===================================== @@ -1268,13 +1268,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, gfxFontStyle* aFontStyle) { aFontStyle->style = FontSlantStyle::NORMAL; -#ifdef BASE_BROWSER_VERSION - *aFontName = u"\"Arimo\""; - aFontStyle->systemFont = true; - aFontStyle->weight = FontWeight::NORMAL; - aFontStyle->stretch = FontStretch::NORMAL; - aFontStyle->size = 14; -#else // As in // https://git.gnome.org/browse/gtk+/tree/gtk/gtkwidget.c?h=3.22.19#n10333 PangoFontDescription* desc; @@ -1283,6 +1276,16 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->systemFont = true; +#ifdef BASE_BROWSER_VERSION + // tor-browser#44410: Set a few properties (especially the font name), but not + // the size, as strange scale methods might be in use in the system. + // We normalize the font size with RFP anyway, so this should not enable + // fingerprinting. + *aFontName = u"\"Arimo\""; + aFontStyle->systemFont = true; + aFontStyle->weight = FontWeight::NORMAL; + aFontStyle->stretch = FontStretch::NORMAL; +#else constexpr auto quote = u"\""_ns; NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc)); *aFontName = quote + family + quote; @@ -1292,6 +1295,7 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, // FIXME: Set aFontStyle->stretch correctly! aFontStyle->stretch = FontStretch::NORMAL; +#endif float size = float(pango_font_description_get_size(desc)) / PANGO_SCALE; @@ -1309,7 +1313,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->size = size; pango_font_description_free(desc); -#endif } bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b208f8b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b208f8b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] fixup! BB 41803: Add some developer tools for working on tor-browser.
by henry (＠henry) 20 Jan '26

20 Jan '26

henry pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 643f7c12 by henry at 2026-01-19T13:57:42+00:00 fixup! BB 41803: Add some developer tools for working on tor-browser. TB 44452: Improve the range-diff and diff-diff commands. (cherry picked from commit c344d0b6916e181d21523b5f308a9e825efd7d7c) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 1 changed file: - tools/base_browser/tb-dev Changes: ===================================== tools/base_browser/tb-dev ===================================== @@ -1409,63 +1409,102 @@ def move_to_default(args: argparse.Namespace) -> None: git_run(["cherry-pick", f"{current_basis}..{old_branch_name}"], check=False) +def convert_ref_to_range(ref: str) -> str: + """ + Convert a reference given by the user into a reference range, defaulting to + the last firefox reference. + + :param ref: The reference to convert to a range, if it isn't one already. + :returns: The reference range. + """ + if ".." in ref: + return ref + firefox_commit = get_firefox_ref(ref).commit + return f"{firefox_commit}..{ref}" + + def show_range_diff(args: argparse.Namespace) -> None: """ - Show the range diff between two branches, from their firefox bases. + Show the range diff. If a single reference is given as one of the arguments, + its last "FIREFOX_" tag is used as the range start. """ - firefox_commit_1 = get_firefox_ref(args.branch1).commit - firefox_commit_2 = get_firefox_ref(args.branch2).commit + range1 = convert_ref_to_range(args.ref1) + range2 = convert_ref_to_range(args.ref2) git_run( - [ - "range-diff", - f"{firefox_commit_1}..{args.branch1}", - f"{firefox_commit_2}..{args.branch2}", - ], - check=False, + ["range-diff", *args.gitargs, range1, range2, "--", *args.path], check=False ) def show_diff_diff(args: argparse.Namespace) -> None: """ - Show the diff between the diffs of two branches, relative to their firefox - bases. + Show the diff between the diffs of two ranges. If a single reference is + given as one of the arguments, its last "FIREFOX_" tag is used as the range + start. """ try: diff_tool = next(git_lines(["config", "--get", "diff.tool"])) except StopIteration: raise TbDevException("No diff.tool configured for git") + drop_context = not args.keep_context + # Filter out parts of the diff we expect to be different. index_regex = re.compile(r"index [0-9a-f]{12}\.\.[0-9a-f]{12}") - lines_regex = re.compile(r"@@ -[0-9]+,[0-9]+ \+[0-9]+,[0-9]+ @@(?P<rest>.*)") + context_regex = re.compile(r"@@ -[0-9]+(:?,[0-9]+)? \+[0-9]+(:?,[0-9]+)? @@") - def save_diff(branch: str) -> str: - firefox_commit = get_firefox_ref(branch).commit + # Limit a line length. E.g. "meld" has a line length limit. + LINE_LIMIT = 1024 + + def save_diff(ref_range: str) -> str: file_desc, file_name = tempfile.mkstemp( - text=True, prefix=f'{branch.split("/")[-1]}-' + text=True, prefix=f'{ref_range.replace("/", "_")}' ) # Register deleting the file at exit. atexit.register(os.remove, file_name) diff_process = subprocess.Popen( - [GIT_PATH, "diff", f"{firefox_commit}..{branch}"], + # --unified=1 will reduce the context to just directly neighbouring + # lines. + [ + GIT_PATH, + "diff", + "--binary", + "--unified=1", + *args.gitargs, + ref_range, + "--", + *args.path, + ], stdout=subprocess.PIPE, text=True, + encoding="utf-8", + errors="replace", ) with os.fdopen(file_desc, "w") as file: assert diff_process.stdout is not None for line in diff_process.stdout: - if index_regex.match(line): - # Fake data that will match. - file.write("index ????????????..????????????\n") - continue - lines_match = lines_regex.match(line) - if lines_match: - # Fake data that will match. - file.write("@@ ?,? ?,? @@" + lines_match.group("rest")) - continue - file.write(line) + if drop_context: + if index_regex.match(line): + # Fake data that will match. + file.write("index ????????????..????????????\n") + continue + if context_regex.match(line): + # Fake data that will match. + file.write("@@ ?,? ?,? @@\n") + continue + + remaining_line = line + while True: + if len(remaining_line) - 1 > LINE_LIMIT: + # NOTE: we use `len() - 1` to not count the trailing + # '\n', which we assume all lines in the diff have. + # Long line, split with a newline character. + file.write(remaining_line[:LINE_LIMIT] + "\n") + remaining_line = remaining_line[:LINE_LIMIT] + else: + file.write(remaining_line) + break status = diff_process.wait() if status != 0: @@ -1473,8 +1512,10 @@ def show_diff_diff(args: argparse.Namespace) -> None: return file_name - file_1 = save_diff(args.branch1) - file_2 = save_diff(args.branch2) + range1 = convert_ref_to_range(args.ref1) + range2 = convert_ref_to_range(args.ref2) + file_1 = save_diff(range1) + file_2 = save_diff(range2) subprocess.run([diff_tool, file_1, file_2], check=False) @@ -1483,6 +1524,28 @@ def show_diff_diff(args: argparse.Namespace) -> None: # * -------------------- * +def ref_complete(prefix: str, **_kwargs: Any) -> list[str]: + """ + Complete the argument with a reference name. + """ + if not within_browser_root(): + return [] + try: + matching = [] + for symbolic_ref in ("HEAD",): + if symbolic_ref.startswith(prefix): + matching.append(symbolic_ref) + for ref_type in ("head", "remote", "tag"): + for ref in get_refs(ref_type, ""): + if ref.name.startswith(prefix): + matching.append(ref.name) + if ref.full_name.startswith(prefix): + matching.append(ref.full_name) + return matching + except Exception: + return [] + + def branch_complete(prefix: str, **_kwargs: Any) -> list[str]: """ Complete the argument with a branch name. @@ -1490,12 +1553,9 @@ def branch_complete(prefix: str, **_kwargs: Any) -> list[str]: if not within_browser_root(): return [] try: - branches = [ref.name for ref in get_refs("head", "")] - branches.extend(ref.name for ref in get_refs("remote", "")) - branches.append("HEAD") + return [ref.name for ref in get_refs("head", "") if ref.name.startswith(prefix)] except Exception: return [] - return [br for br in branches if br.startswith(prefix)] parser = argparse.ArgumentParser() @@ -1506,6 +1566,8 @@ class ArgConfig(TypedDict): help: str metavar: NotRequired[str] nargs: NotRequired[str] + action: NotRequired[str] + default: NotRequired[Any] completer: NotRequired[Callable[[str], list[str]]] @@ -1573,33 +1635,59 @@ all_commands: dict[str, CommandConfig] = { }, }, }, - "branch-range-diff": { + "range-diff": { "func": show_range_diff, "args": { - "branch1": { - "help": "the first branch to compare", - "metavar": "<branch-1>", - "completer": branch_complete, + "ref1": { + "help": "the first range to compare", + "metavar": "<ref-1>", + "completer": ref_complete, }, - "branch2": { - "help": "the second branch to compare", - "metavar": "<branch-2>", - "completer": branch_complete, + "ref2": { + "help": "the second range to compare", + "metavar": "<ref-2>", + "completer": ref_complete, + }, + "--path": { + "help": "path filter to pass to git range-diff. Can be given multiple times", + "metavar": "<path>", + "action": "append", + "default": [], + }, + "gitargs": { + "help": "additional argument to pass to git range-diff", + "metavar": "-- git-range-diff-arg", + "nargs": "*", }, }, }, - "branch-diff-diff": { + "diff-diff": { "func": show_diff_diff, "args": { - "branch1": { + "--keep-context": { + "help": "keep the git context lines as they are, otherwise they are trivialised to reduce differences. You may want to use this if your diff tool, like meld, can filter out these lines from the diff without erasing them", + "action": "store_true", + }, + "ref1": { "help": "the first branch to compare", - "metavar": "<branch-1>", - "completer": branch_complete, + "metavar": "<ref-1>", + "completer": ref_complete, }, - "branch2": { + "ref2": { "help": "the second branch to compare", - "metavar": "<branch-2>", - "completer": branch_complete, + "metavar": "<ref-2>", + "completer": ref_complete, + }, + "--path": { + "help": "path filter to pass to git diff. Can be given multiple times", + "metavar": "<path>", + "action": "append", + "default": [], + }, + "gitargs": { + "help": "additional argument to pass to git diff", + "metavar": "-- git-diff-arg", + "nargs": "*", }, }, }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/643… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/643… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! BB 41803: Add some developer tools for working on tor-browser.
by henry (＠henry) 20 Jan '26

20 Jan '26

henry pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 963cb849 by henry at 2026-01-19T13:55:09+00:00 fixup! BB 41803: Add some developer tools for working on tor-browser. TB 44452: Improve the range-diff and diff-diff commands. (cherry picked from commit c344d0b6916e181d21523b5f308a9e825efd7d7c) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 1 changed file: - tools/base_browser/tb-dev Changes: ===================================== tools/base_browser/tb-dev ===================================== @@ -1409,63 +1409,102 @@ def move_to_default(args: argparse.Namespace) -> None: git_run(["cherry-pick", f"{current_basis}..{old_branch_name}"], check=False) +def convert_ref_to_range(ref: str) -> str: + """ + Convert a reference given by the user into a reference range, defaulting to + the last firefox reference. + + :param ref: The reference to convert to a range, if it isn't one already. + :returns: The reference range. + """ + if ".." in ref: + return ref + firefox_commit = get_firefox_ref(ref).commit + return f"{firefox_commit}..{ref}" + + def show_range_diff(args: argparse.Namespace) -> None: """ - Show the range diff between two branches, from their firefox bases. + Show the range diff. If a single reference is given as one of the arguments, + its last "FIREFOX_" tag is used as the range start. """ - firefox_commit_1 = get_firefox_ref(args.branch1).commit - firefox_commit_2 = get_firefox_ref(args.branch2).commit + range1 = convert_ref_to_range(args.ref1) + range2 = convert_ref_to_range(args.ref2) git_run( - [ - "range-diff", - f"{firefox_commit_1}..{args.branch1}", - f"{firefox_commit_2}..{args.branch2}", - ], - check=False, + ["range-diff", *args.gitargs, range1, range2, "--", *args.path], check=False ) def show_diff_diff(args: argparse.Namespace) -> None: """ - Show the diff between the diffs of two branches, relative to their firefox - bases. + Show the diff between the diffs of two ranges. If a single reference is + given as one of the arguments, its last "FIREFOX_" tag is used as the range + start. """ try: diff_tool = next(git_lines(["config", "--get", "diff.tool"])) except StopIteration: raise TbDevException("No diff.tool configured for git") + drop_context = not args.keep_context + # Filter out parts of the diff we expect to be different. index_regex = re.compile(r"index [0-9a-f]{12}\.\.[0-9a-f]{12}") - lines_regex = re.compile(r"@@ -[0-9]+,[0-9]+ \+[0-9]+,[0-9]+ @@(?P<rest>.*)") + context_regex = re.compile(r"@@ -[0-9]+(:?,[0-9]+)? \+[0-9]+(:?,[0-9]+)? @@") - def save_diff(branch: str) -> str: - firefox_commit = get_firefox_ref(branch).commit + # Limit a line length. E.g. "meld" has a line length limit. + LINE_LIMIT = 1024 + + def save_diff(ref_range: str) -> str: file_desc, file_name = tempfile.mkstemp( - text=True, prefix=f'{branch.split("/")[-1]}-' + text=True, prefix=f'{ref_range.replace("/", "_")}' ) # Register deleting the file at exit. atexit.register(os.remove, file_name) diff_process = subprocess.Popen( - [GIT_PATH, "diff", f"{firefox_commit}..{branch}"], + # --unified=1 will reduce the context to just directly neighbouring + # lines. + [ + GIT_PATH, + "diff", + "--binary", + "--unified=1", + *args.gitargs, + ref_range, + "--", + *args.path, + ], stdout=subprocess.PIPE, text=True, + encoding="utf-8", + errors="replace", ) with os.fdopen(file_desc, "w") as file: assert diff_process.stdout is not None for line in diff_process.stdout: - if index_regex.match(line): - # Fake data that will match. - file.write("index ????????????..????????????\n") - continue - lines_match = lines_regex.match(line) - if lines_match: - # Fake data that will match. - file.write("@@ ?,? ?,? @@" + lines_match.group("rest")) - continue - file.write(line) + if drop_context: + if index_regex.match(line): + # Fake data that will match. + file.write("index ????????????..????????????\n") + continue + if context_regex.match(line): + # Fake data that will match. + file.write("@@ ?,? ?,? @@\n") + continue + + remaining_line = line + while True: + if len(remaining_line) - 1 > LINE_LIMIT: + # NOTE: we use `len() - 1` to not count the trailing + # '\n', which we assume all lines in the diff have. + # Long line, split with a newline character. + file.write(remaining_line[:LINE_LIMIT] + "\n") + remaining_line = remaining_line[:LINE_LIMIT] + else: + file.write(remaining_line) + break status = diff_process.wait() if status != 0: @@ -1473,8 +1512,10 @@ def show_diff_diff(args: argparse.Namespace) -> None: return file_name - file_1 = save_diff(args.branch1) - file_2 = save_diff(args.branch2) + range1 = convert_ref_to_range(args.ref1) + range2 = convert_ref_to_range(args.ref2) + file_1 = save_diff(range1) + file_2 = save_diff(range2) subprocess.run([diff_tool, file_1, file_2], check=False) @@ -1483,6 +1524,28 @@ def show_diff_diff(args: argparse.Namespace) -> None: # * -------------------- * +def ref_complete(prefix: str, **_kwargs: Any) -> list[str]: + """ + Complete the argument with a reference name. + """ + if not within_browser_root(): + return [] + try: + matching = [] + for symbolic_ref in ("HEAD",): + if symbolic_ref.startswith(prefix): + matching.append(symbolic_ref) + for ref_type in ("head", "remote", "tag"): + for ref in get_refs(ref_type, ""): + if ref.name.startswith(prefix): + matching.append(ref.name) + if ref.full_name.startswith(prefix): + matching.append(ref.full_name) + return matching + except Exception: + return [] + + def branch_complete(prefix: str, **_kwargs: Any) -> list[str]: """ Complete the argument with a branch name. @@ -1490,12 +1553,9 @@ def branch_complete(prefix: str, **_kwargs: Any) -> list[str]: if not within_browser_root(): return [] try: - branches = [ref.name for ref in get_refs("head", "")] - branches.extend(ref.name for ref in get_refs("remote", "")) - branches.append("HEAD") + return [ref.name for ref in get_refs("head", "") if ref.name.startswith(prefix)] except Exception: return [] - return [br for br in branches if br.startswith(prefix)] parser = argparse.ArgumentParser() @@ -1506,6 +1566,8 @@ class ArgConfig(TypedDict): help: str metavar: NotRequired[str] nargs: NotRequired[str] + action: NotRequired[str] + default: NotRequired[Any] completer: NotRequired[Callable[[str], list[str]]] @@ -1573,33 +1635,59 @@ all_commands: dict[str, CommandConfig] = { }, }, }, - "branch-range-diff": { + "range-diff": { "func": show_range_diff, "args": { - "branch1": { - "help": "the first branch to compare", - "metavar": "<branch-1>", - "completer": branch_complete, + "ref1": { + "help": "the first range to compare", + "metavar": "<ref-1>", + "completer": ref_complete, }, - "branch2": { - "help": "the second branch to compare", - "metavar": "<branch-2>", - "completer": branch_complete, + "ref2": { + "help": "the second range to compare", + "metavar": "<ref-2>", + "completer": ref_complete, + }, + "--path": { + "help": "path filter to pass to git range-diff. Can be given multiple times", + "metavar": "<path>", + "action": "append", + "default": [], + }, + "gitargs": { + "help": "additional argument to pass to git range-diff", + "metavar": "-- git-range-diff-arg", + "nargs": "*", }, }, }, - "branch-diff-diff": { + "diff-diff": { "func": show_diff_diff, "args": { - "branch1": { + "--keep-context": { + "help": "keep the git context lines as they are, otherwise they are trivialised to reduce differences. You may want to use this if your diff tool, like meld, can filter out these lines from the diff without erasing them", + "action": "store_true", + }, + "ref1": { "help": "the first branch to compare", - "metavar": "<branch-1>", - "completer": branch_complete, + "metavar": "<ref-1>", + "completer": ref_complete, }, - "branch2": { + "ref2": { "help": "the second branch to compare", - "metavar": "<branch-2>", - "completer": branch_complete, + "metavar": "<ref-2>", + "completer": ref_complete, + }, + "--path": { + "help": "path filter to pass to git diff. Can be given multiple times", + "metavar": "<path>", + "action": "append", + "default": [], + }, + "gitargs": { + "help": "additional argument to pass to git diff", + "metavar": "-- git-diff-arg", + "nargs": "*", }, }, }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/963cb84… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/963cb84… 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-147.0a1-16.0-2-build1
by henry (＠henry) 20 Jan '26

20 Jan '26

henry pushed new tag mullvad-browser-147.0a1-16.0-2-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-147.0a1-16.0-2] 29 commits: fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by henry (＠henry) 20 Jan '26

20 Jan '26

henry pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: ec013ea0 by Morgan at 2026-01-19T12:07:05+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates - add time-gated feature issue template - add a revert patchset issue template - - - - - 677aa472 by Morgan at 2026-01-19T12:07:06+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates migrate Project 131 label to Project 196 - - - - - 01a3e906 by henry at 2026-01-19T12:07:07+00:00 fixup! BB 32308: Use direct browser sizing for letterboxing. TB 44289: Handle the case where --toolbar-field-color is set to "inherit". Also, better handle "currentColor" values to not rely on the computed color, which may vary with the UI state. Also, replace "/*" comments with "//". (cherry picked from commit 961b3271e9af455b91bb43e8ea18701ff6a5577f) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 58518070 by henry at 2026-01-19T12:07:08+00:00 fixup! BB 42305: Add script to combine translation files across versions. TB 44498: Change the expected browser version gap between stable and alpha from 0.5 to 1.0. (cherry picked from commit 0f10cc1e6af605090cbd0ba4dbc0615c6f51e286) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 126bc56e by Henry Wilkes at 2026-01-19T12:07:09+00:00 Add CI for Mullvad Browser - - - - - 9bec56b0 by Pier Angelo Vendrame at 2026-01-19T12:07:10+00:00 MB 38: Mullvad Browser configuration - - - - - 9ecb08f2 by Pier Angelo Vendrame at 2026-01-19T12:07:11+00: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 - - - - - 957c17a4 by Henry Wilkes at 2026-01-19T12:07:13+00:00 Mullvad Browser strings This commit adds strings needed by the following Mullvad Browser patches. - - - - - ddef9240 by Pier Angelo Vendrame at 2026-01-19T12:07:14+00: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. - - - - - 1450a249 by Pier Angelo Vendrame at 2026-01-19T12:07:15+00:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 17df5e48 by Pier Angelo Vendrame at 2026-01-19T12:07:16+00:00 MB 37: Customization for the about dialog - - - - - 25aad926 by Henry Wilkes at 2026-01-19T12:07:17+00:00 MB 39: Add home page about:mullvad-browser - - - - - a1f434b5 by hackademix at 2026-01-19T12:07:18+00:00 MB 97: Remove UI cues to install new extensions. - - - - - be03728a by hackademix at 2026-01-19T12:07:19+00:00 MB 47: uBlock Origin customization - - - - - 3b6d7d88 by Pier Angelo Vendrame at 2026-01-19T12:07:20+00: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. - - - - - 20d4720a by Pier Angelo Vendrame at 2026-01-19T12:07:22+00:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 9a0b053c by Nicolas Vigier at 2026-01-19T12:07:23+00:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - bf8379b9 by Pier Angelo Vendrame at 2026-01-19T12:07:24+00: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. - - - - - 915c3e68 by Pier Angelo Vendrame at 2026-01-19T12:07:25+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. - - - - - 7bbc2abf by hackademix at 2026-01-19T12:07:26+00:00 MB 163: Prevent uBlock Origin from being uninstalled/disabled - - - - - 874dc4a5 by Richard Pospesel at 2026-01-19T12:07:27+00:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - b4425c7f by Morgan at 2026-01-19T12:07:28+00:00 fixup! MB 188: Customize Gitlab Issue and Merge templates customise time-gated and revert issue type for Mullvad Browser - - - - - 7331192d by rui hildt at 2026-01-19T12:07:29+00:00 MB 213: Customize the search engines list. - - - - - 5ce25c24 by hackademix at 2026-01-19T12:07:30+00:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - c5f6ac12 by Pier Angelo Vendrame at 2026-01-19T12:07:32+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. - - - - - a8f72ad5 by Henry Wilkes at 2026-01-19T12:07:33+00:00 MB 329: Customize toolbar for mullvad-browser. - - - - - 1da78d33 by Henry Wilkes at 2026-01-19T12:07:34+00:00 MB 419: Mullvad Browser migration procedures. This commit implements the the Mullvad Browser's version of _migrateUI. - - - - - 814109c7 by Henry Wilkes at 2026-01-19T12:07:35+00:00 MB 488: Adjust search engine removal notification for Mullvad Leta. - - - - - 697031fc by Pier Angelo Vendrame at 2026-01-19T12:07:36+00:00 MB 80: Enable Mullvad Browser as a default browser - - - - - 258 changed files: - .gitlab/ci/jobs/update-translations.yml - .gitlab/issue_templates/000 Bug Report.md - .gitlab/issue_templates/010 Proposal.md - .gitlab/issue_templates/020 Web Compatibility.md - .gitlab/issue_templates/030 Test.md - .gitlab/issue_templates/031 Fingerprinting.md - .gitlab/issue_templates/040 Feature.md - + .gitlab/issue_templates/041 Time-Gated Feature.md - + .gitlab/issue_templates/051 Revert.md - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/090 Emergency Security Issue.md - .gitlab/issue_templates/Default.md - .gitlab/merge_request_templates/Default.md - + .gitlab/merge_request_templates/Rebase.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.sys.mjs - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/document_pdf.svg - + browser/branding/mb-alpha/content/firefox-wordmark.svg - + browser/branding/mb-alpha/content/icon128.png - + browser/branding/mb-alpha/content/icon16.png - + browser/branding/mb-alpha/content/icon256.png - + browser/branding/mb-alpha/content/icon32.png - + browser/branding/mb-alpha/content/icon48.png - + browser/branding/mb-alpha/content/icon64.png - + browser/branding/mb-alpha/content/jar.mn - + browser/branding/mb-alpha/content/moz.build - + browser/branding/mb-alpha/content/mullvad-branding.css - + browser/branding/mb-alpha/default128.png - + browser/branding/mb-alpha/default16.png - + browser/branding/mb-alpha/default22.png - + browser/branding/mb-alpha/default24.png - + browser/branding/mb-alpha/default256.png - + browser/branding/mb-alpha/default32.png - + browser/branding/mb-alpha/default48.png - + browser/branding/mb-alpha/default64.png - + browser/branding/mb-alpha/document.icns - + browser/branding/mb-alpha/document.ico - + browser/branding/mb-alpha/document_pdf.ico - + browser/branding/mb-alpha/firefox.icns - + browser/branding/mb-alpha/firefox.ico - + browser/branding/mb-alpha/firefox.svg - + browser/branding/mb-alpha/locales/en-US/brand.ftl - + browser/branding/mb-alpha/locales/en-US/brand.properties - + browser/branding/mb-alpha/locales/jar.mn - + browser/branding/mb-alpha/locales/moz.build - + browser/branding/mb-alpha/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-alpha/moz.build - + browser/branding/mb-alpha/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-alpha/newtab.ico - + browser/branding/mb-alpha/newwindow.ico - + browser/branding/mb-alpha/pbmode.ico - + browser/branding/mb-alpha/pref/firefox-branding.js - + browser/branding/mb-nightly/VisualElements_150.png - + browser/branding/mb-nightly/VisualElements_70.png - + browser/branding/mb-nightly/configure.sh - + browser/branding/mb-nightly/content/about-logo.png - + browser/branding/mb-nightly/content/about-logo.svg - + browser/branding/mb-nightly/content/about-logo(a)2x.png - + browser/branding/mb-nightly/content/about-wordmark.svg - + browser/branding/mb-nightly/content/about.png - + browser/branding/mb-nightly/content/aboutDialog.css - + browser/branding/mb-nightly/content/document_pdf.svg - + browser/branding/mb-nightly/content/firefox-wordmark.svg - + browser/branding/mb-nightly/content/icon128.png - + browser/branding/mb-nightly/content/icon16.png - + browser/branding/mb-nightly/content/icon256.png - + browser/branding/mb-nightly/content/icon32.png - + browser/branding/mb-nightly/content/icon48.png - + browser/branding/mb-nightly/content/icon64.png - + browser/branding/mb-nightly/content/jar.mn - + browser/branding/mb-nightly/content/moz.build - + browser/branding/mb-nightly/content/mullvad-branding.css - + browser/branding/mb-nightly/default128.png - + browser/branding/mb-nightly/default16.png - + browser/branding/mb-nightly/default22.png - + browser/branding/mb-nightly/default24.png - + browser/branding/mb-nightly/default256.png - + browser/branding/mb-nightly/default32.png - + browser/branding/mb-nightly/default48.png - + browser/branding/mb-nightly/default64.png - + browser/branding/mb-nightly/document.icns - + browser/branding/mb-nightly/document.ico - + browser/branding/mb-nightly/document_pdf.ico - + browser/branding/mb-nightly/firefox.icns - + browser/branding/mb-nightly/firefox.ico - + browser/branding/mb-nightly/firefox.svg - + browser/branding/mb-nightly/locales/en-US/brand.ftl - + browser/branding/mb-nightly/locales/en-US/brand.properties - + browser/branding/mb-nightly/locales/jar.mn - + browser/branding/mb-nightly/locales/moz.build - + browser/branding/mb-nightly/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-nightly/moz.build - + browser/branding/mb-nightly/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-nightly/newtab.ico - + browser/branding/mb-nightly/newwindow.ico - + browser/branding/mb-nightly/pbmode.ico - + browser/branding/mb-nightly/pref/firefox-branding.js - + browser/branding/mb-release/VisualElements_150.png - + browser/branding/mb-release/VisualElements_70.png - + browser/branding/mb-release/configure.sh - + browser/branding/mb-release/content/about-logo.png - + browser/branding/mb-release/content/about-logo.svg - + browser/branding/mb-release/content/about-logo(a)2x.png - + browser/branding/mb-release/content/about-wordmark.svg - + browser/branding/mb-release/content/about.png - + browser/branding/mb-release/content/aboutDialog.css - + browser/branding/mb-release/content/document_pdf.svg - + browser/branding/mb-release/content/firefox-wordmark.svg - + browser/branding/mb-release/content/icon128.png - + browser/branding/mb-release/content/icon16.png - + browser/branding/mb-release/content/icon256.png - + browser/branding/mb-release/content/icon32.png - + browser/branding/mb-release/content/icon48.png - + browser/branding/mb-release/content/icon64.png - + browser/branding/mb-release/content/jar.mn - + browser/branding/mb-release/content/moz.build - + browser/branding/mb-release/content/mullvad-branding.css - + browser/branding/mb-release/default128.png - + browser/branding/mb-release/default16.png - + browser/branding/mb-release/default22.png - + browser/branding/mb-release/default24.png - + browser/branding/mb-release/default256.png - + browser/branding/mb-release/default32.png - + browser/branding/mb-release/default48.png - + browser/branding/mb-release/default64.png - + browser/branding/mb-release/document.icns - + browser/branding/mb-release/document.ico - + browser/branding/mb-release/document_pdf.ico - + browser/branding/mb-release/firefox.icns - + browser/branding/mb-release/firefox.ico - + browser/branding/mb-release/firefox.svg - + browser/branding/mb-release/locales/en-US/brand.ftl - + browser/branding/mb-release/locales/en-US/brand.properties - + browser/branding/mb-release/locales/jar.mn - + browser/branding/mb-release/locales/moz.build - + browser/branding/mb-release/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-release/moz.build - + browser/branding/mb-release/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-release/newtab.ico - + browser/branding/mb-release/newwindow.ico - + browser/branding/mb-release/pbmode.ico - + browser/branding/mb-release/pref/firefox-branding.js - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/DesktopActorRegistry.sys.mjs - browser/components/ProfileDataUpgrader.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/moz.build - + browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs - + browser/components/mullvad-browser/content/2728-sparkles.svg - + browser/components/mullvad-browser/content/aboutMullvadBrowser.css - + browser/components/mullvad-browser/content/aboutMullvadBrowser.html - + browser/components/mullvad-browser/content/aboutMullvadBrowser.js - + browser/components/mullvad-browser/jar.mn - + browser/components/mullvad-browser/moz.build - browser/components/preferences/home.inc.xhtml - browser/components/preferences/preferences.xhtml - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - browser/components/preferences/search.inc.xhtml - browser/components/search/SearchUIUtils.sys.mjs - browser/components/shell/ShellService.sys.mjs - browser/components/shell/WindowsDefaultBrowser.cpp - browser/components/shell/nsWindowsShellService.cpp - browser/components/tabbrowser/NewTabPagePreloading.sys.mjs - browser/config/mozconfigs/base-browser - + browser/config/mozconfigs/mullvad-browser - browser/installer/package-manifest.in - browser/installer/windows/nsis/updater_append.ini - browser/locales/l10n.toml - browser/modules/HomePage.sys.mjs - browser/moz.build - browser/moz.configure - config/create_rc.py - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/aboutdebugging/src/components/sidebar/Sidebar.js - devtools/client/jar.mn - devtools/client/themes/images/aboutdebugging-firefox-aurora.svg - devtools/client/themes/images/aboutdebugging-firefox-beta.svg - devtools/client/themes/images/aboutdebugging-firefox-logo.svg - devtools/client/themes/images/aboutdebugging-firefox-nightly.svg - devtools/client/themes/images/aboutdebugging-firefox-release.svg - + devtools/client/themes/images/aboutdebugging-mullvadbrowser-logo.svg - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - moz.configure - mozconfig-linux-aarch64 - mozconfig-linux-aarch64-dev - mozconfig-linux-x86_64 - mozconfig-linux-x86_64-asan - mozconfig-linux-x86_64-dev - mozconfig-macos - mozconfig-macos-dev - mozconfig-windows-x86_64 - + other-licenses/nsis/Contrib/ApplicationID/Makefile - other-licenses/nsis/Contrib/ApplicationID/Set.cpp - + other-licenses/nsis/Contrib/CityHash/Makefile - toolkit/components/extensions/child/ext-storage.js - toolkit/components/extensions/parent/ext-storage.js - toolkit/components/passwordmgr/LoginHelper.sys.mjs - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/content/base-browser-search-engine-icons.json - toolkit/components/search/content/base-browser-search-engines.json - + toolkit/components/search/content/brave.svg - + toolkit/components/search/content/mojeek.ico - toolkit/components/search/tests/xpcshell/test_base_browser.js - toolkit/components/securitylevel/SecurityLevel.sys.mjs - + toolkit/content/aboutRightsMullvad.xhtml - + toolkit/content/aboutTelemetryMullvad.xhtml - toolkit/content/jar.mn - + toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - toolkit/mozapps/defaultagent/EventLog.h - toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp - toolkit/mozapps/extensions/AddonManager.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.css - toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs - toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs - toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der - toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der - toolkit/mozapps/update/updater/release_primary.der - toolkit/mozapps/update/updater/release_secondary.der - + toolkit/themes/shared/icons/mullvadbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn - toolkit/xre/nsAppRunner.cpp - tools/base_browser/l10n/combine-translation-versions.py - tools/lint/fluent-lint/exclusions.yml - widget/windows/WinTaskbar.cpp - widget/windows/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ab… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ab… 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-147.0a1-16.0-2
by henry (＠henry) 19 Jan '26

19 Jan '26

henry pushed new branch mullvad-browser-147.0a1-16.0-2 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] Pushed new tag mullvad-browser-147.0a1-16.0-1-build2
by henry (＠henry) 19 Jan '26

19 Jan '26

henry pushed new tag mullvad-browser-147.0a1-16.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-bundle-testsuite][main] Bug 40095: Drop torbrowser-nightly-android-x86
by boklm (＠boklm) 19 Jan '26

19 Jan '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite Commits: c2ed112d by Nicolas Vigier at 2026-01-19T11:49:45+01:00 Bug 40095: Drop torbrowser-nightly-android-x86 - - - - - 1 changed file: - TBBTestSuite/TestSuite/TorBrowserBuild.pm Changes: ===================================== TBBTestSuite/TestSuite/TorBrowserBuild.pm ===================================== @@ -153,20 +153,6 @@ sub set_tests { ], publish_dir => 'nightly-android-armv7', }, - { - name => 'torbrowser-nightly-android-x86', - descr => 'build tor-browser nightly android-x86', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'browser-single-platform', - 'browser-android-x86', - 'torbrowser', - ], - publish_dir => 'nightly-android-x86', - }, { name => 'torbrowser-nightly-android-x86_64', descr => 'build tor-browser nightly android-x86_64', View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] 2 commits: dropme! TB 41878: [android] Add standalone Tor Bootstrap
by Pier Angelo Vendrame (＠pierov) 19 Jan '26

19 Jan '26

Pier Angelo Vendrame pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: a8ce5ab0 by Pier Angelo Vendrame at 2026-01-19T10:23:13+01:00 dropme! TB 41878: [android] Add standalone Tor Bootstrap Move these changes to a commit that comes before. Do not cherry-pick those changes. - - - - - b11b4421 by Pier Angelo Vendrame at 2026-01-19T10:24:02+01:00 fixup! TB 42247: Android helpers for the TorProvider Move these changes to this commit, as this file is mostly changed only here. - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/eff7fd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/eff7fd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-1] 3 commits: MB 80: Enable Mullvad Browser as a default browser
by Pier Angelo Vendrame (＠pierov) 19 Jan '26

19 Jan '26

Pier Angelo Vendrame pushed to branch mullvad-browser-147.0a1-16.0-1 at The Tor Project / Applications / Mullvad Browser Commits: a8487fd3 by Pier Angelo Vendrame at 2026-01-19T09:26:39+01:00 MB 80: Enable Mullvad Browser as a default browser - - - - - c493899e by henry at 2026-01-19T09:26:39+01:00 fixup! BB 32308: Use direct browser sizing for letterboxing. TB 44289: Handle the case where --toolbar-field-color is set to "inherit". Also, better handle "currentColor" values to not rely on the computed color, which may vary with the UI state. Also, replace "/*" comments with "//". (cherry picked from commit 961b3271e9af455b91bb43e8ea18701ff6a5577f) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - f85f07b7 by henry at 2026-01-19T09:26:39+01:00 fixup! BB 42305: Add script to combine translation files across versions. TB 44498: Change the expected browser version gap between stable and alpha from 0.5 to 1.0. (cherry picked from commit 0f10cc1e6af605090cbd0ba4dbc0615c6f51e286) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 12 changed files: - browser/components/shell/ShellService.sys.mjs - browser/components/shell/WindowsDefaultBrowser.cpp - browser/components/shell/nsWindowsShellService.cpp - + other-licenses/nsis/Contrib/ApplicationID/Makefile - other-licenses/nsis/Contrib/ApplicationID/Set.cpp - + other-licenses/nsis/Contrib/CityHash/Makefile - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs - toolkit/mozapps/defaultagent/EventLog.h - toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp - tools/base_browser/l10n/combine-translation-versions.py - widget/windows/WinTaskbar.cpp - widget/windows/moz.build Changes: ===================================== browser/components/shell/ShellService.sys.mjs ===================================== @@ -286,7 +286,7 @@ let ShellServiceInternal = { ) { if (this._shouldSetDefaultPDFHandler()) { lazy.log.info("Setting Firefox as default PDF handler"); - extraFileExtensions.push(".pdf", "FirefoxPDF"); + extraFileExtensions.push(".pdf", "MullvadBrowserPDF"); } else { lazy.log.info("Not setting Firefox as default PDF handler"); } @@ -324,7 +324,7 @@ let ShellServiceInternal = { try { this.defaultAgent.setDefaultExtensionHandlersUserChoice(aumi, [ ".pdf", - "FirefoxPDF", + "MullvadBrowserPDF", ]); } catch (err) { telemetryResult = "ErrOther"; ===================================== browser/components/shell/WindowsDefaultBrowser.cpp ===================================== @@ -24,7 +24,7 @@ #include <wchar.h> #include <windows.h> -#define APP_REG_NAME_BASE L"Firefox-" +#define APP_REG_NAME_BASE L"MullvadBrowser-" static bool IsWindowsLogonConnected() { WCHAR userName[UNLEN + 1]; ===================================== browser/components/shell/nsWindowsShellService.cpp ===================================== @@ -361,10 +361,12 @@ nsWindowsShellService::CheckAllProgIDsExist(bool* aResult) { *aResult = result; } else { - *aResult = - CheckProgIDExists(FormatProgID(L"FirefoxURL", aumid.get()).get()) && - CheckProgIDExists(FormatProgID(L"FirefoxHTML", aumid.get()).get()) && - CheckProgIDExists(FormatProgID(L"FirefoxPDF", aumid.get()).get()); + *aResult = CheckProgIDExists( + FormatProgID(L"MullvadBrowserURL", aumid.get()).get()) && + CheckProgIDExists( + FormatProgID(L"MullvadBrowserHTML", aumid.get()).get()) && + CheckProgIDExists( + FormatProgID(L"MullvadBrowserPDF", aumid.get()).get()); } return NS_OK; ===================================== other-licenses/nsis/Contrib/ApplicationID/Makefile ===================================== @@ -0,0 +1,14 @@ +CXXFLAGS=-Icityhash -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DCITYHASH_EXPORTS -DUNICODE +SRCS=Set.cpp +OBJS=$(subst .cpp,.o,$(SRCS)) +LDFLAGS=-lole32 -lshlwapi -shared -Wl,--no-insert-timestamp +PLUGIN=ApplicationID.dll + +all: $(PLUGIN) + +$(PLUGIN): $(OBJS) + $(CXX) $(OBJS) $(LDFLAGS) -o $@ + llvm-strip $@ + +clean: + $(RM) $(OBJS) $(PLUGIN) ===================================== other-licenses/nsis/Contrib/ApplicationID/Set.cpp ===================================== @@ -35,7 +35,8 @@ unsigned int g_stringsize; TCHAR *g_variables; // Indicates that an application supports dual desktop and immersive modes. In Windows 8, this property is only applicable for web browsers. -DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDualMode, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 11); +// mingw already defines this in propkey.h. +// DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDualMode, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 11); int popstring(TCHAR *str, int len); void pushstring(const TCHAR *str, int len); ===================================== other-licenses/nsis/Contrib/CityHash/Makefile ===================================== @@ -0,0 +1,14 @@ +CXXFLAGS=-Icityhash -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DCITYHASH_EXPORTS -DUNICODE +SRCS=CityHash.cpp cityhash/city.cpp +OBJS=$(subst .cpp,.o,$(SRCS)) +LDFLAGS=-shared -Wl,--no-insert-timestamp +PLUGIN=CityHash.dll + +all: $(PLUGIN) + +$(PLUGIN): $(OBJS) + $(CXX) $(OBJS) $(LDFLAGS) -o $@ + llvm-strip $@ + +clean: + $(RM) $(OBJS) $(PLUGIN) ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -920,20 +920,49 @@ class _RFPHelper { * @param {CSSStyleDeclaration} style - The computed style for the element we * want to grab the color from. * @param {string} property - The name of the property we want. + * @param {object} [options] - Optional details. + * @param {string} [options.fallbackProperty] - A fallback to use instead if + * the property doesn't have a computed value. + * @param {string} [options.currentColorProperty] - The name of a property to + * use as the currentColor. * * @returns {InspectorRGBATuple} - The RGBA color. The "r", "g", "b" fields * are relative to the 0-255 color range. The "a" field is in the 0-1 range. */ - _convertToRGBA(win, style, property) { + _convertToRGBA(win, style, property, options) { let cssColor = style.getPropertyValue(property); if (!cssColor) { + if (options?.fallbackProperty) { + lazy.logConsole.debug( + "Using fallback property for RGBA.", + property, + options.fallbackProperty + ); + return this._convertToRGBA(win, style, options.fallbackProperty); + } lazy.logConsole.error(`Missing color "${property}"`); return { r: 0, g: 0, b: 0, a: 0 }; } const currentColorRegex = /(^|[^a-zA-Z0-9_-])currentColor($|[^a-zA-Z0-9_-])/g; if (currentColorRegex.test(cssColor)) { - const currentColor = style.color; + let currentColor; + if (options?.currentColorProperty) { + const currRGBA = this._convertToRGBA( + win, + style, + options.currentColorProperty + ); + currentColor = `rgba(${currRGBA.r}, ${currRGBA.g}, ${currRGBA.b}, ${currRGBA.a})`; + } else { + lazy.logConsole.warning( + "Missing a specification for the currentColor, using computed color." + ); + // Use the current "color" value. NOTE: this may not be exactly what we + // want since it's current value may be effected by :hover, :active, + // :focus, etc. But we want this to be a stable colour for the theme. + currentColor = style.color; + } cssColor = cssColor.replace(currentColorRegex, (_, pre, post) => { return pre + currentColor + post; }); @@ -944,7 +973,7 @@ class _RFPHelper { cssColor ); } - /* Can drop the document argument after bugzilla bug 1973684 (142). */ + // Can drop the document argument after bugzilla bug 1973684 (142). const colorRGBA = win.InspectorUtils.colorToRGBA(cssColor, win.document); if (!colorRGBA) { lazy.logConsole.error( @@ -985,12 +1014,13 @@ class _RFPHelper { * @param {Window} win - The window to calculate the color for. * @param {CSSStyleDeclaration} style - The computed style for the #nav-bar * element. + * @param {boolean} verticalTabs - Whether vertical tabs are enabled. * * @returns {InspectorRGBATuple} - The calculated color, which will be opaque. */ - _calculateUrlbarContainerColor(win, style) { + _calculateUrlbarContainerColor(win, style, verticalTabs) { let colorRGBA; - if (!Services.prefs.getBoolPref(kPrefVerticalTabs)) { + if (!verticalTabs) { lazy.logConsole.debug("Toolbar background used."); colorRGBA = this._convertToRGBA(win, style, "--toolbar-bgcolor"); if (colorRGBA.a === 1) { @@ -1069,12 +1099,19 @@ class _RFPHelper { if (letterboxingEnabled) { // Want the effective colour of various elements without any alpha values // so they can be used consistently. + + const verticalTabs = Services.prefs.getBoolPref(kPrefVerticalTabs); + const chromeTextColorProperty = verticalTabs + ? "--toolbox-textcolor" + : "--toolbar-color"; + const navbarStyle = win.getComputedStyle( win.document.getElementById("nav-bar") ); const containerRGBA = this._calculateUrlbarContainerColor( win, - navbarStyle + navbarStyle, + verticalTabs ); urlbarBackgroundRGBA = this._composeRGBA( this._convertToRGBA( @@ -1084,17 +1121,28 @@ class _RFPHelper { ), containerRGBA ); + // NOTE: In the default theme (no "lwtheme" attribute) with + // browser.theme.native-theme set to false, --toolbar-field-color can be + // set to "inherit", which means it will have a blank computed value. We + // fallback to --toolbar-color or --toolbox-textcolor in this case. + // Similarly, for windows OS, it can be set to "currentColor". urlbarTextRGBA = this._composeRGBA( - this._convertToRGBA(win, navbarStyle, "--toolbar-field-color"), + this._convertToRGBA(win, navbarStyle, "--toolbar-field-color", { + fallbackProperty: chromeTextColorProperty, + currentColorProperty: chromeTextColorProperty, + }), urlbarBackgroundRGBA ); - /* Separator between the urlbar container #nav-bar and the tabbox. */ + // Separator between the urlbar container #nav-bar and the tabbox. + // For the default theme, this can be set to --border-color-card, which + // can use "currentColor". const tabboxStyle = win.getComputedStyle(win.gBrowser.tabbox); contentSeparatorRGBA = this._composeRGBA( this._convertToRGBA( win, tabboxStyle, - "--chrome-content-separator-color" + "--chrome-content-separator-color", + { currentColorProperty: chromeTextColorProperty } ), containerRGBA ); @@ -1114,8 +1162,8 @@ class _RFPHelper { contrastRatio ); urlbarBackgroundDark = bgColor.relativeLuminance < 0.5; - /* Very low contrast ratio. For reference the default light theme has - * a contrast ratio of ~1.1. */ + // Very low contrast ratio. For reference the default light theme has + // a contrast ratio of ~1.1. lowBackgroundOutlineContrast = contrastRatio < 1.05; } for (const { name, colorRGBA } of [ ===================================== toolkit/mozapps/defaultagent/EventLog.h ===================================== @@ -7,7 +7,7 @@ #ifndef __DEFAULT_BROWSER_AGENT_EVENT_LOG_H__ #define __DEFAULT_BROWSER_AGENT_EVENT_LOG_H__ -#include "mozilla/Types.h" +#include <cwchar> MOZ_BEGIN_EXTERN_C @@ -15,10 +15,21 @@ extern MOZ_EXPORT const wchar_t* gWinEventLogSourceName; MOZ_END_EXTERN_C -#include "mozilla/WindowsEventLog.h" - -#define LOG_ERROR(hr) MOZ_WIN_EVENT_LOG_ERROR(gWinEventLogSourceName, hr) -#define LOG_ERROR_MESSAGE(format, ...) \ - MOZ_WIN_EVENT_LOG_ERROR_MESSAGE(gWinEventLogSourceName, format, __VA_ARGS__) +#ifdef LOG_ERRORS_FILE +extern FILE* gLogFile; +# define LOG_ERROR(hr) \ + if (gLogFile) { \ + fprintf(gLogFile, "Error in %s:%d: 0x%X\r\n", __FILE__, __LINE__, \ + (unsigned int)hr); \ + } +# define LOG_ERROR_MESSAGE(format, ...) \ + if (gLogFile) { \ + fwprintf(gLogFile, format __VA_OPT__(, ) __VA_ARGS__); \ + fputs("\r\n", gLogFile); \ + } +#else +# define LOG_ERROR(hr) +# define LOG_ERROR_MESSAGE(format, ...) +#endif #endif // __DEFAULT_BROWSER_AGENT_EVENT_LOG_H__ ===================================== toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp ===================================== @@ -444,9 +444,10 @@ nsresult SetDefaultBrowserUserChoice( return NS_ERROR_FAILURE; } - nsTArray<nsString> browserDefaults = { - u"https"_ns, u"FirefoxURL"_ns, u"http"_ns, u"FirefoxURL"_ns, - u".html"_ns, u"FirefoxHTML"_ns, u".htm"_ns, u"FirefoxHTML"_ns}; + nsTArray<nsString> browserDefaults = {u"https"_ns, u"MullvadBrowserURL"_ns, + u"http"_ns, u"MullvadBrowserURL"_ns, + u".html"_ns, u"MullvadBrowserHTML"_ns, + u".htm"_ns, u"MullvadBrowserHTML"_ns}; browserDefaults.AppendElements(aExtraFileExtensions); ===================================== tools/base_browser/l10n/combine-translation-versions.py ===================================== @@ -103,10 +103,11 @@ class BrowserBranch: self.name = branch_name self.prefix = version_match.group("prefix") - self.browser_version = version_match.group("browser") + browser_version_str = version_match.group("browser") + self.browser_version = float(browser_version_str) # Convert tor-browser to "Tor Browser", and similar. browser_name = self.prefix.replace("-", " ").title() - self.browser_version_name = f"{browser_name} {self.browser_version}" + self.browser_version_name = f"{browser_name} {browser_version_str}" self._is_head = is_head self._ref = "HEAD" if is_head else f"origin/{branch_name}" @@ -114,7 +115,7 @@ class BrowserBranch: 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(".")] + browser_nums = [int(n) for n in browser_version_str.split(".")] branch_number = int(version_match.group("number")) # Prioritise the firefox ESR version, then the browser version then the # branch number. @@ -127,25 +128,8 @@ class BrowserBranch: 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 @@ -259,16 +243,14 @@ def get_stable_branch( # 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 + # to the next ".0" 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) - ): + release_diff = compare_version.browser_version - branch.browser_version + if release_diff < 0.0 or release_diff > 1.0: continue stable_branches.append(branch) elif is_legacy: ===================================== widget/windows/WinTaskbar.cpp ===================================== @@ -249,7 +249,7 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId, nsCString appName; if (appInfo && NS_SUCCEEDED(appInfo->GetName(appName))) { nsAutoString regKey; - regKey.AssignLiteral("Software\\Mozilla\\"); + regKey.AssignLiteral("Software\\" MOZ_APP_VENDOR "\\"); AppendASCIItoUTF16(appName, regKey); regKey.AppendLiteral("\\TaskBarIDs"); ===================================== widget/windows/moz.build ===================================== @@ -203,6 +203,7 @@ DEFINES["MOZ_UNICODE"] = True DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"] # Turn `firefox` into `Firefox`. DEFINES["MOZ_TOAST_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"].title() +DEFINES["MOZ_APP_VENDOR"] = '"%s"' % CONFIG["MOZ_APP_VENDOR"] USE_LIBS += [ "jsoncpp", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/fb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/fb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] fixup! [android] Rename as Tor Browser
by clairehurst (＠clairehurst) 16 Jan '26

16 Jan '26

clairehurst pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: eff7fddc by clairehurst at 2026-01-15T15:51:01-07:00 fixup! [android] Rename as Tor Browser tor-browser#44469 Fix branding on Android RR - - - - - 25 changed files: - mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_round.xml - mobile/android/fenix/app/src/debug/ic_launcher-playstore.png - mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher_round.xml - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt - mobile/android/fenix/app/src/main/res/drawable/splash_screen.xml - mobile/android/fenix/app/src/main/res/layout/fragment_about.xml - mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml - mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_round.xml - mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher.xml - mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_round.xml Changes: ===================================== mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> </adaptive-icon> ===================================== mobile/android/fenix/app/src/beta/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/debug/ic_launcher-playstore.png ===================================== Binary files a/mobile/android/fenix/app/src/debug/ic_launcher-playstore.png and b/mobile/android/fenix/app/src/debug/ic_launcher-playstore.png differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> </adaptive-icon> ===================================== mobile/android/fenix/app/src/debug/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt ===================================== @@ -610,7 +610,7 @@ private fun touPageUIData() = OnboardingPageUiData( lineThreeText = stringResource(id = R.string.onboarding_redesign_tou_body_three), lineThreeLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_three_link_text), ), - imageRes = R.drawable.ic_firefox, + imageRes = R.mipmap.ic_launcher_foreground, primaryButtonLabel = stringResource( id = R.string.onboarding_redesign_tou_agree_and_continue_button_label, ), ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt ===================================== @@ -232,7 +232,7 @@ private fun OnboardingPagePreview() { lineThreeText = stringResource(id = R.string.onboarding_redesign_tou_body_three), lineThreeLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_three_link_text), ), - imageRes = R.drawable.ic_firefox, + imageRes = R.mipmap.ic_launcher_foreground, primaryButton = Action( text = stringResource( id = R.string.onboarding_redesign_tou_agree_and_continue_button_label, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt ===================================== @@ -80,7 +80,7 @@ private fun RowScope.BrowserDetailsRow(selected: Boolean = false) { ) { if (selected) { Image( - painter = painterResource(R.drawable.ic_firefox), + painter = painterResource(R.mipmap.ic_launcher_foreground), contentDescription = null, // Decorative only. modifier = Modifier.size(24.dp), ) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt ===================================== @@ -167,7 +167,7 @@ class SearchWidgetProvider : AppWidgetProvider() { // gradient color available for android:fillColor only on SDK 24+ setImageViewResource( R.id.button_search_widget_new_tab_icon, - R.drawable.ic_launcher_foreground, + R.mipmap.ic_launcher_foreground, ) val appName = context.getString(R.string.app_name) ===================================== mobile/android/fenix/app/src/main/res/drawable/splash_screen.xml ===================================== @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:drawable="@drawable/ic_launcher_foreground" + android:drawable="@mipmap/ic_launcher_foreground" android:width="192dp" android:height="192dp" android:gravity="center" /> ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_about.xml ===================================== @@ -25,7 +25,7 @@ android:layout_marginEnd="130dp" android:contentDescription="@string/app_name" android:importantForAccessibility="no" - app:srcCompat="@drawable/ic_launcher_foreground" + app:srcCompat="@mipmap/ic_launcher_foreground" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml ===================================== @@ -139,7 +139,7 @@ android:contentDescription="@string/app_name" android:scaleX="1.8" android:scaleY="1.8" - app:srcCompat="@drawable/ic_launcher_foreground" + app:srcCompat="@mipmap/ic_launcher_foreground" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" ===================================== mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml ===================================== @@ -17,7 +17,7 @@ android:layout_gravity="center" android:contentDescription="@string/search_widget_content_description_2" android:scaleType="centerInside" - tools:src="@drawable/ic_launcher_foreground" + tools:src="@mipmap/ic_launcher_foreground" android:scaleX="1.5" android:scaleY="1.5"/> ===================================== mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml ===================================== @@ -17,7 +17,7 @@ android:layout_gravity="center" android:contentDescription="@string/search_widget_content_description_2" android:scaleType="centerInside" - tools:src="@drawable/ic_launcher_foreground" + tools:src="@mipmap/ic_launcher_foreground" android:scaleX="1.5" android:scaleY="1.5"/> </FrameLayout> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -3,7 +3,7 @@ - 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/. --> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> - <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -3,7 +3,7 @@ - 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/. --> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> - <monochrome android:drawable="@drawable/ic_launcher_monochrome"/> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> </adaptive-icon> ===================================== mobile/android/fenix/app/src/nightly/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> ===================================== mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher.xml ===================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground" /> </adaptive-icon> ===================================== mobile/android/fenix/app/src/release/res/mipmap-anydpi/ic_launcher_round.xml ===================================== @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <monochrome android:drawable="@drawable/ic_launcher_monochrome_foreground"/> </adaptive-icon> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eff7fdd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eff7fdd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-15.0] Migrate Project 131 label to Project 196
by morgan (＠morgan) 16 Jan '26

16 Jan '26

morgan pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build Commits: 0ad98481 by Morgan at 2026-01-15T18:44:57+00:00 Migrate Project 131 label to Project 196 - update Mullvad Browser Release Prep issue templates with new project label - update fetch_changelogs.py script to use new project label - - - - - 3 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - tools/fetch_changelogs.py Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -213,4 +213,4 @@ This step will send the relevant branches, tags (including a tag named after the /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Impact::High" /label ~"Priority::Blocker" -/label ~"Project 131" +/label ~"Project 196" ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -227,4 +227,4 @@ This step will send the relevant branches, tags (including a tag named after the /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Impact::High" /label ~"Priority::Blocker" -/label ~"Project 131" +/label ~"Project 196" ===================================== tools/fetch_changelogs.py ===================================== @@ -13,7 +13,7 @@ GITLAB = "https://gitlab.torproject.org" API_URL = f"{GITLAB}/api/v4" PROJECT_ID = 473 AUTH_HEADER = "PRIVATE-TOKEN" -MB_LABEL = "Project 131" +MB_LABEL = "Project 196" class EntryType(enum.IntFlag): View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Migrate Project 131 label to Project 196
by morgan (＠morgan) 16 Jan '26

16 Jan '26

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 94fff194 by Morgan at 2026-01-15T18:39:44+00:00 Migrate Project 131 label to Project 196 - update Mullvad Browser Release Prep issue templates with new project label - update fetch_changelogs.py script to use new project label - - - - - 3 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - tools/fetch_changelogs.py Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -213,4 +213,4 @@ This step will send the relevant branches, tags (including a tag named after the /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Impact::High" /label ~"Priority::Blocker" -/label ~"Project 131" +/label ~"Project 196" ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -223,4 +223,4 @@ This step will send the relevant branches, tags (including a tag named after the /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Impact::High" /label ~"Priority::Blocker" -/label ~"Project 131" +/label ~"Project 196" ===================================== tools/fetch_changelogs.py ===================================== @@ -13,7 +13,7 @@ GITLAB = "https://gitlab.torproject.org" API_URL = f"{GITLAB}/api/v4" PROJECT_ID = 473 AUTH_HEADER = "PRIVATE-TOKEN" -MB_LABEL = "Project 131" +MB_LABEL = "Project 196" class EntryType(enum.IntFlag): View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-1] fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by morgan (＠morgan) 16 Jan '26

16 Jan '26

morgan pushed to branch mullvad-browser-147.0a1-16.0-1 at The Tor Project / Applications / Mullvad Browser Commits: fb7f41a1 by Morgan at 2026-01-15T17:59:20+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates migrate Project 131 label to Project 196 - - - - - 1 changed file: - .gitlab/issue_templates/031 Fingerprinting.md Changes: ===================================== .gitlab/issue_templates/031 Fingerprinting.md ===================================== @@ -145,5 +145,5 @@ some other non-standard browser configuration? /confidential /label ~"Apps::Product::BaseBrowser" -/label ~"Project 131" +/label ~"Project 196" /label ~"Fingerprinting" View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fb7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fb7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by morgan (＠morgan) 16 Jan '26

16 Jan '26

morgan pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: c78f1fd9 by Morgan at 2026-01-15T17:58:26+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates migrate Project 131 label to Project 196 - - - - - 1 changed file: - .gitlab/issue_templates/031 Fingerprinting.md Changes: ===================================== .gitlab/issue_templates/031 Fingerprinting.md ===================================== @@ -145,5 +145,5 @@ some other non-standard browser configuration? /confidential /label ~"Apps::Product::BaseBrowser" -/label ~"Project 131" +/label ~"Project 196" /label ~"Fingerprinting" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c78f1fd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c78f1fd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by morgan (＠morgan) 16 Jan '26

16 Jan '26

morgan pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 35350851 by Morgan at 2026-01-15T17:57:46+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates migrate Project 131 label to Project 196 - - - - - 1 changed file: - .gitlab/issue_templates/031 Fingerprinting.md Changes: ===================================== .gitlab/issue_templates/031 Fingerprinting.md ===================================== @@ -145,5 +145,5 @@ some other non-standard browser configuration? /confidential /label ~"Apps::Product::BaseBrowser" -/label ~"Project 131" +/label ~"Project 196" /label ~"Fingerprinting" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3535085… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3535085… You're receiving this email because of your account on gitlab.torproject.org.

1 0