[tor-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-155.0a1-17.0-1] 21 commits: fixup! MB 419: Mullvad Browser migration procedures.

Pier Angelo Vendrame pushed to branch mullvad-browser-155.0a1-17.0-1 at The Tor Project / Applications / Mullvad Browser

Commits:

cabad3e9

by Pier Angelo Vendrame at 2026-11-05T10:21:34+01:00

fixup! MB 419: Mullvad Browser migration procedures.

BB 45039: Make it easier to test ProfileDataUpgrader customization.

a71004d2

by Pier Angelo Vendrame at 2026-11-05T10:21:35+01:00

fixup! MB 38: Mullvad Browser configuration

MB 537: Migrate from Mullvad to Quad9 DoH.

34ac3c7d

by Pier Angelo Vendrame at 2026-11-05T10:22:04+01:00

fixup! MB 419: Mullvad Browser migration procedures.

MB 537: Implement DoH migration.

04792781
by Henry Wilkes at 2026-11-05T10:22:06+01:00
```
MB 538: Mullvad DoH discontinued notification.
```

a0be7fa1

by Henry Wilkes at 2026-11-05T10:22:06+01:00

fixup! Mullvad Browser strings

MB 538: Strings for the DoH notification.

b7f8d167
by Pier Angelo Vendrame at 2026-11-05T10:22:06+01:00
```
MB 549: Customize the DoH preferences UI.
```

484482fc

by Pier Angelo Vendrame at 2026-11-05T10:22:07+01:00

fixup! Mullvad Browser strings

MB 549: Customize the DoH preferences UI.

e5d13d3c

by Pier Angelo Vendrame at 2026-11-05T10:22:29+01:00

fixup! MB 1: Mullvad Browser branding

No issue: fix lint.

cb850735

by Morgan at 2026-11-05T10:22:29+01:00

fixup! Mullvad Browser strings

No issue: fix typo

1dddb11e

by Pier Angelo Vendrame at 2026-11-05T10:22:30+01:00

fixup! MB 1: Mullvad Browser branding

MB 575: Remove an unused customization.

That block is removed from about:license in a BB commit.

55ba69e7

by Pier Angelo Vendrame at 2026-11-05T10:23:02+01:00

fixup! MB 38: Mullvad Browser configuration

BB 45073: Part 1: Check tor-browser.js.

We moved some common preferences that were defined both in
000-tor-browser.js and 000-mullvad-browser.js in the common file to
reduce redundancy.

acc88939

by Morgan at 2026-11-05T10:23:02+01:00

fixup! MB 1: Mullvad Browser branding

MB 580: Migrate hiding feedbackPage menuitem to Mullvad Browser patchset

a7e4c717

by Beatriz Rizental at 2026-11-05T10:23:14+01:00

fixup! MB 1: Mullvad Browser branding

Bug 569: Drop kitty image from default browser dialog

915300ff

by Beatriz Rizental at 2026-11-05T10:23:14+01:00

fixup! MB 1: Mullvad Browser branding

Bug 569: Use mullvad Browser logo in sidebar

28013398

by Morgan at 2026-11-05T10:23:14+01:00

fixup! MB 1: Mullvad Browser branding

switch hard-coded fill to 'context-fill' so firefox can colour the icon based on theme

bfe1d332

by Morgan at 2026-11-05T10:23:19+01:00

fixup! MB 538: Mullvad DoH discontinued notification.

MB 581: change Review settings button to move user to about:preferences#dnsOverHttps rather than about:preferences#privacy

2a86ab17

by Beatriz Rizental at 2026-11-05T10:24:00+01:00

fixup! MB 1: Mullvad Browser branding

Bug 576: Fix home page name

afbb9b60

by Beatriz Rizental at 2026-11-05T10:24:00+01:00

fixup! MB 1: Mullvad Browser branding

Bug 576: Fix home page name _correctly_

68f6cf2c

by Beatriz Rizental at 2026-11-05T10:24:01+01:00

fixup! MB 1: Mullvad Browser branding

This reverts commit ce60585f0d88eaef8d6eac4f063ae4032a6c8884.

