[tor-commits] [bridgedb/master] Merge branch 'release/0.3.8'

[isis at torproject.org]

commit 9f753b3ccbd159bc3b906875b18a2b4c53aa8e91
Merge: f2fe8fb 78e352e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Sep 22 12:07:28 2016 +0000

    Merge branch 'release/0.3.8'

 .coveragerc                  |   1 -
 .test.requirements.txt       |   2 +-
 .travis.requirements.txt     |   4 +-
 CHANGELOG                    |  12 +++
 Makefile                     |  15 ++++
 bridgedb.conf                |   4 +
 bridgedb/Main.py             | 172 +++++++++++++++++++++++--------------------
 bridgedb/configure.py        |   4 +-
 requirements.txt             |   4 +-
 scripts/install-dependencies |  12 ++-
 scripts/setup-tests          |   6 +-
 setup.py                     |   2 +-
 12 files changed, 146 insertions(+), 92 deletions(-)