[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_revision
 Priority:  Very High                 |      Milestone:
Component:  Applications/Tor Browser  |        Version:
 Severity:  Normal                    |     Resolution:
 Keywords:  TorBrowserTeam201805      |  Actual Points:
Parent ID:  #25741                    |         Points:
 Reviewer:                            |        Sponsor:
--------------------------------------+---------------------------------

Comment (by mcs):

 Replying to [comment:22 gk]:
 > ...
 > The patch for 19411 is missing (fee72fffc081)

 Kathy and I looked at #19411 and have determined that the patch is
 obsolete. Code examination shows that when Mozilla switched to the
 doorhanger-based UI they also rewrote the code that adds the badges to the
 hamburger menu. We will comment in the corresponding Bugzilla bug.

 > aede530c3ec8850224b7f6c49c1d7e1466684639 -- not okay (9ae35ba3c07e)

 Kathy and I will handle this one.

 > 5c9aa89a778d10d19b55736abfcb63b745e14379 -- not okay (4c9f746f2c19)

 Kathy and I will handle this one too. I made a few comments below.

 > {{{
 > -  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release
 > -  MAR_CHANNEL_ID=firefox-mozilla-release
 > }}}
 > This should be "firefox-mozilla-esr" respectively (I guess you rebased
 the patch before there was a dedicated esr60 branch)

 Yes, that is what happened.

 > aurora|alpha|beta|hardened|release|esr (and at other places) <- we don't
 have the hardened series anymore

 We left that in "just in case" but will leave it out.

 > Do we need
 > {{{
 > -      let prereleaseChannels = ["nightly", "aurora", "beta"];
 > +      let prereleaseChannels = ["nightly", "aurora", "alpha", "beta"];
 > }}}
 > ?

 This is not really needed since it is in telemetry code. We will leave it
 out.
 >
 > The "extensions.lastTorBrowserVersion" part spilled over into
 AddonsManager.jsm from #13052 + adding the AddonManager.jsm in
 toolkit/mozapps/extensions/moz.build

 You meant #13252. After talking to Kathy, I remember that we intentionally
 moved that code from #13252 to #4234 (but we can move it back if you think
 that makes more sense).

 > {{{
 > +  done <"${tmpfile}"
 > }}}
 > add a whitespace between "<" and "\""

 We followed the format that Mozilla used just above in `list_dirs`.

 > mcs/brade: how do you feel addressing #24476 while you are at it?

 Sure, we can do that.

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