commit a6ec3a119cc734acf2d8caa50adfbe8cc85dd8a0
Merge: 8aecab7 3d8204c
Author: aagbsn <[email protected]>
Date: Tue Jan 14 04:38:52 2014 -0800
Merge pull request #265 from
TheTorProject/feature/additional_tor_config_options
Support for Additional Tor Configurations
data/ooniprobe.conf.sample | 5 +++++
ooni/director.py | 24 ++++++++++++++----------
2 files changed, 19 insertions(+), 10 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
