commit cbb078b63c844cf7f0ee9926f9c8f92367a01790 Merge: e1b5588 3debed9 Author: Isis Lovecruft <isis@torproject.org> Date: Wed Apr 23 05:14:44 2014 +0000 Merge branch 'hotfix/11522-gpg-signing' into develop lib/bridgedb/crypto.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)