commit 4ab90f8a39bac65f634247383959059f8ee175a1 Merge: f734d02 09c94c9 Author: Arturo Filastò <art@fuffa.org> Date: Fri Feb 1 16:27:26 2013 +0100 Merge branch 'master' of https://github.com/TheTorProject/ooni-probe * 'master' of https://github.com/TheTorProject/ooni-probe: Expand the user (~) fragment when creating directory Strictly require Twisted 12.2.0. This is a temporary fix for issue #28 The problem arises from the fact that we are overriding a private method (_WrappingProtocol that has been removed in 12.3.0). The proper way to fix this would be to get rid of the hack and use a HTTP Connection Pool. Add ability to specify the Tor data directory from the config file Update version in __init__.py to match tag Update archive reports script to reflect report format changes Update docs to reflect changes in report filename format