[tor-commits] [bridgedb/master] Merge branch 'fix/12029-refactor-Bridges' into develop

[isis at torproject.org]

commit bebe41b6081b88f3c07e9af3a896307961facd70
Merge: 6ccf0c7 d7fd62f
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Aug 28 03:19:49 2014 +0000

    Merge branch 'fix/12029-refactor-Bridges' into develop

 bridgedb.conf                           |    8 +++-
 lib/bridgedb/Bridges.py                 |   52 +++++--------------------
 lib/bridgedb/Tests.py                   |    4 +-
 lib/bridgedb/bridgerequest.py           |    5 ++-
 lib/bridgedb/interfaces.py              |   19 +++++++++
 lib/bridgedb/parse/addr.py              |   64 ++++++++++++++++++++-----------
 lib/bridgedb/parse/fingerprint.py       |   44 +++++++++++++++++++++
 lib/bridgedb/test/deprecated.py         |   33 ++++++++++++++++
 lib/bridgedb/test/test_Tests.py         |    6 +++
 lib/bridgedb/test/test_bridgerequest.py |    4 +-
 10 files changed, 167 insertions(+), 72 deletions(-)