[tor-commits] [ooni-probe/master] Merge pull request #432 from juga0/feature/psiphon-doc

[art at torproject.org]

commit 93d9a6b984476f2af1410343541b277981821023
Merge: 9abf35b 122c8b9
Author: Arturo Filastò <arturo at filasto.net>
Date:   Sun Nov 29 16:28:21 2015 +0100

    Merge pull request #432 from juga0/feature/psiphon-doc
    
    add psiphon user documentation

 docs/source/nettests/ooni.nettests.third_party.rst |    8 ++
 docs/source/tests/psiphon.rst                      |  119 ++++++++++++++++++++
 2 files changed, 127 insertions(+)