[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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



commit 6f0f5365f92d3f39db6ee3d52b7a5eedc09176ab
Merge: e08b98e cdc0ffa
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Sat Mar 21 02:00:24 2015 +0000

    Merge branch 'release-0.3.0'

 .gitignore                                       |    6 +-
 .gnupg/TESTING.pub                               |  Bin 0 -> 4622 bytes
 .gnupg/TESTING.subkeys.sec                       |  Bin 0 -> 7212 bytes
 .gnupg/bridgedb-offline-key.pub.asc              |  113 ++
 .gnupg/bridgedb-online-key.pub.asc               |  100 ++
 .gnupg/gpg.conf                                  |   96 ++
 .gnupg/pubring.gpg                               |  Bin 0 -> 4634 bytes
 .gnupg/secring.gpg                               |  Bin 0 -> 7224 bytes
 .test.requirements.txt                           |    2 +-
 .travis.requirements.txt                         |    9 +-
 .travis.yml                                      |   28 +-
 CHANGELOG                                        |  285 +++-
 Makefile                                         |    6 +-
 README.rst                                       |   73 +-
 TODO                                             |   58 -
 bridgedb.conf                                    |   87 +-
 doc/sphinx/source/bridgedb.Tests.rst             |    8 -
 doc/sphinx/source/bridgedb.bridges.rst           |    8 +
 doc/sphinx/source/bridgedb.geo.rst               |    8 +
 doc/sphinx/source/bridgedb.parse.rst             |    4 +-
 doc/sphinx/source/bridgedb.proxy.rst             |    8 +
 doc/sphinx/source/bridgedb.qrcodes.rst           |    8 +
 doc/sphinx/source/bridgedb.rst                   |    5 +-
 doc/sphinx/source/conf.py                        |   11 +-
 gnupghome/TESTING.subkeys.sec                    |  Bin 7212 -> 0 bytes
 gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 |  Bin 6505 -> 0 bytes
 gnupghome/bridgedb-offline-key.pub.asc           |  113 --
 gnupghome/bridgedb-online-signing-key.pub.asc    |  148 --
 gnupghome/gpg.conf                               |   96 --
 lib/bridgedb/Bridges.py                          |  686 +--------
 lib/bridgedb/Filters.py                          |   89 +-
 lib/bridgedb/HTTPServer.py                       |   37 +-
 lib/bridgedb/Main.py                             |  352 ++---
 lib/bridgedb/Stability.py                        |    2 +-
 lib/bridgedb/Storage.py                          |    5 +-
 lib/bridgedb/Tests.py                            |  780 -----------
 lib/bridgedb/bridgerequest.py                    |   54 +-
 lib/bridgedb/bridges.py                          | 1603 ++++++++++++++++++++++
 lib/bridgedb/configure.py                        |   22 +-
 lib/bridgedb/crypto.py                           |  328 ++---
 lib/bridgedb/email/autoresponder.py              |   44 +-
 lib/bridgedb/email/server.py                     |   12 +-
 lib/bridgedb/geo.py                              |   78 ++
 lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po     |   21 +-
 lib/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po     |  357 +++++
 lib/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po     |  357 +++++
 lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po     |  392 +++++-
 lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po     |  367 ++++-
 lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po     |  169 ++-
 lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po     |  103 +-
 lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po     |   20 +-
 lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po     |  445 +++++-
 lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po  |  387 +++++-
 lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po  |  447 +++++-
 lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po     |  359 +++++
 lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po     |   79 +-
 lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po     |   63 +-
 lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po     |   63 +-
 lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po     |   61 +-
 lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po  |   64 +-
 lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po  |   72 +-
 lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po     |   59 +-
 lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po     |  161 ++-
 lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po     |  145 +-
 lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po     |   19 +-
 lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po     |   20 +-
 lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po     |  161 ++-
 lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po     |  170 ++-
 lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po     |  100 +-
 lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po     |   64 +-
 lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po  |   53 +-
 lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po     |   21 +-
 lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po     |   65 +-
 lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po     |  367 ++++-
 lib/bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po  |  357 +++++
 lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po  |  359 +++++
 lib/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po     |  380 +++++
 lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po     |   61 +-
 lib/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po     |  357 +++++
 lib/bridgedb/i18n/templates/bridgedb.pot         |   90 +-
 lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po     |   97 +-
 lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po     |  184 ++-
 lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po  |  121 +-
 lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po  |   22 +-
 lib/bridgedb/parse/addr.py                       |    7 +
 lib/bridgedb/parse/descriptors.py                |  274 ++++
 lib/bridgedb/parse/fingerprint.py                |   16 +-
 lib/bridgedb/parse/networkstatus.py              |  280 ----
 lib/bridgedb/parse/nickname.py                   |   58 +
 lib/bridgedb/persistent.py                       |   45 +-
 lib/bridgedb/proxy.py                            |  470 +++++++
 lib/bridgedb/qrcodes.py                          |    8 +-
 lib/bridgedb/runner.py                           |   29 +
 lib/bridgedb/schedule.py                         |    6 +-
 lib/bridgedb/strings.py                          |    5 +-
 lib/bridgedb/templates/bridgedb.asc              |  226 ++-
 lib/bridgedb/test/deprecated.py                  |  520 +++++++
 lib/bridgedb/test/deprecated_networkstatus.py    |  275 ++++
 lib/bridgedb/test/email_helpers.py               |   15 +-
 lib/bridgedb/test/legacy_Tests.py                |  725 ++++++++++
 lib/bridgedb/test/test_Bridges.py                |  199 ---
 lib/bridgedb/test/test_Main.py                   |  432 ++++++
 lib/bridgedb/test/test_Tests.py                  |   13 +-
 lib/bridgedb/test/test_bridgedb.py               |    1 +
 lib/bridgedb/test/test_bridges.py                | 1357 ++++++++++++++++++
 lib/bridgedb/test/test_crypto.py                 |  364 ++---
 lib/bridgedb/test/test_email_autoresponder.py    |    2 +-
 lib/bridgedb/test/test_geo.py                    |   96 ++
 lib/bridgedb/test/test_https.py                  |   10 +-
 lib/bridgedb/test/test_parse_descriptors.py      |  653 +++++++++
 lib/bridgedb/test/test_parse_networkstatus.py    |  414 ------
 lib/bridgedb/test/test_parse_nickname.py         |   63 +
 lib/bridgedb/test/test_persistentSaveAndLoad.py  |   68 +-
 lib/bridgedb/test/test_proxy.py                  |  590 ++++++++
 lib/bridgedb/test/test_qrcodes.py                |   73 +
 lib/bridgedb/test/test_smtp.py                   |    1 +
 lib/bridgedb/test/test_util.py                   |   42 +
 lib/bridgedb/util.py                             |   10 +-
 requirements.txt                                 |    3 +-
 scripts/get-tor-exits                            |  199 +++
 setup.cfg                                        |    4 +
 setup.py                                         |    5 +-
 122 files changed, 15331 insertions(+), 4858 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits