[tor-commits] [tor-browser/tor-browser-68.6.0esr-9.5-1] Merge remote-tracking branch 'bradetpo/bug19251-04' into tor-browser-68.6.0esr-9.5-1

[sysrqb at torproject.org]

commit 31200493ae908e01ecbeeb44e0546a354ea8736d
Merge: 7306a08365be e3b4a8bf4a19
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Apr 3 02:03:43 2020 +0000

    Merge remote-tracking branch 'bradetpo/bug19251-04' into tor-browser-68.6.0esr-9.5-1

 browser/actors/NetErrorChild.jsm                   |  10 +
 .../components/onionservices/content/authPrompt.js |  20 +-
 .../components/onionservices/content/authUtil.jsm  |  16 +-
 .../onionservices/content/netError/browser.svg     |   3 +
 .../onionservices/content/netError/network.svg     |   3 +
 .../content/netError/onionNetError.css             |  65 ++++++
 .../content/netError/onionNetError.jsm             | 253 +++++++++++++++++++++
 .../onionservices/content/netError/onionsite.svg   |   7 +
 browser/components/onionservices/jar.mn            |   1 +
 browser/modules/TorStrings.jsm                     |  48 ++++
 docshell/base/nsDocShell.cpp                       |  47 ++--
 dom/ipc/BrowserParent.cpp                          |   4 +-
 dom/ipc/BrowserParent.h                            |   2 +-
 dom/ipc/PBrowser.ipdl                              |   3 +-
 js/xpconnect/src/xpc.msg                           |   2 +
 netwerk/socket/nsSOCKSIOLayer.cpp                  |  11 +
 xpcom/base/ErrorList.py                            |   4 +
 17 files changed, 472 insertions(+), 27 deletions(-)