[tor-commits] [bridgedb/master] Merge branch 'fix/9462-refactor-netstatus-parsers_r9462C_r2' into develop

[isis at torproject.org]

commit 2fd3aca79ca1f0fd6fcfc18952e6c79d38c5acfa
Merge: d0ea228 454bd12
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Dec 12 06:16:33 2013 +0000

    Merge branch 'fix/9462-refactor-netstatus-parsers_r9462C_r2' into develop

 lib/bridgedb/Bridges.py                       |   43 +-
 lib/bridgedb/Dist.py                          |    4 +
 lib/bridgedb/parse/__init__.py                |   55 ++-
 lib/bridgedb/parse/addr.py                    |  275 ++++++++---
 lib/bridgedb/parse/networkstatus.py           |  182 ++++----
 lib/bridgedb/test/test_parse_addr.py          |  615 +++++++++++++++++++++++++
 lib/bridgedb/test/test_parse_networkstatus.py |  389 ++++++++++++++--
 7 files changed, 1363 insertions(+), 200 deletions(-)