Skip to content

MB 192: Rebased MB 12.5 stable on top of 102.13.0esr

Merge Info

Related Issues

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
    • Usual rebase

Merging

  • Merge to mullvad-browser - !fixups to tor-browser-specific commits, new features, security backports
  • Merge to base-browser -!fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • NOTE: if your changeset includes patches to both base-browser and mullvad-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

Change Description

Usual rebase.

I removed the commit that customized the MR template, since MB 188 completely overwrote it.

Also, I moved mullvad-browser#... on top instead of tor-browser#... for this repository.

Other differences are in the profile file, since we moved the related commits to base browser.

Edited by Pier Angelo Vendrame

Merge request reports