commit e1b5588e0ca71834c062cd7b7633871993fd0bf9 Merge: 77f5da5 fafbdc7 Author: Isis Lovecruft <isis@torproject.org> Date: Wed Apr 23 01:46:38 2014 +0000 Merge branch 'hotfix/11522-gpg-signing' into develop lib/bridgedb/crypto.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)