Rebase Mullvad Browser to 102.9.0esr

Merge Info

Related Issues

• #103 (closed)

Backport Timeline

• Immediate - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
• Next Minor Stable Release - patchset that needs to be verified in nightly before backport
• Eventually - patchset that needs to be verified in alpha before backport
• No Backport - patchset for the next major stable

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Change Description

cherry-picked mullvad-browser commits onto base-browser-102.9.0esr-12.0-1-buidl1. Autosquashed previous build tag's commits and moved subsequent fixups next to their parent commits. Had to split the most recent branding fixup as it was modifying a file for about:mullvad-browser (which is not added until the MB 39 commit).

Additionally the location of the disable the extension signing check has swapped with the legacy webcam indicator disable pref. Beyond that diff of diffs is as expected.

requested review from @pierov

assigned to @richard

Range diff cannot match these commits:

git range-diff base-browser-102.8.0esr-12.0-1-build1..mullvad-upstream/mullvad-browser-102.8.0esr-12.0-2 base-browser-102.9.0esr-12.0-1-build1..rebase-109

• only on 102.8: 28ff96c4, d20f4496, 46d10b40, 7ff98878, f9e119c5
• only on 102.9: eb420e19, 106b8cab, 2fbd590e

28ff96c4 is 2fbd590e (102.9 has a better order), d20f4496 is eb420e19, 106b8cab was squashed.

I think the other are actually missing?

Diff of diffs seems to confirm, e.g.:

diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 4ee4ec25452f..941cbef1752b 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -1119,8 +1119,12 @@ function makeURLAbsolute(aBase, aUrl) {
 }
 
 function getHelpLinkURL(aHelpTopic) {
-  var url = Services.urlFormatter.formatURLPref("app.support.baseURL");
-  return url + aHelpTopic;
+  if (aHelpTopic === "firefox-help") {
+    return "https://mullvad.net/en/help";
+  } else {
+    var url = Services.urlFormatter.formatURLPref("app.support.baseURL");
+    return url + aHelpTopic;
+  }
 }
 
 // aCalledFromModal is optional

Also, Giorgio cherry-picked a commit (a98f0ac4) from the main repo, please make sure to cherry-pick it.

added 23 commits

• 25831bee - fixup! Firefox preference overrides.
• ac30c7ce - fixup! Bug 40925: Implemented the Security Level component
• ccadab48 - fixup! Bug 40926: Implemented the New Identity feature
• 13c8f0f4 - squash! Bug 40002: Remove about:ion
• fbfc4374 - MB 74: Create merge template for privacy browser
• 23f5717d - MB 38: Mullvad Browser configuration
• d2257f0e - fixup! MB 38: Mullvad Browser configuration
• 40ef4284 - MB 1: Mullvad Browser branding
• d198d953 - fixup! MB 1: Mullvad Browser branding
• ecd6eebd - fixup! MB 1: Mullvad Browser branding
• 6cf9e0d0 - fixup! MB 1: Mullvad Browser branding
• 01854e67 - MB 18: Remove all Search Engines except DuckDuckGo
• fce852f6 - MB 19: Prefer TRR-only to TRR-first
• f751461c - MB 20: Allow packaged-addons in PBM.
• 0e7199b7 - MB 63: Customize some about pages for Mullvad Browser
• 6f0e2482 - MB 37: Customization for the about dialog
• 38e0a287 - MB 39: Add home page about:mullvad-browser
• e1bcd6da - fixup! MB 39: Add home page about:mullvad-browser
• cd380383 - fixup! MB 39: Add home page about:mullvad-browser
• bfe69ccd - fixup! MB 39: Add home page about:mullvad-browser
• 63d8698c - MB 97: Remove UI cues to install new extensions.
• 465faf73 - MB 47: uBlock Origin customization
• 2e9cc685 - Temporarily allow unsigned extensions.

Compare with previous version

marked this merge request as draft from richard/privacy-browser@25831bee3dfe77409ee82f38042ff0c6c3e09f96

diff of diffs is now correct so long as we don't have any more commits going into the 102.8 branch :)

resolved all threads

approved this merge request

marked this merge request as ready

merged