commit 862b996d9fdec8f0d2b33be9eab065d4e0abd715 Merge: 6fbe6f0 712f116 Author: Isis Lovecruft isis@torproject.org Date: Thu Jun 5 03:07:45 2014 +0000

Merge branch 'fix/12091-dkim-dunno' into fix/9874-automate-email-tests

lib/bridgedb/test/test_email_autoresponder.py | 21 ++++++++++--- lib/bridgedb/test/test_email_dkim.py | 39 +++++++++++++++++++++---- 2 files changed, 50 insertions(+), 10 deletions(-)