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

[bridgedb/develop] 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(-) 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 "" +

1 0

[community/master] Redirect users to get-in-touch IRC help
by gus＠torproject.org 03 Oct '19

03 Oct '19

commit 2cd3dbef03beeec1b7fdf972a1a9e8b5a89feb66 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Thu Oct 3 21:54:14 2019 +0000 Redirect users to get-in-touch IRC help --- content/relay-operations/getting-help/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/getting-help/contents.lr b/content/relay-operations/getting-help/contents.lr index cb72875..1ef463b 100644 --- a/content/relay-operations/getting-help/contents.lr +++ b/content/relay-operations/getting-help/contents.lr @@ -8,7 +8,7 @@ body: If you run into problems while setting up your relay, you can ask your questions on the public [tor-relays mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays). The list is a great resource for asking (and answering) questions, and for getting to know other relay operators. Make sure to check out the archives! -You can also get help by joining the IRC channel #tor-relays in the network [irc.oftc.net](https://www.oftc.net). +You can also get help by joining the IRC channel #tor-relays in the network [irc.oftc.net](https://support.torproject.org/get-in-touch/#irc-help). --- html: two-columns-page.html

1 0

[bridgedb/develop] 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 "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

1 0

[bridgedb/develop] 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

[community/master] Merge branch 'patch-5'
by gus＠torproject.org 03 Oct '19

03 Oct '19

commit 74e3edb5fcc12d7830749dc21b3aae303e3df3e6 Merge: 6910083 4cbe0a2 Author: gus <gus(a)torproject.org> Date: Thu Oct 3 17:11:15 2019 -0400 Merge branch 'patch-5' .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[community/master] Replace Debian repository instructions to Support portal
by gus＠torproject.org 03 Oct '19

03 Oct '19

commit 4cbe0a2a48d5845b2f44f4001ed9cff12d901611 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Fri Sep 27 17:49:45 2019 +0000 Replace Debian repository instructions to Support portal --- .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index b97259c..9596a38 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -10,7 +10,7 @@ body: Get the latest version of Tor. If you're on Debian stable, `sudo apt-get install tor` should give you the latest stable version of Tor. -* Note: **Ubuntu users need to get it from Tor repository. Please see** [Download instructions for Ubuntu](https://www.torproject.org/docs/debian.html.en#ubuntu). +* Note: **Ubuntu users need to get it from Tor repository. Please see** [Download instructions for Ubuntu](https://support.torproject.org/apt/tor-deb-repo/). ### 2. Install obfs4proxy

1 0

[community/master] hello DragonFlyBSD!
by gus＠torproject.org 03 Oct '19

03 Oct '19

