|
|
1
|
+## Merge Info
|
|
|
2
|
+
|
|
|
3
|
+<!-- Bookkeeping information for release management -->
|
|
|
4
|
+
|
|
|
5
|
+### Related Issues
|
|
|
6
|
+- tor-browser#xxxxx
|
|
|
7
|
+- tor-browser-build#xxxxx
|
|
|
8
|
+
|
|
|
9
|
+### Backporting
|
|
|
10
|
+
|
|
|
11
|
+#### Timeline
|
|
|
12
|
+- [ ] **Immediate**: patchset needed as soon as possible
|
|
|
13
|
+- [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport
|
|
|
14
|
+- [ ] **Eventually**: patchset that needs to be verified in alpha before backport
|
|
|
15
|
+- [ ] **No Backport (preferred)**: patchset for the next major stable
|
|
|
16
|
+
|
|
|
17
|
+#### (Optional) Justification
|
|
|
18
|
+- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc
|
|
|
19
|
+- [ ] **Censorship event**: patchset enables censorship circumvention
|
|
|
20
|
+- [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality
|
|
|
21
|
+- [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
|
|
|
22
|
+- [ ] **Sponsor required**: patchset required for sponsor
|
|
|
23
|
+- [ ] **Other**: please explain
|
|
|
24
|
+
|
|
|
25
|
+### Issue Tracking
|
|
|
26
|
+- [ ] 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
|
|
|
27
|
+
|
|
|
28
|
+### Review
|
|
|
29
|
+
|
|
|
30
|
+#### Request Reviewer
|
|
|
31
|
+
|
|
|
32
|
+- [ ] Request review from an applications developer depending on modified system:
|
|
|
33
|
+ - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
|
|
|
34
|
+ - **accessibility** : henry
|
|
|
35
|
+ - **android** : clairehurst, dan
|
|
|
36
|
+ - **build system** : boklm
|
|
|
37
|
+ - **extensions** : ma1
|
|
|
38
|
+ - **firefox internals (XUL/JS/XPCOM)** : ma1
|
|
|
39
|
+ - **fonts** : pierov
|
|
|
40
|
+ - **frontend (implementation)** : henry
|
|
|
41
|
+ - **frontend (review)** : donuts, richard
|
|
|
42
|
+ - **localization** : henry, pierov
|
|
|
43
|
+ - **macos** : clairehurst, dan
|
|
|
44
|
+ - **misc/other** : pierov, richard
|
|
|
45
|
+ - **nightly builds** : boklm
|
|
|
46
|
+ - **rebases/release-prep** : dan, ma1, pierov, richard
|
|
|
47
|
+ - **security** : ma1
|
|
|
48
|
+ - **signing** : boklm, richard
|
|
|
49
|
+ - **updater** : pierov
|
|
|
50
|
+
|
|
|
51
|
+#### Change Description
|
|
|
52
|
+
|
|
|
53
|
+<!-- 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 -->
|
|
|
54
|
+
|
|
|
55
|
+#### How Tested
|
|
|
56
|
+
|
|
|
57
|
+<!-- Description of steps taken to verify the change --> |
|
|
\ No newline at end of file |