[tor-commits] [ooni-probe/master] Merge pull request #376 from TheTorProject/fix/deckgen-stall

[art@xxxxxxxxxxxxxx]

commit cd8618aee6ed78c0d223ff6448b339ef11b9c696
Merge: d3981af 9639103
Author: Arturo Filastò <arturo@xxxxxxxxxxx>
Date:   Wed Feb 4 11:30:03 2015 +0100

    Merge pull request #376 from TheTorProject/fix/deckgen-stall
    
    Fix/deckgen stall

 bin/oonideckgen                           |   10 ++++++++++
 bin/oonireport                            |   19 ++++++++++++++++--
 data/ooniprobe.conf.sample                |    1 +
 ooni/deckgen/cli.py                       |    8 +++++++-
 ooni/nettests/blocking/dns_consistency.py |   31 +++++++++++++++++++----------
 ooni/oonibclient.py                       |    3 ++-
 ooni/report/cli.py                        |    6 +++++-
 ooni/report/tool.py                       |   12 +++++++----
 ooni/reporter.py                          |    6 ++++--
 ooni/settings.py                          |    9 +++++++--
 ooni/utils/hacks.py                       |   29 +++++++++++++++++++++++++++
 ooni/utils/trueheaders.py                 |    2 +-
 12 files changed, 112 insertions(+), 24 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits