[tor-commits] [ooni-probe/master] Merge pull request #425 from TheTorProject/feature/psiphon-dev-sbs-rebased

[art at torproject.org]

commit c853b7bfaccaae9a4122f5241a7e23dea26c1b53
Merge: 8449d67 1172083
Author: Simone Basso <bassosimone at gmail.com>
Date:   Sun Nov 15 17:18:13 2015 +0100

    Merge pull request #425 from TheTorProject/feature/psiphon-dev-sbs-rebased
    
    Add third_party test for psiphon

 ooni/errors.py                       |    8 +-
 ooni/nettests/third_party/psiphon.py |  134 ++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+), 2 deletions(-)