[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 Browser            |        Version:
 Severity:  Major                               |     Resolution:
 Keywords:  TorBrowserTeam201910, tbb-9.0-must  |  Actual Points:
Parent ID:                                      |         Points:  0.5
 Reviewer:                                      |        Sponsor:
------------------------------------------------+--------------------------
Changes (by sysrqb):

 * Attachment "bug32097_merge_conflict_resolution.patch" added.


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