commit f55f5953c6adb6d75cad74fbb6c3b8fa2d617004 Merge: c36ccb58 0b80394c Author: Georg Koppen gk@torproject.org Date: Fri Aug 7 14:31:41 2020 +0000

Merge remote-tracking branch 'gitlab/merge-requests/3' into master

components/domain-isolator.js | 8 +++++++- components/dragDropFilter.js | 9 ++++++++- components/external-app-blocker.js | 9 ++++++++- components/startup-observer.js | 9 ++++++++- components/torCheckService.js | 9 ++++++++- components/torbutton-logger.js | 16 ++++++++-------- 6 files changed, 47 insertions(+), 13 deletions(-)