[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:hellais/ooni-probe

[art at torproject.org]

commit 7332e713372bb79c51e2befbf6821dbdae98411b
Merge: 6dd0468 ba33131
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Nov 26 00:05:41 2012 +0100

    Merge branch 'master' of github.com:hellais/ooni-probe
    
    * 'master' of github.com:hellais/ooni-probe:
      Update ins

 README.md |   70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 62 insertions(+), 8 deletions(-)