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

[phw at torproject.org]

commit 0a1de3f58abe20f73510a43198365fb1fb9f9580
Merge: 46dde4c ed37530
Author: Philipp Winter <phw at nymity.ch>
Date:   Thu Aug 15 14:57:20 2019 -0700

    Merge branch 'fix/22755' into develop

 .test.requirements.txt     |   1 -
 .travis.requirements.txt   |   1 -
 CHANGELOG                  |   4 +
 README.rst                 |   6 +-
 bridgedb/main.py           |  10 +-
 bridgedb/runner.py         |  37 +-----
 doc/HACKING.md             |  10 +-
 scripts/create_descriptors | 298 +++++++++++++++++++++++++++++++++++++++++++++
 scripts/setup-tests        |   2 +-
 setup.py                   |   2 +-
 10 files changed, 316 insertions(+), 55 deletions(-)