May 2020 - tor-commits - lists.torproject.org

[chutney/master] Merge remote-tracking branch 'tor-github/pr/70'
by nickm＠torproject.org 18 May '20

18 May '20

commit 65f4b3018cfac1405e59a8cf01cc20551f3b8416 Merge: bb4e5f6 2f0e34e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 17 20:05:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/70' lib/chutney/TorNet.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)

1 0

[chutney/master] TorNet: make commandline invocations clear
by nickm＠torproject.org 18 May '20

18 May '20

commit 2f0e34e465b929d3d592afca6c38f2dcc8b81a1e Author: c <c(a)chroniko.jp> Date: Sun May 17 01:17:53 2020 +0000 TorNet: make commandline invocations clear Analysis tools such as vulture treat functions configure, restart, and wait_for_bootstrap in Network as unused, when in reality they are called from the ./chutney commandline. Make this explicitly clear. --- lib/chutney/TorNet.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b5f238a..cd9a9ec 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2112,6 +2112,9 @@ class Network(object): sys.exit(1) def configure(self): + """Invoked from command line: Configure and prepare the network to be + started. + """ phase = self._dfltEnv['CUR_CONFIG_PHASE'] if phase == 1: self.create_new_nodes_dir() @@ -2152,7 +2155,9 @@ class Network(object): return n_ok == len(self._nodes) def restart(self): - """Stop and subsequently start our network's nodes.""" + """Invoked from command line: Stop and subsequently start our + network's nodes. + """ self.stop() self.start() @@ -2247,6 +2252,9 @@ class Network(object): CHECKS_PER_PRINT = PRINT_NETWORK_STATUS_DELAY / CHECK_NETWORK_STATUS_DELAY def wait_for_bootstrap(self): + """Invoked from tools/test-network.sh to wait for the network to + bootstrap. + """ print("Waiting for nodes to bootstrap...\n") start = time.time() limit = start + getenv_int("CHUTNEY_START_TIME", 60)

1 0

[tor/master] Fix spacing in if statement in tor_version_parse()
by nickm＠torproject.org 18 May '20

18 May '20

commit 32e791be09211feb8d6040bf8352bbc9b49e0bed Author: Neel Chauhan <neel(a)neelc.org> Date: Sat May 16 22:26:30 2020 -0700 Fix spacing in if statement in tor_version_parse() --- src/core/or/versions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/versions.c b/src/core/or/versions.c index a9a960d66..31f1f5b99 100644 --- a/src/core/or/versions.c +++ b/src/core/or/versions.c @@ -296,7 +296,7 @@ tor_version_parse(const char *s, tor_version_t *out) return -1; hexlen = (int)(close_paren-cp); memwipe(digest, 0, sizeof(digest)); - if ( hexlen == 0 || (hexlen % 2) == 1) + if (hexlen == 0 || (hexlen % 2) == 1) return -1; if (base16_decode(digest, hexlen/2, cp, hexlen) != hexlen/2) return -1;

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 18 May '20

18 May '20

