commit f222a9d68cfd845c3bbb0c66b0e20a0667f78530 Merge: 91f4a18 c70886a Author: Arturo Filastò arturo@filasto.net Date: Tue Jan 26 17:25:50 2016 +0100

Merge pull request #445 from TheTorProject/fix/psiphon

Fix to make the psiphon test run

ooni/nettests/third_party/psiphon.py | 44 +++++++++++++++++++++++++----------- ooni/templates/process.py | 14 +++++++----- 2 files changed, 39 insertions(+), 19 deletions(-)