[tor-commits] [bridgedb/develop] Merge branch 'fix/5463-sign-client-email-addr' into develop

[isis at torproject.org]

commit 91d6e2c68edaf64521f79bcb3c790818568ecefd
Merge: a391323 1040ffa
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 14 03:24:41 2014 +0000

    Merge branch 'fix/5463-sign-client-email-addr' into develop

 gnupghome/TESTING.subkeys.sec             |  Bin 7304 -> 7212 bytes
 lib/bridgedb/email/server.py              |   34 +++++---
 lib/bridgedb/email/templates.py           |  136 +++++++++++++++++++++--------
 lib/bridgedb/strings.py                   |    9 ++
 lib/bridgedb/test/test_email_server.py    |    2 +-
 lib/bridgedb/test/test_email_templates.py |  119 +++++++++++++++++++++++++
 6 files changed, 252 insertions(+), 48 deletions(-)