commit 2c069e1379a07b2384a8201c2de0f19e30da49bb Merge: 8ec21f6 9ffbbc3 Author: Arturo Filastò art@fuffa.org Date: Wed Mar 18 09:54:54 2015 +0100

Merge branch 'joe/13597'

* joe/13597: clean up checking for outdated versions set our own datadir so we can grab obfs4 logs clean up ClientTransportPlugin logic fixes from comments add obfs4 bridge reachability support factor out another level of if/elses factor out a level of if/elses

ooni/nettests/blocking/bridge_reachability.py | 81 ++++++++++++------------- ooni/tests/test_onion.py | 41 +++++++++++++ ooni/utils/onion.py | 57 +++++++++++++++++ 3 files changed, 136 insertions(+), 43 deletions(-)