commit f5bf259fa2f16c68f3dc12bf9e6d28f43ff8d7e1 Merge: f81583b0d6d7 0052c74b7437 Author: Matthew Finkel <sysrqb@torproject.org> Date: Tue Apr 28 20:42:31 2020 +0000 Merge remote-tracking branch 'acatgh/34032' into tor-browser-68.7.0esr-9.5-1 browser/components/onionservices/HttpsEverywhereControl.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)