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

[mikeperry at torproject.org]

commit f82606e56c30ee7db9e6160719ef858b7b9c1e10
Merge: 7f46869 0467379
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Sep 29 17:06:48 2014 -0700

    Merge remote-tracking branch 'brade/bug13138'

 src/chrome/content/aboutTor/aboutTor.xhtml |    7 ++++-
 src/chrome/content/torbutton.js            |   45 ++++++++++++++++++----------
 2 files changed, 35 insertions(+), 17 deletions(-)