commit 0633db0e9cabaf83b035d0eb44a97155b37675b4 Merge: a99ed67 47ff237 Author: Mike Perry mikeperry-git@torproject.org Date: Wed Feb 11 15:06:47 2015 -0800

Merge remote-tracking branch 'gk/bug_9387_12430'

src/chrome/content/torbutton.js | 2 ++ 1 file changed, 2 insertions(+)