fixup! MB 188: Customize Gitlab Issue and Merge templates

.gitlab/issue_templates/000 Bug Report.md

@@ -40,16 +40,13 @@ Please provide the following information:
   - [ ] Alpha
   - [ ] Nightly
 - Distribution method:
-  - [ ] Installer/archive from torproject.org
-  - [ ] tor-browser-launcher
+  - [ ] Installer/archive from mullvad.net
   - [ ] homebrew
   - [ ] other (please specify):
 - Operating System:
   - [ ] Windows
   - [ ] macOS
   - [ ] Linux
-  - [ ] Android
-  - [ ] Tails
   - [ ] Other (please specify):
 - Operating System Version:
 
@@ -87,11 +84,10 @@ Archived packages for past versions can be found here:
 <!--
 Sometimes bugs are fixed in the Alpha (development) channel but not in the Stable channel.
 ⚠️ However, the Alpha release channel is the development version and as such may be contain
-critical bugs not present in the Stable release channel. Do not test in Alpha if you are an
-at risk user unless you really, actually, truly know what you are doing!
+critical bugs not present in the Stable release channel.
 
 The latest Alpha can be found here:
-- https://www.torproject.org/download/alpha/
+- https://github.com/mullvad/mullvad-browser/releases?q=prerelease%3Atrue
 -->
 
 ### Does this bug occur in Firefox ESR (Desktop only)?
@@ -117,5 +113,5 @@ If the issue has been fixed in Firefox, do you know the Bugzilla issue number as
 
 ---
 
-/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Product::MullvadBrowser"
 /label ~"Apps::Type::Bug"

.gitlab/issue_templates/010 Proposal.md

@@ -26,6 +26,7 @@ guarantees?
 
 ### Security
 <!--
+TODO: Mullvad Browser's threat model is somehow less restrictive than Tor Browser's, but currently undefined
 Outline any security implications this feature would introduce. The browser's
 security requirements can be found in our threat model document here:
 - https://gitlab.torproject.org/tpo/applications/wiki/-/wikis/Design-Documents/Tor-Browser-Design-Doc#21-security-requirements
@@ -33,6 +34,7 @@ security requirements can be found in our threat model document here:
 
 ### Privacy
 <!--
+TODO: Mullvad Browser's threat model is somehow less restrictive than Tor Browser's, but currently undefined
 Outline any privacy implications this feature would introduce. The browser's
 privacy requirements can be found in our threat model document here:
 - https://gitlab.torproject.org/tpo/applications/wiki/-/wikis/Design-Documents/Tor-Browser-Design-Doc#22-privacy-requirements
@@ -66,5 +68,5 @@ are there for users?
 
 ---
 
-/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Product::MullvadBrowser"
 /label ~"Apps::Type::Proposal"

.gitlab/issue_templates/020 Web Compatibility.md

@@ -38,16 +38,13 @@ Please provide the following information:
   - [ ] Alpha
   - [ ] Nightly
 - Distribution method:
-  - [ ] Installer/archive from torproject.org
-  - [ ] tor-browser-launcher
+  - [ ] Installer/archive from mullvad.net
   - [ ] homebrew
   - [ ] other (please specify):
 - Operating System:
   - [ ] Windows
   - [ ] macOS
   - [ ] Linux
-  - [ ] Android
-  - [ ] Tails
   - [ ] Other (please specify):
 - Operating System Version:
 
@@ -78,11 +75,10 @@ Archived packages for past versions can be found here:
 <!--
 Sometimes bugs are fixed in the Alpha (development) channel but not in the Stable channel.
 ⚠️ However, the Alpha release channel is the development version and as such may be contain
-critical bugs not present in the Stable release channel. Do not test in Alpha if you are an
-at risk user unless you really, actually, truly know what you are doing!
+critical bugs not present in the Stable release channel.
 
 The latest Alpha can be found here:
-- https://www.torproject.org/download/alpha/
+- https://github.com/mullvad/mullvad-browser/releases?q=prerelease%3Atrue
 -->
 
 ### Does this bug occur in Firefox ESR (Desktop only)?
@@ -108,5 +104,5 @@ If the issue has been fixed in Firefox, do you know the Bugzilla issue number as
 
 ---
 
-/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Product::MullvadBrowser"
 /label ~"Apps::Type::WebCompatibility"

.gitlab/issue_templates/030 Test.md

@@ -25,5 +25,5 @@ and the expected behaviour of each
 
 ---
 
-/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Product::MullvadBrowser"
 /label ~"Apps::Type::Test"

.gitlab/issue_templates/040 Feature.md

@@ -18,7 +18,7 @@ Provide an overview of the technical/implementation aspects of this feature
 
 ### Proposal
 <!-- Add links to associated proposal issues (or delete block) -->
