commit 2ee24e9976652eef800b6d00b57ba322213a1f12 Merge: d2c3d8f23856 8124060e2f33 Author: Georg Koppen gk@torproject.org Date: Fri Aug 14 09:54:56 2020 +0000

Merge remote-tracking branch 'gitlab/merge-requests/33' into tor-browser-78.1.0esr-10.0-1

security/manager/ssl/RemoteSecuritySettings.jsm | 22 ++++++++++++++++++++++ services/settings/IDBHelpers.jsm | 4 ++++ services/settings/dumps/blocklists/moz.build | 8 +------- services/settings/dumps/main/moz.build | 5 ----- services/settings/dumps/security-state/moz.build | 1 - .../components/antitracking/antitracking.manifest | 2 +- toolkit/components/antitracking/components.conf | 7 ------- 7 files changed, 28 insertions(+), 21 deletions(-)