commit 403d60ef1545c70162d24b4126524da494de6e0e Merge: f8f2890 23251cf Author: Arturo Filastò art@fuffa.org Date: Tue Aug 27 11:23:38 2013 +0200

Merge branch 'fix/link_task_schedulers' of https://github.com/aagbsn/ooni-probe into fix/link_task_schedulers

* 'fix/link_task_schedulers' of https://github.com/aagbsn/ooni-probe: Track the number of failures, not the instances. Reschedule failures immediately

ooni/managers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)