October 2019 - tor-commits - lists.torproject.org

[bridgedb/develop] Merge branch 'release-0.8.3'
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit c91498a3287be9717e6a1203e60b9503ad537de8 Merge: 164f62e ad8a95f Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 15:56:33 2019 -0700 Merge branch 'release-0.8.3' .test.requirements.txt | 12 +- .travis.requirements.txt | 31 +-- .travis.yml | 28 +-- CHANGELOG | 18 ++ Makefile | 2 +- bridgedb/distributors/email/server.py | 3 +- … [View More]

1 0

[bridgedb/master] Use last-available translation to fix unit test.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit d9d886f15aad518713a08650002e32abe9cdf73e Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Oct 1 12:04:19 2019 -0700 Use last-available translation to fix unit test. When we last updated our translations, in commit 968a5db, the Dutch translation for "What are bridges?" disappared, which broke a unit test. This commit re-adds this particular translation -- it does seem correct, after all. --- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +- 1 file … [View More]

1 0

[bridgedb/master] Merge branch 'release-0.8.2' into develop
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit e5f83a44f7d9c3da2d2f4821707a8f2ab60115d4 Merge: 069714d 76526a4 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 30 16:13:33 2019 -0700 Merge branch 'release-0.8.2' into develop CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[bridgedb/master] Merge branch 'task/31780' into develop
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 0751ad7148447f30df7c015c77853d58b6077f71 Merge: e5f83a4 39b6285 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 14:28:02 2019 -0700 Merge branch 'task/31780' into develop CHANGELOG | 8 +++++ bridgedb/main.py | 2 +- bridgedb/metrics.py | 13 ++++---- bridgedb/test/test_metrics.py | 4 +-- doc/bridgedb-metrics-spec.txt | 74 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 10 deletions(-)

1 0

[bridgedb/master] Update French translation.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 41e38fca404d70e9c0f8f1ed7895524dc7504ac4 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 30 16:20:06 2019 -0700 Update French translation. --- bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po index 32c57a7..12d091d 100644 --- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po @@ … [View More]

1 0

