[tor-commits] [tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40416_rev' into tor-browser-78.11.0esr-10.5-1

[sysrqb@xxxxxxxxxxxxxx]

commit f9a497c455fecc7a6dcb3591c8cbec9c7a8dfd2f
Merge: 85ca6e359d6b 3aee9ca1bb25
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date:   Wed Jun 30 22:10:35 2021 +0000

    Merge remote-tracking branch 'richardgl/40416_rev' into tor-browser-78.11.0esr-10.5-1

 browser/base/content/aboutNetError.xhtml           |  3 ++
 browser/base/content/browser-siteIdentity.js       | 12 +++++
 browser/base/jar.mn                                |  2 +-
 .../content/netError/onionNetError.js              |  6 +++
 .../content/netError/v2Deprecated.css              | 25 +++++++++
 .../onionservices/content/netError/v2Deprecated.js | 50 ++++++++++++++++++
 browser/components/onionservices/jar.mn            |  8 ++-
 browser/modules/TorStrings.jsm                     |  8 +++
 .../shared/identity-block/identity-block.inc.css   |  3 +-
 browser/themes/shared/onionPattern.inc.xhtml       |  4 +-
 docshell/base/nsDocShell.cpp                       | 61 ++++++++++++++++++++++
 dom/ipc/ContentParent.cpp                          | 11 ++++
 dom/ipc/ContentParent.h                            |  2 +
 dom/ipc/PContent.ipdl                              |  3 ++
 ipc/ipdl/sync-messages.ini                         |  3 ++
 js/xpconnect/src/xpc.msg                           |  1 +
 xpcom/base/ErrorList.py                            |  2 +
 17 files changed, 200 insertions(+), 4 deletions(-)



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