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

[isis at torproject.org]

commit 2a4ba64a3d0c3f108c2fa25142edfcc3148d98e2
Merge: 85e4566 6db4d2b
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon May 21 18:41:54 2018 +0000

    Merge branch 'bug26150' into develop

 bridgedb/Bridges.py | 7 +++++++
 1 file changed, 7 insertions(+)