[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:
                                                 |  needs_information
 Priority:  Very High                            |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Major                                |     Resolution:
 Keywords:  TorBrowserTeam201910R, tbb-9.0-must  |  Actual Points:
Parent ID:                                       |         Points:  0.5
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by gk):

 * status:  needs_review => needs_information


Comment:

 Okay, I went ahead in the morning and committed the 7 backouts to get the
 build going but I am still trying to understand why those 7 patches got
 chosen given that there are a bunch of more bugs involved.

 For instance, the patch for
 https://bugzilla.mozilla.org/show_bug.cgi?id=1570880 got backed out, which
 seems right to me. However, the regression fix for that bug, tracked in
 https://bugzilla.mozilla.org/show_bug.cgi?id=1586770 did not. So, we are
 now actually using code that was only meant to get used with a fix we
 backed out... Are we good with that?

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