commit 74b9b4ff8b2d0ae69292e42243b68b875fb41a63 Merge: 187c57c 0d170c3 Author: Arturo Filastò <arturo@filasto.net> Date: Sat May 2 13:03:12 2015 +0200 Merge pull request #382 from TheTorProject/feature/third-party-template Feature/third party template data/nettests/examples/example_process.py | 10 +++ ooni/errors.py | 6 +- ooni/geoip.py | 4 +- ooni/templates/process.py | 106 +++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 3 deletions(-)