commit cc17beccde05fb748578c5d9cfe25ea5f93d009e Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 17 22:15:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- es_AR/LC_MESSAGES/bridgedb.po | 280 +++++++++++++++++++++--------------------- 1 file changed, 142 insertions(+), 138 deletions(-) diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index d6ff26a167..1e9c3f29f2 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -1,30 +1,31 @@ # Translations template for bridgedb. -# Copyright (C) 2019 'The Tor Project, Inc.' +# Copyright (C) 2020 'The Tor Project, Inc.' # This file is distributed under the same license as the bridgedb project. # # Translators: # cametiope <aldohcasa(a)hotmail.com>, 2014 # Alfredo Chaves <achaves.blg(a)gmail.com>, 2015 # angelica14 <angmarmt13(a)gmail.com>, 2014 +# Burro Moro <burromoro(a)riseup.net>, 2020 # Daniel Gray, 2015 # José Fabián, 2014 # kaze kaze <kaze(a)rlab.be>, 2019 # ezemelano <melanoeze(a)gmail.com>, 2014 -# pablitx 0x <pablitolabarta(a)gmail.com>, 2019 +# Pablito Labarta <pablitolabarta(a)gmail.com>, 2019 # Pablo Di Noto <pdinoto(a)gmail.com>, 2016 # Zuhualime Akoochimoya, 2018-2019 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: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-11-07 23:34+0000\n" -"Last-Translator: pablitx 0x <pablitolabarta(a)gmail.com>\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-17 22:05+0000\n" +"Last-Translator: Burro Moro <burromoro(a)riseup.net>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -47,18 +48,16 @@ msgstr "" #. variable. #. We use our metrics singleton to keep track of BridgeDB metrics such as #. "number of failed HTTPS bridge requests." +#. Convert all key/value pairs from bytes to str. #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" -#. "obfs2" -#. "obfs3" -#. "scramblesuit" -#. "fteproxy" +#. "obfs4" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:138 +#: bridgedb/distributors/https/server.py:154 msgid "Sorry! Something went wrong with your request." msgstr "¡Lo sentimos! Algo salió mal con tu solicitud." @@ -66,15 +65,15 @@ msgstr "¡Lo sentimos! Algo salió mal con tu solicitud." msgid "Language" msgstr "" -#: bridgedb/distributors/https/templates/base.html:92 +#: bridgedb/distributors/https/templates/base.html:94 msgid "Report a Bug" msgstr "Reportar un error" -#: bridgedb/distributors/https/templates/base.html:95 +#: bridgedb/distributors/https/templates/base.html:97 msgid "Source Code" msgstr "Código fuente" -#: bridgedb/distributors/https/templates/base.html:98 +#: bridgedb/distributors/https/templates/base.html:100 msgid "Changelog" msgstr "Bitácora de cambios" @@ -90,31 +89,26 @@ msgstr "Mostrar Código QR" msgid "QRCode for your bridge lines" msgstr "Código QR para tus líneas de bridge" -#. 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/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:125 -msgid "Uh oh, spaghettios!" -msgstr "¡Oh, sonamos!" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "Ha ocurrido un error al obtener tu código QR." -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "Este código QR contiene tus líneas de bridge. Escanealo con un lector de códigos QR para copiarlas en tus dispositivos móviles y otros." -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "" + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "En este momento no existen bridges disponibles..." -#: bridgedb/distributors/https/templates/bridges.html:133 -#: bridgedb/distributors/https/templates/bridges.html:137 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -190,64 +184,32 @@ msgstr "¡%sS%sí!" msgid "%sG%set Bridges" msgstr "%sO%sbtener bridges" -#: bridgedb/strings.py:43 -msgid "[This is an automated message; please do not reply.]" -msgstr "[Este es un mensaje automático; por favor, no responda.]" +#: bridgedb/strings.py:33 +msgid "[This is an automated email.]" +msgstr "" -#: bridgedb/strings.py:45 +#: bridgedb/strings.py:35 msgid "Here are your bridges:" msgstr "Aquí están tus bridges:" -#: bridgedb/strings.py:47 +#: bridgedb/strings.py:37 #, 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 "Te has excedido el límite de tasa. ¡Por favor, andá más despacio! El tiempo mínimo entre\ncorreos electrónicos es %s horas. Todos los correos electrónicos siguientes en este lapso de tiempo serán ignorados." -#: bridgedb/strings.py:50 +#: bridgedb/strings.py:40 msgid "" -"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "COMMANDs: (combiná COMMANDs para especificar opciones múltiples simultáneamente)" - -#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: bridgedb/strings.py:53 -msgid "Welcome to BridgeDB!" -msgstr "¡Bienvenido a BridgeDB!" - -#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: bridgedb/strings.py:55 -msgid "Currently supported transport TYPEs:" -msgstr "TYPEs de transport actualmente soportados:" - -#: bridgedb/strings.py:56 -#, python-format -msgid "Hey, %s!" -msgstr "¡Eh, %s!" - -#: bridgedb/strings.py:57 -msgid "Hello, friend!" -msgstr "¡Hola amigo!" - -#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 -msgid "Public Keys" -msgstr "Claves públicas" - -#. TRANSLATORS: This string will end up saying something like: -#. "This email was generated with rainbows, unicorns, and sparkles -#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: bridgedb/strings.py:62 -#, python-format -msgid "" -"This email was generated with rainbows, unicorns, and sparkles\n" -"for %s on %s at %s." -msgstr "Este correo electrónico fue generado con arcoiris, unicornios y destellos\npara %s el %s a las %s." +"If these bridges are not what you need, reply to this email with one of\n" +"the following commands in the message body:" +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: bridgedb/strings.py:72 +#: bridgedb/strings.py:50 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -258,7 +220,7 @@ msgid "" msgstr "BridgeDB puede proveerte bridges con varios %stipos de Pluggable Transports%s,\nque pueden ayudar a ofuscar tus conexiones a Tor Network, haciendo más difícil\nque alguien que observe tu tráfico de internet determine que estás\nusando Tor.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: bridgedb/strings.py:79 +#: bridgedb/strings.py:57 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -270,7 +232,7 @@ msgstr "Algunos bridges con direcciones IPv6 también están disponibles, aún c #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: bridgedb/strings.py:88 +#: bridgedb/strings.py:66 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -279,127 +241,169 @@ msgid "" "\n" msgstr "Adicionalmente, BridgeDB tiene varios bridges ordinarios como papel de cuete, %s sin ningún\nPluggable Transports %s, que tal vez no suenen tan genial, pero aún pueden\nayudar a burlar la censura de internet en muchos casos.\n\n" -#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 +#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356 msgid "What are bridges?" msgstr "¿Qué son los bridges?" -#: bridgedb/strings.py:102 +#: bridgedb/strings.py:79 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Los Bridges %s son relevos de Tor que te ayudan a evitar la censura." -#: bridgedb/strings.py:107 +#: bridgedb/strings.py:84 msgid "I need an alternative way of getting bridges!" msgstr "¡Necesito una manera alternativa de obtener bridges!" -#: bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "get transport obfs4". +#: bridgedb/strings.py:86 #, python-format msgid "" -"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 or %s." +"Another way to get bridges is to send an email to %s. Leave the email subject\n" +"empty and write \"get transport obfs4\" in the email's message body. Please note\n" +"that you must send the email using an address from one of the following email\n" +"providers: %s or %s." msgstr "" -#: bridgedb/strings.py:115 +#: bridgedb/strings.py:94 msgid "My bridges don't work! I need help!" msgstr "¡Mis bridges no funcionan! ¡Necesito ayuda!" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and #. "Support Portal", respectively. -#: bridgedb/strings.py:119 +#: bridgedb/strings.py:98 #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "" -#: bridgedb/strings.py:123 +#: bridgedb/strings.py:102 msgid "Here are your bridge lines:" msgstr "Aquí están tus líneas de bridges:" -#: bridgedb/strings.py:124 +#: bridgedb/strings.py:103 msgid "Get Bridges!" msgstr "¡Obtené Bridges!" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:107 +msgid "Bridge distribution mechanisms" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". +#: bridgedb/strings.py:109 +#, python-format +msgid "" +"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n" +"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n" +"the pseudo-mechanism \"None\". The following list briefly explains how these\n" +"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" +"mechanisms is." +msgstr "" + +#: bridgedb/strings.py:115 +#, python-format +msgid "" +"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" +"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" +"solve the subsequent CAPTCHA." +msgstr "" + +#: bridgedb/strings.py:119 +#, python-format +msgid "" +"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n" +"request bridges from inside their Tor Browser settings. To get bridges, go to\n" +"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" +"subsequent CAPTCHA, and Tor Browser will automatically add your new\n" +"bridges." +msgstr "" + +#: bridgedb/strings.py:125 +#, python-format +msgid "" +"Users can request bridges from the \"Email\" distribution mechanism by sending an\n" +"email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n" +"email body." +msgstr "" + +#: bridgedb/strings.py:129 +msgid "Reserved" +msgstr "" + +#: bridgedb/strings.py:130 +#, python-format +msgid "" +"BridgeDB maintains a small number of bridges that are not distributed\n" +"automatically. Instead, we reserve these bridges for manual distribution and\n" +"hand them out to NGOs and other organizations and individuals that need\n" +"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" +"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" +"called \"Unallocated\" in %sbridge pool assignment%s files." +msgstr "" + +#: bridgedb/strings.py:137 +msgid "None" +msgstr "" + +#: bridgedb/strings.py:138 +msgid "" +"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n" +"It is the bridge operator's responsibility to distribute their bridges to\n" +"users. Note that on Relay Search, a freshly set up bridge's distribution\n" +"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" +"it will then change to the bridge's actual distribution mechanism.\n" +msgstr "" + +#: bridgedb/strings.py:148 msgid "Please select options for bridge type:" msgstr "Por favor seleccioná opciones para tipo de bridge:" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:149 msgid "Do you need IPv6 addresses?" msgstr "¿Necesitás direcciones IPv6?" -#: bridgedb/strings.py:130 +#: bridgedb/strings.py:150 #, python-format msgid "Do you need a %s?" msgstr "¿Necesitás una %s?" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:154 msgid "Your browser is not displaying images properly." msgstr "Tu navegador no muestra las imágenes correctamente." -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:155 msgid "Enter the characters from the image above..." msgstr "Ingresá los caracteres de la imagen..." -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:159 msgid "How to start using your bridges" msgstr "Cómo comenzar a usar tus bridges" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:161 #, 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 "Para introducir puentes en tu Navegador Tor, primero andá hasta la %s página de descarga\ndel Navegador Tor %s y desde ahí seguí las instrucciones para descargar y ejecutar el Navegador Tor." - -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:146 -msgid "" -"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" -"the wizard until it asks:" -msgstr "Cuando el diálogo 'Configuración de Red de Tor' aparezca, cliqueá 'Configurar' y continuá con\nel asistente hasta que pregunte:" - -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:150 -msgid "" -"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" -"to the Tor network?" -msgstr "¿Su Proveedor de Servicios de Internet (ISP) bloquea o de algún modo censura conexiones\na la red de Tor?" +" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n" +" Manual explains how you can add your bridges to Tor Browser. If you are\n" +" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" +" are using Android, %sclick here%s." +msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:154 -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" -"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 "Seleccioná 'Sí' y luego cliqueá 'Siguiente'. Para configurar tus nuevos bridges, copiá y\npegá las líneas de bridges en el cuadro de texto. Finalmente, cliqueá 'Conectar' y,\n¡eso debería de ser todo! Si experimentás algún problema, intentá cliquear el botón 'Ayuda'\ndel asistente de 'Configuración de la Red de Tor' para recibir más asistencia." - -#: bridgedb/strings.py:162 -msgid "Displays this message." -msgstr "Mostrar éste mensaje." - -#. 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:166 -msgid "Request vanilla bridges." -msgstr "Pedir bridges ordinarios." +msgid "" +"Add these bridges to your Tor Browser by opening your browser\n" +"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" +"bridge\" field." +msgstr "" -#: bridgedb/strings.py:167 -msgid "Request IPv6 bridges." -msgstr "Pedir bridges IPv6." +#: bridgedb/strings.py:173 +msgid "(Request unobfuscated Tor bridges.)" +msgstr "" -#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:169 -msgid "Request a Pluggable Transport by TYPE." -msgstr "Pedir un Pluggable Transport por TYPE." +#: bridgedb/strings.py:174 +msgid "(Request IPv6 bridges.)" +msgstr "" -#. TRANSLATORS: Please DO NOT translate "BridgeDB". -#. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:172 -msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB." +#: bridgedb/strings.py:175 +msgid "(Request obfs4 obfuscated bridges.)" +msgstr ""

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 18 May '20

