commit 4164537e9917e77670968eedde0e18a13d1eb1f7 Merge: 05346a3 9b25111 Author: Arturo Filastò <hellais@gmail.com> Date: Thu Jun 13 05:28:54 2013 -0700 Merge pull request #82 from aagbsn/feature/add-obfsproxy-bridges Add bridge and obfsproxy support to director when starting Tor ooni/director.py | 16 ++++++++++++++++ ooniprobe.conf.sample | 1 + 2 files changed, 17 insertions(+)