commit 533841454da554359ef8a722f15b5d09b819923f
Merge: af03b56 4164537
Author: Arturo Filastò <[email protected]>
Date: Mon Jun 17 13:03:15 2013 +0200
Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
* 'master' of ssh://git-rw.torproject.org/ooni-probe:
Add bridge and obfsproxy support to director when starting Tor
ooni/director.py | 16 ++++++++++++++++
ooniprobe.conf.sample | 1 +
2 files changed, 17 insertions(+)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
