commit f266f32c365eb7a16cf156cc02f7e492266a7b51 Merge: 783babc 24dc8dc Author: Isis Lovecruft isis@torproject.org Date: Wed Mar 26 05:46:11 2014 +0000

Merge branch 'release-0.1.6'

.travis.yml | 8 +- CHANGELOG | 13 + Makefile | 5 +- bridgedb.conf | 7 +- lib/bridgedb/Bridges.py | 52 +- lib/bridgedb/Dist.py | 24 +- lib/bridgedb/EmailServer.py | 32 +- lib/bridgedb/HTTPServer.py | 208 ++++-- lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 104 +++ lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 101 +++ lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 104 +++ lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 101 +++ lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 +++ lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 100 +++ lib/bridgedb/runner.py | 2 +- lib/bridgedb/templates/base.html | 12 +- lib/bridgedb/test/test_HTTPServer.py | 669 +++++++++++++++++ lib/bridgedb/test/test_bridgedb.py | 12 +- lib/bridgedb/test/test_txrecaptcha.py | 21 +- lib/bridgedb/txrecaptcha.py | 52 +- scripts/gen_bridge_descriptors | 870 ----------------------- setup.py | 8 +- 28 files changed, 2106 insertions(+), 1012 deletions(-)