[tbb-bugs] #26401 [Applications/Tor Browser]: Rebase Orfox patches onto Tor Browser 8.0 for TBA

[Tor Bug Tracker & Wiki]

#26401: Rebase Orfox patches onto Tor Browser 8.0 for TBA
-----------------------------------------------+---------------------------
 Reporter:  sysrqb                             |          Owner:  tbb-team
     Type:  task                               |         Status:
                                               |  needs_review
 Priority:  Very High                          |      Milestone:
Component:  Applications/Tor Browser           |        Version:
 Severity:  Normal                             |     Resolution:
 Keywords:  tbb-mobile, TorBrowserTeam201807R  |  Actual Points:
Parent ID:  #26531                             |         Points:
 Reviewer:                                     |        Sponsor:
-----------------------------------------------+---------------------------

Comment (by sysrqb):

 Replying to [comment:18 gk]:
 > commit 21149e7a423d1f88866e5781e521021a08fca126 -- not okay
 >
 > Indentation of code in the else-clauses is missing.

 I'll correct these.

 > Are we good with all the other account manager related things that Orfox
 patched but this patch omits?

 Did you find specific changes I missed or is this a general question? The
 only commit in Orfox I see is:
 https://github.com/guardianproject/tor-
 browser/commit/b19ab5c8e300042ffc75022099628997e72be773

 >
 > commit db3c54ef05e71234a009bdc1abdbf9b80135cb0a -- ???
 >
 > That one is hard for me to review. Is that a new NetCipher version
 included? If so, what's the new one and what was the old one, used for
 ESR52?

 Yes. The imported files are from commit
 26304115de4939f20f023715ab7b079ce7105c1d and (it looks like) the old
 version was tag 1.2 (commit 2f3e6f0bbea4755617286813b2dd80907d0a573f in
 the [[https://github.com/guardianproject/NetCipher.git|NetCipher]] repo)

 But I thought about this some more. I'll ask Nathan if there were any
 critical fixes between the 1.2 tag and the current master. If there
 weren't any critical patches, then I'll revert this commit and cherry-pick
 Orfox's netcipher import commit from tag 1.2. It may not be worth the time
 reviewing the changes between versions if we consider we are only using
 netcipher and Orbot in the first couple alpha releases, and we'll use a
 tor launcher before the first stable is released.

 >
 > Do we really want to have mobile/android/orfox? What happened to
 > {{{
 > +  <string
 name="no_space_to_start_error">&no_space_to_start_error;</string>
 > +  <string name="error_loading_file">&error_loading_file;</string>
 > }}}
 > ?

 That came from this commit,
 https://github.com/guardianproject/tor-
 browser/commit/b2c793dc73c23c60d5d3e22c6a138fad9f7cd1b2

 Those strings aren't included anymore. I missed the `orfox -> torbrowser`
 change. I'll correct that.

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