[tor-commits] [torbutton/master] Merge remote-tracking branch 'gk/bug_26058'

[gk at torproject.org]

commit 824e6df6e8177fabcb33dac06142332add64a7dd
Merge: 46c71b6 72aacbd
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jun 21 20:28:06 2018 +0000

    Merge remote-tracking branch 'gk/bug_26058'

 src/chrome/content/torbutton.js         | 16 ----------------
 src/defaults/preferences/preferences.js |  1 -
 2 files changed, 17 deletions(-)