[tor-commits] [ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

[ioerror@xxxxxxxxxxxxxx]

commit 9a161185cbe508c691b675aa1f14028397cc0fdc
Merge: 8e651e5 39e613a
Author: Jacob Appelbaum <jacob@xxxxxxxxxxxxx>
Date:   Sun Dec 9 02:05:00 2012 +0630

    Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

 docs/source/architecture.rst |  204 ++++++++++++++++++++++++++++++++++++++++++
 docs/source/index.rst        |    1 +
 ooni/config.py               |   22 +++--
 ooni/oonicli.py              |   19 +---
 ooni/reporter.py             |   19 +++--
 ooni/runner.py               |   36 ++++----
 ooni/utils/__init__.py       |   34 +++++++-
 ooni/utils/geodata.py        |    1 +
 tests/test_runner.py         |   20 ++--
 tests/test_utils.py          |   20 ++++
 10 files changed, 312 insertions(+), 64 deletions(-)



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