commit 558610e3fa321b76af03142d4aa1ab92125a43d5 Merge: bab5d96 d2a2d0c Author: Isis Lovecruft isis@torproject.org Date: Fri Feb 21 20:26:37 2014 +0000

Merge branch 'testing/tpo-sysrqb/bug9264_rebased_1-test2' into develop

lib/bridgedb/Bridges.py | 149 ++++++++++++++++++++++++++++++----- lib/bridgedb/Main.py | 72 ++++++++--------- lib/bridgedb/parse/networkstatus.py | 2 +- lib/bridgedb/test/test_Bridges.py | 111 ++++++++++++++++++++++++++ 4 files changed, 275 insertions(+), 59 deletions(-)