[tbb-commits] [torbutton/master] Merge remote-tracking branch 'igt0/25013-v4'

[gk at torproject.org]

commit 831c8bee11a464b42dcee9c84ad52fca07e5e241
Merge: 923fd850 78d26b12
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Nov 12 11:21:30 2018 +0000

    Merge remote-tracking branch 'igt0/25013-v4'

 makexpi.sh                      |  4 +--
 moz.build                       | 12 ++++++++
 src/chrome/content/torbutton.js |  2 --
 src/chrome/locale/en-US         |  1 +
 src/jar.mn                      | 68 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 83 insertions(+), 4 deletions(-)