commit 2acdf4d9ac039aee11351631a79ab0437dc4e39a Merge: 5ac0bb1 398eba8 Author: Mike Perry mikeperry-git@torproject.org Date: Tue Mar 24 14:16:00 2015 -0700

Merge remote-tracking branch 'gk/bug_9387_v12'

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