[tor-bugs] #15197 [Tor Browser]: Rebase Tor Browser patches to ESR 45

[Tor Bug Tracker & Wiki]

#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:31 mcs]:
 > Replying to [comment:24 mcs]:
 > > For #12827 (f1a5dfae111d9ab281e766a67ae00559cc13578a), some additional
 changes are needed.  Kathy and I can provide a fixup patch or a revised
 patch; which one do you prefer?
 >
 > We went ahead and created a replacement patch. I will attach it to this
 ticket.

 I reviewed this patch and it looks good to me. If gk thinks it looks OK as
 well, I will add it to our branch. In case it's useful for reviewing,
 here's a fixup version of the same patch:
 https://github.com/arthuredelstein/tor-
 browser/commit/9947fad289055f7ed973271d4e78a3bad87d0383

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/15197#comment:55>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online