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

[isis at torproject.org]

commit 94dd10673f9e6650e8a00e162f348e64f7a1ecab
Merge: 3a1aa0d 2519454
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Apr 22 01:25:42 2015 +0000

    Merge branch 'release-0.3.2'

 .travis.yml                                 |   21 +-
 CHANGELOG                                   |   61 ++++++
 Makefile                                    |    3 +-
 README.rst                                  |    1 +
 bridgedb.conf                               |   80 +++++++-
 doc/sphinx/source/conf.py                   |    2 +-
 lib/bridgedb/Bridges.py                     |  145 +++----------
 lib/bridgedb/Bucket.py                      |    8 -
 lib/bridgedb/Dist.py                        |   69 +++++--
 lib/bridgedb/Filters.py                     |   16 +-
 lib/bridgedb/HTTPServer.py                  |   15 +-
 lib/bridgedb/Main.py                        |   49 ++---
 lib/bridgedb/Storage.py                     |  127 +-----------
 lib/bridgedb/bridgerequest.py               |   11 +-
 lib/bridgedb/bridges.py                     |  101 ++++++---
 lib/bridgedb/captcha.py                     |    2 +-
 lib/bridgedb/configure.py                   |   25 ++-
 lib/bridgedb/email/autoresponder.py         |   19 +-
 lib/bridgedb/email/server.py                |   12 +-
 lib/bridgedb/email/templates.py             |    4 +-
 lib/bridgedb/geo.py                         |   28 +--
 lib/bridgedb/parse/descriptors.py           |  106 +++++-----
 lib/bridgedb/parse/options.py               |   27 ---
 lib/bridgedb/proxy.py                       |   15 +-
 lib/bridgedb/runner.py                      |   47 -----
 lib/bridgedb/schedule.py                    |   66 +++++-
 lib/bridgedb/strings.py                     |   90 +++++++-
 lib/bridgedb/templates/options.html         |   13 +-
 lib/bridgedb/test/email_helpers.py          |    3 +
 lib/bridgedb/test/legacy_Tests.py           |  105 ++--------
 lib/bridgedb/test/test_HTTPServer.py        |    2 +-
 lib/bridgedb/test/test_bridges.py           |  296 ++++++++++++++++++++++++++-
 lib/bridgedb/test/test_email_server.py      |    2 +-
 lib/bridgedb/test/test_parse_descriptors.py |   77 +++++++
 lib/bridgedb/test/test_schedule.py          |   86 ++++----
 lib/bridgedb/test/util.py                   |   59 ++++++
 scripts/get-tor-exits                       |    2 +-
 scripts/install-dependencies                |   40 ++++
 scripts/setup-tests                         |   29 +++
 setup.py                                    |  119 ++++++++++-
 40 files changed, 1300 insertions(+), 683 deletions(-)