[tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile and desktop patches

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile and desktop patches
-------------------------------------------------+-------------------------
 Reporter:  sysrqb                               |          Owner:  acat
     Type:  task                                 |         Status:
                                                 |  needs_revision
 Priority:  Medium                               |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tbb-9.5, ReleaseTrainMigration,      |  Actual Points:
  TorBrowserTeam202006                           |
Parent ID:  #33656                               |         Points:  1
 Reviewer:  sysrqb, gk                           |        Sponsor:
                                                 |  Sponsor58-must
-------------------------------------------------+-------------------------
Changes (by gk):

 * keywords:  tbb-9.5, ReleaseTrainMigration, TorBrowserTeam202006R =>
     tbb-9.5, ReleaseTrainMigration, TorBrowserTeam202006
 * status:  needs_review => needs_revision


Comment:

 Replying to [comment:24 acat]:
 > Thanks for the review: here is the revised branch:
 https://github.com/acatarineu/tor-browser/commits/31918+1
 (4f94bc827bb8045b3c6504e8c65c5629d76c2313).

 To follow-up here: this looks mostly good. One thing I think we should fix
 is in the squashed commit that brings the onboarding back (commit
 025e0d950612a9a56cfcbb46069e5f94418e2abc). That patch contains references
 to `Torbutton`'s `onboarding.properties` which do not belong into
 resurrecting the old Firefox onboarding (see: `BUNDLE_URI` and the change
 to `nsStringBundle.cpp`) but rather in the follow-up commit which is doing
 our on onboarding.

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