commit 5b401e30773acdff7eb797c83ee711f36acd30cf Merge: a066884 105de16 Author: Isis Lovecruft isis@torproject.org Date: Sat Mar 21 03:59:55 2015 +0000

Merge branch 'hotfix/10385-init-gpg-ret' into develop

lib/bridgedb/crypto.py | 2 ++ 1 file changed, 2 insertions(+)