[tbb-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug13406-01'

[mikeperry at torproject.org]

commit 0ac77f28bed415b27942d5264b0e5037fb57c2a1
Merge: a717611 2ccb9cb
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Feb 9 14:51:05 2015 -0800

    Merge remote-tracking branch 'brade/bug13406-01'

 src/chrome/content/popup.xul       |    7 +++----
 src/chrome/content/torbutton.js    |   30 +++++++++---------------------
 src/chrome/locale/en/aboutTor.dtd  |    4 ++--
 src/chrome/locale/en/torbutton.dtd |    2 +-
 src/chrome/skin/torbutton.css      |    4 ++--
 5 files changed, 17 insertions(+), 30 deletions(-)