commit 0f1ea47ff08d81d50195b509aabaea0fc9188e51 Merge: f5157a69e88c fe77759e2e32 Author: Matthew Finkel sysrqb@torproject.org Date: Wed Nov 4 20:57:18 2020 +0000

Merge remote-tracking branch 'acatgl/40137' into tor-browser-78.4.0esr-10.5-1

toolkit/components/extensions/Extension.jsm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)