[tbb-commits] [tor-browser/tor-browser-68.4.1esr-9.5-1] Merge commit '6cac185d0c10e4f26ca7eaf000c31fae36d13bfc' into tor-browser-68.4.1esr-9.5-1

[sysrqb at torproject.org]

commit 28641dbae674f58429aa3518342555a6b977342e
Merge: 45677fd3bc4f 6cac185d0c10
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Wed Feb 5 00:02:35 2020 +0000

    Merge commit '6cac185d0c10e4f26ca7eaf000c31fae36d13bfc' into tor-browser-68.4.1esr-9.5-1

 browser/actors/NetErrorChild.jsm                   |   2 +-
 browser/base/content/browser.js                    |  10 +
 browser/base/content/browser.xul                   |   3 +
 browser/base/content/tab-content.js                |   5 +
 browser/components/moz.build                       |   1 +
 .../content/authNotificationIcon.inc.xul           |   6 +
 .../onionservices/content/authPopup.inc.xul        |  14 +
 .../components/onionservices/content/authPrompt.js | 290 +++++++++++++++++++++
 .../components/onionservices/content/authUtil.jsm  |  32 +++
 .../onionservices/content/onionservices.css        |  69 +++++
 browser/components/onionservices/jar.mn            |   4 +
 browser/components/onionservices/moz.build         |   1 +
 browser/modules/TorStrings.jsm                     |  74 +++++-
 browser/themes/shared/notification-icons.inc.css   |   3 +
 docshell/base/nsDocShell.cpp                       |  62 +++++
 dom/ipc/BrowserParent.cpp                          |  23 ++
 dom/ipc/BrowserParent.h                            |   3 +
 dom/ipc/PBrowser.ipdl                              |   8 +
 js/xpconnect/src/xpc.msg                           |   8 +
 netwerk/base/nsSocketTransport2.cpp                |   6 +
 netwerk/socket/nsSOCKSIOLayer.cpp                  |  30 +++
 toolkit/modules/PopupNotifications.jsm             |   6 +
 xpcom/base/ErrorList.py                            |  18 ++
 23 files changed, 672 insertions(+), 6 deletions(-)