[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'evil/master' into httprequests

[art at torproject.org]

commit be68c6cea8475ec845f6b4eac8747218bb7a7914
Merge: 51902f8 07ed416
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Nov 19 18:53:04 2012 +0100

    Merge remote-tracking branch 'evil/master' into httprequests
    
    * evil/master:
      twisted Headers() class edited to avoid header fix in reference to: https://trac.torproject.org/projects/tor/ticket/7432

 ooni/lib/txagentwithsocks.py |  164 +++++++++++++++++++++++++++---------------
 1 files changed, 106 insertions(+), 58 deletions(-)