commit 3ee91c1f50e2ec0206f19fc1a161b4596bc1fd04 Merge: 380820f 00228a8 Author: Isis Lovecruft isis@torproject.org Date: Tue Feb 4 00:27:19 2014 +0000

Merge branch 'release-0.1.1'

CHANGELOG | 69 +++ README | 19 +- bridgedb.conf | 139 ++++-- doc/DESCRIPTORS.md | 3 +- .../XXX-bridgedb-database-improvements.txt | 260 ++++++++++ doc/proposals/XXX-bridgedb-social-distribution.txt | 496 ++++++++++++++++++++ lib/bridgedb/Bridges.py | 4 +- lib/bridgedb/HTTPServer.py | 179 +++++-- lib/bridgedb/Main.py | 21 +- lib/bridgedb/Storage.py | 10 +- lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 49 +- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 41 +- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 34 +- lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 45 +- lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 41 +- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 49 +- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 33 +- lib/bridgedb/persistent.py | 2 +- lib/bridgedb/templates/assets/custom.css | 2 +- lib/bridgedb/templates/base.html | 32 ++ setup.py | 10 +- 41 files changed, 1593 insertions(+), 838 deletions(-)