[tor-commits] [bridgedb/develop] Merge branch 'release/0.3.5'

[isis at torproject.org]

commit 7d6defe277547bcb71b67e40ed90c2dea34bfb85
Merge: 93ecf69 7931067
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Dec 1 02:45:00 2015 +0000

    Merge branch 'release/0.3.5'

 .coveragerc        |   10 +--
 CHANGELOG          |  120 ++++++++++++++++++++++++++++-
 bridgedb.conf      |    2 +-
 setup.py           |   12 +--
 test/test_https.py |  213 +++++++++++++++++++++++-----------------------------
 5 files changed, 225 insertions(+), 132 deletions(-)