commit dbfe843d265cb7df664104898fd3f24a0ccded34 Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Thu Oct 3 18:43:34 2019 +0000 hello DragonFlyBSD! - avoid pushing people to use DPorts, as we have `pkg` :) --- .../technical-setup/guard/dragonflybsd/contents.lr | 99 ++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/content/relay-operations/technical-setup/guard/dragonflybsd/contents.lr b/content/relay-operations/technical-setup/guard/dragonflybsd/contents.lr new file mode 100644 index 0000000..8218178 --- /dev/null +++ b/content/relay-operations/technical-setup/guard/dragonflybsd/contents.lr @@ -0,0 +1,99 @@ +_model: page +--- +color: primary +--- +title: DragonflyBSD +--- +body: + +# 1. Bootstrap `pkg` + +DragonFlyBSD's daily snapshots and releases (starting with 3.4) come with `pkg` already installed. Upgrades from earlier releases, however, will not have it. + +If `pkg` is missing on the system for any reason, it can be quickly bootstrapped without having to build it from source or even having **DPorts** installed: + +``` +cd /usr +make pkg-bootstrap +rehash +pkg-static install -y pkg +rehash +``` + +### 1.1. Recommended Steps to Setup `pkg` + +Here, it will be similar to what we have on a **FreeBSD** system, and we are going to use HTTPS to fetch our packages, and updates - so here we also need an extra package to help us out (ca_root_nss). + +Installing the `ca_root_nss` package: + +``` +pkg install ca_root_nss +``` + +For fresh installations, the file `/usr/local/etc/pkg/repos/df-latest.conf.sample` is copied to `/usr/local/etc/pkg/repos/df-latest`. The files ending in the ".sample" extension are ignored; pkg(8) only reads files that end in ".conf" and it will read as many as it finds. + +DragonflyBSD has 2 packages repositories: + + - Avalon (mirror-master.dragonflybsd.org) + - Wolfpond (pkg.wolfpond.org) + +We can simply edit the **URL** used to point out the repositories on `/usr/local/etc/pkg/repos/df-latest` and that's it! Remember to use **pkg+https://** for Avalon. + +After applying all these changes, we update the packages list again and try to check if there's already a new update to apply: + +``` +pkg update -f +pkg upgrade -y -f +``` + +# 2. Install `tor` DragonflyBSD's Package + +Here we can choose to install the latest stable version, like: + +``` +pkg install tor +``` + + ... or install an alpha release: + + +``` +pkg install tor-devel +``` + +# 3. Configure `/usr/local/etc/tor/torrc` + +This is a very simple version of the `torrc` configuration file in order to run a Middle/Guard relay on the Tor network: + +``` +Nickname myBSDRelay # Change your relay's nickname to something you like +ContactInfo your@email # Please write your email address and be aware that it will be published +ORPort 443 # You might want to use/try a different port, should you want to +ExitRelay 0 +SocksPort 0 +Log notice syslog +``` + +# 4. Start `tor`: + +Here we set `tor` to start at boot time and use the setuid feature, in order to bind to lower ports like 443 (the daemon itself will still run as a regular non-privileged user). + +``` +echo "tor_setuid=YES" >> /etc/rc.conf +echo "tor_enable=YES" >> /etc/rc.conf +service tor start +``` + +# 5. Final Notes + +If you are having troubles setting up your relay, have a look at our [help section](/relay/getting-help/). If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes. +--- +html: two-columns-page.html +--- +key: 2 +--- +section: Middle/Guard relay +--- +section_id: relay-operations +--- +subtitle: How to deploy a Middle/Guard relay on DragonflyBSD

1 0

[community/master] present NetBSD to awesome people willing to support Tor :)
by gus＠torproject.org 03 Oct '19

03 Oct '19

commit d01fcd5fe64822fc1fd50fa3b9e778ac5295b207 Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Thu Oct 3 18:14:35 2019 +0000 present NetBSD to awesome people willing to support Tor :) - this commit kinda mirrors the up to date wiki page to the new community portal; - all fine from 'wiki/TorRelayGuide/NetBSD'; - keeping the standards for all *BSD guides, working out of the box for vanilla systems. --- .../technical-setup/guard/netbsd/contents.lr | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/content/relay-operations/technical-setup/guard/netbsd/contents.lr b/content/relay-operations/technical-setup/guard/netbsd/contents.lr new file mode 100644 index 0000000..688cbce --- /dev/null +++ b/content/relay-operations/technical-setup/guard/netbsd/contents.lr @@ -0,0 +1,51 @@ +_model: page +--- +color: primary +--- +title: NetBSD +--- +body: + +# 1. Setup `pkg_add` + +``` +echo "PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/$(uname -r)/All" > /etc/pkg_install.conf +``` + +# 2. Install `tor` NetBSD's package + +``` +pkg_add tor +``` + +# 3. Configure `/usr/pkg/etc/tor/torrc` + +``` +Nickname myBSDRelay # Change your relay's nickname to something you like +ContactInfo your@email # Please write your email address and be aware that it will be published +ORPort 443 # You might want to use/try a different port, should you want to +ExitRelay 0 +SocksPort 0 +Log notice syslog +``` + +# 6. Start `tor`: + +Here we set `tor` to start during boot and call it for the first time: + +``` +ln -sf /usr/pkg/share/examples/rc.d/tor /etc/rc.d/tor +echo "tor=YES" >> /etc/rc.conf +/etc/rc.d/tor start +``` + +--- +html: two-columns-page.html +--- +key: 2 +--- +section: Middle/Guard relay +--- +section_id: relay-operations +--- +subtitle: How to deploy a Middle/Guard relay on NetBSD

1 0

[community/master] update FreeBSD setup guide for middle/guard relays;
by gus＠torproject.org 03 Oct '19

03 Oct '19

