commit 5f568cb1b1bc896641145d79b5c9e42067282bab
Merge: 691aed3 46308d5
Author: Arturo Filastò <[email protected]>
Date: Tue Feb 26 13:47:27 2013 +0100
Merge remote-tracking branch 'thetorproject/master' into merging
* thetorproject/master:
Set a default collector
collector | 1 +
ooni/oonicli.py | 3 ++-
ooni/runner.py | 9 +++++++++
3 files changed, 12 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
