morgan pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / 
Applications / Tor Browser


Commits:
5fd73855 by Pier Angelo Vendrame at 2025-01-22T15:07:58+00:00
fixup! Adding issue and merge request templates

Remove "Emergency" from security updates as per today's meeting.

Our policy usually is to backport (almost) all emergency fixes, sooner
or later. The actual emergency can be inferred from the timeline.

- - - - -


1 changed file:

- .gitlab/merge_request_templates/default.md


Changes:

=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -35,12 +35,12 @@
 
 #### Timeline
 - [ ] **No Backport (preferred)**: patchset for the next major stable
-- [ ] **Immediate**: patchset needed as soon as possible
+- [ ] **Immediate**: patchset needed as soon as possible (fixes CVEs, 0-days, 
etc)
 - [ ] **Next Minor Stable Release**: patchset that needs to be verified in 
nightly before backport
 - [ ] **Eventually**: patchset that needs to be verified in alpha before 
backport
 
 #### (Optional) Justification
-- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc
+- [ ] **Security update**: patchset contains a security fix (be sure to select 
the correct item in _Timeline_)
 - [ ] **Censorship event**: patchset enables censorship circumvention
 - [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality
 - [ ] **Consistency**: patchset which would make development easier if it were 
in both the alpha and release branches; developer tools, build system changes, 
etc



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5fd7385557de7c89185a1e99985f9cdef7ea4404

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5fd7385557de7c89185a1e99985f9cdef7ea4404
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to