[tor-commits] [bridgedb/develop] Merge branch 'hotfix/5463-email-line-recieved-logging' into develop

[isis at torproject.org]

commit 8939e6d4a981d5104f78d2e439c2a45e62b9d79e
Merge: 33cf0d7 c20c6a8
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Jun 9 22:09:55 2014 +0000

    Merge branch 'hotfix/5463-email-line-recieved-logging' into develop

 bridgedb.conf                                 |    8 ++-
 lib/bridgedb/Dist.py                          |   29 +++++----
 lib/bridgedb/Main.py                          |    3 +-
 lib/bridgedb/email/autoresponder.py           |   83 ++++++++++++++++---------
 lib/bridgedb/email/server.py                  |   25 ++++++--
 lib/bridgedb/parse/addr.py                    |    2 +
 lib/bridgedb/test/email_helpers.py            |    3 +
 lib/bridgedb/test/test_email_autoresponder.py |    4 +-
 8 files changed, 110 insertions(+), 47 deletions(-)