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

[isis at torproject.org]

commit 9de09766c0c4fedea2db328a80fb7ecf8f7fd43e
Merge: f824063 0ae1263
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Jul 25 22:54:32 2017 +0000

    Merge branch 'fix/22998' into develop

 .travis.yml      | 20 +++++++++++++-------
 requirements.txt |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)