commit 6dd0468865afee189ed4180ddb43619fa6070fdc Merge: 4d693cf 659dda6 Author: Arturo Filastò art@fuffa.org Date: Mon Nov 26 00:04:47 2012 +0100

Merge branch 'resumesupport'

* resumesupport: Add test state execution tracking and resume support * Clean up some debug messages * Handle DNS lookup problems * Handle TCP Timeouts properly * Better error handling in HTTP tests * Make sure that responses are written even if the response is not received

Conflicts: ooni/runner.py

ooni/config.py | 7 +++-- ooni/reporter.py | 2 +- ooni/runner.py | 4 +- ooni/templates/httpt.py | 60 ++++++++++++++++++++++++++++++++++++----------- ooniprobe.conf | 5 +-- 5 files changed, 55 insertions(+), 23 deletions(-)

diff --cc ooniprobe.conf index 66ab017,66ab017..5fa0743 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@@ -15,13 -15,13 +15,12 @@@ privacy # Should we include the ASN of the probe in the report? includecity: false # Should we collect a full packet capture on the client? -- includepcap: false ++ includepcap: true advanced: # XXX change this to point to the directory where you have stored the GeoIP # database file. This should be the directory in which OONI is installed # /path/to/ooni-probe/data/ -- #geoip_data_dir: /usr/share/GeoIP/ -- geoip_data_dir: /home/x/code/networking/ooni-probe/data/ ++ geoip_data_dir: /usr/share/GeoIP/ debug: true threadpool_size: 10 tor_socksport: 9050