[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

[isis at torproject.org]

commit a2aec599ae199d0ddc8b3f2adf7d4455002cae22
Merge: 88569fb 9871642
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Feb 5 22:48:48 2014 +0000

    Merge branch 'master' into develop