[tor-commits] [tor-browser/tor-browser-78.10.0esr-10.5-1] Merge remote-tracking branch 'richardgl/27476_rev2' into tor-browser-78.10.0esr-10.5-1

[sysrqb@xxxxxxxxxxxxxx]

commit 41c6d99e17639bab7cfc4b5e1e6f971508406acc
Merge: 627d83ded2fb 6d8d49baa9ae
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date:   Mon May 17 19:34:32 2021 +0000

    Merge remote-tracking branch 'richardgl/27476_rev2' into tor-browser-78.10.0esr-10.5-1

 browser/actors/NetErrorParent.jsm                  |   8 +
 browser/base/content/aboutNetError.js              |   8 +-
 browser/base/content/browser-siteIdentity.js       |   2 +-
 browser/base/content/browser.js                    |  10 +
 browser/base/content/browser.xhtml                 |   2 +
 browser/components/BrowserGlue.jsm                 |  14 +
 browser/components/about/AboutRedirector.cpp       |   4 +
 browser/components/about/components.conf           |   1 +
 browser/components/moz.build                       |   1 +
 browser/components/torconnect/TorConnectChild.jsm  |   9 +
 browser/components/torconnect/TorConnectParent.jsm | 117 ++++++++
 .../torconnect/content/aboutTorConnect.css         |  96 +++++++
 .../torconnect/content/aboutTorConnect.js          | 299 +++++++++++++++++++++
 .../torconnect/content/aboutTorConnect.xhtml       |  46 ++++
 .../components/torconnect/content/onion-slash.svg  |   7 +
 browser/components/torconnect/content/onion.svg    |   3 +
 .../torconnect/content/torBootstrapUrlbar.js       | 136 ++++++++++
 .../torconnect/content/torconnect-urlbar.css       |  55 ++++
 .../torconnect/content/torconnect-urlbar.inc.xhtml |  11 +
 browser/components/torconnect/jar.mn               |   7 +
 browser/components/torconnect/moz.build            |   6 +
 .../components/torpreferences/content/torPane.js   |  46 ++++
 .../torpreferences/content/torPane.xhtml           |  23 ++
 .../torpreferences/content/torPreferences.css      | 121 +++++++++
 browser/modules/TorProcessService.jsm              |  12 +
 browser/modules/TorProtocolService.jsm             | 124 ++++++++-
 browser/modules/TorStrings.jsm                     |  72 +++++
 browser/modules/moz.build                          |   1 +
 browser/themes/shared/jar.inc.mn                   |   1 +
 browser/themes/shared/onionPattern.css             | 121 +++++++++
 browser/themes/shared/onionPattern.inc.xhtml       | 207 ++++++++++++++
 browser/themes/shared/urlbar-searchbar.inc.css     |   2 +
 dom/base/Document.cpp                              |  51 +++-
 toolkit/modules/RemotePageAccessManager.jsm        |  20 ++
 .../themes/shared/in-content/info-pages.inc.css    |  15 +-
 .../lib/environments/browser-window.js             |   4 +
 36 files changed, 1650 insertions(+), 12 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits