commit 13231f18ff2dc8a80d6d5561833b503f690f3872 Merge: 8745167 8dfcd5d Author: Isis Lovecruft <isis@torproject.org> Date: Tue Apr 1 21:54:44 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug5232_adding_concurrent_processing_squashed_r1' into develop .travis.yml | 2 +- CHANGELOG | 14 +++ lib/bridgedb/Bridges.py | 66 +++++------ lib/bridgedb/Bucket.py | 104 ++++++++-------- lib/bridgedb/Dist.py | 115 +++++++++--------- lib/bridgedb/EmailServer.py | 56 ++++++--- lib/bridgedb/Main.py | 210 +++++++++++++++++++++------------ lib/bridgedb/Stability.py | 204 ++++++++++++++++---------------- lib/bridgedb/Storage.py | 158 +++++++++++++++++++++++-- lib/bridgedb/Tests.py | 4 +- lib/bridgedb/test/test_EmailServer.py | 160 +++++++++++++++++++++++++ lib/bridgedb/test/test_Storage.py | 56 +++++++++ lib/bridgedb/test/test_bridgedb.py | 39 +++++- setup.py | 2 +- 14 files changed, 840 insertions(+), 350 deletions(-)