Compare revisions

Pier Angelo Vendrame · Pier Angelo Vendrame · henry · Pier Angelo Vendrame · Pier Angelo Vendrame · Pier Angelo Vendrame
--- a/.gitlab/issue_templates/Emergency Security Issue.md
+++ b/.gitlab/issue_templates/Emergency Security Issue.md
@@ -18,9 +18,7 @@
 ### Type of Issue: What are we dealing with?

 - [ ] Security (sandbox escape, remote code execution, etc)
- [ ] Proxy Bypass (traffic contents becoming MITM'able)
- [ ] De-Anonymization (otherwise identifying which website a user is visiting)
- [ ] Cross-Site Linkability (correlating sessions across circuits and websites)
+- [ ] Cross-Site Linkability (correlating sessions across websites)
 - [ ] Disk Leak (persisting session information to disk)
 - [ ] Other (please explain)

@@ -36,16 +34,11 @@
  - [ ] **richard** : signing, release
  - [ ] **thorin** : fingerprinting
 - [ ] Other Engineering Teams
-  - [ ] Networking (**ahf**, **dgoulet**)
-  - [ ] Anti-Censorship (**meskio**, **cohosh**)
  - [ ] UX (**donuts**)
  - [ ] TPA (**anarcat**, **lavamind**)
 - [ ] External Tor Partners
-  - [ ] Mozilla
-  - [ ] Mullvad
-  - [ ] Brave
-  - [ ] Guardian Project (Orbot, Onion Browser)
-  - [ ] Tails
+  - [ ] Mozilla (**tjr**)
+  - [ ] Mullvad (**ruihildt**)
  - [ ] Other (please list)

 ### Urgency: When do we need to act?
@@ -72,6 +65,7 @@ Sometimes fixes have side-effects: users lose their data, roadmaps need to be ad

 - [ ] Start an initial email thread with the following people:
  - [ ] **bella**
+  - [ ] **ruihildt**, **support@mullvadvpn.net**
  - [ ] Relevant Applications Developers
  - [ ] **(Optional)** **micah**
    - if there are considerations or asks outside the Applications Team
@@ -84,6 +78,7 @@ Sometimes fixes have side-effects: users lose their data, roadmaps need to be ad
 /cc @ma1
 /cc @micah
 /cc @richard
+/cc @ruihildt

 /confidential


--- a/.gitlab/issue_templates/Rebase Browser - Alpha.md
+++ b/.gitlab/issue_templates/Rebase Browser - Alpha.md
+**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr
+
+<details>
+  <summary>Explanation of Variables</summary>
+
+- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building mullvad-browser tags, labels, etc
+  - **Example**: `102.8.0`
+- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`
+  - **Example**: `FIREFOX_102_8_0esr_RELEASE`
+- `$(BROWSER_MAJOR)`: the browser major version
+  - **Example**: `12`
+- `$(BROWSER_MINOR)`: the browser minor version
+  - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
+- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch
+  - **Example**: `base-browser-102.8.0esr-12.5-1`
+- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch
+  - **Example**: `base-browser-102.7.0esr-12.5-1`
+- `$(BASE_BROWSER_BRANCH_TAG)`: the `base-browser` build tag used as base commit for `mullvad-browser`
+  - **Example**: `base-browser-102.8.0esr-12.5-1-build1`
+- `$(BASE_BROWSER_BRANCH_PREV_TAG)`: the `base-browser` build tag used as base commit for the previous `mullvad-browser`
+  - **Example**: `base-browser-102.7.0esr-12.5-1-build1`
+- `$(MULLVAD_BROWSER_BRANCH)`: the full name of the current `mullvad-browser` branch
+  - **Example**: `mullvad-browser-102.8.0esr-12.5-1`
+- `$(MULLVAD_BROWSER_BRANCH_PREV)`: the full name of the previous `mullvad-browser` branch
+  - **Example**: `mullvad-browser-102.7.0esr-12.5-1`
+</details>
+
+**NOTE:** It is assumed that we've already rebased and tagged `base-browser` alpha and that we've already rebased `mullvad-browser` stable
+
+### **Bookkeeping**
+
+- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep) issue.
+
+### Update Branch Protection Rules
+
+- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/settings/repository):
+  - [ ] Remove previous alpha `mullvad-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)
+  - [ ] Create new `mullvad-browser` branch protection rule:
+    - **Branch**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*`
+      - **Example**: `mullvad-browser-102.8.0esr-12.5-1*`
+    - **Allowed to merge**: `Maintainers`
+    - **Allowed to push and merge**: `Maintainers`
+    - **Allowed to force push**: `false`
+
+### **Create and Push New Branch**
+
+- [ ] Create new alpha `mullvad-browser` branch from this ESR's alpha `base-browser` tag
+  - Branch name in the form: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
+  - **Example**: `git branch mullvad-browser-102.8.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1`
+- [ ] Push new `mullvad-browser` branch to `upstream`
+- [ ] Push `base-browser` tag to `upstream`
+
+### **Rebase tor-browser**
+
+- [ ] Checkout a new local branch for the `mullvad-browser` rebase
+  - **Example**: `git branch mullvad-browser-rebase upstream/mullvad-browser-102.8.0esr-12.5-1`
+- [ ] `mullvad-browser` rebase
+  - [ ] Cherry-pick the previous `mullvad-browser` branch's commit range up to the last `mullvad-browser` `build1` tag
+    - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..mullvad-browser-102.7.0esr-12.5-1-build1`
+  - [ ] Rebase and autosquash these newly cherry-picked commits
+    - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.5-1`
+  - [ ] Cherry-pick remainder of patches after the last `mullvad-browser` `buildN` tag
+    - **Example**: `git cherry-pick mullvad-browser-102.7.0esr-12.5-1-build1..upstream/mulvad-browser-102.7.0esr-12.5-1`
+  - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting.
+    - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.5-1`
+- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
+  - [ ] diff of diffs:
+    -  Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or -
+    - `git diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) > current_patchset.diff`
+    - `git diff $(BASE_BROWSER_BRANCH_TAG)..HEAD > rebased_patchset.diff`
+    - diff `current_patchset.diff` and `rebased_patchset.diff`
+      - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `mullvad-browser` branch)
+  - [ ] rangediff: `git range-diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) $(BASE_BROWSER_BRANCH_TAG)..HEAD`
+    - **Example**: `git range-diff base-browser-102.7.0esr-12.5-1-build1..upstream/mullvad-browser-102.7.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1..HEAD`
+- [ ] Open MR for the `mullvad-browser` rebase
+- [ ] Merge
+
+### **Sign and Tag**
+
+- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:
+  - In **mullvad-browser.git**, checkout the new alpha `mullvad-browser` branch
+  - In **tor-browser-build.git**, run signing script:
+    ```bash
+    ./tools/browser/sign-tag.mullvadbrowser alpha build1
+    ```
+  - [ ] Push tag to `upstream`
--- a/.gitlab/issue_templates/Rebase Browser - Stable.md
+++ b/.gitlab/issue_templates/Rebase Browser - Stable.md
+**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr
+
+<details>
+  <summary>Explanation of Variables</summary>
+
+- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building mullvad-browser tags, labels, etc
+  - **Example**: `102.8.0`
+- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`
+  - **Example**: `FIREFOX_102_8_0esr_RELEASE`
+- `$(BROWSER_MAJOR)`: the browser major version
+  - **Example**: `12`
+- `$(BROWSER_MINOR)`: the browser minor version
+  - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
+- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch
+  - **Example**: `base-browser-102.8.0esr-12.0-1`
+- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch
+  - **Example**: `base-browser-102.7.0esr-12.0-1`
+- `$(BASE_BROWSER_BRANCH_TAG)`: the `base-browser` build tag used as base commit for `mullvad-browser`
+  - **Example**: `base-browser-102.8.0esr-12.0-1-build1`
+- `$(BASE_BROWSER_BRANCH_PREV_TAG)`: the `base-browser` build tag used as base commit for the previous `mullvad-browser`
+  - **Example**: `base-browser-102.7.0esr-12.0-1-build1`
+- `$(MULLVAD_BROWSER_BRANCH)`: the full name of the current `mullvad-browser` branch
+  - **Example**: `mullvad-browser-102.8.0esr-12.0-1`
+- `$(MULLVAD_BROWSER_BRANCH_PREV)`: the full name of the previous `mullvad-browser` branch
+  - **Example**: `mullvad-browser-102.7.0esr-12.0-1`
+</details>
+
+**NOTE:** It is assumed that we've already rebased and tagged `base-browser` stable
+
+### **Bookkeeping**
+
+- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep) issue.
+
+### Update Branch Protection Rules
+
+- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/settings/repository):
+  - [ ] Remove previous stable `mullvad-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)
+  - [ ] Create new `mullvad-browser` branch protection rule:
+    - **Branch**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*`
+      - **Example**: `mullvad-browser-102.8.0esr-12.0-1*`
+    - **Allowed to merge**: `Maintainers`
+    - **Allowed to push and merge**: `Maintainers`
+    - **Allowed to force push**: `false`
+
+### **Create and Push New Branch**
+
+- [ ] Create new stable `mullvad-browser` branch from this ESR's stable `base-browser` tag
+  - Branch name in the form: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
+  - **Example**: `git branch mullvad-browser-102.8.0esr-12.0-1 base-browser-102.8.0esr-12.0-1-build1`
+- [ ] Push new `mullvad-browser` branch to `upstream`
+- [ ] Push `base-browser` tag to `upstream`
+- [ ] Push `$(ESR_TAG)` to `upstream`
+
+### **Rebase mullvad-browser**
+
+- [ ] Checkout a new local branch for the `mullvad-browser` rebase
+  - **Example**: `git branch mullvad-browser-rebase upstream/mullvad-browser-102.8.0esr-12.0-1`
+- [ ] `mullvad-browser` rebase
+  - [ ] Cherry-pick the previous `mullvad-browser` branch's commit range up to the last `mullvad-browser` `build1` tag
+    - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..mullvad-browser-102.7.0esr-12.0-1-build1`
+  - [ ] Rebase and autosquash these newly cherry-picked commits
+     - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.0-1`
+  - [ ] Cherry-pick remainder of patches after the last `mullvad-browser` `buildN` tag
+    - **Example**: `git cherry-pick mullvad-browser-102.7.0esr-12.0-1-build1..upstream/mullvad-browser-102.7.0esr-12.0-1`
+  - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting.
+    - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.0-1`
+- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
+  - [ ] diff of diffs:
+    -  Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or -
+    - `git diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) > current_patchset.diff`
+    - `git diff $(BASE_BROWSER_BRANCH_TAG)..HEAD > rebased_patchset.diff`
+    - diff `current_patchset.diff` and `rebased_patchset.diff`
+      - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `mullvad-browser` branch)
+  - [ ] rangediff: `git range-diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) $(BASE_BROWSER_BRANCH_TAG)..HEAD`
+    - **Example**: `git range-diff base-browser-102.7.0esr-12.0-1-build1..upstream/mullvad-browser-102.7.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1..HEAD`
+- [ ] Open MR for the `mullvad-browser` rebase
+- [ ] Merge
+
+### **Sign and Tag**
+
+- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:
+  - In **mullvad-browser.git**, checkout the new stable `mullvad-browser` branch
+  - In **tor-browser-build.git**, run signing script:
+    ```bash
+    ./tools/browser/sign-tag.mullvadbrowser stable build1
+    ```
+  - [ ] Push tag to `upstream`
--- a/.gitlab/merge_request_templates/default.md
+++ b/.gitlab/merge_request_templates/default.md
@@ -5,14 +5,14 @@
 ### Issues

 #### Resolves
