[tor-commits] [bridgedb/master] Merge branch 'fix/9873-convert-old-unittests_r3' into develop

[isis at torproject.org]

commit 9f8144961d0e98ed047ca0318287bc0a88b63488
Merge: 21d0361 34db641
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Dec 20 09:20:12 2013 +0000

    Merge branch 'fix/9873-convert-old-unittests_r3' into develop

 .gitignore                                    |    2 +
 .travis.yml                                   |   20 +-
 lib/bridgedb/Bridges.py                       |   15 +-
 lib/bridgedb/Dist.py                          |    7 +-
 lib/bridgedb/Tests.py                         |   87 ++++++---
 lib/bridgedb/Time.py                          |   14 +-
 lib/bridgedb/crypto.py                        |    8 +-
 lib/bridgedb/test/deprecated.py               |  149 +++++++++++++++
 lib/bridgedb/test/test_Tests.py               |  248 +++++++++++++++++++++++++
 lib/bridgedb/test/test_parse_networkstatus.py |   11 +-
 lib/bridgedb/test/test_persistent.py          |    8 +-
 lib/bridgedb/test/util.py                     |   48 ++---
 12 files changed, 530 insertions(+), 87 deletions(-)