[tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile and desktop patches

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile and desktop patches
-------------------------------------------------+-------------------------
 Reporter:  sysrqb                               |          Owner:  acat
     Type:  task                                 |         Status:
                                                 |  needs_revision
 Priority:  Medium                               |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tbb-9.5, ReleaseTrainMigration,      |  Actual Points:
  TorBrowserTeam202006                           |
Parent ID:  #33656                               |         Points:  1
 Reviewer:  sysrqb, gk                           |        Sponsor:
                                                 |  Sponsor58-must
-------------------------------------------------+-------------------------

Comment (by gk):

 Replying to [comment:26 acat]:
 > Ok, I ended up doing a new squashed branch in
 ​https://github.com/acatarineu/tor-browser/commits/31918+2
 (3ef48160be35fd86516031b6782b983b91366127).
 >
 > * Moved remaining build config definitions to mozconfig patch.
 >
 > * Squashed tests which did not have corresponding commit into same "unit
 tests" commit.
 >
 > * Squashed search engine tests with its corresponding patch.
 >
 > * Squashed two 14631 commits.
 >
 > * Split Bug 16441: Suppress "Reset Tor Browser" prompt: part went to the
 "tests patch" and the other to pref override.

 That list looks good to me. Just two nits we should fix in the next
 revision:
 {{{
 9cbc26f2e923550183cf0f75c385424685ec7521 Bug 28044: Integrate Tor Launcher
 into tor-browser
 }}}
 The `--disable-tor-launcher` build option is not new anymore with that
 commit; I guess we can just omit that sentence in the commit message now?
 {{{
 f9e8153d4001291de490b0ecac8e2a1c7d0fc8d3 Bug 4234: Use the Firefox Update
 Process for Tor Browser
 }}}
 `--enable-tor-browser-update` is no new configure option at this point
 anymore (please adjust the commit message)

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