[tor-commits] [torbutton/master] Merge remote-tracking branch 'arthur/26128+1'

[gk at torproject.org]

commit 1e43e9c6ed448d9ca91235c38f5ea0b4d43c71cb
Merge: 65b5371 3e1c144
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jun 19 08:17:29 2018 +0000

    Merge remote-tracking branch 'arthur/26128+1'

 src/chrome/content/torbutton.js |   2 +
 src/modules/noscript-control.js | 126 ++++++++++++++++++++++++++++++++++++++++
 src/modules/security-prefs.js   |   8 +--
 3 files changed, 131 insertions(+), 5 deletions(-)