January 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Fix bug where open() was called even when COUNTY_BLOCK_FILE=None.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit b659bbc75ad91979e0e182f28138dc8bb0b47a94 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:57:55 2014 +0000 Fix bug where open() was called even when COUNTY_BLOCK_FILE=None. --- lib/bridgedb/Bucket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index a32adcd..6b8bf54 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -222,7 +222,7 @@ class BucketManager: # for a bridge, get the list of countries it might not work in blocklist = dict() - if hasattr(self.cfg, "COUNTRY_BLOCK_FILE"): + if getattr(self.cfg, "COUNTRY_BLOCK_FILE", None) is not None: f = open(self.cfg.COUNTRY_BLOCK_FILE, 'r') for ID,address,portlist,countries in bridgedb.Bridges.parseCountryBlockFile(f): blocklist[toHex(ID)] = countries

1 0

[bridgedb/master] Log when we're dumping bridge assignments to a file in bridgedb.Bucket.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 87e44b444806321b52342fe9189a2d66339a7f4a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:57:12 2014 +0000 Log when we're dumping bridge assignments to a file in bridgedb.Bucket. --- lib/bridgedb/Bucket.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 05f447e..a32adcd 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -211,6 +211,7 @@ class BucketManager: def dumpBridgesToFile(self, filename, bridges): """Dump a list of given bridges into a file """ + logging.debug("Dumping bridge assignments to file: %r" % filename) # get the bridge histories and sort by Time On Same Address bridgeHistories = [] for b in bridges:

1 0

[bridgedb/master] Change loglevel on message about adding PTs to a bridge in bridgedb.Main.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 304e38b0324c493861e778ac0b0e2c6d0c69fb32 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 04:20:02 2014 +0000 Change loglevel on message about adding PTs to a bridge in bridgedb.Main. --- lib/bridgedb/Main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 87b95fc..6243017 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -163,8 +163,8 @@ def load(state, splitter, clear=False): ID, method_name, address, port, argdict = transport try: if bridges[ID].running: - logging.debug("Adding %s transport to running bridge" - % method_name) + logging.info("Adding %s transport to running bridge" + % method_name) bridgePT = Bridges.PluggableTransport( bridges[ID], method_name, address, port, argdict) bridges[ID].transports.append(bridgePT)

1 0

[bridgedb/master] Log when a distributor's hashrings are being prepopulated.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit c05941ff12a63874526125086be826f93a67937a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 04:00:10 2014 +0000 Log when a distributor's hashrings are being prepopulated. --- lib/bridgedb/Dist.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 84e9c75..1758021 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -157,6 +157,7 @@ class IPBasedDistributor(Distributor): self.setDistributorName('HTTPS') def prepopulateRings(self): + logging.info("Prepopulating %s distributor hashrings..." % self.name) # populate all rings (for dumping assignments and testing) for filterFn in [None, filterBridgesByIP4, filterBridgesByIP6]: n = self.nClusters

1 0