5569ad41
by Beatriz Rizental at 2026-11-05T10:24:01+01:00
```
fixup! MB 39: Add home page about:mullvad-browser
```

ab9b3977

by hackademix at 2026-11-05T10:24:35+01:00

fixup! MB 538: Mullvad DoH discontinued notification.

MB 586: Stop leaking browser windows in mullvadDoHNotification.js

18 changed files:

browser/app/profile/000-mullvad-browser.js
browser/base/content/browser-main.js
browser/base/content/browser-menubar.inc.xhtml
browser/base/content/browser.xhtml
+ browser/base/content/mullvadDoHNotification.js
browser/base/content/overrides/app-license.html
browser/base/jar.mn
browser/components/ProfileDataUpgrader.sys.mjs
browser/components/preferences/config/privacy.mjs
browser/components/preferences/main.js
+ browser/components/tests/unit/test_profileDataUpgrade_mullvad_doh.js
browser/components/tests/unit/xpcshell.toml
browser/extensions/newtab/lib/AboutPreferences.sys.mjs
browser/themes/shared/sidebar/firefox.svg
toolkit/components/aboutpdf/content/aboutPDF.html
toolkit/content/widgets/moz-promo/moz-promo.css
toolkit/content/widgets/moz-promo/moz-promo.tokens.css
toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl

Changes:

browser/app/profile/000-mullvad-browser.js

@@ -11,12 +11,14 @@ pref("browser.base-browser-support-url", "https://mullvad.net/en/help/");
  pref("browser.toolbars.bookmarks.visibility", "never");
  // mullvad-browser#19: Enable Mullvad's DOH
 -pref("network.trr.uri", "https://dns.mullvad.net/dns-query");
 -pref("network.trr.default_provider_uri", "https://dns.mullvad.net/dns-query");
 +pref("network.trr.uri", "https://doh-mullvad.quad9.net/dns-query");
 +pref("network.trr.default_provider_uri", "https://doh-mullvad.quad9.net/dns-query");
  pref("network.trr.mode", 3);
 -pref("doh-rollout.provider-list", "[{\"UIName\":\"Mullvad\",\"autoDefault\":true,\"canonicalName\":\"\",\"id\":\"mullvad\",\"last_modified\":0,\"schema\":0,\"uri\":\"https://dns.mullvad.net/dns-query\"},{\"UIName\":\"Mullvad (Ad-blocking)\",\"autoDefault\":false,\"canonicalName\":\"\",\"id\":\"mullvad\",\"last_modified\":0,\"schema\":0,\"uri\":\"https://adblock.dns.mullvad.net/dns-query\"}]");
 +pref("doh-rollout.provider-list", "[{\"uri\":\"https://doh-mullvad.quad9.net/dns-query\",\"UIName\":\"Quad9 - no threat blocking\",\"schema\":0,\"autoDefault\":false,\"canonicalName\":\"\",\"id\":\"quad9-no-threat-blocking\",\"last_modified\":0},{\"uri\":\"https://dns.quad9.net/dns-query\",\"UIName\":\"Quad9 - secure: threat blocking\",\"schema\":0,\"autoDefault\":true,\"canonicalName\":\"\",\"id\":\"quad9-threat-blocking\",\"last_modified\":0}]");
  // mullvad-browser#122: Audit DoH heuristics
  pref("doh-rollout.disable-heuristics", true);
 +// mullvad-browser#537: migrate users from Mullvad DoH service.
 +pref("mullvadbrowser.migration.show_doh_notification", false);
  // mullvad-browser#87: Windows and Linux need additional work to make the
  // default browser choice working.
@@ -33,10 +35,8 @@ pref("privacy.spoof_english", 2);
  pref("browser.tabs.tabmanager.enabled", false);
  // mullvad-browser#131: Review a few updater preferences
 -pref("app.update.notifyDuringDownload", true);
  pref("app.update.url.manual", "https://mullvad.net/download/browser");
  pref("app.update.url.details", "https://mullvad.net/download/browser");
 -pref("app.update.badgeWaitTime", 0);
  // point to our feedback url rather than Mozilla's
  pref("app.feedback.baseURL", "https://mullvad.net/help/tag/browser/");

browser/base/content/browser-main.js