-- tor-browser#12345
+- mullvad-browser#123
 
 ### Design
 <!-- Add links to associated design issues (or delete block) -->
@@ -28,5 +28,5 @@ Provide an overview of the technical/implementation aspects of this feature
 
 ---
 
-/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Product::MullvadBrowser"
 /label ~"Apps::Type::Feature"

.gitlab/issue_templates/060 Rebase - Alpha.md

@@ -5,12 +5,10 @@
 <details>
   <summary>Explanation of Variables</summary>
 
-- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc
+- `$(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`
-- `$(ESR_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from)
-  - **Example**: `FIREFOX_102_7_0esr_BUILD1`
 - `$(BROWSER_MAJOR)`: the browser major version
   - **Example**: `12`
 - `$(BROWSER_MINOR)`: the browser minor version
@@ -19,13 +17,17 @@
   - **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`
-- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch
-  - **Example**: `tor-browser-102.8.0esr-12.5-1`
-- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch
-  - **Example**: `tor-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 identified the new ESR branch during the tor-browser stable rebase
+**NOTE:** It is assumed that we've already rebased and tagged `base-browser` alpha and that we've already rebased `mullvad-browser` stable
 
 ### **Bookkeeping**
 
@@ -33,131 +35,62 @@
 
 ### Update Branch Protection Rules
 
-- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/settings/repository):
-  - [ ] Remove previous alpha `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)
-  - [ ] Create new `base-browser` and `tor-browser` branch protection rule:
-    - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*`
-      - **Example**: `*-102.8.0esr-12.5-1*`
+- [ ] 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`
-    - If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them!
-
-### **Create New Branches**
-
-- [ ] Find the Firefox mercurial tag `$(ESR_TAG)`
-  - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release
-  - Otherwise:
-    - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags`
-    - [ ] Find and inspect the commit tagged with `$(ESR_TAG)`
-      - Tags are in yellow in the Mercurial web UI
-    - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)`
-      - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`)
-      - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead
-    - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"`
-- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag
-  - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
-  - **Example**: `base-browser-102.8.0esr-12.5-1`
-- [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag
-  - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
-  - **Example**: `tor-browser-102.8.0esr-12.5-1`
-- [ ] Push new `base-browser` branch to `upstream`
-- [ ] Push new `tor-browser` branch to `upstream`
+
+### **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 `tor-browser` rebase
-  - **Example**: `git branch tor-browser-rebase FIREFOX_102_8_0esr_BUILD1`
-- [ ] **(Optional)** `base-browser` rebase and autosquash
-  - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag
-  - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch
-    - **Example**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.5-1-build1`
-  - [ ] Rebase and autosquash these cherry-picked commits
-    - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD`
-  - [ ] Cherry-pick remainder of patches after the `buildN` tag
-    - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..upstream/base-browser-102.7.0esr-12.5-1`
-
-- [ ] `tor-browser` rebase and autosquash
-  - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD`
-  - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag
-    - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..tor-browser-102.7.0esr-12.5-1-build1`
-    - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..tor-browser-102.7.0esr-12.5-1-build1`
-  - [ ] Rebase and autosquash  **ONLY** these newly cherry-picked commits using the commit noted previously: `git rebase --autosquash --interactive $(PREV_HEAD)`
-     - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE`
-  - [ ] **(Optional)** Patch reordering
-    - **NOTE**: We typically want to do this after new features or bug fix commits which are not !fixups to an existing commit have been merged and are just sitting at the end of the commit history
-    - Relocate new `base-browser` patches in the patch-set to enforce this rough thematic ordering:
-      - **MOZILLA BACKPORTS** - official Firefox patches we have backported to our ESR branch: Android-specific security updates, critical bug fixes, worthwhile features, etc
-      - **MOZILLA REVERTS** - revert commits of official Firefox patches
-      - **UPLIFT CANDIDATES** - patches which stand on their own and should be uplifted to `mozilla-central`
-      - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc
-      - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc
-      - **SECURITY PATCHES** - security improvements, hardening, etc
-      - **PRIVACY PATCHES** - fingerprinting, linkability, proxy bypass, etc
-      - **FEATURES** - new functionality: updater, UX, letterboxing, security level, add-on
-    - Relocate new `tor-browser` patches in the patch-set to enforce this rough thematic ordering:
-      - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc
-      - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc
-      - **UPDATER PATCHES** - updater tweaks, signing keys, etc
-      - **SECURITY PATCHES** - non tor-dependent security improvements, hardening, etc
-      - **PRIVACY PATCHES** - non tor-dependent fingerprinting, linkability, proxy bypass, etc
-      - **FEAURES** - non tor-dependent features
-      - **TOR INTEGRATION** - legacy tor-launcher/torbutton, tor modules, bootstrapping, etc
-      - **TOR SECURITY PATCHES** - tor-specific security improvements
-      - **TOR PRIVACY PATCHES** - tor-specific privacy improvements
-      - **TOR FEATURES** - new tor-specific functionality: manual, onion-location, onion service client auth, etc
-  - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag
-    - **Example**: `git cherry-pick tor-browser-102.7.0esr-12.5-1-build1..upstream/tor-browser-102.7.0esr-12.5-1`
+- [ ] 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 FIREFOX_102_8_0esr_RELEASE`
+    - **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 $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff`
-    - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff`
+    - `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 `tor-browser` branch)
-  - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD`
-    - **Example**: `git range-dif FIREFOX_102_7_0esr_BUILD1..upstream/tor-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD`
-- [ ] Open MR for the `tor-browser` rebase
+      - 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
-- Update and push `base-browser` branch
-  - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch
-  - [ ] Push these commits to `upstream`
-- [ ] Set `$(TOR_BROWSER_BRANCH)` as the default GitLab branch
-  - [ ] Go to [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/settings/repository)
-  - [ ] Expand `Branch defaults`
-  - [ ] Set the branch and leave the `Auto-close` checkbox unchecked
-  - [ ] Save changes
 
 ### **Sign and Tag**
 
-- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch:
-  - In **tor-browser.git**, checkout the new alpha `tor-browser` branch
-  - In **tor-browser-build.git**, run signing script:
-    ```bash
-    ./tools/browser/sign-tag.torbrowser alpha build1
-    ```
-  - [ ] Push tag to `upstream`
-- [ ] Sign/Tag HEAD of the merged `base-browser` branch:
-  - In **tor-browser.git**, checkout the new alpha `base-browser` branch
+- [ ] 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.basebrowser alpha build1
+    ./tools/browser/sign-tag.mullvadbrowser alpha build1
     ```
   - [ ] Push tag to `upstream`
-- [ ] Update tor-browser-build's `main` branch (no MR required, you can just push it if you have the permissions)
-  - [ ] Update `projects/firefox/config`
-    - [ ] Update `firefox_platform_version`
-    - [ ] Set `browser_build` to 1 (to prevent failures in alpha testbuilds)
-  - [ ] Update `projects/geckoview/config`
-    - [ ] Update `firefox_platform_version`
-    - [ ] Set `browser_build` to 1 (to prevent failures in alpha testbuilds)
 
 <!-- Do not edit beneath this line <3 -->
 
 ---
 
-/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Product::MullvadBrowser"
 /label ~"Apps::Type::Rebase"
 /label ~"Apps::Priority::Blocker"

.gitlab/issue_templates/061 Rebase - Stable.md

 # ⤵️ Rebase Stable
-
 **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 tor-browser tags, labels, etc
+- `$(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`
-- `$(ESR_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from)
-  - **Example**: `FIREFOX_102_7_0esr_BUILD1`
 - `$(BROWSER_MAJOR)`: the browser major version
   - **Example**: `12`
 - `$(BROWSER_MINOR)`: the browser minor version
@@ -19,100 +16,74 @@
   - **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`
-- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch
-  - **Example**: `tor-browser-102.8.0esr-12.0-1`
-- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch
-  - **Example**: `tor-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=Apps%3A%3AType%3A%3AReleasePreparation) issue.
 
 ### Update Branch Protection Rules
 
-- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/settings/repository):
-  - [ ] Remove previous stable `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)
-  - [ ] Create new `base-browser` and `tor-browser` branch protection rule:
-    - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*`
-      - **Example**: `*-102.8.0esr-12.0-1*`
+- [ ] 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`
 
-### **Identify the Firefox Tagged Commit and Create New Branches**
-
-- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags
-   - **Example**: `FIREFOX_102_8_0esr_BUILD1`
-- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev
-  - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr102` branch to find the equivalent commit
-  - **Example**: `3a3a96c9eedd02296d6652dd50314fccbc5c4845`
-- [ ] Sign and Tag `gecko-dev` commit
-  - Sign/Tag `gecko-dev` commit :
-    - **Tag**: `$(ESR_TAG)`
-    - **Message**: `Hg tag $(ESR_TAG)`
-- [ ] Create new stable `base-browser` branch from tag
-  - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
-  - **Example**: `base-browser-102.8.0esr-12.0-1`
-- [ ] Create new stable `tor-browser` branch from
-  - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
-  - **Example**: `tor-browser-102.8.0esr-12.0-1`
-- [ ] Push new `base-browser` branch to `upstream`
-- [ ] Push new `tor-browser` branch to `upstream`
-- [ ] Push new `$(ESR_TAG)` to `upstream`
-
-### **Rebase tor-browser**
-
-- [ ] Checkout a new local branch for the `tor-browser` rebase
-  - **Example**: `git branch tor-browser-rebase FIREFOX_102_8_0esr_BUILD1`
-- [ ] **(Optional)** `base-browser` rebase
-  - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag
-  - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch
-    - **Example**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.0-1-build1`
-  - [ ] Rebase and autosquash these cherry-picked commits
-    - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD`
-  - [ ] Cherry-pick remainder of patches after the `buildN` tag
-    - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..upstream/base-browser-102.7.0esr-12.0-1`
-- [ ] `tor-browser` rebase
-  - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD`
-  - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag
-    - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..tor-browser-102.7.0esr-12.0-1-build1`
-    - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..tor-browser-102.7.0esr-12.0-1-build1`
-  - [ ] Rebase and autosquash these newly cherry-picked commits: `git rebase --autosquash --interactive $(PREV_HEAD)`
-     - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE`
-  - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag
-    - **Example**: `git cherry-pick tor-browser-102.7.0esr-12.0-1-build1..upstream/tor-browser-102.7.0esr-12.0-1`
+### **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 FIREFOX_102_8_0esr_RELEASE`
+    - **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 $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff`
-    - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff`
+    - `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 `tor-browser` branch)
-  - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD`
-    - **Example**: `git range-dif FIREFOX_102_7_0esr_BUILD1..upstream/tor-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD`
-- [ ] Open MR for the `tor-browser` rebase
+      - 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
-- Update and push `base-browser` branch
-  - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch
-  - [ ] Push these commits to `upstream`
 
 ### **Sign and Tag**
 
-- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch:
-  - In **tor-browser.git**, checkout the new stable `tor-browser` branch
-  - In **tor-browser-build.git**, run signing script:
-    ```bash
-    ./tools/browser/sign-tag.torbrowser stable build1
-    ```
-  - [ ] Push tag to `upstream`
-- [ ] Sign/Tag HEAD of the merged `base-browser` branch:
-  - In **tor-browser.git**, checkout the new stable `base-browser` branch
+- [ ] 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.basebrowser stable build1
+    ./tools/browser/sign-tag.mullvadbrowser stable build1
     ```
   - [ ] Push tag to `upstream`
 
@@ -120,6 +91,6 @@
 
 ---
 
-/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Product::MullvadBrowser"
 /label ~"Apps::Type::Rebase"
 /label ~"Apps::Priority::Blocker"

.gitlab/issue_templates/090 Emergency Security Issue.md

@@ -5,13 +5,11 @@
 ## Information
 
 ### Related Issue
-- tor-browser#AAAAA
 - mullvad-browser#BBBBB
 - tor-browser-build#CCCCC
 
 #### Affected Platforms
 
-- [ ] Android
 - [ ] Desktop
   - [ ] Windows
   - [ ] macOS
@@ -20,7 +18,9 @@
 ### Type of Issue: What are we dealing with?
 
 - [ ] Security (sandbox escape, remote code execution, etc)
-- [ ] Cross-Site Linkability (correlating sessions across websites)
+- [ ] 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)
 - [ ] Disk Leak (persisting session information to disk)
 - [ ] Other (please explain)
 
@@ -40,8 +40,8 @@
   - [ ] UX (**donuts**)
   - [ ] TPA (**anarcat**, **lavamind**)
 - [ ] External Tor Partners
-  - [ ] Mozilla (**tjr**)
-  - [ ] Mullvad (**ruihildt**)
+  - [ ] Mozilla
+  - [ ] Mullvad
   - [ ] Other (please list)
 
 ### Urgency: When do we need to act?
@@ -68,7 +68,6 @@ 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
@@ -91,7 +90,6 @@ Godspeed! :pray:
 
 /confidential
 
-/label ~"Apps::Product::TorBrowser"
 /label ~"Apps::Product::MullvadBrowser"
 /label ~"Apps::Type::Bug"
 /label ~"Apps::Priority::Blocker"

.gitlab/merge_request_templates/Rebase.md

+## Merge Info
+
+<!-- Bookkeeping information for release management -->
+
+### Rebase Issue
+- tor-browser#xxxxx
+- mullvad-browser#xxxxx
+
+### Release Prep Issue
+- tor-browser-build#xxxxx
+
+### Issue Tracking
+- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Apps%3A%3AType%3A%3AReleasePreparation&first_page_size=20) for changelog generation
+
+### Review
+
+#### Request Reviewer
+
+- [ ] Request review from a release engineer: boklm, dan, ma1, morgan, pierov
+
+#### Change Description
+
+<!-- Any interesting notes about the rebase and an overview of what the reviewer should expect from the diff of diffs and range-diff -->