[tor-commits] [ooni-probe/master] Merge pull request #401 from TheTorProject/fix/twisted15.0

[art at torproject.org]

commit 8449d674f69c8ca740631fab534935fc87265af2
Merge: 866ed35 b1cf6c4
Author: Simone Basso <bassosimone at gmail.com>
Date:   Fri Nov 13 08:57:08 2015 +0100

    Merge pull request #401 from TheTorProject/fix/twisted15.0
    
    Fix/twisted15.0

 ooni/reporter.py           |    2 +-
 ooni/tests/test_oonicli.py |    2 ++
 ooni/utils/hacks.py        |   27 ---------------------------
 ooni/utils/trueheaders.py  |    7 ++++---
 requirements.txt           |    2 +-
 5 files changed, 8 insertions(+), 32 deletions(-)