commit 90117e81023594bcf1bc453e1153fc6554088925 Merge: 7888084 c8c45cd Author: Arturo Filastò arturo@filasto.net Date: Mon Jun 29 20:49:50 2015 +0200

Merge pull request #388 from TheTorProject/feature/lantern

Feature/lantern

ooni/nettests/third_party/lantern.py | 100 ++++++++++++++++++++++++++++++++++ ooni/templates/process.py | 5 +- 2 files changed, 104 insertions(+), 1 deletion(-)