[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:
                                             |  needs_review
 Priority:  Very High                        |      Milestone:
Component:  Applications/Tor Browser         |        Version:
 Severity:  Normal                           |     Resolution:
 Keywords:  TorBrowserTeam201805R, ff60-esr  |  Actual Points:
Parent ID:  #25741                           |         Points:
 Reviewer:                                   |        Sponsor:
---------------------------------------------+-----------------------------
Changes (by arthuredelstein):

 * keywords:  TorBrowserTeam201805, ff60-esr => TorBrowserTeam201805R,
     ff60-esr
 * status:  needs_revision => needs_review


Comment:

 Here's the new branch: https://github.com/arthuredelstein/tor-
 browser/commits/25543+15 (fe68460a72cddd936a5a313a2f986bafd9e7e7ef)

 Replying to [comment:39 gk]:
 > 1) f89d5a6b2775cfb9a0f45669640c73c9ef9855a6 needs to go, it is disabling
 our hash check for the downloaded MAR files.

 Removed.

 > > > 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

 > > > aa9b5e2811ab86a66d7ee20eec981c110a23c7a0 -- not okay (c79b911518ed)
 > > >
 > > > This got upstreamed in
 https://bugzilla.mozilla.org/show_bug.cgi?id=1382359. We should do a fixup
 commit setting `dom.securecontext.whitelist_onions` to `true` and that's
 it. So "C c79b911518ed" -> "U c79b911518ed"
 > >
 > > I removed this commit. And the pref is there.
 >
 > No, it is gone on your branch, please add it.

 Oops -- added back.

 > > > ee6b576bc2a9f5c885ae9f027dd1bd4e78ab86ce -- not okay (2646633951fe)
 > > >
 > > > That's not needed anymore given that
 https://bugzilla.mozilla.org/show_bug.cgi?id=1418052 landed.
 > >
 > > Removed.
 >
 > No, the patch is still there (commit
 6a5d740cd85de6e2ea97e33f705cb0633893bff5).

 Ok, actually removed.

 > > > a4ae1392fffd7aa6ae1ba28575bad6de3b3489a3 -- not okay (ba141b6054ea)
 > > >
 > > > Not needed anymore as `showModalDialog()` is gone (see:
 https://bugzilla.mozilla.org/show_bug.cgi?id=981796)
 > >
 > > Removed.
 >
 > No, the preference is still there.

 Removed properly now.

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