commit 6480891a3549fbbe906b66183d5306a6c298d5f9 Merge: b98f080 d617d4e Author: Isis Lovecruft <isis@torproject.org> Date: Mon Apr 21 17:16:00 2014 +0000 Merge branch 'hotfix/remove-sqlitedict-class' into develop lib/bridgedb/Storage.py | 77 ----------------------------------------------- lib/bridgedb/Tests.py | 49 ++---------------------------- 2 files changed, 2 insertions(+), 124 deletions(-)