[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'aagbsn/feature/add_nonblocking_inputprocessor_setup' into feature/oonib-support

[art at torproject.org]

commit 81cf3c89a1d8d21c75000e92f90ed3bc63558521
Merge: 8d77ff5 6f5493d
Author: Arturo Filastò <art at fuffa.org>
Date:   Wed Aug 21 16:14:53 2013 +0200

    Merge remote-tracking branch 'aagbsn/feature/add_nonblocking_inputprocessor_setup' into feature/oonib-support
    
    * aagbsn/feature/add_nonblocking_inputprocessor_setup:
      Update Unit Tests
      Make inputProcessor setup be non-blocking
      Make the return value of getInputProcessor be a deferred.
      Get the input processor as late as possible
    
    Conflicts:
    	ooni/nettest.py

 ooni/director.py           |    1 +
 ooni/nettest.py            |   17 ++++++++++++-----
 ooni/tests/test_nettest.py |    3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)