[tor-bugs] #33533 [Applications/Tor Browser]: Rebase Tor Browser esr68 patches on top of mozilla-central

[Tor Bug Tracker & Wiki]

#33533: Rebase Tor Browser esr68 patches on top of mozilla-central
--------------------------------------+--------------------------------
 Reporter:  acat                      |          Owner:  acat
     Type:  task                      |         Status:  needs_review
 Priority:  Medium                    |      Milestone:
Component:  Applications/Tor Browser  |        Version:
 Severity:  Normal                    |     Resolution:
 Keywords:  TorBrowserTeam202004      |  Actual Points:  14
Parent ID:  #33661                    |         Points:
 Reviewer:  sysrqb, pospeselr         |        Sponsor:  Sponsor58-must
--------------------------------------+--------------------------------
Changes (by acat):

 * status:  needs_revision => needs_review


Comment:

 New branch: https://github.com/acatarineu/tor-browser/commits/33533+5.

 I cherry picked the commits
 `0c30acdef6e4da186409a70300a685801b11c02d..e1a0211ded85189c3805451fbe26a13a35dcc43f`
 and
 `85c9db6a4c74c549e70a04ddf4f94a86f82bf312..3ef48160be35fd86516031b6782b983b91366127`
 from my squashed branch https://github.com/acatarineu/tor-
 browser/commits/31918+2 onto https://github.com/mozilla/gecko-
 dev/commit/2c5ac3b9c8c32957bca822fd92ba04d68e97e087 from the beta branch
 (that should be `FIREFOX_77_0b1_BUILD3`). That means all commits from
 `31918+2` branch except patch and tests for #21537, which were upstreamed.

 I also picked changes from `bug_33626_v2` to
 `mobile/android/torbrowser.configure` and removed `--with-android-
 distribution-directory` and `--without-google-play-services`, in the
 mozconfigs patch.

 Here is the list of conflicts found while cherry-picking:

 {{{
 824f3bf0ba545... TB3: Tor Browser's official .mozconfigs.
   both modified:   toolkit/modules/AppConstants.jsm

 afe9769539a39... Bug 10760: Integrate TorButton to TorBrowser core
   both modified:   browser/base/content/browser-doctype.inc

 6af5fa32b1c59... Bug 14631: Improve profile access error messages.
   both modified:   toolkit/xre/nsAppRunner.cpp
     restartMessageNoUnlocker -> restartMessageNoUnlocker2

 650b1b9a3c093... Bug 2176: Rebrand Firefox to TorBrowser
   deleted by us:   browser/components/preferences/connection.xhtml
     Moved to browser/components/preferences/dialogs/connection.xhtml.
   both modified:   browser/components/preferences/main.js
   both modified:   browser/themes/shared/identity-block/identity-
 block.inc.css
     #identity-icon-labels -> #identity-icon-label

   Had to patch extra instances of brand.ftl -> tor-browser-brand.ftl.
   Having #33954 fixed soonish is worth considering.

   Also fixed mistake from 33533 branch, "tor-browser-brand.ftler-
 brand.ftl" ->
   "tor-browser-brand.ftl"

 f9e8153d40012... Bug 4234: Use the Firefox Update Process for Tor Browser.
   both modified:   browser/app/profile/firefox.js
     app.update.url was removed in Bug 1568994, moved to
 build/application.ini.in.

 10cb47918ad67... Bug 16940: After update, load local change notes.
   both modified:   browser/components/BrowserGlue.jsm

 0eed8e3197782... Bug 25658: Replace security slider with security level UI
   both modified:   browser/base/content/browser.xhtml
   both modified:   browser/components/preferences/preferences.xhtml

   Some #include relative path fixes due to  browser/components/preferences
 rename
   (#include ../../securitylevel/content/securityLevelPreferences.inc.xhtml
 ->
   #include ../securitylevel/content/securityLevelPreferences.inc.xhtml).

 02ec1955a67b6... Bug 23247: Communicating security expectations for .onion
   both modified:   browser/base/content/browser-siteIdentity.js
     No onionVerifiedIdentity anymore, EV UI was removed. So I removed
 those parts.
   both modified:   browser/themes/shared/jar.inc.mn
   both modified:   docshell/base/nsDocShell.cpp
     Non-trivial fix. GetAllowMixedContentAndConnectionData is not
 responsible
     for setting aRootHasSecureConnection anymore (due to Fission?). This
 is
     now done in https://searchfox.org/mozilla-
 central/rev/7908ce29657cfd623993046bd8e38664e1c0b28e/dom/security/nsMixedContentBlocker.cpp#835,
     and that `IsSecure` flag is set in https://searchfox.org/mozilla-
 central/rev/7908ce29657cfd623993046bd8e38664e1c0b28e/dom/base/Document.cpp#3614.
     I patched that last file.

 25893a628c702... Bug 31575: Replace Firefox Home (newtab) with about:tor
   both modified:   browser/components/BrowserGlue.jsm
     Simple fix for the already existing changes in BrowserGlue.jsm,
     but I also patched `requestCache` function in `BrowserGlue.jsm`, which
     is a new usage of the removed `AboutNewTab`.
   both modified:   browser/components/newtab/AboutNewTabService.jsm
     Non-trivial fixes: Some script loading was moved to
     `browser/actors/AboutNewTabChild.jsm`: I removed that actor from
     `BrowserGlue.jsm`.

 7da5526ee7604... Bug 27511: Add new identity button to toolbar
   both modified:   browser/themes/shared/jar.inc.mn

 fb8f647f8b220... Bug 26961: New user onboarding.
   both modified:   browser/app/permissions
   both modified:   browser/themes/shared/UITour.inc.css
     There was a padding-left + padding-right -> padding-inline change, but
 simple fix.

 9e15f1b6721ba... Bug 31286: Implementation of bridge, proxy, and firewall
 settings in about:preferences#tor
   both modified:   browser/components/preferences/main.inc.xhtml
   both modified:   browser/components/preferences/main.js
   both modified:   browser/components/preferences/preferences.js

   Several relative path fixes due to browser/components/preferences folder
 rename.

 f5406b841b557... Bug 30237: Add v3 onion services client authentication
 prompt
   both modified:   dom/ipc/BrowserParent.cpp
 }}}

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