- tor-browser#xxxxx
 - mullvad-browser#xxxxx
+- tor-browser#xxxxx
 - tor-browser-build#xxxxx

 #### Related

- tor-browser#xxxxx
 - mullvad-browser#xxxxx
+- tor-browser#xxxxx
 - tor-browser-build#xxxxx

 ### Merging
@@ -21,15 +21,14 @@

 #### Target Branches

- [ ] **`tor-browser`** - `!fixups` to `tor-browser`-specific commits, new features, security backports
- [ ] **`base-browser`** *and* **`mullvad-browser`** - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports
-  - ⚠️ **IMPORTANT**: Please list the `base-browser`-specific commits which need to be cherry-picked to the `base-browser` and `mullvad-browser` branches here
+- [ ] **`mullvad-browser`** - `!fixups` to `mullvad-browser`-specific commits, new features, security backports
+- [ ] **`base-browser`** *and* **`tor-browser`** - `!fixups` to `base-browser`-specific commits or new features to be shared with `tor-browser`
+  - ⚠️ **IMPORTANT**: Please list the `base-browser`-specific commits which need to be cherry-picked to the `base-browser` and `tor-browser` branches here

 #### Target Channels

 - [ ] **Alpha**: esr128-14.5
 - [ ] **Stable**: esr128-14.0
