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

[isis at torproject.org]

commit 91305fa523c8b9e6a631d8c29f583e3da722832e
Merge: 9a926f2 da84c25
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Dec 20 22:59:11 2017 +0000

    Merge branch 'fix/24636' into develop

 README.rst | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)