| ... |
... |
@@ -2,23 +2,34 @@ |
|
2
|
2
|
|
|
3
|
3
|
<!-- Bookkeeping information for release management -->
|
|
4
|
4
|
|
|
5
|
|
-- ### Related Issues
|
|
6
|
|
- - tor-browser#xxxxx
|
|
7
|
|
- - tor-browser-build#xxxxx
|
|
8
|
|
- - etc
|
|
9
|
|
-
|
|
10
|
|
-- ### Backport Timeline
|
|
11
|
|
- - [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
|
|
12
|
|
- - [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
|
|
13
|
|
- - [ ] **Eventually** - patchset that needs to be verified in alpha before backport
|
|
14
|
|
- - [ ] **No Backport** - patchset for the next major stable
|
|
15
|
|
-
|
|
16
|
|
-- ### Upstream Merging
|
|
17
|
|
- - [ ] Merge to `base-browser` - typically for `!fixups` to patches in the `base-browser` branch, though sometimes new patches as well
|
|
18
|
|
- - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please please make separate merge requests for each part
|
|
19
|
|
-
|
|
20
|
|
-- ### Issue Tracking
|
|
21
|
|
- - [ ] 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
|
|
|
5
|
+### Related Issues
|
|
|
6
|
+- tor-browser#xxxxx
|
|
|
7
|
+- mullvad-browser#xxxxx
|
|
|
8
|
+- tor-browser-build#xxxxx
|
|
|
9
|
+
|
|
|
10
|
+### Backporting
|
|
|
11
|
+
|
|
|
12
|
+#### Timeline
|
|
|
13
|
+- [ ] **Immediate**: patchset needed as soon as possible
|
|
|
14
|
+- [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport
|
|
|
15
|
+- [ ] **Eventually**: patchset that needs to be verified in alpha before backport
|
|
|
16
|
+- [ ] **No Backport (preferred)**: patchset for the next major stable
|
|
|
17
|
+
|
|
|
18
|
+#### (Optional) Justification
|
|
|
19
|
+- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc
|
|
|
20
|
+- [ ] **Censorship event**: patchset enables censorship circumvention
|
|
|
21
|
+- [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality
|
|
|
22
|
+- [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
|
|
|
23
|
+- [ ] **Sponsor required**: patchset required for sponsor
|
|
|
24
|
+- [ ] **Other**: please explain
|
|
|
25
|
+
|
|
|
26
|
+### Merging
|
|
|
27
|
+- [ ] Merge to `tor-browser` - `!fixups` to `tor-browser`-specific commits, new features, security backports
|
|
|
28
|
+- [ ] Merge to `base-browser` -`!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports
|
|
|
29
|
+ - **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
|
|
|
30
|
+
|
|
|
31
|
+### Issue Tracking
|
|
|
32
|
+- [ ] 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
|
|
22
|
33
|
|
|
23
|
34
|
## Change Description
|
|
24
|
35
|
|