commit 022a75777e4ddfcaeb81ee0293926ac6aaf8108d Merge: df660bb 4476867 Author: Isis Lovecruft isis@torproject.org Date: Sun Jan 12 03:34:27 2014 +0000

Merge branch 'fix/10559-keyid-in-pt-lines' into develop

lib/bridgedb/Bridges.py | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)