commit 790cb1fe16d54b2328b8e9c12293d74dffb69125 Merge: 2b72638 966435d Author: Arturo Filastò <hellais@gmail.com> Date: Fri Feb 10 15:06:42 2012 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe refactor/ooni-probe.conf | 1 + refactor/plugoo.py | 2 +- refactor/tests/bridget.py | 3 +++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --cc refactor/tests/bridget.py index 12e3fa1,cea0d91..cb77c89 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@@ -52,8 -42,8 +52,9 @@@ ClientTransportPlugin obfs2 exec /usr/l UseBridges 1 bridge %s DataDirectory %s + usemicrodescriptors 0 """ % (socksport, bridge, datadir) + try: f = open(randomname, "wb") f.write(torrc)