18 May '20

commit 352622b15130d539fa545bf77bdad87aae089cc2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 17 22:15:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- es_AR/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index c31d9fdeb0..5b7a1dec43 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -19,7 +19,7 @@ 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: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-17 21:40+0000\n" +"PO-Revision-Date: 2020-05-17 22:05+0000\n" "Last-Translator: Burro Moro <burromoro(a)riseup.net>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -387,23 +387,23 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr "Primero, necesitas %sdescargar el Navegador Tor%s. Nuestro Manual de usuario del Navegador Tor\nexplica cómo puedes agregar tus puentes al Navegador Tor. Si estás\nutilizando Windows, Linux u OS X, %shaz clic aquí%s para obtener más información. Si estás\nutilizando Android, %shaz clic aquí%s." #: bridgedb/strings.py:166 msgid "" "Add these bridges to your Tor Browser by opening your browser\n" "preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" "bridge\" field." -msgstr "" +msgstr "Agrega estos bridges a tu Navegador Tor abriendo las preferencias de tu navegador,\nhaciendo clic en \"Tor\" y luego agregándolos al campo \"Provide a\nbridge\"." #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)" -msgstr "" +msgstr "(Solicitar Tor bridges no ofuscados.)" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)" -msgstr "" +msgstr "(Solicitar bridges IPv6 .)" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)" -msgstr "" +msgstr "(Solicita bridges obfs4 ofuscados)."

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 18 May '20

