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

[isis at torproject.org]

commit d9741cf7e04f2571a4fcd82877a4fb84232eb941
Merge: 37e126f 35772f8
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri May 4 18:25:37 2018 +0000

    Merge branch 'fix/26023' into develop

 bridgedb/parse/descriptors.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)