[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'tpo-common/master'

[isis at torproject.org]

commit e6e679d10c90be096243b9bf5cc572ce1fe1068d
Merge: 80c99cb 59d6fad
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat May 18 15:47:11 2013 +0000

    Merge remote-tracking branch 'tpo-common/master'

 nettests/blocking/tcpconnect.py    |   18 ++++++++++++++++++
 nettests/manipulation/http_host.py |   10 ++++++++++
 ooni/config.py                     |   23 ++++-------------------
 ooni/director.py                   |   23 ++++++++++++++---------
 ooni/geoip.py                      |    2 +-
 ooni/nettest.py                    |    5 ++---
 ooni/otime.py                      |    2 ++
 7 files changed, 51 insertions(+), 32 deletions(-)