commit 9cfb4690b4a2f6d88542a275af2e387955c2113c Merge: 54c6629 d9741cf Author: Isis Lovecruft isis@torproject.org Date: Fri May 4 18:29:25 2018 +0000

Merge branch 'release/0.6.5'

bridgedb/parse/descriptors.py | 14 ++++++- scripts/assign-reserve-bridges.py | 81 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-)