[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe into setup-deps

[art at torproject.org]

commit 3902a082746d9e298900f310ed48c61110f9e765
Merge: 35e7ded e0cb2ec
Author: David Stainton <dstainton415 at gmail.com>
Date:   Mon Jan 13 21:30:33 2014 +0100

    Merge branch 'master' of github.com:TheTorProject/ooni-probe into setup-deps

 README.md |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)