18 May '20

commit ddbbb694f68ea8c8c299cbc224099f22de8503fb Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 17 21:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- es_AR/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index 60f9367c2d..c31d9fdeb0 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -19,7 +19,7 @@ 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: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-17 21:08+0000\n" +"PO-Revision-Date: 2020-05-17 21:40+0000\n" "Last-Translator: Burro Moro <burromoro(a)riseup.net>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -203,7 +203,7 @@ msgstr "Te has excedido el límite de tasa. ¡Por favor, andá más despacio! El msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "Si estos puentes no son lo que necesita, responda a este correo electrónico con uno de\nlos siguientes comandos en el cuerpo del mensaje:" +msgstr "Si estos bridges no son lo que necesitas, responda a este correo electrónico con uno de\nlos siguientes comandos en el cuerpo del mensaje:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -262,7 +262,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "Otra forma de obtener puentes es enviar un correo electrónico a %s. Deja el asunto del correo electrónico\nvacío y escribe \"get transport obfs4\" en el cuerpo del mensaje del correo electrónico. Ten en cuenta\nque debes enviar el correo electrónico utilizando una dirección de uno de los siguientes correos electrónicos de los \nproveedores: %s or %s." +msgstr "Otra forma de obtener bridges es enviar un correo electrónico a %s. Deja el asunto del correo electrónico\nvacío y escribe \"get transport obfs4\" en el cuerpo del mensaje del correo electrónico. Ten en cuenta\nque debes enviar el correo electrónico utilizando una dirección de uno de los siguientes correos electrónicos de los \nproveedores: %s or %s." #: bridgedb/strings.py:94 msgid "My bridges don't work! I need help!" @@ -287,7 +287,7 @@ msgstr "¡Obtené Bridges!" #: bridgedb/strings.py:107 msgid "Bridge distribution mechanisms" -msgstr "Mecanismos de distribución Bridge" +msgstr "Mecanismos de distribución de Bridge" #. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". #: bridgedb/strings.py:109 @@ -298,7 +298,7 @@ msgid "" "the pseudo-mechanism \"None\". The following list briefly explains how these\n" "mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" "mechanisms is." -msgstr "BridgeDB implementa cuatro mecanismos para distribuir puentes: \"HTTPS\", \"Moat\",\n\"Email\", y \"Reserved\". Los puentes que no se distribuyen a través de BridgeDB utilizan\nel pseudo-mecanismo \"None\". La siguiente lista explica brevemente cómo \nestos mecanismos y nuestras %smétricas de BridgeDB%s visualizan que tan popular\nes el mecanismo." +msgstr "BridgeDB implementa cuatro mecanismos para distribuir bridges: \"HTTPS\", \"Moat\",\n\"Email\", y \"Reserved\". Los bridges que no se distribuyen a través de BridgeDB utilizan\nel pseudo-mecanismo \"None\". La siguiente lista explica brevemente cómo \nestos mecanismos y nuestras %smétricas de BridgeDB%s visualizan que tan popular\nes el mecanismo." #: bridgedb/strings.py:115 #, python-format @@ -306,7 +306,7 @@ msgid "" "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" "bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" "solve the subsequent CAPTCHA." -msgstr "El mecanismo de distribución \"HTTPS\" reparte puentes sobre este sitio web. Para obtener\npuentes, dirígete a %s bridges.torproject.org%s, selecciona tus opciones preferidas y\nresuelva el CAPTCHA subsiguiente." +msgstr "El mecanismo de distribución \"HTTPS\" reparte bridges sobre este sitio web. Para obtener\nbridges, dirígete a %s bridges.torproject.org%s, selecciona tus opciones preferidas y\nresuelva el CAPTCHA subsiguiente." #: bridgedb/strings.py:119 #, python-format @@ -316,7 +316,7 @@ msgid "" "your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" "subsequent CAPTCHA, and Tor Browser will automatically add your new\n" "bridges." -msgstr "El mecanismo de distribución \"Moat\" es parte del navegador Tor, lo que permite a los usuarios\nsolicitar puentes desde la configuración de su navegador Tor. Para obtener puentes, dirígete a\ntu Navegador Tor %sen configuraciones de Tor%s, haz clic en \"solicitar un nuevo puente\", resuelve el\nCAPTCHA subsiguiente y el Navegador Tor agregará automáticamente tus nuevos\npuentes." +msgstr "El mecanismo de distribución \"Moat\" es parte del navegador Tor, lo que permite a los usuarios\nsolicitar bridges desde la configuración de su navegador Tor. Para obtener bridges, dirígete a\ntu Navegador Tor %sen configuraciones de Tor%s, haz clic en \"solicitar un nuevo bridge\", resuelve el\nCAPTCHA subsiguiente y el Navegador Tor agregará automáticamente tus nuevos\npuentes." #: bridgedb/strings.py:125 #, python-format @@ -324,7 +324,7 @@ msgid "" "Users can request bridges from the \"Email\" distribution mechanism by sending an\n" "email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n" "email body." -msgstr "Los usuarios pueden solicitar puentes desde el mecanismo de distribución \"Email\" enviando un\ncorreo electrónico a %sbridges(a)torproject.org%s y escribiendo \"get transport obfs4\" en el \ncuerpo del correo electrónico." +msgstr "Los usuarios pueden solicitar bridges desde el mecanismo de distribución \"Email\" enviando un\ncorreo electrónico a %sbridges(a)torproject.org%s y escribiendo \"get transport obfs4\" en el \ncuerpo del correo electrónico." #: bridgedb/strings.py:129 msgid "Reserved" @@ -339,7 +339,7 @@ msgid "" "bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" "see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" "called \"Unallocated\" in %sbridge pool assignment%s files." -msgstr "BridgeDB mantiene una pequeña cantidad de puentes que no se distribuyen\nautomáticamente. En cambio, reservamos estos puentes para su distribución manual y\nlos entregamos a las ONG´s y otras organizaciones e individuos que necesitan\npuentes. Los puentes que se distribuyen a través del mecanismo \"Reserved\" pueden no\nver a los usuarios durante mucho tiempo. Tenga en cuenta que el mecanismo de distribución \"Reserved\" se\ndenomina \"Unallocated\" en los archivos de %sasignación de agrupación de puentes.%s " +msgstr "BridgeDB mantiene una pequeña cantidad de bridges que no se distribuyen\nautomáticamente. En cambio, reservamos estos bridges para su distribución manual y\nlos entregamos a las ONG´s y otras organizaciones e individuos que necesitan\nbridges. Los bridges que se distribuyen a través del mecanismo \"Reserved\" pueden no\nver a los usuarios durante mucho tiempo. Ten en cuenta que el mecanismo de distribución \"Reserved\" se\ndenomina \"Unallocated\" en los archivos de %sasignación de agrupación de bridges.%s " #: bridgedb/strings.py:137 msgid "None" @@ -352,7 +352,7 @@ msgid "" "users. Note that on Relay Search, a freshly set up bridge's distribution\n" "mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" "it will then change to the bridge's actual distribution mechanism.\n" -msgstr "" +msgstr "BridgeDB no distribuye los bridges cuyo mecanismo de distribución es\"None\"\nEs responsabilidad del operador del bridge distribuir sus bridges a los\nusuarios. Ten en cuenta que en el Relay Search, el mecanismo de distribución de un bridge recién configurado\ndice \"None\" por hasta aproximadamente un día. Se un poco paciente, y\nluego cambiará al mecanismo de distribución real del bridge.\n" #: bridgedb/strings.py:148 msgid "Please select options for bridge type:"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 18 May '20

18 May '20

commit 836ec1d6b04a71d606fc8037a2a06cf2fb06c4f4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 17 21:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- es_AR/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index 1d1e1851d6..60f9367c2d 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -19,8 +19,8 @@ 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: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-17 21:08+0000\n" +"Last-Translator: Burro Moro <burromoro(a)riseup.net>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -101,7 +101,7 @@ msgstr "Este código QR contiene tus líneas de bridge. Escanealo con un lector #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB encontró un error." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." @@ -203,7 +203,7 @@ msgstr "Te has excedido el límite de tasa. ¡Por favor, andá más despacio! El msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "Si estos puentes no son lo que necesita, responda a este correo electrónico con uno de\nlos siguientes comandos en el cuerpo del mensaje:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -339,7 +339,7 @@ msgid "" "bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" "see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" "called \"Unallocated\" in %sbridge pool assignment%s files." -msgstr "" +msgstr "BridgeDB mantiene una pequeña cantidad de puentes que no se distribuyen\nautomáticamente. En cambio, reservamos estos puentes para su distribución manual y\nlos entregamos a las ONG´s y otras organizaciones e individuos que necesitan\npuentes. Los puentes que se distribuyen a través del mecanismo \"Reserved\" pueden no\nver a los usuarios durante mucho tiempo. Tenga en cuenta que el mecanismo de distribución \"Reserved\" se\ndenomina \"Unallocated\" en los archivos de %sasignación de agrupación de puentes.%s " #: bridgedb/strings.py:137 msgid "None"

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 18 May '20

