[tor-commits] [ooni-probe/master] Merge branch 'master' into fix/tor-binary

[art at torproject.org]

commit 626aedf03ec7c07d5f2e8dcd53b4bbbc5b683cfb
Merge: eec13dff b3a6b393
Author: Arturo Filastò <arturo at filasto.net>
Date:   Mon Jul 17 09:51:35 2017 +0200

    Merge branch 'master' into fix/tor-binary

 README.rst            |   4 +-
 docs/source/index.rst | 452 +-------------------------------------------------
 ooni/ui/cli.py        |   4 +-
 3 files changed, 6 insertions(+), 454 deletions(-)