Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
85c86696
by Richard Pospesel at 2023-02-23T18:40:14+00:00
3 changed files:
- + .gitlab/issue_templates/Backport Android Security Fixes.md
- + .gitlab/issue_templates/Rebase Browser - Alpha.md
- + .gitlab/issue_templates/Rebase Browser - Stable.md
Changes:
1 | +<details>
|
|
2 | + <summary>Explanation of Variables</summary>
|
|
3 | +- `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc
|
|
4 | + - example : `102.8.0`
|
|
5 | +- `$(RR_VERSION)` : the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train.
|
|
6 | + - example: `110`
|
|
7 | +- `$(TOR_BROWSER_MAJOR)` : the Tor Browser major version
|
|
8 | + - example : `12`
|
|
9 | +- `$(TOR_BROWSER_MINOR)` : the Tor Browser minor version
|
|
10 | + - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
|
|
11 | +- `$(BUILD_N)` : a project's build revision within a its branch; many of the Firefox-related projects have a `$(BUILD_N)` suffix and may differ between projects even when they contribute to the same build.
|
|
12 | + - example : `build1`
|
|
13 | +</details>
|
|
14 | + |
|
15 | +**NOTE:** It is assumed the `tor-browser` rebase has already happened and there exists a `build1` build tag for both `base-browser` and `tor-browser`
|
|
16 | + |
|
17 | +### **Bookkeeping**
|
|
18 | + |
|
19 | +- [ ] 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) issues (stable and alpha).
|
|
20 | + |
|
21 | +### **Security Vulnerabilities Report** : https://www.mozilla.org/en-US/security/advisories/
|
|
22 | + |
|
23 | +- Potentially Affected Components:
|
|
24 | + - `firefox`/`geckoview` : https://github.com/mozilla/gecko-dev
|
|
25 | + - `application-services` : https://github.com/mozilla/application-services
|
|
26 | + - `android-components` : https://github.com/mozilla-mobile/firefox-android
|
|
27 | + - `fenix` : https://github.com/mozilla-mobile/firefox-android
|
|
28 | + |
|
29 | +**NOTE:** `android-components` and `fenix` used to have their own repos, but since November 2022 they have converged to a single `firefox-android` repo. Any backports will require manually porting patches over to our legacy repos.
|
|
30 | + |
|
31 | +- [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create a candidate list of CVEs which potentially need to be backported in this issue:
|
|
32 | + - CVEs which are explicitly labeled as 'Android' only
|
|
33 | + - CVEs which are fixed in Rapid Release but not in ESR
|
|
34 | + - 'Memory safety bugs' fixed in Rapid Release but not in ESR
|
|
35 | +- [ ] Foreach issue:
|
|
36 | + - Create link to the CVE on [mozilla.org](https://www.mozilla.org/en-US/security/advisories/)
|
|
37 | + - example: https://www.mozilla.org/en-US/security/advisories/mfsa2023-05/#CVE-2023-25740
|
|
38 | + - Create link to the associated Bugzilla issues (found in the CVE description)
|
|
39 | + - Create a link to the relevant `gecko-dev`/other commit hashes which need to be backported OR a brief justification for why the fix does not need to be backported
|
|
40 | + - To find the `gecko-dev` version of a `mozilla-central`, search for a unique string in the relevant `mozilla-central` commit message in the `gecko-dev/release` branch log.
|
|
41 | + - **NOTE:** This process is unfortunately somewhat poorly defined/ad-hoc given the general variation in how Bugzilla issues are labeled and resolved. In general this is going to involve a bit of hunting to identify needed commits or determining whether or not the fix is relevant.
|
|
42 | + |
|
43 | + |
|
44 | +### **tor-browser** : https://gitlab.torproject.org/tpo/applications/tor-browser.git
|
|
45 | +- [ ] Backport any Android-specific security fixes from Firefox rapid-release
|
|
46 | + - [ ] Sign/Tag commit:
|
|
47 | + - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)`
|
|
48 | + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)`
|
|
49 | + - [ ] Push tag to `origin`
|
|
50 | +**OR**
|
|
51 | +- [ ] No backports
|
|
52 | + |
|
53 | +### **application-services** : *TODO: we will need to setup a gitlab copy of this repo that we can apply security backports to if there are ever any security issues here*
|
|
54 | +- [ ] Backport any Android-specific security fixes from Firefox rapid-release
|
|
55 | + - [ ] Sign/Tag commit:
|
|
56 | + - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)`
|
|
57 | + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha`
|
|
58 | + - [ ] Push tag to `origin`
|
|
59 | + **OR**
|
|
60 | +- [ ] No backports
|
|
61 | + |
|
62 | + |
|
63 | +### **android-components** : https://gitlab.torproject.org/tpo/applications/android-components.git
|
|
64 | +- [ ] Backport any Android-specific security fixes from Firefox rapid-release
|
|
65 | + - **NOTE**: Since November 2022, this repo has been merged with `fenix` into a singular `firefox-android` repo: https://github.com/mozilla-mobile/firefox-android. Any backport will require a patch rewrite to apply to our legacy `android-components` project.
|
|
66 | + - [ ] Sign/Tag commit:
|
|
67 | + - Tag : `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)`
|
|
68 | + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)`
|
|
69 | + - [ ] Push tag to `origin`
|
|
70 | +**OR**
|
|
71 | +- [ ] No backports
|
|
72 | + |
|
73 | + |
|
74 | +### **fenix** : https://gitlab.torproject.org/tpo/applications/fenix.git
|
|
75 | +- [ ] Backport any Android-specific security fixes from Firefox rapid-release
|
|
76 | + - **NOTE**: Since February 2023, this repo has been merged with `android-components` into a singular `firefox-android` repo: https://github.com/mozilla-mobile/firefox-android. Any backport will require a patch rewrite to apply to our legacy `fenix` project.
|
|
77 | + - [ ] Sign/Tag commit:
|
|
78 | + - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)`
|
|
79 | + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)`
|
|
80 | + - [ ] Push tag to `origin`
|
|
81 | +**OR**
|
|
82 | +- [ ] No backports
|
|
83 | + |
|
84 | +### CVEs
|
|
85 | + |
|
86 | +<!-- Create CVE resolution here -->
|
|
87 | + |
|
88 | +/confidential |
1 | +**NOTE:** All examples reference the rebase from 102.7.0esr to 102.8.0esr
|
|
2 | + |
|
3 | +<details>
|
|
4 | + <summary>Explanation of Variables</summary>
|
|
5 | +- `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc
|
|
6 | + - example : `102.8.0`
|
|
7 | +- `$(ESR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`
|
|
8 | + - example : `FIREFOX_102_8_0esr_RELEASE`
|
|
9 | +- `$(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)
|
|
10 | +- `$(BROWSER_MAJOR)` : the browser major version
|
|
11 | + - example : `12`
|
|
12 | +- `$(BROWSER_MINOR)` : the browser minor version
|
|
13 | + - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
|
|
14 | +- `$(BASE_BROWSER_BRANCH)` : the full name of the current `base-browser` branch
|
|
15 | + - example: `base-browser-102.8.0esr-12.5-1`
|
|
16 | +- `$(BASE_BROWSER_BRANCH_PREV)` : the full name of the previous `base-browser` branch
|
|
17 | + - example: `base-browser-102.7.0esr-12.5-1`
|
|
18 | +- `$(TOR_BROWSER_BRANCH)` : the full name of the current `tor-browser` branch
|
|
19 | + - example: `tor-browser-102.8.0esr-12.5-1`
|
|
20 | +- `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous `tor-browser` branch
|
|
21 | + - example: `tor-browser-102.7.0esr-12.5-1`
|
|
22 | +</details>
|
|
23 | + |
|
24 | +**NOTE:** It is assumed that we've already identified the new esr branch during the tor-browser stable rebase
|
|
25 | + |
|
26 | +### **Bookkeeping**
|
|
27 | + |
|
28 | +- [ ] 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.
|
|
29 | + |
|
30 | +### **Rebase base-browser**
|
|
31 | + |
|
32 | +- [ ] Checkout a new branch for the `base-browser` rebase
|
|
33 | + - example: `git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1`
|
|
34 | +- [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `build1` tag onto new `base-browser` rebase branch
|
|
35 | + - example: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.5-1-build1`
|
|
36 | +- [ ] Rebase and autosquash these cherry-picked commits
|
|
37 | + - example: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD`
|
|
38 | +- [ ] Cherry-pick remainder of patches after the `build1` tag
|
|
39 | + - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1 origin/base-browser-102.7.0esr-12.5-1`
|
|
40 | +- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
|
|
41 | + - [ ] diff of diffs:
|
|
42 | + - 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 -
|
|
43 | + - `git diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) > current_patchset.diff`
|
|
44 | + - `git diff $(ESR_TAG)..$(BASE_BROWSER_BRANCH) > rebased_patchset.diff`
|
|
45 | + - diff `current_patchset.diff` and `rebased_patchset.diff`
|
|
46 | + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456`
|
|
47 | + - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD`
|
|
48 | + - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/base-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD`
|
|
49 | +- [ ] Open MR for the `base-browser` rebase
|
|
50 | +- [ ] Merge
|
|
51 | +- [ ] Sign/Tag HEAD of the merged new `base-browser` branch:
|
|
52 | + - Tag : `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
|
|
53 | + - Message : `Tagging build1 for $(ESR_VERSION)esr-based alpha`
|
|
54 | +- [ ] Push tag to `origin`
|
|
55 | + |
|
56 | +### **Rebase tor-browser**
|
|
57 | + |
|
58 | +- [ ] Checkout a new branch for the `tor-browser` rebase starting from the `base-browser` `build1` tag
|
|
59 | + - example: `git branch tor-browser-rebase base-browser-102.8.0esr-12.5-1-build1`
|
|
60 | +- [ ] Cherry-pick the previous `tor-browser` commits from `base-browser`'s previous `build1` tag up to `tor-browser`'s newest `buildN` tag (not necessarily `build1` if we have multiple build tags)
|
|
61 | + - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..tor-browser-102.7.0esr-12.5-1-build1`
|
|
62 | +- [ ] Rebase and autosquash these cherry-picked commits (from the last new `base-browser` commit to `HEAD`)
|
|
63 | + - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.5-1-build1 HEAD`
|
|
64 | +- [ ] Cherry-pick remainder of patches after the last `buildN` tag
|
|
65 | + - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..origin/tor-browser-102.7.0esr-12.5-1`
|
|
66 | +- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
|
|
67 | + - [ ] diff of diffs:
|
|
68 | + - 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 -
|
|
69 | + - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff`
|
|
70 | + - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff`
|
|
71 | + - diff `current_patchset.diff` and `rebased_patchset.diff`
|
|
72 | + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456`
|
|
73 | + - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD`
|
|
74 | + - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD`
|
|
75 | +- [ ] Open MR for the `tor-browser` rebase
|
|
76 | +- [ ] Merge
|
|
77 | +- [ ] Sign/Tag HEAD of the merged new `tor-browser` branch:
|
|
78 | + - Tag : `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
|
|
79 | + - Message : `Tagging build1 for $(ESR_VERSION)esr-based alpha`
|
|
80 | +- [ ] Push tag to `origin`
|
|
81 | + |
1 | +**NOTE:** All examples reference the rebase from 102.7.0esr to 102.8.0esr
|
|
2 | + |
|
3 | +<details>
|
|
4 | + <summary>Explanation of variables</summary>
|
|
5 | +- `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc
|
|
6 | + - example : `102.8.0`
|
|
7 | +- `$(ESR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`
|
|
8 | + - example : `FIREFOX_102_8_0esr_RELEASE`
|
|
9 | +- `$(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)
|
|
10 | +- `$(BROWSER_MAJOR)` : the browser major version
|
|
11 | + - example : `12`
|
|
12 | +- `$(BROWSER_MINOR)` : the browser minor version
|
|
13 | + - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
|
|
14 | +- `$(BASE_BROWSER_BRANCH)` : the full name of the current `base-browser` branch
|
|
15 | + - example: `base-browser-102.8.0esr-12.0-1`
|
|
16 | +- `$(BASE_BROWSER_BRANCH_PREV)` : the full name of the previous `base-browser` branch
|
|
17 | + - example: `base-browser-102.7.0esr-12.0-1`
|
|
18 | +- `$(TOR_BROWSER_BRANCH)` : the full name of the current `tor-browser` branch
|
|
19 | + - example: `tor-browser-102.8.0esr-12.0-1`
|
|
20 | +- `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous `tor-browser` branch
|
|
21 | + - example: `tor-browser-102.7.0esr-12.0-1`
|
|
22 | +</details>
|
|
23 | + |
|
24 | +### **Bookkeeping**
|
|
25 | + |
|
26 | +- [ ] 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.
|
|
27 | + |
|
28 | +### **Identify the Firefox Tagged Commit and Create New Branches**
|
|
29 | + |
|
30 | +- [ ] Find the Firefox mercurial tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags
|
|
31 | + - example: `FIREFOX_102_8_0esr_BUILD1`
|
|
32 | +- [ ] Find the analogous `gecko-dev` commit : https://github.com/mozilla/gecko-dev
|
|
33 | + - Search for unique string found in the mercurial commit in the `gecko-dev/esr102` branch
|
|
34 | + - example: 3a3a96c9eedd02296d6652dd50314fccbc5c4845
|
|
35 | +- [ ] Sign and Tag `gecko-dev` commit
|
|
36 | + - Sign/Tag `gecko-dev` commit :
|
|
37 | + - Tag : `$(ESR_TAG)`
|
|
38 | + - Message : `Hg tag $(ESR_TAG)`
|
|
39 | +- [ ] Create new stable `base-browser` branch from tag
|
|
40 | + - branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
|
|
41 | + - example: `base-browser-102.8.0esr-12.0-1`
|
|
42 | +- [ ] Create new stable `tor-browser` branch from
|
|
43 | + - branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
|
|
44 | + - example: `tor-browser-102.8.0esr-12.0-1`
|
|
45 | +- [ ] Push new `base-browser` branch to `origin`
|
|
46 | +- [ ] Push new `tor-browser` branch to `origin`
|
|
47 | +- [ ] Push new `$(ESR_TAG)` to `origin`
|
|
48 | + |
|
49 | +### **Rebase base-browser**
|
|
50 | + |
|
51 | +- [ ] Checkout a new branch for the `base-browser` rebase
|
|
52 | + - example: `git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1`
|
|
53 | +- [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `build1` tag onto new `base-browser` rebase branch
|
|
54 | + - example: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.0-1-build1`
|
|
55 | +- [ ] Rebase and autosquash these cherry-picked commits
|
|
56 | + - example: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD`
|
|
57 | +- [ ] Cherry-pick remainder of patches after the `build1` tag
|
|
58 | + - example: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1 origin/base-browser-102.7.0esr-12.0-1`
|
|
59 | +- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
|
|
60 | + - [ ] diff of diffs:
|
|
61 | + - 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 -
|
|
62 | + - `git diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) > current_patchset.diff`
|
|
63 | + - `git diff $(ESR_TAG)..$(BASE_BROWSER_BRANCH) > rebased_patchset.diff`
|
|
64 | + - diff `current_patchset.diff` and `rebased_patchset.diff`
|
|
65 | + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456`
|
|
66 | + - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD`
|
|
67 | + - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/base-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD`
|
|
68 | +- [ ] Open MR for the `base-browser` rebase
|
|
69 | +- [ ] Merge
|
|
70 | +- [ ] Sign/Tag HEAD of the merged new `base-browser` branch:
|
|
71 | + - Tag : `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
|
|
72 | + - Message : `Tagging build1 for $(ESR_VERSION)esr-based stable`
|
|
73 | +- [ ] Push tag to `origin`
|
|
74 | + |
|
75 | +### **Rebase tor-browser**
|
|
76 | + |
|
77 | +- [ ] Checkout a new branch for the `tor-browser` rebase starting from the `base-browser` `build1` tag
|
|
78 | + - example: `git branch tor-browser-rebase base-browser-102.8.0esr-12.0-1-build1`
|
|
79 | +- [ ] Cherry-pick the previous `tor-browser` commits from `base-browser`'s previous `build1` tag up to `tor-browser`'s newest `buildN` tag (not necessarily `build1` if we have multiple build tags)
|
|
80 | + - example: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..tor-browser-102.7.0esr-12.0-1-build1`
|
|
81 | +- [ ] Rebase and autosquash these cherry-picked commits (from the last new `base-browser` commit to `HEAD`)
|
|
82 | + - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.0-1-build1 HEAD`
|
|
83 | +- [ ] Cherry-pick remainder of patches after the last `buildN` tag
|
|
84 | + - example: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..origin/tor-browser-102.7.0esr-12.0-1`
|
|
85 | +- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
|
|
86 | + - [ ] diff of diffs:
|
|
87 | + - 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 -
|
|
88 | + - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff`
|
|
89 | + - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff`
|
|
90 | + - diff `current_patchset.diff` and `rebased_patchset.diff`
|
|
91 | + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456`
|
|
92 | + - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD`
|
|
93 | + - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD`
|
|
94 | +- [ ] Open MR for the `tor-browser` rebase
|
|
95 | +- [ ] Merge
|
|
96 | +- [ ] Sign/Tag HEAD of the merged new `tor-browser` branch:
|
|
97 | + - Tag : `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
|
|
98 | + - Message : `Tagging build1 for $(ESR_VERSION)esr-based stable`
|
|
99 | +- [ ] Push tag to `origin`
|
|
100 | + |