18 May '20

commit 134619a9dbd6c3f6f27bedd5a20fbccbe99e9299 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 17 16:15:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+hr.po | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/contents+hr.po b/contents+hr.po index 76aec763e1..161d903b0e 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -58,7 +58,7 @@ msgstr "" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.title) msgid "Relay operations" -msgstr "Funkcije releja" +msgstr "Pokretanje releja" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.subtitle) @@ -78,7 +78,8 @@ msgstr "Pomogni širiti Tor mrežu" #: (content/relay-operations/contents+en.lrpage.body) msgid "The Tor network relies on volunteers to donate bandwidth." msgstr "" -"Tor mreža treba volontere koji nude upotrebu svojih komunikacijskih kanala." +"Tor mreža treba volontere koji nude upotrebu vlastitih komunikacijskih " +"kanala." #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) @@ -390,8 +391,7 @@ msgstr "" msgid "" "* How much bandwidth/monthly traffic do you want to allow for Tor traffic?" msgstr "" -"* Koju količinu propusnosti/mjesečnog prometa želiš dozvoliti za Torov " -"promet?" +"* Koju količinu propusnosti/mjesečni promet želiš dozvoliti za Torov promet?" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body) @@ -475,6 +475,8 @@ msgid "" "bandwidth and 16 Mbit/s (Mbps) download bandwidth available for Tor. More is" " better." msgstr "" +"Preporučuje se da relej ima propusnost za prijenos od barem 16 Mbit/s (Mbps)" +" i propusnost za preuzimanje od 16 Mbit/s (Mbps) za Tor. Više je bolje." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -494,6 +496,8 @@ msgid "" "If you do not know your bandwidth you can use http://beta.speedtest.net to " "measure it." msgstr "" +"Ako ne znaš tvoju propusnost, za mjerenje možeš koristiti " +"http://beta.speedtest.net." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -532,6 +536,9 @@ msgid "" "If you have a metered plan you might want to configure tor to only use a " "given amount of [bandwidth or monthly traffic](/relay/setup/post-install/)." msgstr "" +"Ako imaš tarifu s ograničenim prometom, možda želiš konfigurirati tor tako " +"da koristi samo određenu količinu [propusnosti ili mjesečnog " +"prometa](/relay/setup/post-install/)." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 17 May '20

