[tor-commits] [bridgedb/master] Merge branch 'fix/10559-keyid-in-pt-lines' into develop

[isis at torproject.org]

commit 022a75777e4ddfcaeb81ee0293926ac6aaf8108d
Merge: df660bb 4476867
Author: Isis Lovecruft <isis at 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(-)