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

isis at torproject.org isis at torproject.org
Sun Jan 12 06:06:36 UTC 2014


commit 380820ff6fe8798e7cb9f15ac43641b5fc2f261d
Merge: 0be47e0 38af253
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sun Jan 12 05:36:00 2014 +0000

    Merge branch 'release-0.1.0'

 .coveragerc                                       |   34 +
 .gitignore                                        |   26 +-
 .pylintrc                                         |  249 +++++
 .travis.yml                                       |   44 +
 LICENSE                                           |    5 +-
 Makefile                                          |   29 +
 README                                            |  130 ++-
 bridge-db-spec.txt                                |  281 ------
 bridgedb.conf                                     |  275 ++++--
 doc/DESCRIPTORS.md                                |  190 ++++
 doc/HACKING.md                                    |   56 ++
 doc/bridge-db-spec.txt                            |  391 ++++++++
 doc/proposals/XXX-bridgedb-learns-ipv6.txt        |  280 ++++++
 doc/sphinx/Makefile                               |  153 +++
 doc/sphinx/ext/apilinks_sphinxext.py              |   54 ++
 doc/sphinx/source/_static/fonts/lato-black.woff   |  Bin 0 -> 48564 bytes
 doc/sphinx/source/_static/fonts/lato-bold.woff    |  Bin 0 -> 50472 bytes
 doc/sphinx/source/_static/fonts/lato-italic.woff  |  Bin 0 -> 51076 bytes
 doc/sphinx/source/_static/fonts/lato-regular.woff |  Bin 0 -> 50112 bytes
 doc/sphinx/source/_static/no-google-fonts.css     |   24 +
 doc/sphinx/source/bridgedb.Bridges.rst            |    8 +
 doc/sphinx/source/bridgedb.Bucket.rst             |    8 +
 doc/sphinx/source/bridgedb.Dist.rst               |    8 +
 doc/sphinx/source/bridgedb.EmailServer.rst        |    8 +
 doc/sphinx/source/bridgedb.Filters.rst            |    8 +
 doc/sphinx/source/bridgedb.HTTPServer.rst         |    8 +
 doc/sphinx/source/bridgedb.I18n.rst               |    8 +
 doc/sphinx/source/bridgedb.Main.rst               |    8 +
 doc/sphinx/source/bridgedb.Raptcha.rst            |    8 +
 doc/sphinx/source/bridgedb.Stability.rst          |    8 +
 doc/sphinx/source/bridgedb.Storage.rst            |   10 +
 doc/sphinx/source/bridgedb.Tests.rst              |    8 +
 doc/sphinx/source/bridgedb.Util.rst               |    9 +
 doc/sphinx/source/bridgedb.crypto.rst             |    8 +
 doc/sphinx/source/bridgedb.parse.rst              |   13 +
 doc/sphinx/source/bridgedb.persistent.rst         |    7 +
 doc/sphinx/source/bridgedb.rst                    |   25 +
 doc/sphinx/source/bridgedb.runner.rst             |    8 +
 doc/sphinx/source/conf.py                         |  380 ++++++++
 doc/sphinx/source/gen_bridge_descriptors.rst      |    7 +
 doc/sphinx/source/index.rst                       |   27 +
 gnupghome/TESTING.subkeys.sec                     |  Bin 0 -> 6505 bytes
 gnupghome/bridgedb-offline-key.pub.asc            |  113 +++
 gnupghome/bridgedb-online-signing-key.pub.asc     |  148 +++
 gnupghome/gpg.conf                                |   96 ++
 lib/bridgedb/Bridges.py                           |  638 ++++++++----
 lib/bridgedb/Bucket.py                            |    5 +-
 lib/bridgedb/Dist.py                              |  272 ++++--
 lib/bridgedb/EmailServer.py                       |   69 +-
 lib/bridgedb/HTTPServer.py                        |  237 ++++-
 lib/bridgedb/Main.py                              |  733 ++++++++------
 lib/bridgedb/Opt.py                               |   17 -
 lib/bridgedb/Tests.py                             |  125 ++-
 lib/bridgedb/Time.py                              |   14 +-
 lib/bridgedb/__init__.py                          |   17 +-
 lib/bridgedb/_langs.py                            |   24 +
 lib/bridgedb/crypto.py                            |   60 ++
 lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.mo      |  Bin 3278 -> 0 bytes
 lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po      |   44 +-
 lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.mo      |  Bin 2676 -> 0 bytes
 lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po      |   43 +-
 lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.mo      |  Bin 2727 -> 0 bytes
 lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po      |   47 +-
 lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.mo      |  Bin 3826 -> 0 bytes
 lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po      |   49 +-
 lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po      |  108 +++
 lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po   |  108 +++
 lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po   |  108 +++
 lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.mo      |  Bin 2858 -> 0 bytes
 lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po      |   46 +-
 lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.mo      |  Bin 2760 -> 0 bytes
 lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po      |   47 +-
 lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.mo      |  Bin 3212 -> 0 bytes
 lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po      |   44 +-
 lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.mo      |  Bin 2827 -> 0 bytes
 lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po      |   66 +-
 lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.mo      |  Bin 2736 -> 0 bytes
 lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po      |   42 +-
 lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.mo      |  Bin 3007 -> 0 bytes
 lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po      |   41 +-
 lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.mo   |  Bin 2714 -> 0 bytes
 lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po   |   44 +-
 lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po      |  113 +++
 lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.mo      |  Bin 2653 -> 0 bytes
 lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po      |   42 +-
 lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.mo      |  Bin 3007 -> 0 bytes
 lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po      |   34 +-
 lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po      |  111 +++
 lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.mo      |  Bin 2715 -> 0 bytes
 lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po      |   45 +-
 lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.mo   |  Bin 2762 -> 0 bytes
 lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po   |   47 +-
 lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.mo      |  Bin 2623 -> 0 bytes
 lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po      |   41 +-
 lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.mo      |  Bin 2733 -> 0 bytes
 lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po      |   46 +-
 lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.mo      |  Bin 2737 -> 0 bytes
 lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po      |   46 +-
 lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.mo   |  Bin 2700 -> 0 bytes
 lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po   |   58 +-
 lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.mo      |  Bin 3275 -> 0 bytes
 lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po      |   43 +-
 lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.mo   |  Bin 4080 -> 0 bytes
 lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po   |   42 +-
 lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.mo      |  Bin 2713 -> 0 bytes
 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.mo      |  Bin 2732 -> 0 bytes
 lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po      |   42 +-
 lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.mo   |  Bin 2586 -> 0 bytes
 lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po   |   33 +-
 lib/bridgedb/parse/__init__.py                    |   90 ++
 lib/bridgedb/parse/addr.py                        |  371 +++++++
 lib/bridgedb/parse/headers.py                     |   76 ++
 lib/bridgedb/parse/networkstatus.py               |  273 ++++++
 lib/bridgedb/parse/options.py                     |  269 +++++
 lib/bridgedb/parse/versions.py                    |   70 ++
 lib/bridgedb/persistent.py                        |  266 +++++
 lib/bridgedb/runner.py                            |  125 +++
 lib/bridgedb/sitecustomize.py                     |   34 +
 lib/bridgedb/templates/assets/custom.css          |   15 +-
 lib/bridgedb/templates/base.html                  |   14 +
 lib/bridgedb/templates/bridges.html               |    8 +-
 lib/bridgedb/templates/index.html                 |   41 +-
 lib/bridgedb/templates/robots.txt                 | 1079 +++++++++++++++++++++
 lib/bridgedb/test/bridgedb.conf                   |   55 ++
 lib/bridgedb/test/deprecated.py                   |  149 +++
 lib/bridgedb/test/test_EmailServer.py             |   98 ++
 lib/bridgedb/test/test_Tests.py                   |  248 +++++
 lib/bridgedb/test/test_bridgedb.py                |   91 ++
 lib/bridgedb/test/test_crypto.py                  |   57 ++
 lib/bridgedb/test/test_parse_addr.py              |  615 ++++++++++++
 lib/bridgedb/test/test_parse_networkstatus.py     |  416 ++++++++
 lib/bridgedb/test/test_persistent.py              |  170 ++++
 lib/bridgedb/test/test_persistentSaveAndLoad.py   |   97 ++
 lib/bridgedb/test/util.py                         |   66 ++
 maint/get-completed-translations                  |  163 ++++
 requirements.txt                                  |   16 +-
 scripts/bridgedb                                  |   33 +-
 scripts/executioner                               |   35 +
 scripts/gen_bridge_descriptors                    |  870 +++++++++++++++++
 scripts/make-ssl-cert                             |   59 ++
 setup.py                                          |  260 ++++-
 xxx-bridgedb-learns-ipv6.txt                      |  280 ------
 144 files changed, 11592 insertions(+), 1955 deletions(-)



More information about the tor-commits mailing list