17 May '20

commit 237101ead11c9382cc7d0e3dc92329bcc0cec76c Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 17 15:45:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+hr.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contents+hr.po b/contents+hr.po index 537868fbbb..76aec763e1 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -390,7 +390,7 @@ msgstr "" msgid "" "* How much bandwidth/monthly traffic do you want to allow for Tor traffic?" msgstr "" -"* Koju količinu upotrebe kanala/mjesečnog prometa želiš dozvoliti za Torov " +"* Koju količinu propusnosti/mjesečnog prometa želiš dozvoliti za Torov " "promet?" #: https//community.torproject.org/relay/setup/ @@ -423,8 +423,8 @@ msgid "" "Requirements for Tor relays depend on the type of relay and the bandwidth " "they provide. Learn more about specific relay requirements." msgstr "" -"Zahtjevi za Tor releje ovise o vrsti releja i širini pojasa koje pružaju. " -"Saznaj više o specifičnim zahtjevima releja." +"Zahtjevi za Tor releje ovise o vrsti releja i količini propusnosti koje " +"pružaju. Saznaj više o specifičnim zahtjevima releja." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -432,12 +432,13 @@ msgid "" "Requirements for Tor relays depend on the type of relay and the bandwidth " "they provide." msgstr "" -"Zahtjevi za Tor releje ovise o vrsti releja i širini pojasa koje pružaju." +"Zahtjevi za Tor releje ovise o vrsti releja i količini propusnosti koje " +"pružaju." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Bandwidth and Connections" -msgstr "" +msgstr "# Propusnost kanala i veze" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)

1 0

[metrics-lib/master] Extend Torperf results to provide error codes.
by karsten＠torproject.org 17 May '20

17 May '20

commit a422aff99f964c04b1c2c9d65f487717eccd882d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun May 17 17:22:39 2020 +0200 Extend Torperf results to provide error codes. Implements the remaining part of #30602. --- CHANGELOG.md | 3 +++ .../org/torproject/descriptor/TorperfResult.java | 9 ++++++++ .../descriptor/impl/TorperfResultImpl.java | 14 +++++++++++ .../descriptor/impl/TorperfResultImplTest.java | 27 ++++++++++++++++++++++ 4 files changed, 53 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 100bed2..7bb22c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes in version 2.??.? - 2020-??-?? + * Medium changes + - Extend Torperf results to provide error codes. + # Changes in version 2.13.0 - 2020-05-16 diff --git a/src/main/java/org/torproject/descriptor/TorperfResult.java b/src/main/java/org/torproject/descriptor/TorperfResult.java index 695be01..ea5b6f4 100644 --- a/src/main/java/org/torproject/descriptor/TorperfResult.java +++ b/src/main/java/org/torproject/descriptor/TorperfResult.java @@ -282,5 +282,14 @@ public interface TorperfResult extends Descriptor { * @since 1.7.0 */ String getSourceAddress(); + + /** + * Return the combined error code contained in the {@code tgen} client logs + * and the {@code tor} client logs, or {@code null} if no error occured or if + * the OnionPerf line didn't contain this information. + * + * @since 2.14.0 + */ + String getErrorCode(); } diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index b2c58cc..571f8b2 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -182,6 +182,9 @@ public class TorperfResultImpl extends DescriptorImpl case "SOURCEADDRESS": this.parseSourceAddress(value); break; + case "ERRORCODE": + this.parseErrorcode(value); + break; default: if (key.startsWith("DATAPERC")) { this.parseDataPercentile(value, keyValue, line); @@ -444,6 +447,10 @@ public class TorperfResultImpl extends DescriptorImpl this.sourceAddress = value; } + private void parseErrorcode(String value) { + this.errorCode = value; + } + private long parseTimestamp(String value, String keyValue, String line) throws DescriptorParseException { long timestamp = -1L; @@ -704,5 +711,12 @@ public class TorperfResultImpl extends DescriptorImpl public String getSourceAddress() { return this.sourceAddress; } + + private String errorCode; + + @Override + public String getErrorCode() { + return this.errorCode; + } } diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index 0e76c97..c4740f8 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -152,5 +152,32 @@ public class TorperfResultImplTest { assertEquals("op-us", torperfResult.getHostnameRemote()); assertEquals("199.119.112.144", torperfResult.getSourceAddress()); } + + private static final String inputWithErrorcode = + "BUILDTIMES=0.0999999046326,0.139999866486,0.240000009537 CIRC_ID=94982 " + + "CONNECT=1554235190.26 DATACOMPLETE=0.0 DATAREQUEST=1554235192.60 " + + "DATARESPONSE=1554235192.92 DIDTIMEOUT=1 " + + "ENDPOINTLOCAL=localhost:127.0.0.1:56560 " + + "ENDPOINTPROXY=localhost:127.0.0.1:41204 " + + "ENDPOINTREMOTE=ywoeaxadmmsmewf7.onion:0.0.0.0:80 ERRORCODE=TGEN/READ " + + "FILESIZE=5242880 HOSTNAMELOCAL=op-ab HOSTNAMEREMOTE=op-ab " + + "LAUNCH=1554235084.64 NEGOTIATE=1554235190.26 " + + "PATH=$1FC89C159EA0F96D52D8A7092BF938C509DB6984," + + "$EEDF0AF1F892C82F056063827B47283CC9AEAA41," + + "$356B94BAD3096790E409790898144A4030AC225C QUANTILE=0.8 " + + "READBYTES=5069130 REQUEST=1554235190.26 RESPONSE=0.0 " + + "SOCKET=1554235190.26 SOURCE=cyan SOURCEADDRESS=unknown " + + "START=1554235190.26 TIMEOUT=1500 USED_AT=1554235192.92 " + + "USED_BY=149138 WRITEBYTES=56"; + + @Test + public void testErrorcode() throws DescriptorParseException { + List<Descriptor> result = TorperfResultImpl.parseTorperfResults( + inputWithErrorcode.getBytes(), null); + assertEquals(1, result.size()); + TorperfResultImpl torperfResult = (TorperfResultImpl) result.get(0); + assertNull(torperfResult.getUnrecognizedKeys()); + assertEquals("TGEN/READ", torperfResult.getErrorCode()); + } }

1 0