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

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
--------------------------------------+--------------------------
 Reporter:  sysrqb                    |          Owner:  tbb-team
     Type:  task                      |         Status:  new
 Priority:  Medium                    |      Milestone:
Component:  Applications/Tor Browser  |        Version:
 Severity:  Normal                    |     Resolution:
 Keywords:                            |  Actual Points:
Parent ID:                            |         Points:
 Reviewer:                            |        Sponsor:
--------------------------------------+--------------------------

Comment (by sysrqb):

 Making a note here:
 `ed7faf1c2b88cd025596151f2ad97892891965a4` contains:
 {{{
 diff --git a/toolkit/modules/AppConstants.jsm
 b/toolkit/modules/AppConstants.jsm
 index 109f1f94e3d3..bc679fb6f9f0 100644
 --- a/toolkit/modules/AppConstants.jsm
 +++ b/toolkit/modules/AppConstants.jsm
 @@ -387,4 +387,11 @@ this.AppConstants = Object.freeze({
  #else
      false,
  #endif
 +
 +  TOR_BROWSER_UPDATE:
 +#ifdef TOR_BROWSER_UPDATE
 +    true,
 +#else
 +    false,
 +#endif
 }}}

 But `TOR_BROWSER_UPDATE` is used earlier in
 `14df73ecfdd88db89f196cecfb934dab7e552969`. We should move this code block
 into the earlier patch.

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