[tbb-commits] [tor-browser/tor-browser-68.6.0esr-9.5-1] Merge commit 'da5513527e50e7f13e3b1c3206ed75ff8fbd76db' into tor-browser-68.6.0esr-9.5-1

[sysrqb at torproject.org]

commit 2d2c850302274bdf1a506949856c91c5b138983c
Merge: 31200493ae90 da5513527e50
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Apr 3 02:13:56 2020 +0000

    Merge commit 'da5513527e50e7f13e3b1c3206ed75ff8fbd76db' into tor-browser-68.6.0esr-9.5-1

 browser/base/content/browser.js                    |  12 ++
 browser/base/content/browser.xul                   |   3 +
 browser/components/BrowserGlue.jsm                 |  10 ++
 .../onionservices/OnionLocationChild.jsm           |  43 ++++++
 .../onionservices/OnionLocationParent.jsm          | 161 +++++++++++++++++++++
 .../content/onionlocation-notification-icons.css   |   5 +
 .../onionservices/content/onionlocation-urlbar.css |  27 ++++
 .../content/onionlocation-urlbar.inc.xul           |  10 ++
 .../onionservices/content/onionlocation.svg        |   3 +
 .../content/onionlocationPreferences.inc.xul       |  11 ++
 .../content/onionlocationPreferences.js            |  31 ++++
 browser/components/onionservices/jar.mn            |   2 +
 browser/components/onionservices/moz.build         |   2 +
 .../components/preferences/in-content/privacy.js   |  17 +++
 .../components/preferences/in-content/privacy.xul  |   2 +
 browser/modules/TorStrings.jsm                     |  39 +++++
 browser/themes/shared/notification-icons.inc.css   |   2 +
 browser/themes/shared/urlbar-searchbar.inc.css     |   2 +
 dom/base/Document.cpp                              |  32 +++-
 dom/base/Document.h                                |   2 +
 dom/webidl/Document.webidl                         |   9 ++
 modules/libpref/init/StaticPrefList.h              |   7 +
 xpcom/ds/StaticAtoms.py                            |   1 +
 23 files changed, 432 insertions(+), 1 deletion(-)

diff --cc browser/components/onionservices/moz.build
index e4b6d73f8f40,bf276c4a3c4c..dfd664df434e
--- a/browser/components/onionservices/moz.build
+++ b/browser/components/onionservices/moz.build
@@@ -1,7 -1,6 +1,9 @@@
  JAR_MANIFESTS += ['jar.mn']
  
  EXTRA_JS_MODULES += [
 +    'ExtensionMessaging.jsm',
 +    'HttpsEverywhereControl.jsm',
 +    'OnionAliasStore.jsm',
+     'OnionLocationChild.jsm',
+     'OnionLocationParent.jsm',
  ]