[tor-bugs] #32097 [Applications/Tor Browser]: Fix conflicts in mobile onbarding while rebasing to esr68.2.0

[Tor Bug Tracker & Wiki]

#32097: Fix conflicts in mobile onbarding while rebasing to esr68.2.0
-------------------------------------+-------------------------------------
     Reporter:  gk                   |      Owner:  tbb-team
         Type:  defect               |     Status:  new
     Priority:  Very High            |  Milestone:
    Component:  Applications/Tor     |    Version:
  Browser                            |   Keywords:  TorBrowserTeam201910,
     Severity:  Major                |  tbb-9.0-must
Actual Points:                       |  Parent ID:
       Points:  0.5                  |   Reviewer:
      Sponsor:                       |
-------------------------------------+-------------------------------------
 It turns out that there are a number of conflicts between our mobile
 onboarding code and the coming esr68.2.0 which we need to think about how
 to resolve. They stem in particular from

 https://bugzilla.mozilla.org/show_bug.cgi?id=1570878

 and

 https://bugzilla.mozilla.org/show_bug.cgi?id=1587631

 Not sure whether we want to just back out those changes or make them
 otherwise compatible with our modifications.

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