commit aec0a06c7cb61b2ef429b2164de576f74ad5b3a4 Merge: 38b3e62 b0e7ef1 Author: Isis Lovecruft <isis@torproject.org> Date: Thu Mar 13 22:35:55 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug9264_rebased_3_r1' into develop lib/bridgedb/Bridges.py | 11 ++++++++++- lib/bridgedb/Main.py | 22 ++++++++++++---------- lib/bridgedb/test/test_Bridges.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-)