- [ ] **Legacy**: esr115-13.5

 ### Backporting

@@ -41,7 +40,6 @@

 #### (Optional) Justification
 - [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc
- [ ] **Censorship event**: patchset enables censorship circumvention
 - [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality
 - [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
 - [ ] **Sponsor required**: patchset required for sponsor

--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -31,7 +31,7 @@ ifeq ($(OS_ARCH),WINNT)
 # (this dependency should really be just for firefox.exe, not other targets)
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
-EXTRA_DEPS += $(srcdir)/firefox.exe.manifest
+EXTRA_DEPS += $(srcdir)/mullvadbrowser.exe.manifest
 endif

 PROGRAMS_DEST = $(DIST)/bin
@@ -108,5 +108,5 @@ endif
 endif
 	$(MKDIR) -p '$(dist_dest)/Contents/Frameworks'
 	mv '$(dist_dest)/Contents/Resources/ChannelPrefs.framework' '$(dist_dest)/Contents/Frameworks'
-	printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo'
+	printf APPLMULB > '$(dist_dest)/Contents/PkgInfo'
 endif
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -201,7 +201,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>@APP_VERSION@</string>
 	<key>CFBundleSignature</key>
-	<string>MOZB</string>
+	<string>MULB</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

--- a/browser/app/module.ver
+++ b/browser/app/module.ver
-WIN32_MODULE_COMPANYNAME=Mozilla Corporation
-WIN32_MODULE_COPYRIGHT=Firefox and Mozilla Developers; available under the MPL 2 license.
+WIN32_MODULE_COMPANYNAME=Mullvad VPN AB
+WIN32_MODULE_COPYRIGHT=Mullvad, Tor Browser, and Mozilla Developers; available under the MPL 2 license.
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
-WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation.
+WIN32_MODULE_TRADEMARKS=Mullvad Browser is a Trademark of Mullvad VPN AB.
 WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
--- a/browser/app/firefox.exe.manifest
+++ b/browser/app/firefox.exe.manifest
@@ -3,7 +3,7 @@
 <assemblyIdentity
        version="1.0.0.0"
        processorArchitecture="*"
-        name="Firefox"
+        name="Mullvad Browser"
        type="win32"
 />
 <description>Firefox</description>

--- a/browser/app/profile/000-mullvad-browser.js
+++ b/browser/app/profile/000-mullvad-browser.js
+// Preferences specific to Mullvad Browser
+
+pref("browser.startup.homepage", "about:mullvad-browser");
+
+// Do not show the bookmark panel for now, because it makes the initial browser
+// window (about:home) bigger, and regular pages will show letterbox margins as
+// a result.
+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.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\"}]");
+// mullvad-browser#122: Audit DoH heuristics
+pref("doh-rollout.disable-heuristics", true);
+
+// mullvad-browser#37: Customization for the about dialog
+pref("app.releaseNotesURL.aboutDialog", "about:blank");
+
+// mullvad-browser#87: Windows and Linux need additional work to make the
+// default browser choice working.
+// We are shipping only the portable versions for the initial release anyway, so
+// we leave this popup enabled only on macOS.
+#ifndef XP_MACOSX
+pref("browser.shell.checkDefaultBrowser", false);
+#endif
+
+// mullvad-browser#228: default to spoof en-US and skip showing the dialog
+pref("privacy.spoof_english", 2);
+
+// mullvad-browser#234: Do not spoof the OS in the User-Agent header
+pref("privacy.resistFingerprinting.spoofOsInUserAgentHeader", false);
+
+// mullvad-browser#222: Hide "List all tabs" when the tabs don't overflow
+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);
+pref("app.releaseNotesURL", "https://github.com/mullvad/mullvad-browser/releases");
+// disables the 'What's New?' link in the about dialog, otherwise we need to
+// duplicate logic for generating the url to the github releases page
+pref("app.releaseNotesURL.aboutDialog", "about:blank");
+// point to our feedback url rather than Mozilla's
+pref("app.feedback.baseURL", "https://mullvad.net/help/tag/browser/");
--- a/browser/app/profile/001-base-profile.js
+++ b/browser/app/profile/001-base-profile.js
@@ -74,10 +74,10 @@ pref("browser.helperApps.deleteTempFileOnExit", true);
 pref("browser.download.enable_spam_prevention", true);

 // Misc privacy: Disk
-pref("signon.rememberSignons", false);
-pref("browser.formfill.enable", false);
+pref("signon.rememberSignons", false, locked);
+pref("browser.formfill.enable", false, locked);
 pref("signon.formlessCapture.enabled", false); // Added with tor-browser#41496
-pref("signon.autofillForms", false);
+pref("signon.autofillForms", false, locked);
 pref("extensions.formautofill.available", "");
 pref("extensions.formautofill.addresses.enabled", false);
 pref("extensions.formautofill.creditCards.enabled", false);
@@ -359,7 +359,7 @@ pref("security.remote_settings.crlite_filters.enabled", false);
 pref("security.pki.crlite_mode", 0);

 // Disable website password breach alerts
-pref("signon.management.page.breach-alerts.enabled", false);
+pref("signon.management.page.breach-alerts.enabled", false, locked);
 // tor-browser#42814: Opt out from Firefox relay by default.
 // Firefox would normally assign disabled when a user has been presented the
 // opportunity to use the service and opted out (see firefox.js).
@@ -466,6 +466,8 @@ pref("browser.display.use_system_colors", false);
 // tor-browser#43366: do not use system accent color in inputs.
 // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1861362.
 pref("widget.non-native-theme.use-theme-accent", false);
+// tor-browser#43236: Disable vsync on Wayland to prevent refresh rate leaks.
+pref("widget.wayland.vsync.enabled", false);

 // tor-browser#41943: defense-in-depth, but do not lock anymore (enabled in Firefox 119, http://bugzil.la/1851162)
 pref("javascript.options.spectre.disable_for_isolated_content", false);
@@ -523,7 +525,6 @@ pref("network.http.tailing.enabled", true, locked);
 // As of Firefox 118 (Bug 1843763), upstream does not add any protocol by
 // default, but setting it to blank seems a good idea (tor-browser#42054).
 pref("network.gio.supported-protocols", "");
-pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces
 // Mullvad Browser enables WebRTC by default, meaning that there the following prefs
 // are first-line defense, rather than "in depth" (mullvad-browser#40)
 // tor-browser#41667 - Defense in depth: use mDNS to avoid local IP leaks on Android too if user enables WebRTC
@@ -535,9 +536,6 @@ pref("media.peerconnection.ice.default_address_only", true);
 pref("media.peerconnection.ice.no_host", true);
 pref("media.peerconnection.ice.proxy_only_if_behind_proxy", true);

-// Disables media devices but only if `media.peerconnection.enabled` is set to
-// `false` as well. (see bug 16328 for this defense-in-depth measure)
-pref("media.navigator.enabled", false);
 // GMPs (Gecko Media Plugins, https://wiki.mozilla.org/GeckoMediaPlugins)
 // We make sure they don't show up on the Add-on panel and confuse users.
 // And the external update/donwload server must not get pinged. We apply a

--- a/browser/base/content/aboutDialog.xhtml
+++ b/browser/base/content/aboutDialog.xhtml
@@ -37,6 +37,7 @@
    <html:link rel="localization" href="branding/brand.ftl"/>
    <html:link rel="localization" href="browser/aboutDialog.ftl"/>
    <html:link rel="localization" href="toolkit/global/base-browser.ftl"/>
+    <html:link rel="localization" href="toolkit/global/mullvad-browser.ftl"/>
  </linkset>

  <html:div id="aboutDialogContainer">
@@ -112,10 +113,12 @@
                <label id="version" class="update"/>
                <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>
              </hbox>
+#ifndef MULLVAD_BROWSER
              <description class="text-blurb">
                <label is="text-link" onclick="openHelpLink('firefox-help')" data-l10n-id="aboutdialog-help-user"/>
                <label id="submit-feedback" is="text-link" onclick="openFeedbackPage()" data-l10n-id="aboutdialog-submit-feedback"/>
              </description>
+#endif
            </vbox>
 #endif
          </hbox>
@@ -134,14 +137,14 @@
              <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>
            </description>
          </vbox>
-          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
-            <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"/>
-            <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
+          <description class="text-blurb" data-l10n-id="mullvad-about-desc">
+            <label is="text-link" href="https://mullvad.net" data-l10n-name="mullvad-about-mullvadLink"/>
+            <label is="text-link" href="https://www.torproject.org" data-l10n-name="mullvad-about-torProjectLink"/>
          </description>
-          <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
-            <label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
-            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
+          <description class="text-blurb">
+            <label is="text-link" href="https://mullvad.net/browser" data-l10n-id="mullvad-about-readMore"/>
          </description>
+          <description class="text-blurb" data-l10n-id="mullvad-about-feedback2" data-l10n-args='{"emailAddress":"support@mullvadvpn.net"}'/>
        </vbox>
      </vbox>
    </hbox>
@@ -149,7 +152,8 @@
      <hbox pack="center">
        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/>
-        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>
+        <label is="text-link" class="bottom-link" href="https://mullvad.net/en/help/privacy-policy/" data-l10n-id="bottomLinks-privacy"/>
+        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:telemetry" data-l10n-id="mullvad-about-telemetryLink"/>
      </hbox>
      <description id="trademark" data-l10n-id="trademarkInfo"></description>
    </vbox>

--- a/browser/base/content/appmenu-viewcache.inc.xhtml
+++ b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -71,6 +71,7 @@
      <toolbarbutton id="appMenu-passwords-button"
                     class="subviewbutton"
                     data-l10n-id="appmenuitem-passwords"
+                     hidden="true"
                     />
      <toolbarbutton id="appMenu-extensions-themes-button"
                     class="subviewbutton"

--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -456,7 +456,6 @@
     have their strings defined by appmenu-data-l10n-id. -->
                <menuitem id="menu_openHelp"
                          oncommand="openHelpLink('firefox-help')"
-                          hidden="true"
                          data-l10n-id="menu-get-help"
                          appmenu-data-l10n-id="appmenu-get-help"
 #ifdef XP_MACOSX

--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1426,6 +1426,7 @@ var BookmarkingUI = {
    let newTabURLs = [
      newTabURL,
      "about:home",
+      "about:mullvad-browser",
      "chrome://browser/content/blanktab.html",
    ];
    if (PrivateBrowsingUtils.isWindowPrivate(window)) {

--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -720,6 +720,7 @@ async function gLazyFindCommand(cmd, ...args) {
 }

 var gPageIcons = {
+  "about:mullvad-browser": "chrome://branding/content/icon32.png",
  "about:home": "chrome://branding/content/icon32.png",
  "about:newtab": "chrome://branding/content/icon32.png",
  "about:welcome": "chrome://branding/content/icon32.png",
@@ -727,6 +728,7 @@ var gPageIcons = {
 };

 var gInitialPages = [
+  "about:mullvad-browser",
  "about:blank",
  "about:home",
  "about:firefoxview",

--- a/browser/base/content/default-bookmarks.html
+++ b/browser/base/content/default-bookmarks.html
 #filter substitution

-#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E
+#define mullvad_icon data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='254px' height='254px' viewBox='0 0 254 254' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M0.7,127 C0.7,196.8 57.3,253.3 127,253.3 C196.7,253.3 253.3,196.8 253.3,127 C253.3,57.2 196.8,0.7 127,0.7 C57.2,0.7 0.7,57.2 0.7,127 L0.7,127 L0.7,127 L0.7,127 Z' id='bg' fill='%23192E45' /%3E%3Cpath d='M17.6,111.9 L27.2,98.5 C27.2,98.6 26.6,117.8 26.6,117.8 L29.3,103.3 C37.3,119.5 56.9,141.9 74.8,153.9 C76.7,155.2 78.3,156.6 79.4,158 C81.7,158.9 84,159.4 86.3,159.8 C87.5,160 88.8,160.1 90,160.2 C91.2,160.3 92.5,160.3 93.7,160.3 C94.9,160.3 96.1,160.2 97.3,160.1 C98.5,160 99.7,159.8 100.9,159.6 C102.1,159.4 103.3,159.2 104.4,158.8 C105.6,158.5 106.7,158.2 107.9,157.8 C109,157.5 110.2,157 111.3,156.6 C112.4,156.1 113.5,155.7 114.6,155.1 C115.7,154.5 116.8,154 117.8,153.4 C118.9,152.9 119.9,152.2 121,151.6 C122.1,151 123.1,150.3 124.2,149.7 C125.3,149.1 126.3,148.4 127.3,147.8 C128.3,147.1 129.4,146.5 130.4,145.8 C131.4,145.1 132.5,144.5 133.6,143.8 L134.6,143.2 L135.1,143.5 L142.3,148.3 L135,146.4 C134.3,147.2 133.6,148 132.8,148.8 C131.9,149.7 130.9,150.6 130,151.5 C129,152.3 128,153.2 126.9,153.9 C125.8,154.7 124.8,155.4 123.6,156.1 C121.4,157.5 119,158.7 116.5,159.7 C115.3,160.2 114,160.7 112.8,161.1 C111.5,161.5 110.3,161.9 109,162.2 C107.7,162.5 106.4,162.8 105.1,163 C103.8,163.2 102.5,163.3 101.2,163.5 C98.6,163.6 95.9,163.6 93.3,163.2 C92,163 90.7,162.8 89.4,162.5 C88.1,162.2 86.9,161.8 85.7,161.4 C83.6,160.6 81.5,159.6 79.6,158.4 C79.6,158.4 72.7,159.4 75.5,164.6 C78.3,169.8 82.5,169.3 80.5,175.4 C79.1,178.7 77.1,181.9 74.9,184.9 C70.3,191.1 63.1,196.6 63.8,199.9 C96.5,240.2 170.2,234.6 198.2,198.6 C197.8,193.4 189.6,190.9 183.9,178.2 C185.5,178.7 187.9,179.4 187.9,179.3 C187.9,179.2 181.1,168.2 180.8,167.1 L185.2,167.4 C185.2,167.4 179.4,160.2 179.2,159.5 L185.1,158.7 C185.1,158.7 177.7,150.2 177.6,149.5 L185.1,150.7 L176.9,140.8 L180.8,140.8 L176.2,134.1 C175.4,133.8 174.6,133.6 173.8,133.4 C172.8,133.1 171.8,132.8 170.8,132.5 C159.6,129 149,125.8 138.8,119.4 C124.5,110.5 111.7,99.6 102.1,91.1 L82.8,81.7 C64.3,80.3 46.9,80.8 36.3,82.9 L43.1,71.3 L32.7,83.8 C32,83.6 31.8,83.2 31.8,83.2 L32.5,67.8 L29.2,81.7 C28.2,81.2 27,81 25.8,81 C21.2,81 17.5,84.7 17.5,89.3 C17.5,93.5 20.6,97 24.7,97.5 L17.6,111.9 L17.6,111.9 L17.6,111.9 L17.6,111.9 Z' id='Mullvad_Fur' fill='%23D0933A' /%3E%3Cpath d='M29.2,81.5 C28.2,81.1 27,80.8 25.9,80.8 C21.3,80.8 17.6,84.5 17.6,89.1 C17.6,93.1 20.5,96.5 24.3,97.3 C24.4,97.3 24.4,97.3 24.5,97.3 C27,96.5 32,89.8 31.2,85.6 C30.9,84.1 30.2,82.7 29.2,81.5 L29.2,81.5 L29.2,81.5 L29.2,81.5 Z' id='Mullvad_Nose' fill='%23FFCC86' /%3E%3Cpath d='M102.1,70.8 C100.6,66.7 101,61.4 103.1,56.4 C106.1,49.5 111.8,44.9 117.2,44.9 C118.3,44.9 119.3,45.1 120.3,45.5 C123.4,42.7 127,40.4 131,38.8 C153.1,30 185.4,45.7 193.7,67.4 C197.7,77.9 196.5,89.4 193.1,99.9 C190.3,108.5 180.1,120.9 183.9,130.3 C182.4,129.9 150.8,120.1 142,114.5 C127.9,105.7 115.2,94.9 105.7,86.5 L105.4,86.2 L73.3,71 C72.9,70.8 72.5,70.6 72.2,70.4 C76.8,70.4 94.3,72.5 102.1,70.8' id='Mullvad_Helmet' fill='%23FDD321' /%3E%3Cg id='Helmet_Lamp' transform='translate(103.000000, 46.000000)' fill-rule='nonzero'%3E%3Cpath d='M8.6,28.4 C7.7,28.4 6.9,28.2 6.3,27.9 C4.7,27.2 3.5,25.9 2.7,23.9 C1.3,20.5 1.7,15.8 3.6,11.4 C6.1,5.7 10.8,1.7 15.1,1.7 C15.9,1.7 16.7,1.9 17.5,2.2 C19.6,3.1 21.1,5.2 21.6,8.2 C22.2,11.4 21.7,15.1 20.1,18.6 C17.6,24.3 12.8,28.4 8.6,28.4 Z' id='Path' fill='%23FFFFFF' /%3E%3Cpath d='M15,3.3 C15.6,3.3 16.2,3.4 16.8,3.7 C18.4,4.4 19.6,6.2 20,8.6 C20.5,11.5 20.1,14.9 18.6,18.1 C16.4,23.2 12.1,26.9 8.5,26.9 C7.9,26.9 7.3,26.8 6.8,26.6 L6.8,26.6 L6.8,26.6 C5.3,26 4.5,24.6 4.1,23.5 C2.9,20.5 3.2,16.1 4.9,12.1 C7.2,7 11.4,3.3 15,3.3 M15,0.3 C10.2,0.3 4.9,4.7 2.1,11 C-2.22044605e-16,15.7 -0.3,20.8 1.2,24.7 C2.1,27 3.6,28.6 5.5,29.5 C6.4,29.9 7.4,30.1 8.5,30.1 C13.3,30.1 18.6,25.7 21.3,19.4 C23,15.6 23.5,11.6 22.9,8.1 C22.3,4.6 20.5,2.1 17.9,1 C17.1,0.5 16.1,0.3 15,0.3 L15,0.3 Z' id='Shape' fill='%231D2A3A' /%3E%3C/g%3E%3C/g%3E%3C/svg%3E%0A

-#define firefox_icon data:image/png;base64,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
-
-#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==
-
-#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC
-
-#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII=
 <!-- 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/. -->
@@ -16,54 +9,13 @@
 <html>
 <head>
    <meta charset="UTF-8">
-    <!-- These localization links are not automatically applied to any XHR
-         response body and must be applied manually as well.  They are included
-         so that viewing the file directly shows the results. -->
-    <link rel="localization" href="branding/brand.ftl"/>
-    <link rel="localization" href="browser/profile/default-bookmarks.ftl"/>
-    <title data-l10n-id="default-bookmarks-title">default-bookmarks-title</title>
+    <title>Bookmarks</title>
 </head>
 <body>
-<h1 data-l10n-id="default-bookmarks-heading">default-bookmarks-heading</h1>
+<h1>Bookmarks</h1>

 <dl><p>
-    <dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">default-bookmarks-toolbarfolder</h3></dt>
-    <dd data-l10n-id="default-bookmarks-toolbarfolder-description">default-bookmarks-toolbarfolder-description</dd>
-#ifndef NIGHTLY_BUILD
-#ifdef EARLY_BETA_OR_EARLIER
-        <dl><p>
-            <dt><a href="https://www.mozilla.org/firefox/central/" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>
-        </dl><p>
-#else
-        <dl><p>
-            <dt><a href="https://www.mozilla.org/firefox/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users&utm_content=-global" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>
-        </dl><p>
-#endif
-    <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>
-        <dl><p>
-            <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>
-            <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>
-#ifdef EARLY_BETA_OR_EARLIER
-            <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-beta&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
-#else
-            <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
-#endif
-            <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>
-        </dl><p>
-#else
-        <dl><p>
-            <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-nightly&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
-        </dl><p>
-    <dt><h3 data-l10n-id="default-bookmarks-nightly-heading">default-bookmarks-nightly-heading</h3></dt>
-        <dl><p>
-            <dt><a href="https://blog.nightly.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-nightly-blog">default-bookmarks-nightly-blog</a></dt>
-            <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz" data-l10n-id="default-bookmarks-bugzilla">default-bookmarks-bugzilla</a></dt>
-            <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn" data-l10n-id="default-bookmarks-mdn">default-bookmarks-mdn</a></dt>
-            <dt><a href="https://addons.mozilla.org/firefox/addon/nightly-tester-tools/" icon="@addon_icon@" data-l10n-id="default-bookmarks-nightly-tester-tools">default-bookmarks-nightly-tester-tools</a></dt>
-            <dt><a href="about:crashes" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-crashes">default-bookmarks-crashes</a></dt>
-            <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-planet">default-bookmarks-planet</a></dt>
-        </dl><p>
-#endif
-</dl>
+    <dt><a href="https://mullvad.net/" icon="@mullvad_icon@">Mullvad VPN</a></dt>
+</dl><p>
 </body>
 </html>
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1186,7 +1186,7 @@ class nsContextMenu {
      if (!this.isLoginForm()) {
        return;
      }
-      showManage = true;
+      showManage = Services.prefs.getBoolPref("signon.rememberSignons", true);

      // Disable the fill option if the user hasn't unlocked with their primary password
      // or if the password field or target field are disabled.

--- a/browser/base/content/overrides/app-license.html
+++ b/browser/base/content/overrides/app-license.html
@@ -3,6 +3,7 @@
   - 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="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla Public
+  <a href="https://www.torproject.org/">Tor Project</a> and
+  <a href="https://mullvad.net/">Mullvad VPN</a> under the Mozilla Public
  License 2.0 (MPL). <a href="about:rights">Know your rights</a>.
 </p>
--- a/browser/base/content/pageinfo/pageInfo.xhtml
+++ b/browser/base/content/pageinfo/pageInfo.xhtml
@@ -382,7 +382,8 @@
            </td>
          </tr>
          <!-- Passwords -->
-          <tr>
+          <!-- We remove the password manager in Mullvad Browser -->
+          <tr hidden="true">
            <th>
              <xul:label control="security-privacy-passwords-value" data-l10n-id="security-view-privacy-passwords-value"/>
            </th>

--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -78,6 +78,7 @@ function isBlankPageURL(aURL) {
  return (
    aURL == "about:blank" ||
    aURL == "about:home" ||
+    aURL == "about:mullvad-browser" ||
    aURL == BROWSER_NEW_TAB_URL ||
    aURL == "chrome://browser/content/blanktab.html"
  );
@@ -558,6 +559,9 @@ function makeURLAbsolute(aBase, aUrl) {
 }

 function getHelpLinkURL(aHelpTopic) {
+  if (aHelpTopic === "firefox-help") {
+    return "https://mullvad.net/en/help/tag/mullvad-browser/";
+  }
  var url = Services.urlFormatter.formatURLPref("app.support.baseURL");
  return url + aHelpTopic;
 }
No results found