commit e47248dc7be0f1988cd02de3c2a2e9c64fc54186 Merge: f8907b3 6a7d9d6 Author: Isis Lovecruft <isis@torproject.org> Date: Tue Jul 22 23:04:31 2014 +0000 Merge branch 'fix/9385-fuzzy-email-matching_r1' into develop bridgedb.conf | 23 ++++++++++++-- lib/bridgedb/email/autoresponder.py | 14 +++++++++ lib/bridgedb/email/server.py | 7 +++++ lib/bridgedb/test/email_helpers.py | 6 ++++ lib/bridgedb/test/test_email_autoresponder.py | 7 +++++ lib/bridgedb/test/test_util.py | 42 +++++++++++++++++++++++++ lib/bridgedb/util.py | 40 +++++++++++++++++++++++ 7 files changed, 136 insertions(+), 3 deletions(-)