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

[mikeperry at torproject.org]

commit 8e38c9f33fbfcccfd9b4071360a976b67c340cee
Merge: 7d3a231 32003e1
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Jun 27 09:34:08 2014 -0700

    Merge remote-tracking branch 'gk/bug_9268_final_stopgap_rebased'

 src/chrome/content/torbutton.js |   91 ++++++++++++++++++++++++++++++---------
 1 file changed, 71 insertions(+), 20 deletions(-)