commit b8365ad36d78d279af4d19736991262b2f9c8268 Merge: 95ad0a6 f7bb49f Author: Isis Lovecruft isis@torproject.org Date: Mon Feb 23 23:31:26 2015 +0000

Merge branch 'fix/10385-python-gnupg_r1' into develop

.gitignore | 3 - .gnupg/TESTING.pub | Bin 0 -> 4622 bytes .gnupg/TESTING.subkeys.sec | Bin 0 -> 7212 bytes .gnupg/bridgedb-offline-key.pub.asc | 113 ++++++++ .gnupg/bridgedb-online-key.pub.asc | 100 +++++++ .gnupg/gpg.conf | 96 ++++++ .gnupg/pubring.gpg | Bin 0 -> 4634 bytes .gnupg/secring.gpg | Bin 0 -> 7224 bytes .travis.requirements.txt | 2 +- .travis.yml | 4 +- README.rst | 6 +- bridgedb.conf | 55 +++- gnupghome/TESTING.subkeys.sec | Bin 7212 -> 0 bytes gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 | Bin 6505 -> 0 bytes gnupghome/bridgedb-offline-key.pub.asc | 113 -------- gnupghome/bridgedb-online-signing-key.pub.asc | 148 ---------- gnupghome/gpg.conf | 96 ------ lib/bridgedb/configure.py | 3 +- lib/bridgedb/crypto.py | 285 +++++------------- lib/bridgedb/email/autoresponder.py | 45 ++- lib/bridgedb/email/server.py | 12 +- lib/bridgedb/test/email_helpers.py | 15 +- lib/bridgedb/test/test_Main.py | 5 +- lib/bridgedb/test/test_crypto.py | 339 +++++++++------------- lib/bridgedb/test/test_email_autoresponder.py | 2 +- requirements.txt | 2 +- 26 files changed, 631 insertions(+), 813 deletions(-)