commit 80fef967c99e23834cd1a283292c9636753a3852 Merge: ec15fd9 5e62580 Author: Isis Lovecruft isis@torproject.org Date: Thu May 29 19:43:34 2014 +0000

Merge branch 'fix/12086-rcptto-other-domain' into fix/9874-automate-email-tests

lib/bridgedb/email/server.py | 71 ++++++++++++++++++++++++-------- lib/bridgedb/test/test_email_server.py | 18 ++++---- 2 files changed, 62 insertions(+), 27 deletions(-)