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

[mikeperry@xxxxxxxxxxxxxx]

commit 1e1210fd40638cc63b9450a4323cce42ebe5ee21
Merge: 18aba4a d7cb80e
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Thu Feb 27 15:02:24 2014 -0800

    Merge remote-tracking branch 'gk/bug_9901_v5'

 src/chrome/content/torbutton.js        |  100 ++++++++++++++++++++++++++++++++
 src/components/external-app-blocker.js |   24 ++------
 2 files changed, 106 insertions(+), 18 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits