commit c70886ab71954382c97e9897a71f18e83cf90eac Merge: c8e6244 c9d1d95 Author: Arturo Filastò <arturo@filasto.net> Date: Tue Jan 26 17:25:42 2016 +0100 Merge pull request #451 from juga0/fix/psiphon Fix/psiphon ooni/nettests/third_party/psiphon.py | 40 ++++++++++++++++++++++++++++-------- ooni/templates/process.py | 14 +++++++------ 2 files changed, 40 insertions(+), 14 deletions(-)