[tor-bugs] #19675 [Applications/Tor Browser]: Merge Orfox patches into tor-browser

[Tor Bug Tracker & Wiki]

#19675: Merge Orfox patches into tor-browser
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  igt0
     Type:  task                                 |         Status:
                                                 |  needs_revision
 Priority:  Medium                               |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tbb-mobile, ff52-esr,                |  Actual Points:
  TorBrowserTeam201803                           |
Parent ID:  #5709                                |         Points:
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------

Comment (by sysrqb):

 Replying to [comment:19 gk]:
 > I am not overly thrilled to add .xpi files to our tree in commit
 4553e490317622677475d0d63ba169074df2f085, especially as they are outdated
 (there is HTTPS-E 5.2.21 available instead of 5.2.20 if the requirement is
 a non-WebExtension Add-On). But I guess we can iterate from that. :)

 Yes, I can follow up with a new ticket for updating these.

 >
 > Could you provide an updated branch without
 b27b64b540cd81a895a289e09d611a50255de3c1 as it does not seem to do
 anything?

 Sure thing, I pushed branch bug19675_orfox_patches_1 with that commit
 deleted
 https://gitweb.torproject.org/user/sysrqb/tor-
 browser.git/log/?h=bug19675_orfox_patches_1

 For reference:
 {{{
 $ git status
 On branch bug19675_orfox_patches_1
 nothing to commit, working tree clean

 $ git diff bug19675_orfox_patches
 diff --git a/mobile/android/base/AndroidManifest.xml.in
 b/mobile/android/base/AndroidManifest.xml.in
 index 1d6730d13ff4..1aa50a08463d 100644
 --- a/mobile/android/base/AndroidManifest.xml.in
 +++ b/mobile/android/base/AndroidManifest.xml.in
 @@ -22,7 +22,6 @@
       fileincluded here, so that they can be referenced by both APKs. -->
  #include FennecManifest_permissions.xml.in

 -
      <application android:label="@string/moz_app_displayname"
                   android:icon="@drawable/icon"
                   android:logo="@drawable/logo"
 }}}

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