commit 6910083da66d719b880069e6a3a21c3ef00677a1 Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Thu Oct 3 17:49:49 2019 +0000 update FreeBSD setup guide for middle/guard relays; - ensure we cover also pkg's bootstrap (for vanila systems w/o any available package); - track the 'latest' branch used by pkg to get more frequent packages updates; - use HTTPS:// on the repository url (needs extra package, ca_root_nss); - cover starting our daemon on port 443, but still as '_tor' non-root user. --- .../technical-setup/guard/freebsd/contents.lr | 104 ++++++++++++++------- 1 file changed, 69 insertions(+), 35 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/contents.lr index b442ca8..8744d31 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/contents.lr @@ -6,68 +6,102 @@ title: FreeBSD --- body: -# 1. Enable Automatic Software Updates +# 1. Enable Automatic Updates for Packages One of the most imported things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it. Follow the instructions to enable [automatic software updates](updates) for your operating system. -# 2. Install the tor package +# 2. Bootstrap `pkg` -`pkg install tor ca_root_nss` +This article considers we have already a base installation of FreeBSD running, and only the base system (here, we are running 12.0-RELEASE). That means we do not have any packages installed neither the `pkg` packages manager itself (there's no `sudo` available - we are running commands as root). -or for alpha releases: +To bootstrap and install `pkg` we should run the following command: -`pkg install tor-devel ca_root_nss` +``` +pkg bootstrap +pkg update -f +``` + +### 2.1. Recommended Steps to Setup `pkg` + +To follow upstream updates in a "faster way" we recommend changing the 'quarterly' branch used by `pkg` to its 'latest' branch. + +One additional step is to prefer using HTTPS to fetch our packages, and updates - so here we also need an extra package to help us out (ca_root_nss). -# 3. Put the configuration file `/usr/local/etc/tor/torrc` in place +Installing the `ca_root_nss` package: ``` -#change the nickname "myNiceRelay" to a name that you like -Nickname myNiceRelay -ORPort 9001 -ExitRelay 0 -SocksPort 0 -# Change the email address bellow and be aware that it will be published -ContactInfo tor-operator@your-emailaddress-domain -Log notice syslog +pkg install ca_root_nss ``` -# 4. Ensure that the `random_id` sysctl setting is enabled: +We are keeping the original setting used by `pkg` but setting a new one that will override it, so we set up a new directory and than create a configuration file to override what we need. This configuration file will be `/usr/local/etc/pkg/repos/FreeBSD.conf`. + +Creating the new directory: ``` -echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf -sysctl net.inet.ip.random_id=1 +mkdir -p /usr/local/etc/pkg/repos ``` -# 5. Start the tor daemon and make sure it starts at boot: +This is how the new configuration file `/usr/local/etc/pkg/repos/FreeBSD.conf` must look like: ``` -sysrc tor_enable=YES -service tor start +FreeBSD: { + url: pkg+https://pkg.freebsd.org/${ABI}/latest +} ``` -### Optional but recommended +After applying all these changes, we update the packages list again and try to check if there's already a new update to apply: -To get package updates faster after they have been build it is best to switch from the "quarterly" with "latest" repository. +``` +pkg update -f +pkg upgrade -y -f +``` -Create the following folder: +# 3. Install `tor` FreeBSD's Package -`mkdir -p /usr/local/etc/pkg/repos` +Here we can choose to install the latest stable version, like: -and create the file `/usr/local/etc/pkg/repos/FreeBSD.conf` with the following content: +``` +pkg install tor +``` + + ... or install an alpha release: + +``` +pkg install tor-devel ``` -FreeBSD: { enabled: no } -FreeBSDlatest: { - url: "pkg+https://pkg.FreeBSD.org/${ABI}/latest", - mirror_type: "srv", - signature_type: "fingerprints", - fingerprints: "/usr/share/keys/pkg", - enabled: yes -} +# 4. Configure `/usr/local/etc/tor/torrc` + +This is a very simple version of the `torrc` configuration file in order to run a Middle/Guard relay on the Tor network: + +``` +Nickname myBSDRelay # Change your relay's nickname to something you like +ContactInfo your@email # Please write your email address and be aware that it will be published +ORPort 443 # You might want to use/try a different port, should you want to +ExitRelay 0 +SocksPort 0 +Log notice syslog +``` + +# 5. Ensure `net.inet.ip.random_id` is enabled: + +``` +echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf +sysctl net.inet.ip.random_id=1 +``` + +# 6. Start `tor`: + +Here we set `tor` to start at boot time and use the setuid feature, in order to bind to lower ports like 443 (the daemon itself will still run as a regular non-privileged user). + +``` +sysrc tor_setuid=YES +sysrc tor_enable=YES +service tor start ``` -# 6. Final notes +# 7. Final Notes If you are having troubles setting up your relay, have a look at our [help section](/relay/getting-help/). If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes. --- @@ -79,4 +113,4 @@ section: Middle/Guard relay --- section_id: relay-operations --- -subtitle: How to deploy a middle/Guard relay on FreeBSD +subtitle: How to deploy a Middle/Guard relay on FreeBSD

