[tbb-commits] [torbutton/master] Merge remote-tracking branch 'gitlab/merge-requests/6' into master

[gk at torproject.org]

commit 3dc1c58d6c494eeb5514ad84831b76661667ba2c
Merge: 6c2cf4bc b27d4fd8
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Aug 16 19:03:20 2020 +0000

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

 modules/noscript-control.js | 82 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 23 deletions(-)