[bridgedb/master] Update docstring parameters for IPBasedDistributor.getBridgesForIP().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 7293758a3cd28db210809e338811b308324f66a3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 04:00:53 2014 +0000 Update docstring parameters for IPBasedDistributor.getBridgesForIP(). --- lib/bridgedb/Dist.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 1758021..6e9c436 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -221,6 +221,11 @@ class IPBasedDistributor(Distributor): :param list bridgeFilterRules: A list of callables used filter the bridges returned in the response to the client. See :mod:`~bridgedb.Filters`. + :rtype: list + :return: A list of :class:`~bridgedb.Bridges.Bridge`s to include in + the response. See + :meth:`bridgedb.HTTPServer.WebResource.getBridgeRequestAnswer` + for an example of how this is used. """ logging.info("Attempting to return %d bridges to client %s..." % (N, Util.logSafely(ip)))

1 0

[bridgedb/master] Cleanup the log statements for hashring prepopulation in bridgedb.Main.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 618ef22c9faa41e2a34a30d01f6c00390142414a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 04:21:45 2014 +0000 Cleanup the log statements for hashring prepopulation in bridgedb.Main. --- lib/bridgedb/Main.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 6243017..24ec825 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -512,20 +512,31 @@ def startup(options): state.proxyList.replaceProxyList(loadProxyList(cfg)) if emailDistributor is not None: - logging.debug("Prepopulating email distributor hashrings...") emailDistributor.prepopulateRings() # create default rings - logging.info("Bridges allotted for email distribution: %d" - % len(emailDistributor.splitter)) + logging.info("Bridges allotted for %s distribution: %d" + % (emailDistributor.name, + len(emailDistributor.splitter))) else: logging.warn("No email distributor created!") if ipDistributor is not None: - logging.debug("Prepopulating HTTPS distributor hashrings...") ipDistributor.prepopulateRings() # create default rings - logging.info("Bridges allotted for web distribution: %d" - % len(ipDistributor.splitter)) - for (n,(f,r)) in ipDistributor.splitter.filterRings.items(): - logging.info("\tby filter set %s, %d" % (n, len(r))) + + logging.info("Bridges allotted for %s distribution: %d" + % (ipDistributor.name, + len(ipDistributor.splitter))) + logging.info("\tNum bridges:\tFilter set:") + + nSubrings = 0 + ipSubrings = ipDistributor.splitter.filterRings + for (ringname, (filterFn, subring)) in ipSubrings.items(): + nSubrings += 1 + filterSet = ' '.join( + ipDistributor.splitter.extractFilterNames(ringname)) + logging.info("\t%2d bridges\t%s" % (len(subring), filterSet)) + + logging.info("Total subrings for %s: %d" + % (ipDistributor.name, nSubrings)) else: logging.warn("No HTTP(S) distributor created!")

1 0

[bridgedb/master] Add missing import for bridgedb.Util in bridgedb.Bridges.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 8ebb4757370a2f4c67cd39cdbb63669fdd7324ac Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 04:38:40 2014 +0000 Add missing import for bridgedb.Util in bridgedb.Bridges. --- lib/bridgedb/Bridges.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index c61f8ff..f8ec2c3 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -18,6 +18,7 @@ import random import bridgedb.Storage import bridgedb.Bucket +import bridgedb.Util as Util from bridgedb.parse import addr from bridgedb.parse import networkstatus

1 0

[bridgedb/master] Change renderAnswer() to take bridge lines, not Bridge classes.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9111b70702d869a816ea9b1277ccaf3bc461ff5b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 04:50:14 2014 +0000 Change renderAnswer() to take bridge lines, not Bridge classes. Otherwise, we'd also have to pass the `transport`, and `addressClass` parameters to renderAnswer(). --- lib/bridgedb/HTTPServer.py | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index fc637a4..51387b0 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -228,7 +228,7 @@ class WebResource(twisted.web.resource.Resource): % (Util.logSafely(ip), request.args)) rules = [] - bridges = None + bridgeLines = None if ip: if ipv6: @@ -252,12 +252,17 @@ class WebResource(twisted.web.resource.Resource): self.nBridgesToGive, countryCode, bridgeFilterRules=rules) + bridgeLines = "".join(" %s\n" % b.getConfigLine( + includeFingerprint=self.includeFingerprints, + addressClass=addressClass, + transport=transport, + request=bridgedb.Dist.uniformMap(ip) + ) for b in bridges) - answer = self.renderAnswer(request, ip, bridges, rtl, format) + answer = self.renderAnswer(request, bridgeLines, rtl, format) return answer - def renderAnswer(self, request, ip=None, bridges=None, - rtl=False, format=None): + def renderAnswer(self, request, bridgeLines=None, rtl=False, format=None): """Generate a response for a client which includes **bridges**. The generated response can be plaintext or HTML. @@ -265,10 +270,9 @@ class WebResource(twisted.web.resource.Resource): :type request: :api:`twisted.web.http.Request` :param request: A ``Request`` object containing the HTTP method, full URI, and any URL/POST arguments and headers present. - :type ip: str or None - :param ip: The IP address of the client we're responding to. - :type bridges: list or None - :param bridges: A list of :class:`~bridgedb.Bridges.Bridge`s. + :type bridgeLines: list or None + :param bridgeLines: A list of strings used to configure a Tor client + to use a bridge. :param bool rtl: If ``True``, the language used for the response to the client should be rendered right-to-left. :type format: str or None @@ -279,22 +283,12 @@ class WebResource(twisted.web.resource.Resource): :rtype: str :returns: A plaintext or HTML response to serve. """ - answer = None - - if bridges and ip: - answer = "".join(" %s\n" % b.getConfigLine( - includeFingerprint=self.includeFingerprints, - addressClass=addressClass, - transport=transport, - request=bridgedb.Dist.uniformMap(ip) - ) for b in bridges) - if format == 'plain': request.setHeader("Content-Type", "text/plain") return answer else: request.setHeader("Content-Type", "text/html; charset=utf-8") - return lookup.get_template('bridges.html').render(answer=answer, + return lookup.get_template('bridges.html').render(answer=bridgeLines, rtl=rtl) class WebRoot(twisted.web.resource.Resource):

1 0

[bridgedb/master] Several whitespace fixes in bridgedb.HTTPServer module.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 38af253fba219deccf3b7478fede61689171590d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 04:53:03 2014 +0000 Several whitespace fixes in bridgedb.HTTPServer module. --- lib/bridgedb/HTTPServer.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 51387b0..be5bc44 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -26,7 +26,7 @@ import bridgedb.Dist import bridgedb.I18n as I18n import bridgedb.Util as Util -from recaptcha.client import captcha +from recaptcha.client import captcha from bridgedb.Raptcha import Raptcha from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport @@ -60,7 +60,7 @@ try: except Exception as err: logging.debug("Error while loading geoip module: %r" % err) - logging.warn("GeoIP database not found") + logging.warn("GeoIP database not found") geoip = None else: logging.info("GeoIP database loaded") @@ -129,7 +129,7 @@ class WebResource(twisted.web.resource.Resource): isLeaf = True def __init__(self, distributor, schedule, N=1, useForwardedHeader=False, - includeFingerprints=True, domains=None): + includeFingerprints=True, domains=None): """Create a new WebResource. distributor -- an IPBasedDistributor object schedule -- an IntervalSchedule object @@ -309,7 +309,7 @@ def addWebServer(cfg, dist, sched): HTTPS_USE_IP_FROM_FORWARDED_HEADER RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY - RECAPTCHA_PRIV_KEY + RECAPTCHA_PRIV_KEY dist -- an IPBasedDistributor object. sched -- an IntervalSchedule object. """ @@ -335,7 +335,7 @@ def addWebServer(cfg, dist, sched): httpdist.putChild('bridges', protected) else: httpdist.putChild('bridges', resource) - + site = Site(httpdist) if cfg.HTTP_UNENCRYPTED_PORT:

1 0

[bridgedb/master] Merge branch 'release-0.1.0'
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 380820ff6fe8798e7cb9f15ac43641b5fc2f261d Merge: 0be47e0 38af253 Author: Isis Lovecruft <isis(a)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(-)

1 0