[bridgedb/master] Add specification for BridgeDB's metrics format.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 39b6285b28e2826af09bce6a3563f0b1138eac7e Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Sep 18 13:42:47 2019 -0700 Add specification for BridgeDB's metrics format. We implemented BridgeDB's metrics in <https://bugs.torproject.org/9316> but haven't specified its format until this patch. This patch also makes our implementation consistent with our (slightly updated) specification. In particular: * For naming consistency, we changed … [View More]"bridgedb-stats-version" to "bridgedb-metrics-version" and "bridgedb-stats-end" to "bridgedb-metrics-end". * For simplicity, we also changed our version from a major and minor number to a single number. * Instead of appending to our metrics file, we now overwrite the file because our specification requires "bridgedb-metrics-end" and "bridgedb-metrics-version" to be there exactly once. --- CHANGELOG | 8 +++++ bridgedb/main.py | 2 +- bridgedb/metrics.py | 13 ++++---- bridgedb/test/test_metrics.py | 4 +-- doc/bridgedb-metrics-spec.txt | 74 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 06968d2..c2fca89 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +Changes in version A.B.C - YYYY-MM-DD + + * FIXES https://bugs.torproject.org/31780 + We implemented BridgeDB's metrics in #9316 but haven't specified its + format until now. In addition to adding a specification, this patch + also makes our implementation consistent with our (slightly updated) + specification. + Changes in version 0.8.2 - 2019-09-20 Updated translations for the following languages: diff --git a/bridgedb/main.py b/bridgedb/main.py index 94f4921..7c2df6d 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -85,7 +85,7 @@ def writeMetrics(filename, measurementInterval): logging.debug("Dumping metrics to file: '%s'" % filename) try: - with open(filename, 'a') as fh: + with open(filename, 'w') as fh: metrics.export(fh, measurementInterval) except IOError as err: logging.error("Failed to write metrics to '%s': %s" % (filename, err)) diff --git a/bridgedb/metrics.py b/bridgedb/metrics.py index 4e1c880..5e14146 100644 --- a/bridgedb/metrics.py +++ b/bridgedb/metrics.py @@ -9,7 +9,7 @@ # :license: see LICENSE for licensing information # _____________________________________________________________________________ -"""API for keeping track of BridgeDB statistics, e.g., the demand for bridges +"""API for keeping track of BridgeDB metrics, e.g., the demand for bridges over time. """ @@ -53,9 +53,9 @@ SUBNET_CTR_PREFIX_LEN = 20 # All of the pluggable transports BridgeDB currently supports. SUPPORTED_TRANSPORTS = None -# Major and minor version number for our statistics format. -METRICS_MAJOR_VERSION = 1 -METRICS_MINOR_VERSION = 0 +# Version number for our metrics format. We increment the version if our +# format changes. +METRICS_VERSION = 1 def setProxies(proxies): @@ -120,11 +120,10 @@ def export(fh, measurementInterval): logging.debug("Metrics module knows about %d proxies." % numProxies) now = datetime.datetime.utcnow() - fh.write("bridgedb-stats-end %s (%d s)\n" % ( + fh.write("bridgedb-metrics-end %s (%d s)\n" % ( now.strftime("%Y-%m-%d %H:%M:%S"), measurementInterval)) - fh.write("bridgedb-stats-version %d.%d\n" % (METRICS_MAJOR_VERSION, - METRICS_MINOR_VERSION)) + fh.write("bridgedb-metrics-version %d\n" % METRICS_VERSION) httpsLines = httpsMetrix.getMetrics() for line in httpsLines: diff --git a/bridgedb/test/test_metrics.py b/bridgedb/test/test_metrics.py index a870fc2..a27431c 100644 --- a/bridgedb/test/test_metrics.py +++ b/bridgedb/test/test_metrics.py @@ -110,8 +110,8 @@ class StateTest(unittest.TestCase): self.assertTrue(len(pseudo_fh.getvalue()) > 0) lines = pseudo_fh.getvalue().split("\n") - self.assertTrue(lines[0].startswith("bridgedb-stats-end")) - self.assertTrue(lines[1].startswith("bridgedb-stats-version")) + self.assertTrue(lines[0].startswith("bridgedb-metrics-end")) + self.assertTrue(lines[1].startswith("bridgedb-metrics-version")) self.assertTrue(lines[2] == "bridgedb-metric-count https.obfs4.de.success.None 10") diff --git a/doc/bridgedb-metrics-spec.txt b/doc/bridgedb-metrics-spec.txt new file mode 100644 index 0000000..14c38f9 --- /dev/null +++ b/doc/bridgedb-metrics-spec.txt @@ -0,0 +1,74 @@ + BridgeDB metrics (version 1) + +BridgeDB exports usage metrics once every 24 hours. These metrics +encode how many approximate successful/failed requests BridgeDB has seen +per distribution mechanism, per pluggable transport, per country code or +email provider. For example, one of these metrics lines can tell us +that over the last 24 hours, BridgeDB has seen between 21 and 30 +successful requests for obfs4 over moat from Zimbabwe. + +This section specifies the format of BridgeDB's metrics. Each metrics +file is formatted as follows: + + "bridgedb-metrics-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL + [At start, exactly once.] + + YYYY-MM-DD HH:MM:SS defines the end (in UTC) of the included + measurement interval of length NSEC seconds (86400 seconds by + default). + + Example: + bridgedb-metrics-end 2019-09-18 00:33:44 (86400 s) + + "bridgedb-metrics-version" VERSION NL + [Exactly once.] + + VERSION determines the version of the metrics format. As the + format changes over time, we will increment VERSION. The latest + version is 1 -- the first iteration of the metrics format. + + Example: + bridgedb-metrics-version 1 + + "bridgedb-metric-count" METRIC_KEY COUNT NL + [Any number.] + + METRIC_KEY determines a metrics key, which consists of several + fields, separated by a period: + + DISTRIBUTION "." TRANSPORT "." CC/EMAIL "." "success" | "fail" "." RESERVED + + DISTRIBUTION is BridgeDB's distribution mechanism, which includes + "https", "email", and "moat". These distribution mechanisms may + change in the future. + + TRANSPORT refers to a pluggable transport protocol. This includes + "obfs2", "obfs3", "obfs4", "scramblesuit", and "fte". These + pluggable transports will change in the future. + + CC/EMAIL refers to a two-letter country code of the user's IP + address iff DISTRIBUTION is "moat" or "https"; or to an email + provider iff DISTRIBUTION is "email". We use two reserved country + codes, "??" and "zz". "??" denotes that we couldn't map an IP + address to its country, e.g., because our geolocation API was + unable to. "zz" denotes a proxy IP address, e.g., Tor exit + relays. The two allowed email providers are "gmail" and "riseup". + + The next field is either "success" or "fail", depending on if the + BridgeDB request was successful or not. A request is successful + if BridgeDB attempts to provide the user with bridges, even if + BridgeDB currently has no bridges available. A request has failed + if BridgeDB won't provide the user with bridges, for example, if + the user could not solve the CAPTCHA. + + The field RESERVED is reserved for an anomaly score. It is + currently set to "none" and should be ignored by implementations. + + COUNT is the approximate number of user requests for the given + METRIC_KEY. We round up the number of requests to the next + multiple of 10 to preserve some user privacy. + + Examples: + bridgedb-metric-count https.scramblesuit.zz.fail.none 100 + bridgedb-metric-count moat.obfs4.??.success.none 3550 + bridgedb-metric-count email.fte.gmail.fail.none 10 [View Less]