1 0

[community/master] add OpenBSD setup for middle/guard relays (@)<
by gus＠torproject.org 03 Oct '19

03 Oct '19

commit db2e96faa6e7c70388ffaf898e5e4752d1730538 Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Thu Oct 3 18:02:58 2019 +0000 add OpenBSD setup for middle/guard relays (@)< - recommend using more recent package, from M:Tier; - cover the use of 'openup' to update packages; - tune system's limits to operate a fine relay (fix trac ticket 27489 [0]). [0] https://trac.torproject.org/projects/tor/ticket/27489 --- .../technical-setup/guard/openbsd/contents.lr | 94 ++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/content/relay-operations/technical-setup/guard/openbsd/contents.lr b/content/relay-operations/technical-setup/guard/openbsd/contents.lr new file mode 100644 index 0000000..24a5dd7 --- /dev/null +++ b/content/relay-operations/technical-setup/guard/openbsd/contents.lr @@ -0,0 +1,94 @@ +_model: page +--- +color: primary +--- +title: OpenBSD +--- +body: + +# 1. Install `tor` OpenBSD's Package + +Recent OpenBSD systems, like 6.5/amd64, already have the repository configured on `/etc/installurl` so we do not need to bother changing it. + +Should that's not your case, please adjust the `installurl` configuration file like this: + +``` +echo "https://cdn.openbsd.org/pub/OpenBSD" > /etc/installurl +``` + +Proceed with `pkg_add` to install the package: + +``` +pkg_add tor +``` + +### 2.1. Recommended Steps to Install `tor` on OpenBSD + +If you want to install a newer version of the `tor` OpenBSD's package, you can use M:Tier's binary packages: + +``` +ftp https://stable.mtier.org/openup +``` + +Right after fetching `openup` you can run it to sync M:Tier's repository and update your packages; it's an alternative to `pkg_add -u`. + +Here is how you proceed with these steps: + +``` +openup +``` + +# 3. Configure `/etc/tor/torrc` + +This is a very simple version of the `torrc` configuration file in order to run a Middle/Guard relay on the Tor network: + +``` +Nickname myBSDRelay # Change your relay's nickname to something you like +ContactInfo your@email # Please write your email address and be aware that it will be published +ORPort 443 # You might want to use/try a different port, should you want to +ExitRelay 0 +SocksPort 0 +Log notice syslog +User _tor +``` + +# 4. Change `openfiles-max` and `maxfiles` Tweaks + +By default, OpenBSD maintains a rather low limit on the maximum number of open files for a process. For a daemon such as Tor's, that opens a connection to each and every other relay (currently around 7000 relays), these limits should be raised. + +Append the following section to `/etc/login.conf`: + +``` +tor:\ + :openfiles-max=13500:\ + :tc=daemon: +``` + +OpenBSD also stores a kernel-level file descriptor limit in the sysctl variable `kern.maxfiles`. + +Increase it from the default of 7030 to 16000: + +``` +echo "kern.maxfiles=16000" >> /etc/sysctl.conf +sysctl kern.maxfiles=16000 +``` + +# 6. Start `tor`: + +Here we set `tor` to start during boot and call it for the first time: + +``` +rcctl enable tor +rcctl start tor +``` + +--- +html: two-columns-page.html +--- +key: 2 +--- +section: Middle/Guard relay +--- +section_id: relay-operations +--- +subtitle: How to deploy a Middle/Guard relay on OpenBSD

1 0