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

commit bd5be6801b3bd2ac19e9f7dad98f229d32a82224 Merge: 2c2c5a8 cda1d6c Author: Mike Perry mikeperry-git@torproject.org Date: Thu Oct 30 15:17:59 2014 -0700

Merge remote-tracking branch 'gk/bug_9387_test_02'

src/chrome/content/preferences.js | 37 +++++++ src/chrome/content/preferences.xul | 62 +++++++++-- src/chrome/content/torbutton.js | 177 +++++++++++++++++++++++++++++++ src/chrome/locale/en/torbutton.dtd | 9 +- src/defaults/preferences/preferences.js | 3 + 5 files changed, 276 insertions(+), 12 deletions(-)