Forked from
The Tor Project / Applications / Tor Browser
130435 commits behind, 876 commits ahead of the upstream repository.
-
Richard Pospesel authored- removed exta unneeded dashes - updated Backporting section to better match our desired process going forward: - discourage requests for backport to stable - provide justification for backport request from list proposed at last Tor meeting - added 'consistency' justification for patches/changes which can be difficult to context switch between but don't affect the final build output - added explicit merge destination selectionRichard Pospesel authored- removed exta unneeded dashes - updated Backporting section to better match our desired process going forward: - discourage requests for backport to stable - provide justification for backport request from list proposed at last Tor meeting - added 'consistency' justification for patches/changes which can be difficult to context switch between but don't affect the final build output - added explicit merge destination selection
default.md 1.79 KiB
Merge Info
Related Issues
- tor-browser#xxxxx
- mullvad-browser#xxxxx
- tor-browser-build#xxxxx
Backporting
Timeline
- Immediate: patchset needed as soon as possible
- 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
- No Backport (preferred): patchset for the next major stable
(Optional) Justification
- Emergency security update: patchset fixes CVEs, 0-days, etc
- 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
- Sponsor required: patchset required for sponsor
- Other: please explain
Merging
-
Merge to
tor-browser-!fixupstotor-browser-specific commits, new features, security backports -
Merge to
base-browser-!fixupstobase-browser-specific commits, new features to be shared withmullvad-browser, and security backports-
NOTE: if your changeset includes patches to both
base-browserandtor-browserplease clearly label in the change description which commits should be cherry-picked tobase-browserafter merging
-
NOTE: if your changeset includes patches to both
Issue Tracking
- Link resolved issues with appropriate Release Prep issue for changelog generation