1 0

[bridgedb/master] Merge branch 'task/31903' into develop
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 44d6ed319f8c6f8c43ea0db2eb8c0e64c3d73b50 Merge: 0751ad7 a93a636 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 15:16:37 2019 -0700 Merge branch 'task/31903' into develop bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +- bridgedb/i18n/templates/bridgedb.pot | 312 ++++++++++++++++--------------- 3 files changed, 167 insertions(+), 156 deletions(-)

1 0

[bridgedb/master] Import rfc822 directly instead of over detour.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 15b8e0df097e2cf98c13faf6aabc3236520fa14b Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 08:59:50 2019 -0700 Import rfc822 directly instead of over detour. Some of our code got the rfc822 module over a detour, by importing it through twisted.mail.smtp. This is dangerous and only works if twisted.mail.smtp actually does import rfc822 -- which newer versions stopped doing. We're fixing this by doing what we should have been doing all along: … [View More]importing the module ourselves. --- bridgedb/distributors/email/server.py | 3 ++- bridgedb/test/test_email_dkim.py | 2 +- bridgedb/test/test_email_server.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bridgedb/distributors/email/server.py b/bridgedb/distributors/email/server.py index 229f118..8bd4b36 100644 --- a/bridgedb/distributors/email/server.py +++ b/bridgedb/distributors/email/server.py @@ -52,6 +52,7 @@ from __future__ import unicode_literals import logging import io import socket +import rfc822 from twisted.internet import defer from twisted.internet import reactor @@ -254,7 +255,7 @@ class SMTPMessage(object): for line in self.lines: rawMessage.writelines(unicode(line.decode('utf8')) + u'\n') rawMessage.seek(0) - return smtp.rfc822.Message(rawMessage) + return rfc822.Message(rawMessage) class SMTPIncomingDelivery(smtp.SMTP): diff --git a/bridgedb/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py index dc4c53b..be34370 100644 --- a/bridgedb/test/test_email_dkim.py +++ b/bridgedb/test/test_email_dkim.py @@ -12,8 +12,8 @@ """Unittests for the :mod:`bridgedb.distributors.email.dkim` module.""" import io +import rfc822 -from twisted.mail.smtp import rfc822 from twisted.trial import unittest from bridgedb.distributors.email import dkim diff --git a/bridgedb/test/test_email_server.py b/bridgedb/test/test_email_server.py index edf2539..bc331f4 100644 --- a/bridgedb/test/test_email_server.py +++ b/bridgedb/test/test_email_server.py @@ -16,6 +16,7 @@ from __future__ import print_function import socket import string import types +import rfc822 from twisted.python import log from twisted.internet import defer @@ -25,7 +26,6 @@ from twisted.mail.smtp import SMTPBadRcpt from twisted.mail.smtp import SMTPBadSender from twisted.mail.smtp import User from twisted.mail.smtp import Address -from twisted.mail.smtp import rfc822 from twisted.test import proto_helpers from twisted.trial import unittest [View Less]

1 0

