[tor-bugs] #31010 [Applications/Tor Browser]: Rebase Tor Browser mobile/ patches for Firefox ESR 68

[Tor Bug Tracker & Wiki]

#31010: Rebase Tor Browser mobile/ patches for Firefox ESR 68
-------------------------------------------------+-------------------------
 Reporter:  sysrqb                               |          Owner:  tbb-
                                                 |  team
     Type:  defect                               |         Status:
                                                 |  needs_revision
 Priority:  Medium                               |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tbb-mobile, tbb-9.0-must-nightly,    |  Actual Points:
  TorBrowserTeam201908                           |
Parent ID:  #30429                               |         Points:
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------

Comment (by sysrqb):

 Replying to [comment:10 mcs]:
 > Replying to [comment:9 sysrqb]:
 > > Bisecting leads to [https://github.com/acatarineu/tor-
 browser/commit/d03d360bd773c8d8a97ef1f69e565afcc19796e5 this commit]
 (commit `d03d360bd773c8d8a97ef1f69e565afcc19796e5` on acat's `30429+5`
 branch). This'll require some digging. mcs/brade, if you have any
 suggestions about where I should look, they'll be very much appreciated.
 > > ...
 >
 > Without knowing a lot about the Android-specific code, my guess is that
 the #9173 patch is just not correct by itself for Android. What is missing
 from acat's 30429+5 branch is a patch for #13252, which Kathy and I have
 been working on along with the updater patches. The #13252 patch adds the
 "side-by-side" TorBrowser-Data magic for macOS and also changes how the
 app data directory is determined on all platforms. As of yesterday, we
 have a "hot off the press" patch for #13252 which we plan to get to acat
 soon. I will attach a copy to this ticket so you can try it now.
 >
 > One caveat: the ESR68 #13252 patch is intended to be inserted into the
 commit stream immediately after the #11641 patch
 (69c8b59f9cdc792ee533187723286fdd75dbabd0 on acat's 30429+5 branch). You
 may get conflicts if you tack it on the end.

 Thanks, that patch did help.

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