@@ -31,6 +31,7 @@
    Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this);
    Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
    Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
 +  Services.scriptloader.loadSubScript("chrome://browser/content/mullvadDoHNotification.js", this);
    Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);
    if (AIWindow.isOpeningAIWindow(window)) {
      ChromeUtils.importESModule("chrome://browser/content/urlbar/SmartbarInput.mjs", { global: "current" });

browser/base/content/browser-menubar.inc.xhtml

@@ -468,6 +468,7 @@
                            hidden="true"
                            appmenu-data-l10n-id="appmenuitem-report-broken-site"/>
                  <menuitem id="feedbackPage"
 +                          hidden="true"
                            data-l10n-id="menu-help-share-ideas"
                            appmenu-data-l10n-id="appmenu-help-share-ideas"/>
                  <menuitem id="helpSafeMode"

browser/base/content/browser.xhtml

@@ -99,6 +99,7 @@
    <link rel="localization" href="">"browser/syncedTabs.ftl"/>
    <link rel="localization" href="">"browser/profiles.ftl"/>
    <link rel="localization" href="">"toolkit/global/base-browser.ftl"/>
 +  <link rel="localization" href="">"toolkit/global/mullvad-browser.ftl"/>
    <!-- Untranslated FTL files -->
    <link rel="localization" href="">"preview/credentialChooser.ftl" />
    <link rel="localization" href="">"preview/enUS-searchFeatures.ftl" />

browser/base/content/mullvadDoHNotification.js

 +"use strict";
++
 +window.addEventListener("load", () => {
 +  // A notification to let users known that their DNS over HTTPS settings have
 +  // changed because the mullvad DoH services has been discontinued and
 +  // replaced. tor-browser#538.
 +  const notification = {
 +    // ProfileDataUpgrader.upgradeMB migration will set the `showPref`
 +    // preference conditionally on whether the user is effected. We wait for
 +    // this preference for confirmation.
 +    showPref: "mullvadbrowser.migration.show_doh_notification",
 +    shown: false,
++
 +    init() {
 +      Services.prefs.addObserver(this.showPref, this);
 +      window.addEventListener("unload", () => {
 +        if (!this.shown) {
 +          Services.prefs.removeObserver(this.showPref, this);
 +        }
 +      });
 +      this.maybeShow();
 +    },
++
 +    observe() {
 +      this.maybeShow();
 +    },
++
 +    async maybeShow() {
 +      if (this.shown || !Services.prefs.getBoolPref(this.showPref, false)) {
 +        return;
 +      }
 +      this.shown = true;
 +      Services.prefs.removeObserver(this.showPref, this);
++
 +      gNotificationBox.appendNotification(
 +        "mullvad-doh-notification",
 +        {
 +          label: { "l10n-id": "mullvad-doh-notification-body" },
 +          priority: gNotificationBox.PRIORITY_INFO_HIGH,
 +          eventCallback: name => {
 +            if (name === "dismissed") {
 +              Services.prefs.clearUserPref(this.showPref);
 +            }
 +          },
 +        },
 +        [
 +          {
 +            "l10n-id": "moz-support-link-text",
 +            link: "https://mullvad.net/en/blog/shutting-down-our-public-encrypted-dns-servers-and-sponsoring-quad9-instead",
 +          },
 +          {
 +            "l10n-id": "mullvad-doh-notification-settings-button",
 +            primary: true,
 +            callback: () => {
 +              window.openPreferences("dnsOverHttps");
 +              Services.prefs.clearUserPref(this.showPref);
 +              // Keep the notification open in case the user wants to click
 +              // "Learn more".
 +              return true;
 +            },
 +          },
 +        ]
 +      );
 +    },
 +  };
 +  notification.init();
 +});

browser/base/content/overrides/app-license.html

@@ -3,7 +3,6 @@
     - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
  <p>
    <b>Binaries</b> of this product have been made available to you by the
 -  <a href="">"https://www.torproject.org/">Tor Project</a> and
 -  <a href="">"https://mullvad.net/">Mullvad VPN</a> under the Mozilla Public
 +  <a href="">"http://www.mozilla.org/">Mozilla Project</a> under the Mozilla Public
    License 2.0 (MPL). <a href="">"about:rights">Know your rights</a>.
  </p>

browser/base/jar.mn

@@ -102,4 +102,5 @@ browser.jar:
          content/browser/spotlight.js                  (content/spotlight.js)
  *       content/browser/default-bookmarks.html        (content/default-bookmarks.html)
 +        content/browser/mullvadDoHNotification.js     (content/mullvadDoHNotification.js)
          content/browser/languageNotification.js       (content/languageNotification.js)

browser/components/ProfileDataUpgrader.sys.mjs

@@ -1247,12 +1247,21 @@ export let ProfileDataUpgrader = {
      Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION);
    },
 -  async upgradeMB(isNewProfile) {
 +  /**
 +   * Run the profile data migration for Tor Browser if needed.
 +   *
 +   * @param {boolean} isNewProfile When true, just set the migration version
 +   * without actually changing anything.
 +   * @param {number} [currentVersion] The version to migrating from. To be used
 +   * only by tests.
 +   */
 +  async upgradeMB(isNewProfile, currentVersion) {
      // Version 1: Mullvad Browser 14.5a6: Clear home page update url preference
      //            (mullvad-browser#411).
      // Version 2: Mullvad Browser 15.0a2: Remove legacy search addons
      //            (tor-browser#43111).
 -    const MB_MIGRATION_VERSION = 2;
 +    // Version 3: Mullvad Browser 16.0a12: DoH migration (mullvad-browser#537).
 +    const MB_MIGRATION_VERSION = 3;
      const MIGRATION_PREF = "mullvadbrowser.migration.version";
      if (isNewProfile) {
@@ -1265,11 +1274,14 @@ export let ProfileDataUpgrader = {
        console.error("upgradeTB: isNewProfile is undefined.");
+     }
 -    const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0);
 +    if (currentVersion === undefined) {
 +      currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0);
 +    }
      if (currentVersion < 1) {
        Services.prefs.clearUserPref("mullvadbrowser.post_update.url");
+     }
++
      const dropAddons = async list => {
        for (const id of list) {
          try {
@@ -1278,6 +1290,7 @@ export let ProfileDataUpgrader = {
          } catch {}
+       }
      };
++
      if (currentVersion < 2) {
        await dropAddons([
          "brave@xxxxxxxxxxxxxxxxxx",
@@ -1290,6 +1303,36 @@ export let ProfileDataUpgrader = {
        ]);
+     }
 +    if (currentVersion < 3) {
 +      this.upgradeDoH();
 +    }
++
      Services.prefs.setIntPref(MIGRATION_PREF, MB_MIGRATION_VERSION);
    },
++
 +  upgradeDoH() {
 +    const DOH_NOTIFICATION_PREF =
 +      "mullvadbrowser.migration.show_doh_notification";
 +    const DOH_URI_PREF = "network.trr.uri";
 +    const DOH_MODE_PREF = "network.trr.mode";
 +    const MULLVAD_ADBLOCK_URL = "https://adblock.dns.mullvad.net/dns-query";
++
 +    const dohMode = Services.prefs.getIntPref(DOH_MODE_PREF, -1);
 +    const usesAdBlock =
 +      Services.prefs.getStringPref(DOH_URI_PREF, "") === MULLVAD_ADBLOCK_URL;
 +    const usesCustomUri =
 +      Services.prefs.prefHasUserValue(DOH_URI_PREF) && !usesAdBlock;
 +    if (
 +      dohMode === Ci.nsIDNSService.MODE_TRROFF ||
 +      (dohMode === Ci.nsIDNSService.MODE_TRRONLY && usesCustomUri)
 +    ) {
 +      return;
 +    }
++
 +    Services.prefs.setIntPref(DOH_MODE_PREF, Ci.nsIDNSService.MODE_TRRONLY);
 +    if (usesAdBlock) {
 +      Services.prefs.clearUserPref(DOH_URI_PREF);
 +    }
 +    Services.prefs.setBoolPref(DOH_NOTIFICATION_PREF, true);
 +  },
  };

browser/components/preferences/config/privacy.mjs

@@ -1146,15 +1146,10 @@ SettingGroupManager.registerGroups({
          id: "dohRadioGroup",
          control: "moz-radio-group",
          options: [
 -          {
 -            id: "dohRadioDefault",
 -            value: "default",
 -            l10nId: "preferences-doh-radio-default",
 -          },
+           {
              id: "dohRadioCustom",
              value: "custom",
 -            l10nId: "preferences-doh-radio-custom",
 +            l10nId: "mullvad-preferences-doh-radio-always-on",
              items: [
+               {
                  id: "dohFallbackIfCustom",
@@ -1175,7 +1170,7 @@ SettingGroupManager.registerGroups({
+           {
              id: "dohRadioOff",
              value: "off",
 -            l10nId: "preferences-doh-radio-off",
 +            l10nId: "mullvad-preferences-doh-radio-off",
            },
          ],
        },
@@ -3286,14 +3281,13 @@ Preferences.addSetting({
    id: "dohModeBoxItem",
    deps: ["dohMode"],
    getControlConfig: (config, deps) => {
 -    let l10nId = "preferences-doh-overview-off";
 +    let l10nId = "mullvad-preferences-doh-overview-off";
      if (deps.dohMode.value == Ci.nsIDNSService.MODE_NATIVEONLY) {
        l10nId = "preferences-doh-overview-default";
 -    } else if (
 -      deps.dohMode.value == Ci.nsIDNSService.MODE_TRRFIRST ||
 -      deps.dohMode.value == Ci.nsIDNSService.MODE_TRRONLY
 -    ) {
 +    } else if (deps.dohMode.value == Ci.nsIDNSService.MODE_TRRFIRST) {
        l10nId = "preferences-doh-overview-custom";
 +    } else if (deps.dohMode.value == Ci.nsIDNSService.MODE_TRRONLY) {
 +      l10nId = "mullvad-preferences-doh-overview-always-on";
+     }
      return {
        ...config,
@@ -3504,6 +3498,7 @@ Preferences.addSetting({
    // for the mismatch of control-to-pref.
    deps: ["dohMode"],
    disabled: ({ dohMode }) => dohMode.locked,
 +  visible: () => false,
    onUserChange: val => {
      if (val) {
        Glean.securityDohSettings.modeChangedButton.record({

browser/components/preferences/main.js

@@ -482,10 +482,6 @@ function createDefaultBrowserConfig({
      id: "isDefaultPane",
      l10nId: "is-default-browser-2",
      control: "moz-promo",
 -    controlAttrs: {
 -      imagesrc: "chrome://global/skin/illustrations/kit-happy.svg",
 -      imagedisplay: "cover",
 -    },
    };
    const isNotDefaultPane = {
@@ -504,10 +500,6 @@ function createDefaultBrowserConfig({
          },
        },
      ],
 -    controlAttrs: {
 -      imagesrc: "chrome://global/skin/illustrations/kit-concerned.svg",
 -      imagedisplay: "cover",
 -    },
    };
    const items = includeIsDefaultPane

browser/components/tests/unit/test_profileDataUpgrade_mullvad_doh.js

 +/* Any copyright is dedicated to the Public Domain.
 +https://creativecommons.org/publicdomain/zero/1.0/ */
++
 +"use strict";
++
 +const { ProfileDataUpgrader } = ChromeUtils.importESModule(
 +  "moz-src:///browser/components/ProfileDataUpgrader.sys.mjs"
 +);
++
 +const DOH_NOTIFICATION_PREF = "mullvadbrowser.migration.show_doh_notification";
 +const DOH_URI_PREF = "network.trr.uri";
 +const DOH_MODE_PREF = "network.trr.mode";
 +const MULLVAD_ADBLOCK_URL = "https://adblock.dns.mullvad.net/dns-query";
++
 +/**
 + * Run a test case.
 + *
 + * The test takes for granted the final mode can be either off (only if it was
 + * already) or TRR-only in all other cases.
 + * The caller need to supply the expected outcomes for the other prefs.
 + *
 + * @param {number} mode The mode to set before the migration
 + * @param {string?} oldUri The URI to set before the migration, or null to clear
 + *   the related preference.
 + * @param {string?} newUri The expected new value for the preference, or null if
 + *   the preference should have its default value.
 + * @param {boolean} showNotification The expected value for the preference that
 + *   signals that the change notification should be shown to the UI.
 + */
 +async function runTest(mode, oldUri, newUri, showNotification) {
 +  info(`Running test for mode ${mode} and old uri ${oldUri}.`);
++
 +  Services.prefs.setIntPref(DOH_MODE_PREF, mode);
 +  if (oldUri !== null) {
 +    Services.prefs.setStringPref(DOH_URI_PREF, oldUri);
 +  } else {
 +    Services.prefs.clearUserPref(DOH_URI_PREF);
 +  }
 +  Services.prefs.clearUserPref(DOH_NOTIFICATION_PREF);
++
 +  await ProfileDataUpgrader.upgradeMB(false, 2);
++
 +  if (newUri) {
 +    Assert.equal(Services.prefs.getStringPref(DOH_URI_PREF), newUri);
 +  } else {
 +    Assert.ok(
 +      !Services.prefs.prefHasUserValue(DOH_URI_PREF),
 +      "The migration was supposed to clear the custom URI and so it did."
 +    );
 +  }
++
 +  if (mode === Ci.nsIDNSService.MODE_TRROFF) {
 +    Assert.equal(
 +      Services.prefs.getIntPref(DOH_MODE_PREF, -1),
 +      Ci.nsIDNSService.MODE_TRROFF,
 +      "The migration did not turn on DoH."
 +    );
 +  } else {
 +    Assert.equal(
 +      Services.prefs.getIntPref(DOH_MODE_PREF, -1),
 +      Ci.nsIDNSService.MODE_TRRONLY,
 +      "Regardless of the starting mode, after the migration we are on TRR-only."
 +    );
 +  }
++
 +  Assert.equal(
 +    Services.prefs.getBoolPref(DOH_NOTIFICATION_PREF, false),
 +    showNotification,
 +    `The value for ${DOH_NOTIFICATION_PREF} is correct after the migration`
 +  );
 +}
++
 +add_task(async function test_default_uri() {
 +  // Max protection (our default): inherits the URI change, so we need to show
 +  // the notification.
 +  await runTest(Ci.nsIDNSService.MODE_TRRONLY, null, null, true);
 +  // We move default and increased protection to maximum protection, and they
 +  // inherit the default URI: show the notification.
 +  await runTest(Ci.nsIDNSService.MODE_NATIVEONLY, null, null, true);
 +  await runTest(Ci.nsIDNSService.MODE_TRRFIRST, null, null, true);
 +});
++
 +add_task(async function test_mullvad_adblock() {
 +  // Mullvad Adblock was retired, so move to the default URI with maximum
 +  // protection. Show the notification.
 +  // This option could be set only with TRR first and TRR only, so test only
 +  // those.
 +  await runTest(
 +    Ci.nsIDNSService.MODE_TRRFIRST,
 +    MULLVAD_ADBLOCK_URL,
 +    null,
 +    true
 +  );
 +  await runTest(Ci.nsIDNSService.MODE_TRRONLY, MULLVAD_ADBLOCK_URL, null, true);
 +});
++
 +add_task(async function test_custom_provider() {
 +  const CUSTOM_URL = "https://example.org/dns";
 +  // Custom provider + TRR-only: nothing should change, do not show the
 +  // notification.
 +  await runTest(Ci.nsIDNSService.MODE_TRRONLY, CUSTOM_URL, CUSTOM_URL, false);
 +  // Custom provider but TRR-first: we change it to TRR-only, so we should show
 +  // a notification.
 +  await runTest(Ci.nsIDNSService.MODE_TRRFIRST, CUSTOM_URL, CUSTOM_URL, true);
 +  // Firefox's "default" mode and off automatically reset the provider URI, so
 +  // we do not test them here.
 +});
++
 +add_task(async function test_update_doh_disabled() {
 +  // No DoH: the migration should not turn it on. I.e., no changes, therefore no
 +  // notification as well.
 +  // Firefox resets the URL to the default one from the UI, so test only the
 +  // default URI case.
 +  await runTest(Ci.nsIDNSService.MODE_TRROFF, null, null, false);
 +});

browser/components/tests/unit/xpcshell.toml

@@ -43,6 +43,9 @@ skip-if = [
  ["test_profileDataUpgrade_duplicateCookiePerms.js"]
 +["test_profileDataUpgrade_mullvad_doh.js"]
 +tags = "mullvad-browser"
++
  ["test_profileDataUpgrade_smartwindow.js"]
  ["test_profileDataUpgrade_smartwindow_semanticHistory.js"]

browser/extensions/newtab/lib/AboutPreferences.sys.mjs

@@ -891,7 +891,7 @@ export class AboutPreferences {
            options: [
+             {
                value: "home",
 -              l10nId: "home-mode-choice-default-fx-srd",
 +              l10nId: "home-mode-choice-mullvad",
              },
              { value: "blank", l10nId: "home-mode-choice-blank-srd" },
              { value: "custom", l10nId: "home-mode-choice-custom-srd" },
@@ -911,7 +911,7 @@ export class AboutPreferences {
            options: [
+             {
                value: "home",
 -              l10nId: "home-mode-choice-default-fx-srd",
 +              l10nId: "home-mode-choice-mullvad",
              },
              { value: "blank", l10nId: "home-mode-choice-blank-srd" },
            ],

browser/themes/shared/sidebar/firefox.svg

  <!-- This Source Code Form is subject to the terms of the Mozilla Public
     - License, v. 2.0. If a copy of the MPL was not distributed with this
     - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 -<svg width="26" height="26" viewBox="0 0 26 26" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
 -  <path d="M24.3095 8.8538C23.7791 7.57797 22.7049 6.20058 21.8613 5.76523C22.5478 7.11119 22.9452 8.46136 23.097 9.46901C23.097 9.47099 23.0978 9.47592 23.0994 9.48932C21.7194 6.04976 19.3795 4.66282 17.4687 1.64296C17.3723 1.49026 17.2755 1.33716 17.1813 1.17577C17.1333 1.09335 17.0885 1.00913 17.0469 0.923289C16.9675 0.770024 16.9063 0.60802 16.8645 0.440563C16.8647 0.432635 16.8621 0.424884 16.8569 0.418833C16.8518 0.412782 16.8446 0.408868 16.8367 0.40786C16.8292 0.405713 16.8213 0.405713 16.8138 0.40786C16.8121 0.408469 16.8096 0.410449 16.8077 0.41116C16.805 0.412227 16.8016 0.414664 16.7988 0.416238C16.8002 0.41441 16.803 0.410297 16.8039 0.409332C13.7382 2.20475 12.6982 5.5261 12.6026 7.18782C12.7448 7.17797 12.8866 7.16603 13.0313 7.16603C15.3192 7.16603 17.3117 8.42388 18.3786 10.2883C17.727 9.83052 16.5601 9.37842 15.436 9.57393C19.8256 11.7684 18.6471 19.3252 12.5646 19.04C12.0229 19.0179 11.4876 18.9146 10.9766 18.7337C10.8557 18.6882 10.7362 18.6394 10.6181 18.5871C10.5492 18.5558 10.4804 18.524 10.4124 18.4889C10.4149 18.4906 10.4182 18.4924 10.4207 18.494C10.3611 18.4653 10.3018 18.4358 10.243 18.4054C10.3001 18.4327 10.3537 18.4625 10.4123 18.4887C8.92186 17.7184 7.69123 16.2628 7.53751 14.4951C7.53751 14.4951 8.10083 12.396 11.5712 12.396C11.9463 12.396 13.0189 11.3492 13.0387 11.0456C13.0342 10.9465 10.9101 10.1016 10.0821 9.28574C9.63965 8.84984 9.42957 8.63965 9.24351 8.48198C9.14257 8.39672 9.03704 8.31704 8.92739 8.2433C8.64923 7.27013 8.63741 6.24012 8.89317 5.26082C7.63948 5.83165 6.66438 6.73398 5.95547 7.53074H5.94984C5.46604 6.91796 5.50017 4.89657 5.52774 4.47452C5.52195 4.44837 5.16684 4.65886 5.12032 4.6906C4.69341 4.99532 4.29431 5.33723 3.92768 5.71232C3.51059 6.13547 3.12951 6.59266 2.7884 7.07915C2.7884 7.07975 2.78804 7.08047 2.78784 7.08107C2.78784 7.08041 2.7882 7.07975 2.7884 7.07915C2.00364 8.19123 1.44707 9.44781 1.15086 10.7763C1.14502 10.8027 1.14009 10.8302 1.1344 10.8568C1.11145 10.9643 1.00816 11.5095 0.993738 11.6265C0.992621 11.6354 0.994805 11.6175 0.993738 11.6265C0.899547 12.1899 0.839448 12.7585 0.81377 13.3291C0.81377 13.35 0.8125 13.3706 0.8125 13.3915C0.8125 20.1305 6.27656 25.5937 13.0165 25.5937C19.0526 25.5937 24.0644 21.2119 25.0456 15.4562C25.0663 15.3 25.0828 15.143 25.1011 14.9854C25.3437 12.8927 25.0742 10.6931 24.3095 8.8538ZM23.0989 9.48049C23.0995 9.48481 23.1002 9.48932 23.1009 9.49364L23.1005 9.49232L23.0989 9.48049Z"/>
 +<svg width="26" height="26" viewBox="0 0 80 80" fill="context-fill" xmlns="http://www.w3.org/2000/svg" >
 +  <path fill-rule="evenodd" clip-rule="evenodd" d="M13.125 8.125C10.3636 8.125 8.125 10.3636 8.125 13.125V66.875C8.125 69.6364 10.3636 71.875 13.125 71.875H66.875C69.6364 71.875 71.875 69.6364 71.875 66.875V13.125C71.875 10.3636 69.6364 8.125 66.875 8.125H13.125ZM17.5 16.875H27L40 41.5L53 16.875H62.5V63.75H53V39.25L46.5 51.625H33.5L27 39.25V63.75H17.5V16.875Z" />
  </svg>

toolkit/components/aboutpdf/content/aboutPDF.html

@@ -68,11 +68,7 @@
            hidden
          />
          <div id="promo-row">
 -          <moz-promo
 -            id="promo"
 -            hidden
 -            data-l10n-id="about-pdf-promo"
 -          >
 +          <moz-promo id="promo" hidden data-l10n-id="about-pdf-promo">
              <moz-button
                id="set-default"
                slot="actions"

toolkit/content/widgets/moz-promo/moz-promo.css

@@ -190,6 +190,7 @@
    word-break: break-word;
    margin: 0;
    align-items: center;
 +  justify-content: space-between;
    /* stylelint-disable-next-line stylelint-plugin-mozilla/no-has-selector */
    &:has(slot:has-slotted) {

toolkit/content/widgets/moz-promo/moz-promo.tokens.css


     --promo-image-size-large: calc(2 * var(--size-image-xlarge));
     --promo-message-text-color: var(--text-color);
     --promo-message-text-color-vibrant: light-dark(var(--color-violet-80), var(--color-violet-0));
-    --promo-padding: var(--space-medium);
+    --promo-padding: var(--space-medium) var(--space-xlarge);
   }
 }
 

toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl

@@ -32,3 +32,26 @@ home-mode-choice-mullvad =
  telemetry-title = Telemetry Information
  telemetry-description = Telemetry is disabled in { -brand-short-name }.
++
 +## DNS over HTTPS settings customization.
++
 +mullvad-preferences-doh-overview-always-on =
 +    .label = Always on
 +    .description = Always use secure DNS.
 +mullvad-preferences-doh-overview-off =
 +    .label = Off
 +    .description = Use your default DNS resolver.
 +mullvad-preferences-doh-radio-always-on =
 +    .label = Always on
 +    .description = Always use secure DNS
 +mullvad-preferences-doh-radio-off =
 +    .label = Off (recommended when using a VPN)
 +    .description = Use your default DNS resolver
++
 +## DNS over HTTPS provider changed notification.
++
 +# The first sentence should be wrapped in '<strong>' and '</strong>'.
 +# "Mullvad" is an organization name.
 +mullvad-doh-notification-body = <strong>Your default DNS Over HTTPS settings have been changed.</strong> Mullvad secure DNS service is being discontinued.
 +mullvad-doh-notification-settings-button =
 +    .label = Review settings