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

 * actualpoints:   => 0.5


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