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

Tor Bug Tracker & Wiki blackhole at torproject.org
Fri May 25 11:46:46 UTC 2018

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

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


 Replying to [comment:36 arthuredelstein]:
 > Here's my new branch for review:
 > https://github.com/arthuredelstein/tor-browser/commits/25543+13

 Thanks, we are getting closer! Could you rebase the next branch onto the
 commit used for 60.0.1esr (it won't have the bulk of the Windows build
 fixes, but that's okay as we'll cherry-pick those once we get to the
 Windows builds)?

 Here is what I did: I created two branches, one with the patches from
 `25543+8` and one with the patches from `25543+13`, rebased both to the
 latest esr60 commit and diffed them with `git diff` then I compared the
 result to my notes from the `25543+8` review and tried to make sure
 everything that should have been changed got changed and everything that
 should have been gone was gone (and that the remaining things staid as
 they were).

 I've yet to give the permissions related patch a second look and have not
 looked at the external helper app patch.

 mcs/brade could you help with the latter? I think it's commit
 50f1dc0847958df657529be88b32410c57969a9e (feel free to have another look
 at the permissions one, too, if you like

 Alright, here comes the feedback:

 1) f89d5a6b2775cfb9a0f45669640c73c9ef9855a6 needs to go, it is disabling
 our hash check for the downloaded MAR files.

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

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

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

 > > a4ae1392fffd7aa6ae1ba28575bad6de3b3489a3 -- not okay (ba141b6054ea)
 > >
 > > Not needed anymore as `showModalDialog()` is gone (see:
 > Removed.

 No, the preference is still there.

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

More information about the tbb-bugs mailing list