[tor-commits] [ooni-probe/master] Merge branch 'feature/use_postprocessor_with_http_requests'

Sat Nov 23 11:11:41 UTC 2013

commit ff4a709f5371528ead0fafee07c782cdc62c874c
Merge: db7d028 d766cf6
Author: Arturo FilastÃ² <art at fuffa.org>
Date:   Fri Nov 22 18:01:08 2013 +0100

    Merge branch 'feature/use_postprocessor_with_http_requests'
    
    * feature/use_postprocessor_with_http_requests:
      Indicate whether Tor was used in a request or not in the report.
      Refactor postProcessor to accommodate result callback refactoring.
      Add measurement result to measurement object.
      Use inlineCallbacks
      Rewrite http_requests to use postProcessor API

 ooni/director.py                        |    4 +-
 ooni/managers.py                        |    2 +-
 ooni/nettest.py                         |    5 ++-
 ooni/nettests/blocking/http_requests.py |   75 +++++++++++++------------------
 ooni/templates/httpt.py                 |    3 +-
 5 files changed, 40 insertions(+), 49 deletions(-)