[tor-commits] [ooni-probe/master] Merge pull request #347 from kudrom/feature/deckgen

[art at torproject.org]

commit aeccb188dd083cc23da3ba74b5c105b05467f5dd
Merge: 8545423 1986819
Author: aagbsn <aagbsn at extc.org>
Date:   Tue Sep 2 15:48:58 2014 +0000

    Merge pull request #347 from kudrom/feature/deckgen
    
    Review of deckgen branch

 ooni/deckgen/cli.py                              |   15 +++--------
 ooni/deckgen/processors/citizenlab_test_lists.py |   29 +++++++++++-----------
 ooni/deckgen/processors/namebench_dns_servers.py |    1 -
 ooni/resources/cli.py                            |    2 --
 ooni/resources/update.py                         |    9 +++++++
 ooni/utils/__init__.py                           |    4 ++-
 6 files changed, 30 insertions(+), 30 deletions(-)