commit 760b25c199910e2bd9ad4ef530ecb1516f1f0d5e Merge: 46d47c8f0cb0 cc7dcbbba213 Author: Matthew Finkel sysrqb@torproject.org Date: Wed Feb 10 18:57:15 2021 +0000
Merge remote-tracking branch 'sankethgl/40209-squashed-again' into tor-browser-78.7.1esr-10.5-1
browser/actors/CryptoSafetyChild.jsm | 87 ++++++++++++++++ browser/actors/CryptoSafetyParent.jsm | 142 +++++++++++++++++++++++++++ browser/actors/moz.build | 2 + browser/base/content/popup-notifications.inc | 14 +++ browser/components/BrowserGlue.jsm | 17 ++++ browser/modules/TorStrings.jsm | 48 +++++++++ browser/themes/shared/browser.inc.css | 5 + toolkit/content/license.html | 32 ++++++ toolkit/modules/Bech32Decode.jsm | 103 +++++++++++++++++++ toolkit/modules/moz.build | 1 + 10 files changed, 451 insertions(+)