commit ec1c0f448893775b660313042709a9b057b3ab75 Merge: 59f3b783 866e3974 Author: Georg Koppen gk@torproject.org Date: Tue Sep 18 09:49:29 2018 +0000

Merge remote-tracking branch 'arthur/27427_alpha'

src/modules/noscript-control.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)