[tor-commits] [ooni-probe/master] Merge pull request #256 from TheTorProject/fix/misc

[art at torproject.org]

commit dbdff9b8ef7afba81d2868348c97c939f9ad6ce1
Merge: e7dcee3 1e704b4
Author: Arturo Filastò <hellais at users.noreply.github.com>
Date:   Thu Jan 2 06:19:33 2014 -0800

    Merge pull request #256 from TheTorProject/fix/misc
    
    Fix/misc

 Vagrantfile                              |    2 +-
 data/decks/basic.deck                    |    2 +-
 data/ooniprobe.conf.sample               |    2 +-
 ooni/__init__.py                         |    2 +-
 ooni/api/spec.py                         |    4 ++--
 ooni/director.py                         |    9 +++++----
 ooni/geoip.py                            |   23 +++++++++++++++++------
 ooni/managers.py                         |    1 -
 ooni/nettest.py                          |    2 +-
 ooni/nettests/manipulation/traceroute.py |   12 ++++++------
 ooni/oonicli.py                          |   14 +++++++-------
 ooni/reporter.py                         |    2 +-
 ooni/templates/scapyt.py                 |    4 ++--
 ooni/tests/disable_test_dns.py           |   24 ++++++++++++++++++++++++
 ooni/tests/test_dns.py                   |   24 ------------------------
 ooni/tests/test_nettest.py               |    4 ++--
 requirements.txt                         |    2 +-
 17 files changed, 72 insertions(+), 61 deletions(-)