[tbb-commits] [tor-browser/tor-browser-78.12.0esr-11.0-1] Merge remote-tracking branch 'richardgl/40547_rev' into tor-browser-78.12.0esr-11.0-1

[sysrqb at torproject.org]

commit 9f2339d6efc64317406bc6e49093461dd9123a4c
Merge: d54c4f1cf20e b3a4fa8c7cdc
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Mon Aug 2 23:16:01 2021 +0000

    Merge remote-tracking branch 'richardgl/40547_rev' into tor-browser-78.12.0esr-11.0-1

 browser/base/content/aboutNetError.js              |  4 +-
 browser/base/content/browser.js                    | 65 +++++++++-------
 browser/base/content/browser.xhtml                 |  1 +
 browser/base/content/utilityOverlay.js             |  8 ++
 .../alpha/content/identity-icons-brand.svg         | 26 +------
 browser/branding/alpha/content/jar.mn              |  1 +
 browser/branding/alpha/content/tor-styles.css      | 13 ++++
 .../nightly/content/identity-icons-brand.svg       | 30 +-------
 browser/branding/nightly/content/jar.mn            |  1 +
 browser/branding/nightly/content/tor-styles.css    | 13 ++++
 .../official/content/identity-icons-brand.svg      | 32 +-------
 browser/branding/official/content/jar.mn           |  1 +
 browser/branding/official/content/tor-styles.css   | 14 ++++
 browser/branding/tor-styles.inc.css                | 87 ++++++++++++++++++++++
 browser/components/BrowserGlue.jsm                 |  2 +-
 browser/components/sessionstore/SessionStore.jsm   | 12 ---
 browser/components/torconnect/TorConnectParent.jsm | 12 ++-
 .../torconnect/content/aboutTorConnect.css         | 24 +++---
 .../torconnect/content/aboutTorConnect.js          | 39 +++++++---
 .../torconnect/content/torBootstrapUrlbar.js       |  6 +-
 .../torconnect/content/torconnect-urlbar.css       | 36 ++++-----
 .../torconnect/content/torconnect-urlbar.inc.xhtml |  1 -
 .../torpreferences/content/torPreferences.css      | 16 ++--
 browser/modules/TorConnect.jsm                     | 78 +++++++++++--------
 browser/modules/TorStrings.jsm                     |  5 ++
 .../shared/identity-block/identity-block.inc.css   | 16 +---
 26 files changed, 321 insertions(+), 222 deletions(-)