[bridgedb/master] Request new translations.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit a93a636072865c60fa9d1e36dee2d4a5c09355d5 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 15:05:38 2019 -0700 Request new translations. We modified a string in strings.py and should request new translations for it. The following command updated bridgedb.pot automatically: python setup.py extract_messages --- bridgedb/i18n/templates/bridgedb.pot | 312 ++++++++++++++++++----------------- 1 file changed, 161 insertions(+), 151 deletions(-) … [View More]diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index bc6080f..1607e92 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -1,24 +1,42 @@ -# Translations template for BridgeDB. -# Copyright (C) 2015 'The Tor Project, Inc.' -# This file is distributed under the same license as the BridgeDB project. -# -# Translators: -# runasand <inactive+runasand(a)transifex.com>, 2011 +# Translations template for bridgedb. +# Copyright (C) 2019 'The Tor Project, Inc.' +# This file is distributed under the same license as the bridgedb project. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-19 09:41+0000\n" -"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" -"Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n" +"Project-Id-Version: bridgedb 0.8.0+15.gd9d886f.dirty\n" +"Report-Msgid-Bugs-To: " +"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" +"=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" +"POT-Creation-Date: 2019-10-03 15:04-0700\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" -"Language: en\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - +"Generated-By: Babel 2.7.0\n" + +#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*- +#. This file is part of BridgeDB, a Tor bridge distribution system. +#. :authors: please see included AUTHORS file +#. :copyright: (c) 2007-2017, The Tor Project, Inc. +#. (c) 2013-2017, Isis Lovecruft +#. :license: see LICENSE for licensing information +#. : The path to the HTTPS distributor's web templates. (Should be the +#. : "templates" directory in the same directory as this file.) +#. Setting `filesystem_checks` to False is recommended for production servers, +#. due to potential speed increases. This means that the atimes of the Mako +#. template files aren't rechecked every time the template is requested +#. (otherwise, if they are checked, and the atime is newer, the template is +#. recompiled). `collection_size` sets the number of compiled templates which +#. are cached before the least recently used ones are removed. See: +#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup +#. : Localisations which BridgeDB supports which should be rendered right-to-left. +#. We use our metrics singleton to keep track of BridgeDB metrics such as +#. "number of failed HTTPS bridge requests." #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" @@ -30,177 +48,171 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/https/server.py:167 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." -msgstr "Sorry! Something went wrong with your request." +msgstr "" -#: bridgedb/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Report a Bug" +msgstr "" -#: bridgedb/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:82 msgid "Source Code" -msgstr "Source Code" +msgstr "" -#: bridgedb/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:85 msgid "Changelog" -msgstr "Changelog" - -#: bridgedb/https/templates/base.html:88 -msgid "Contact" -msgstr "Contact" +msgstr "" -#: bridgedb/https/templates/bridges.html:35 +#: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" -msgstr "Select All" +msgstr "" -#: bridgedb/https/templates/bridges.html:40 +#: bridgedb/distributors/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Show QRCode" +msgstr "" -#: bridgedb/https/templates/bridges.html:52 +#: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QRCode for your bridge lines" +msgstr "" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: bridgedb/https/templates/bridges.html:67 -#: bridgedb/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:67 +#: bridgedb/distributors/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Uh oh, spaghettios!" +msgstr "" -#: bridgedb/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "It seems there was an error getting your QRCode." +msgstr "" -#: bridgedb/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:73 msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices." +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy " +"your bridge lines onto mobile and other devices." +msgstr "" -#: bridgedb/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "There currently aren't any bridges available..." +msgstr "" -#: bridgedb/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:132 #, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr " Perhaps you should try %s going back %s and choosing a different bridge type!" +msgid " Perhaps you should try %s going back %s and choosing a different bridge type!" +msgstr "" -#: bridgedb/https/templates/index.html:11 +#: bridgedb/distributors/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "Step %s1%s" +msgstr "" -#: bridgedb/https/templates/index.html:13 +#: bridgedb/distributors/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Download %s Tor Browser %s" +msgstr "" -#: bridgedb/https/templates/index.html:25 +#: bridgedb/distributors/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "Step %s2%s" +msgstr "" -#: bridgedb/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Get %s bridges %s" +msgstr "" -#: bridgedb/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "Step %s3%s" +msgstr "" -#: bridgedb/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Now %s add the bridges to Tor Browser %s" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#: bridgedb/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sJ%sust give me bridges!" +msgstr "" -#: bridgedb/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:51 msgid "Advanced Options" -msgstr "Advanced Options" +msgstr "" -#: bridgedb/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:86 msgid "No" -msgstr "No" +msgstr "" -#: bridgedb/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:87 msgid "none" -msgstr "none" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: bridgedb/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "%sY%ses!" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: bridgedb/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sG%set Bridges" +msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[This is an automated message; please do not reply.]" +msgstr "" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Here are your bridges:" +msgstr "" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" -"emails is %s hours. All further emails during this time period will be ignored." -msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored." +"emails is %s hours. All further emails during this time period will be " +"ignored." +msgstr "" #: bridgedb/strings.py:50 -msgid "" -"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgid "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "Welcome to BridgeDB!" +msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Currently supported transport TYPEs:" +msgstr "" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "Hey, %s!" +msgstr "" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Hello, friend!" +msgstr "" -#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 msgid "Public Keys" -msgstr "Public Keys" +msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -210,7 +222,7 @@ msgstr "Public Keys" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -221,10 +233,11 @@ msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s o msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" "which can help obfuscate your connections to the Tor Network, making it more\n" -"difficult for anyone watching your internet traffic to determine that you are\n" +"difficult for anyone watching your internet traffic to determine that you are" +"\n" "using Tor.\n" "\n" -msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -232,7 +245,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -242,140 +255,137 @@ msgstr "Some bridges with IPv6 addresses are also available, though some Pluggab #: bridgedb/strings.py:88 #, python-format msgid "" -"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" -"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any" +"\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still" +"\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n" +msgstr "" -#: bridgedb/strings.py:101 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 msgid "What are bridges?" -msgstr "What are bridges?" +msgstr "" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "I need an alternative way of getting bridges!" +msgstr "" #: bridgedb/strings.py:108 #, python-format msgid "" -"Another way to get bridges is to send an email to %s. Please note that you must\n" +"Another way to get bridges is to send an email to %s. Please note that you " +"must\n" "send the email using an address from one of the following email providers:\n" -"%s, %s or %s." -msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s." +"%s or %s." +msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "My bridges don't work! I need help!" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format -msgid "If your Tor doesn't work, you should email %s." -msgstr "If your Tor doesn't work, you should email %s." +msgid "If your Tor cannot connect, please take a look at the %s and our %s." +msgstr "" -#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:121 -msgid "" -"Try including as much info about your case as you can, including the list of\n" -"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" -"and any messages which Tor gave out, etc." -msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc." - -#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Here are your bridge lines:" +msgstr "" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:122 msgid "Get Bridges!" -msgstr "Get Bridges!" +msgstr "" -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:126 msgid "Please select options for bridge type:" -msgstr "Please select options for bridge type:" +msgstr "" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:127 msgid "Do you need IPv6 addresses?" -msgstr "Do you need IPv6 addresses?" +msgstr "" -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:128 #, python-format msgid "Do you need a %s?" -msgstr "Do you need a %s?" +msgstr "" -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:132 msgid "Your browser is not displaying images properly." -msgstr "Your browser is not displaying images properly." +msgstr "" -#: bridgedb/strings.py:140 +#: bridgedb/strings.py:133 msgid "Enter the characters from the image above..." -msgstr "Enter the characters from the image above..." +msgstr "" -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:137 msgid "How to start using your bridges" -msgstr "How to start using your bridges" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:139 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "To enter bridges into Tor Browser, first go to the %s Tor Browser download\npage %s and then follow the instructions there for downloading and starting\nTor Browser." +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:151 +#: bridgedb/strings.py:144 msgid "" -"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " +"follow\n" "the wizard until it asks:" -msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:155 +#: bridgedb/strings.py:148 msgid "" -"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"Does your Internet Service Provider (ISP) block or otherwise censor " +"connections\n" "to the Tor network?" -msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:159 +#: bridgedb/strings.py:152 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" -"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and" +"\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance." +msgstr "" -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:160 msgid "Displays this message." -msgstr "Displays this message." +msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:164 msgid "Request vanilla bridges." -msgstr "Request vanilla bridges." +msgstr "" -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:165 msgid "Request IPv6 bridges." -msgstr "Request IPv6 bridges." +msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:167 msgid "Request a Pluggable Transport by TYPE." -msgstr "Request a Pluggable Transport by TYPE." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:177 +#: bridgedb/strings.py:170 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Get a copy of BridgeDB's public GnuPG key." +msgstr "" + [View Less]

1 0

[bridgedb/master] Update pyOpenSSL to version 17.5.0.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 935c3eaa7ad0287d15b276b1098fd4eeed29dd56 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 9 18:28:18 2019 -0700 Update pyOpenSSL to version 17.5.0. This fixes security vulnerabilities. --- .travis.yml | 18 +++++++++--------- requirements.txt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26e4d28..9d30d10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,27 +34,27 @@ env: - PYTHON_EGG_CACHE="… [View More]

1 0