[tor-bugs] #15197 [Tor Browser]: Rebase Tor Browser patches to ESR 45
Tor Bug Tracker & Wiki
blackhole at torproject.org
Sun Apr 10 15:14:45 UTC 2016
#15197: Rebase Tor Browser patches to ESR 45
-------------------------------------------------+-------------------------
Reporter: gk | Owner:
Type: task | arthuredelstein
Priority: Very High | Status:
Component: Tor Browser | needs_revision
Severity: Critical | Milestone:
Keywords: ff45-esr, TorBrowserTeam201604, | Version:
tbb-6.0a5 | Resolution:
Parent ID: | Actual Points:
Reviewer: | Points:
| Sponsor:
| SponsorU
-------------------------------------------------+-------------------------
Comment (by arthuredelstein):
Replying to [comment:27 gk]:
> arthuredelstein: When you are preparing a new branch, please don't
forget the 5 patches in #18290 that need to get applied, too (although I
still hope we can find a better fix instead of reverting Jacek's fix).
Ideally these should be the first ones on top of the Mozilla branch I
think. For the view management fix you need `--ignore-whitespace` when
using `git am`.
Here's the new branch, autosquashed including the 5 patches from #18290.
https://github.com/arthuredelstein/tor-browser/commits/15197+11
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/15197#comment:42>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list