[tor-commits] [bridgedb/develop] Merge branch 'fix/9380-stem_r10' into develop

[isis at torproject.org]

commit e48437a8a246d6a32aae2e00c97af667d99630d6
Merge: 034a421 8dc041b
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Feb 18 23:06:25 2015 +0000

    Merge branch 'fix/9380-stem_r10' into develop

 .test.requirements.txt                        |    2 +-
 .travis.requirements.txt                      |    3 +-
 lib/bridgedb/Bridges.py                       |  687 +----------
 lib/bridgedb/Filters.py                       |   89 +-
 lib/bridgedb/HTTPServer.py                    |    5 +-
 lib/bridgedb/Main.py                          |  238 ++--
 lib/bridgedb/Stability.py                     |    2 +-
 lib/bridgedb/Storage.py                       |    5 +-
 lib/bridgedb/Tests.py                         |  780 ------------
 lib/bridgedb/bridgerequest.py                 |   54 +-
 lib/bridgedb/bridges.py                       | 1586 +++++++++++++++++++++++++
 lib/bridgedb/configure.py                     |   17 +-
 lib/bridgedb/crypto.py                        |   41 +
 lib/bridgedb/parse/descriptors.py             |  274 +++++
 lib/bridgedb/parse/fingerprint.py             |   16 +-
 lib/bridgedb/parse/networkstatus.py           |  280 -----
 lib/bridgedb/parse/nickname.py                |   58 +
 lib/bridgedb/schedule.py                      |    6 +-
 lib/bridgedb/test/deprecated.py               |  520 ++++++++
 lib/bridgedb/test/deprecated_networkstatus.py |  275 +++++
 lib/bridgedb/test/legacy_Tests.py             |  725 +++++++++++
 lib/bridgedb/test/test_Bridges.py             |  199 ----
 lib/bridgedb/test/test_Tests.py               |   13 +-
 lib/bridgedb/test/test_bridges.py             | 1345 +++++++++++++++++++++
 lib/bridgedb/test/test_crypto.py              |   61 +
 lib/bridgedb/test/test_parse_descriptors.py   |  653 ++++++++++
 lib/bridgedb/test/test_parse_networkstatus.py |  414 -------
 lib/bridgedb/test/test_parse_nickname.py      |   63 +
 setup.py                                      |    2 +-
 29 files changed, 5887 insertions(+), 2526 deletions(-)