| ... |
... |
@@ -2,18 +2,42 @@ |
|
2
|
2
|
|
|
3
|
3
|
<!-- Bookkeeping information for release management -->
|
|
4
|
4
|
|
|
5
|
|
-### Related Issues
|
|
|
5
|
+### Issues
|
|
|
6
|
+
|
|
|
7
|
+#### Resolves
|
|
6
|
8
|
- tor-browser#xxxxx
|
|
7
|
9
|
- mullvad-browser#xxxxx
|
|
8
|
10
|
- tor-browser-build#xxxxx
|
|
9
|
11
|
|
|
|
12
|
+#### Related
|
|
|
13
|
+
|
|
|
14
|
+- tor-browser#xxxxx
|
|
|
15
|
+- mullvad-browser#xxxxx
|
|
|
16
|
+- tor-browser-build#xxxxx
|
|
|
17
|
+
|
|
|
18
|
+### Merging
|
|
|
19
|
+
|
|
|
20
|
+<!-- This block tells the merger where commits need to be merged and future code archaeologists where commits were *supposed* to be merged -->
|
|
|
21
|
+
|
|
|
22
|
+#### Target Branches
|
|
|
23
|
+
|
|
|
24
|
+- [ ] **`tor-browser`** - `!fixups` to `tor-browser`-specific commits, new features, security backports
|
|
|
25
|
+- [ ] **`base-browser`** *and* **`mullvad-browser`** - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports
|
|
|
26
|
+ - ⚠️ **IMPORTANT**: Please list the `base-browser`-specific commits which need to be cherry-picked to the `base-browser` and `mullvad-browser` branches here
|
|
|
27
|
+
|
|
|
28
|
+#### Target Channels
|
|
|
29
|
+
|
|
|
30
|
+- [ ] **Alpha**: esr128-14.5
|
|
|
31
|
+- [ ] **Stable**: esr128-14.0
|
|
|
32
|
+- [ ] **Legacy**: esr115-13.5
|
|
|
33
|
+
|
|
10
|
34
|
### Backporting
|
|
11
|
35
|
|
|
12
|
36
|
#### Timeline
|
|
|
37
|
+- [ ] **No Backport (preferred)**: patchset for the next major stable
|
|
13
|
38
|
- [ ] **Immediate**: patchset needed as soon as possible
|
|
14
|
39
|
- [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport
|
|
15
|
40
|
- [ ] **Eventually**: patchset that needs to be verified in alpha before backport
|
|
16
|
|
-- [ ] **No Backport (preferred)**: patchset for the next major stable
|
|
17
|
41
|
|
|
18
|
42
|
#### (Optional) Justification
|
|
19
|
43
|
- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc
|
| ... |
... |
@@ -24,11 +48,6 @@ |
|
24
|
48
|
- [ ] **Localization**: typos and other localization changes that should be also in the release branch
|
|
25
|
49
|
- [ ] **Other**: please explain
|
|
26
|
50
|
|
|
27
|
|
-### Merging
|
|
28
|
|
-- [ ] Merge to `tor-browser` - `!fixups` to `tor-browser`-specific commits, new features, security backports
|
|
29
|
|
-- [ ] Merge to `base-browser` - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports
|
|
30
|
|
- - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please clearly label in the change description which commits should be cherry-picked to `base-browser` after merging
|
|
31
|
|
-
|
|
32
|
51
|
### Issue Tracking
|
|
33
|
52
|
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
|
|
34
|
53
|
|
| ... |
... |
@@ -37,7 +56,7 @@ |
|
37
|
56
|
#### Request Reviewer
|
|
38
|
57
|
|
|
39
|
58
|
- [ ] Request review from an applications developer depending on modified system:
|
|
40
|
|
- - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
|
|
|
59
|
+ - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since Gitlab only allows 1 reviewer)
|
|
41
|
60
|
- **accessibility** : henry
|
|
42
|
61
|
- **android** : clairehurst, dan
|
|
43
|
62
|
- **build system** : boklm
|
| ... |
... |
@@ -45,21 +64,22 @@ |
|
45
|
64
|
- **firefox internals (XUL/JS/XPCOM)** : jwilde, ma1
|
|
46
|
65
|
- **fonts** : pierov
|
|
47
|
66
|
- **frontend (implementation)** : henry
|
|
48
|
|
- - **frontend (review)** : donuts, richard
|
|
|
67
|
+ - **frontend (review)** : donuts, morgan
|
|
49
|
68
|
- **localization** : henry, pierov
|
|
50
|
69
|
- **macOS** : clairehurst, dan
|
|
51
|
70
|
- **nightly builds** : boklm
|
|
52
|
|
- - **rebases/release-prep** : dan, ma1, pierov, richard
|
|
|
71
|
+ - **rebases/release-prep** : dan, ma1, pierov, morgan
|
|
53
|
72
|
- **security** : jwilde, ma1
|
|
54
|
|
- - **signing** : boklm, richard
|
|
|
73
|
+ - **signing** : boklm, morgan
|
|
55
|
74
|
- **updater** : pierov
|
|
56
|
|
- - **windows** : jwilde, richard
|
|
57
|
|
- - **misc/other** : pierov, richard
|
|
|
75
|
+ - **windows** : jwilde, morgan
|
|
|
76
|
+ - **misc/other** : pierov, morgan
|
|
58
|
77
|
|
|
59
|
78
|
#### Change Description
|
|
60
|
79
|
|
|
61
|
80
|
<!-- Whatever context the reviewer needs to effectively review the patchset; if the patch includes UX updates be sure to include screenshots/video of how any new behaviour -->
|
|
62
|
81
|
|
|
|
82
|
+
|
|
63
|
83
|
#### How Tested
|
|
64
|
84
|
|
|
65
|
85
|
<!-- Description of steps taken to verify the change --> |