commit 1d308e3f51df4b5d289140f4c5469a62111c7a71 Merge: e6518fd 9f3f95a Author: Arturo Filastò hellais@users.noreply.github.com Date: Wed Apr 30 19:32:45 2014 +0200

Merge pull request #315 from TheTorProject/feature/manpage

Add ooniprobe manpage.

data/ooni.1 | 1100 +++++++++++++++++++++++++++++++++++++++++++++++++++ docs/source/conf.py | 2 +- ooni/oonicli.py | 11 +- 3 files changed, 1110 insertions(+), 3 deletions(-)