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

[art at torproject.org]

commit a516d0caafbcd7e043ce92d34c4618ad6e0ea531
Merge: 223ad4d 03af673
Author: Arturo Filastò <arturo at filasto.net>
Date:   Mon Oct 8 07:07:25 2012 +0000

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

 INSTALL                 |   67 +---------------------------------------
 docs/source/install.rst |   79 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 77 insertions(+), 69 deletions(-)