[tbb-commits] [torbutton/master] Merge remote-tracking branch 'gk/bug_7255_v2' into 1.9-next

[mikeperry at torproject.org]

commit 9a1a82e2ee6f7536bbc8fe91333e52157f61d219
Merge: ab5010d 52ab447
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Mar 25 10:24:50 2015 -0700

    Merge remote-tracking branch 'gk/bug_7255_v2' into 1.9-next

 src/chrome/content/torbutton.js           |  109 ++++++++++++++++++++++-------
 src/chrome/locale/en/torbutton.properties |    2 +
 src/defaults/preferences/preferences.js   |    6 ++
 3 files changed, 93 insertions(+), 24 deletions(-)