[tbb-bugs] #25543 [Applications/Tor Browser]: Rebase Tor Browser patches for ESR60

[Tor Bug Tracker & Wiki]

#25543: Rebase Tor Browser patches for ESR60
---------------------------------------------+-----------------------------
 Reporter:  gk                               |          Owner:
                                             |  arthuredelstein
     Type:  task                             |         Status:  closed
 Priority:  Very High                        |      Milestone:
Component:  Applications/Tor Browser         |        Version:
 Severity:  Normal                           |     Resolution:  fixed
 Keywords:  TorBrowserTeam201805R, ff60-esr  |  Actual Points:
Parent ID:  #25741                           |         Points:
 Reviewer:                                   |        Sponsor:
---------------------------------------------+-----------------------------
Changes (by gk):

 * status:  needs_review => closed
 * resolution:   => fixed


Comment:

 Replying to [comment:45 arthuredelstein]:
 > > > > Why is `browser_permissions.js` suddenly deleted?
 > > > > You are adding `^M` characters to `test_permmanager_defaults.js`
 when doing changes.
 > > >
 > > > Fixed (I have rebased the existing Permissions patch for now.)
 > >
 > > I still see those characters. I think you can get rid of them by
 converting that file using `dos2unix` or some similar tool.
 >
 > I'm not seeing the characters -- maybe I'm missing something? The new
 commit is fe68460a72cddd936a5a313a2f986bafd9e7e7ef

 I see those by doing `git show -p -1
 extensions/cookie/test/unit/test_permmanager_defaults.js`. The problem
 seems actually to be that the patch for bug 1421992 is causing this. Thus,
 if Mozilla thinks this is okay, then be it so.

 This looks fine to me now. I added just one fixup commit to remove a
 superfluous newline that got added during the last revision and pushed
 `tor-browser-60.0.1esr-8.0-1` to our `tor-browser` repo. \o/

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