[tor-commits] [bridgedb/master] Merge branch 'feature/9865-test-runner-2-r1' into develop

[isis@xxxxxxxxxxxxxx]

commit 1f695a46474ef7520bd94f58ed720ff2a1990859
Merge: 6255494 f5d3726
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Sat Oct 26 09:16:31 2013 +0000

    Merge branch 'feature/9865-test-runner-2-r1' into develop

 .travis.yml                    |   40 +-
 doc/DESCRIPTORS.md             |  190 +++++++++
 lib/bridgedb/Main.py           |   64 +--
 lib/bridgedb/Tests.py          |   42 +-
 lib/bridgedb/opt.py            |  140 +++++++
 lib/bridgedb/parse/versions.py |   70 ++++
 lib/bridgedb/runner.py         |   97 +++++
 requirements.txt               |   10 +-
 scripts/bridgedb               |   54 ++-
 scripts/executioner            |   35 ++
 scripts/gen_bridge_descriptors |  836 ++++++++++++++++++++++++++++++++++++----
 scripts/make-ssl-cert          |   56 +++
 setup.py                       |   11 +-
 13 files changed, 1468 insertions(+), 177 deletions(-)



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