commit 91f4cf9c084765748fed80f8f8d00eae80c5e68e Merge: 7a1a54f 5e032ef Author: Isis Lovecruft <isis@torproject.org> Date: Wed Apr 1 06:13:21 2015 +0000 Merge branch 'fix/12505-5418-remove-old-block-code' into develop lib/bridgedb/Bridges.py | 72 ------------------------------------- lib/bridgedb/Bucket.py | 8 ----- lib/bridgedb/Main.py | 20 ----------- lib/bridgedb/Storage.py | 46 ------------------------ lib/bridgedb/test/legacy_Tests.py | 40 +-------------------- 5 files changed, 1 insertion(+), 185 deletions(-)