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

Fri Feb 21 21:56:56 UTC 2014

commit 564f4b9fdf0c63128c1fd6d1e7f4e36a42848fb4
Merge: 9871642 26ba67b
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Feb 21 21:54:41 2014 +0000

    Merge branch 'release-0.1.3'

 .travis.yml                         |    3 +-
 CHANGELOG                           |   14 ++++
 doc/DESCRIPTORS.md                  |    4 +-
 doc/gsoc2014-volunteer.txt          |   92 +++++++++++++++++++++
 lib/bridgedb/Bridges.py             |  151 ++++++++++++++++++++++++++++++-----
 lib/bridgedb/HTTPServer.py          |   55 +++++++++++--
 lib/bridgedb/Main.py                |   72 ++++++++---------
 lib/bridgedb/parse/networkstatus.py |    2 +-
 lib/bridgedb/persistent.py          |   11 ++-
 lib/bridgedb/templates/base.html    |    5 ++
 lib/bridgedb/templates/index.html   |   11 +--
 lib/bridgedb/templates/options.html |   39 +++++++++
 lib/bridgedb/test/test_Bridges.py   |  111 +++++++++++++++++++++++++
 13 files changed, 491 insertions(+), 79 deletions(-)