September 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit affbe376f9a15c7c839287b8127d3bd9ac2eab02 Merge: 89c5b8d7d ae1aea4cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 15:53:06 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug25505 | 3 +++ src/or/channelpadding.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Bug 25505: Check circuitmux queues before padding.
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit ae1aea4cc490658e917b0c08584c7115a57da00b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 13 13:50:35 2018 +0000 Bug 25505: Check circuitmux queues before padding. --- changes/bug25505 | 3 +++ src/or/channelpadding.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug25505 b/changes/bug25505 new file mode 100644 index 000000000..101c7d524 --- /dev/null +++ b/changes/bug25505 @@ -0,0 +1,3 @@ + o Minor bugfixes (netflow padding): + - Ensure circuitmux queues are empty before scheduling or sending padding. + Fixes bug 25505; bugfix on 0.3.1.1-alpha. diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index 5da3009e6..ba432e716 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -379,7 +379,8 @@ channelpadding_send_padding_cell_for_callback(channel_t *chan) chan->pending_padding_callback = 0; if (monotime_coarse_is_zero(&chan->next_padding_time) || - chan->has_queued_writes(chan)) { + chan->has_queued_writes(chan) || + (chan->cmux && circuitmux_num_cells(chan->cmux))) { /* We must have been active before the timer fired */ monotime_coarse_zero(&chan->next_padding_time); return; @@ -755,7 +756,11 @@ channelpadding_decide_to_pad_channel(channel_t *chan) return CHANNELPADDING_WONTPAD; } - if (!chan->has_queued_writes(chan)) { + /* There should always be a cmux on the circuit. After that, + * only schedule padding if there are no queued writes and no + * queued cells in circuitmux queues. */ + if (chan->cmux && !chan->has_queued_writes(chan) && + !circuitmux_num_cells(chan->cmux)) { int is_client_channel = 0; if (CHANNEL_IS_CLIENT(chan, options)) {

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 902b34a0debeee92cb5844ec87c55db9f447562b Merge: 2d0a6d769 affbe376f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 15:53:06 2018 -0400 Merge branch 'maint-0.3.4'

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 11 Sep '18

11 Sep '18

commit 32683b9b9693b26b09e6189971702165c8b3145c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 19:19:01 2018 +0000 Update translations for support-portal --- contents+pt_BR.po | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/contents+pt_BR.po b/contents+pt_BR.po index 7dabe69ec..78419664d 100644 --- a/contents+pt_BR.po +++ b/contents+pt_BR.po @@ -2046,6 +2046,8 @@ msgid "" "<a href=\"https://duckduckgo.com/\">DuckDuckGo</a> is the " "default search engine in Tor Browser." msgstr "" +"<a href=\"https://duckduckgo.com/\">DuckDuckGo</a>é o buscador " +"padrão no navegador Tor." #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -2055,6 +2057,8 @@ msgid "" "2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory " "server" msgstr "" +"2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory " +"server" #: http//localhost/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.title) @@ -2078,7 +2082,7 @@ msgstr "Eu estou tendo um problema com o HTTPS Everywhere." #: http//localhost/tbb/tbb-39/ #: (content/tbb/tbb-39/contents+en.lrquestion.seo_slug) msgid "tor-browser-issues-facebook-twitter-websites" -msgstr "" +msgstr "navegador-tor-problemas-facebook-twitter-websites" #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -2141,6 +2145,8 @@ msgid "" "13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with " "SSL state (No SSL object)" msgstr "" +"13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with " +"SSL state (No SSL object)" #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -2243,7 +2249,7 @@ msgstr "" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "$ deb http://deb.torproject.org/torproject.org <version> main" -msgstr "" +msgstr "$ deb http://deb.torproject.org/torproject.org<version> main" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) @@ -2252,6 +2258,9 @@ msgid "" "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." msgstr "" +"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " +"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," +" 1 minutes, or that theirs is ahead." #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.description) @@ -2277,7 +2286,7 @@ msgstr "Quando o Tor Browser para Android será lançado?" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.seo_slug) msgid "how-do-i-run-a-middle-or-guard-relay" -msgstr "" +msgstr "como-operar-um-relay-intermediario-ou-guarda" #: http//localhost/misc/misc-15/ #: (content/misc/misc-15/contents+en.lrquestion.description) @@ -2292,7 +2301,7 @@ msgstr "" #: http//localhost/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.seo_slug) msgid "different-circuit-each-website" -msgstr "" +msgstr "diferentes-circuitos-para-cada-website" #: http//localhost/misc/misc-9/ #: (content/misc/misc-9/contents+en.lrquestion.description) @@ -2314,6 +2323,8 @@ msgid "" "See <a href=\"#operators-6\">How do I run a bridge</a> for " "instructions." msgstr "" +"Veja <a href=\"#operators-6\">Como operar uma ponte</a>para " +"mais instruções." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -2338,6 +2349,8 @@ msgid "" "11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. " "Discarding this circuit." msgstr "" +"11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. " +"Discarding this circuit." #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 11 Sep '18

11 Sep '18

commit a38e211aa924fe94446e11d7709665b8123b413c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 18:48:53 2018 +0000 Update translations for support-portal --- contents+pt_BR.po | 51 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/contents+pt_BR.po b/contents+pt_BR.po index c0ea98e99..7dabe69ec 100644 --- a/contents+pt_BR.po +++ b/contents+pt_BR.po @@ -649,7 +649,7 @@ msgstr "" #: http//localhost/connecting/connecting-1/ #: (content/connecting/connecting-1/contents+en.lrquestion.seo_slug) msgid "tor-browser-wont-connect" -msgstr "tor-browser-não-conecta" +msgstr "tor-browser-nao-conecta" #: http//localhost/onionservices/ #: (content/onionservices/contents+en.lrtopic.seo_slug) @@ -1019,7 +1019,7 @@ msgstr "Eu posso executar Tor em um aparelho Android?" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "#RelayBandwidthBurst 100 MBytes" -msgstr "" +msgstr "#RelayBandwidthBurst 100 MBytes" #: http//localhost/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.description) @@ -1028,6 +1028,9 @@ msgid "" "href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced" " exit policy</a>." msgstr "" +"Considere se você não gostaria de mudar para a <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Política" +" reduzida de saída</a>." #: http//localhost/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.seo_slug) @@ -1070,14 +1073,14 @@ msgstr "* tor.real" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "bandwidth caps)" -msgstr "" +msgstr "largura de banda" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "##### Common log error #4: Clock skew" -msgstr "" +msgstr "##### Log de erro comum: #4 Clock skew" #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1085,13 +1088,16 @@ msgid "" "Both options are located in the Menu, but you can also access the New " "Circuit option inside the site information menu, in the URL bar." msgstr "" +"Ambas opções estão localizadas no menu, porém você também pode acessar a " +"opção \"Novo Circuito\" em cima do menu de informações do site, na barra da " +"URL." #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "Using bridges will likely fix this." -msgstr "" +msgstr "Utilizar pontes provavelmente irá corrigir isso." #: http//localhost/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.description) @@ -1377,6 +1383,8 @@ msgid "" "Look for a log entry in /var/log/syslog such as \"Self-testing indicates " "your ORPort is reachable from the outside. Excellent.\"" msgstr "" +"Veja sua entrada de log em /var/log/syslog algo como \"Self-testing " +"indicates your ORPort is reachable from the outside. Excellent.\"" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.title) @@ -1447,7 +1455,7 @@ msgstr "" #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.seo_slug) msgid "run-exit-from-home" -msgstr "" +msgstr "operar-saida-de-casa" #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.title) @@ -1466,6 +1474,9 @@ msgid "" "href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorExitGuidelines\">Exit" " relay guidelines</a>" msgstr "" +"* Revise nossos <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorExitGuidelines\">" +" Diretrizes de relays de saída</a>" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -1515,7 +1526,7 @@ msgstr "" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.seo_slug) msgid "how-do-i-run-a-obfs4-bridge-debian" -msgstr "" +msgstr "como-rodar-o-obfs4-ponte-debian" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -1543,7 +1554,7 @@ msgstr "rastreamento-de-usuarios-tor" #: http//localhost/tbb/tbb-20/ #: (content/tbb/tbb-20/contents+en.lrquestion.seo_slug) msgid "tor-browser-will-not-connect-no-censorship" -msgstr "" +msgstr "tor-browser-nao-conecta-sem-censura" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -1587,12 +1598,12 @@ msgstr "Posso utilizar o Tor com um browser que não seja o Tor Browser?" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) msgid "ExitPolicy reject *:*" -msgstr "" +msgstr "ExitPolicy reject *:*" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "BridgeRelay 1" -msgstr "" +msgstr "BridgeRelay 1" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) @@ -1600,6 +1611,8 @@ msgid "" "* Look for a log entry in /var/log/syslog such as \"Self-testing indicates " "your ORPort is reachable from the outside. Excellent.\"" msgstr "" +"* Veja o log de entrada em /var/log/syslog tal como \"Self-testing " +"indicates your ORPort is reachable from the outside. Excellent.\"" #: http//localhost/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description) @@ -1623,6 +1636,8 @@ msgid "" "11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake " "with first hop" msgstr "" +"11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake " +"with first hop" #: http//localhost/connecting/ #: (content/connecting/contents+en.lrtopic.seo_slug) @@ -1632,7 +1647,7 @@ msgstr "conectando-ao-tor" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) @@ -1658,7 +1673,7 @@ msgstr "uso-do-logotipo-tor" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.seo_slug) msgid "get-rid-of-captchas" -msgstr "" +msgstr "como-se-livrar-dos-captchas" #: http//localhost/tbb/tbb-2/ #: (content/tbb/tbb-2/contents+en.lrquestion.description) @@ -1680,6 +1695,8 @@ msgid "" "<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " "Circuit for this Site\">" msgstr "" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " +"Circuit for this Site\">" #: http//localhost/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -1767,6 +1784,8 @@ msgid "" "The best success we've had in getting sites to unblock Tor users is getting " "users to contact the site administrators directly." msgstr "" +"O meio com maior sucesso em fazer com que websites desbloqueie usuários Tor," +" é os usuários entrando em contato direto com os administradores do site." #: http//localhost/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.title) @@ -1820,7 +1839,7 @@ msgstr "" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "#RelayBandwidthRate 30 MBytes" -msgstr "" +msgstr "#RelayBandwidthRate 30 MBytes" #: http//localhost/tbb/tbb-4/ #: (content/tbb/tbb-4/contents+en.lrquestion.description) @@ -1892,7 +1911,7 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "###### Common log error #1: Proxy connection failure" -msgstr "" +msgstr "###### Common log error #1: Proxy connection failure" #: http//localhost/misc/misc-3/ #: (content/misc/misc-3/contents+en.lrquestion.description) @@ -1907,7 +1926,7 @@ msgstr "" #: http//localhost/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.seo_slug) msgid "using-tor-with-a-browser-besides-tor-browser" -msgstr "" +msgstr "sando-tor-com-uma-navegador-alem-do-tor-browser" #: http//localhost/tbb/tbb-6/ #: (content/tbb/tbb-6/contents+en.lrquestion.description) @@ -1971,7 +1990,7 @@ msgstr "" #: http//localhost/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.seo_slug) msgid "tor-browser-firefox-not-working-error" -msgstr "" +msgstr "navegador-tor-firefox-nao-funciona-erro" #: http//localhost/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.seo_slug)

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 11 Sep '18

11 Sep '18

commit cd7e431ba32d8ba5cd4afac1f2afd4062244590f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 18:47:25 2018 +0000 Update translations for tor-browser-manual_completed --- es_AR/es_AR.po | 382 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 271 insertions(+), 111 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index ac2d09adf..6731aec93 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -1,7 +1,7 @@ # Translators: # Nico Edu <neteleport(a)gmail.com>, 2016 -# psss <facevedo(a)openmailbox.org>, 2016 # ezemelano <melanoeze(a)gmail.com>, 2016 +# psss <facevedo(a)openmailbox.org>, 2016 # Joaquín Serna, 2017 # Rodolfo Fernando Juarez <rfjuarez(a)gmail.com>, 2017 # orienta cionscj <orientacionscj-survey(a)yahoo.com.ar>, 2017 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2016-12-06 16:36-0600\n" +"POT-Creation-Date: 2018-09-07 16:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Zuhualime Akoochimoya, 2018\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" @@ -222,11 +222,11 @@ msgstr "" #: bridges.page:63 msgctxt "_" msgid "" -"external ref='media/tor-launcher-custom-bridges_en-US.png' " -"md5='93365c2aa3fb4d627497e83f28a39b7e'" +"external ref='media/tor-launcher-custom-bridges.png' " +"md5='34b5e99516d297fcbb467209d8479f40'" msgstr "" -"external ref='media/tor-launcher-custom-bridges_en-US.png' " -"md5='93365c2aa3fb4d627497e83f28a39b7e'" +"external ref='media/tor-launcher-custom-bridges.png' " +"md5='34b5e99516d297fcbb467209d8479f40'" #: bridges.page:65 msgid "" @@ -277,10 +277,10 @@ msgstr "Usando transportes insertables" msgctxt "_" msgid "" "external ref='media/circumvention/configure.png' " -"md5='519d888303eadfe4cb03f178aedd90f5'" +"md5='1107595d21fe90f2aab1263d7fb0abd3'" msgstr "" "external ref='media/circumvention/configure.png' " -"md5='519d888303eadfe4cb03f178aedd90f5'" +"md5='1107595d21fe90f2aab1263d7fb0abd3'" #: circumvention.page:28 msgid "" @@ -316,10 +316,10 @@ msgstr "" msgctxt "_" msgid "" "external ref='media/circumvention/bridges.png' " -"md5='910cdd5e45860b81a1ad4739c589a195'" +"md5='f5acc05bd9bacf6c69a31163d25a8778'" msgstr "" "external ref='media/circumvention/bridges.png' " -"md5='910cdd5e45860b81a1ad4739c589a195'" +"md5='f5acc05bd9bacf6c69a31163d25a8778'" #: circumvention.page:51 msgid "" @@ -349,11 +349,11 @@ msgstr "" msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-" -"azure, meek-amazon." +"azure and Snowflake." msgstr "" -"Si usted está tratando de eludir una conexión bloqueada por primera vez, " -"debería probar los diferentes transportes: obfs3, obfs4, ScrambleSuit, FTE, " -"meek-azure, meek-amazon." +"Si estás tratando de eludir una conexión bloqueada por primera vez, deberías" +" probar los diferentes transportes: obfs3, obfs4, ScrambleSuit, fte, meek-" +"azure y Snowflake." #: circumvention.page:72 msgid "" @@ -406,17 +406,17 @@ msgstr "GetTor" msgid "" "GetTor is a service that automatically responds to messages with links to " "the latest version of Tor Browser, hosted at a variety of locations, such as" -" Dropbox, Google Drive and Github.." +" Dropbox, Google Drive and GitHub." msgstr "" "GetTor es un servicio que automáticamente responde a mensajes con vínculos a" " la última versión del navegador Tor, alojadas en una variedad de " "locaciones, tales como Dropbox, Google Drive y Github." -#: downloading.page:34 +#: downloading.page:33 msgid "To use GetTor via email:" msgstr "Usar GetTor vía correo electrónico:" -#: downloading.page:39 +#: downloading.page:38 msgid "" "Send an email to gettor(a)torproject.org, and in the body of the message " "simply write “windows”, “osx”, or “linux”, (without quotation marks) " @@ -426,7 +426,7 @@ msgstr "" "simplemente escriba, dependiendo cual sea su sistema operativo, “windows”, " "“osx” o “linux” (sin comillas)." -#: downloading.page:46 +#: downloading.page:45 msgid "" "GetTor will respond with an email containing links from which you can " "download the Tor Browser package, the cryptographic signature (needed for " @@ -442,11 +442,11 @@ msgstr "" "ofrecida una opción para programas de 32 ó 64 bits: ésto depende del modelo " "de computadora que estás usando." -#: downloading.page:57 +#: downloading.page:56 msgid "To use GetTor via Twitter:" msgstr "Usar GetTor vía Twitter:" -#: downloading.page:62 +#: downloading.page:61 msgid "" "To get links for downloading Tor Browser in English for OS X, send a Direct " "Message to @get_tor with the words \"osx en\" in it (you don't need to " @@ -456,11 +456,11 @@ msgstr "" "enviá un mensaje directo a @get_tor con las palabras \"osx en\" en él (no " "necesitás seguir la cuenta)." -#: downloading.page:70 -msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" -msgstr "Usar GetTor vía Jabber/XMPP (Mensajero Tor, Jitsi, CoyIM):" +#: downloading.page:69 +msgid "To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):" +msgstr "Usar GetTor vía Jabber/XMPP (Jitsi, CoyIM, etc.):" -#: downloading.page:75 +#: downloading.page:74 msgid "" "To get links for downloading Tor Browser in Chinese for Linux, send a " "message to gettor(a)torproject.org with the words \"linux zh\" in it." @@ -469,11 +469,11 @@ msgstr "" "enviá un mensaje a gettor(a)torproject.org con las palabras \"linux zh\" en " "él." -#: downloading.page:84 +#: downloading.page:83 msgid "Satori" msgstr "Satori" -#: downloading.page:85 +#: downloading.page:84 msgid "" "Satori is an add-on for the Chrome or Chromium browsers that allows you to " "download several security and privacy programs from different sources." @@ -482,19 +482,19 @@ msgstr "" "permite descargar varios programas de seguridad y privacidad desde " "diferentes fuentes." -#: downloading.page:90 +#: downloading.page:89 msgid "To download Tor Browser using Satori:" msgstr "Descargar el navegador Tor usando Satori:" -#: downloading.page:95 +#: downloading.page:94 msgid "Install Satori from the Chrome App Store." msgstr "Instalá Satori desde la tienda de aplicaciones de Chrome." -#: downloading.page:100 +#: downloading.page:99 msgid "Select Satori from your browser’s Apps menu." msgstr "Seleccioná Satori desde al menú de aplicaciones de tu navegador." -#: downloading.page:105 +#: downloading.page:104 msgid "" "When Satori opens, click on your preferred language. A menu will open " "listing the available downloads for that language. Find the entry for Tor " @@ -509,7 +509,7 @@ msgstr "" "fuente diferente desde la cual obtener el programa. Entonces, tu descarga " "empezará." -#: downloading.page:115 +#: downloading.page:114 msgid "" "Wait for your download to finish, then find the “Generate Hash” section in " "Satori’s menu and click “Select Files”." @@ -517,7 +517,7 @@ msgstr "" "Esperá a que tu descarga termine, luego encontrá la sección \"Generar hash\"" " en el menú de Satori y cliqueá \"Seleccionar archivos\"." -#: downloading.page:121 +#: downloading.page:120 msgid "" "Select the downloaded Tor Browser file. Satori will display the checksum of " "the file, which you should compare with the software’s original checksum: " @@ -565,10 +565,10 @@ msgstr "Conectar" msgctxt "_" msgid "" "external ref='media/first-time/connect.png' " -"md5='9d07068f751a3bfd274365a4ba8d90ca'" +"md5='f6de80de01c8fa2a8f80857eb8213768'" msgstr "" "external ref='media/first-time/connect.png' " -"md5='9d07068f751a3bfd274365a4ba8d90ca'" +"md5='f6de80de01c8fa2a8f80857eb8213768'" #: first-time.page:23 msgid "" @@ -641,10 +641,10 @@ msgstr "" msgctxt "_" msgid "" "external ref='media/first-time/proxy_question.png' " -"md5='30853b3e86cfd386bbc32e5b8b45a378'" +"md5='f72753a963e3449129718e3d824a8ac8'" msgstr "" "external ref='media/first-time/proxy_question.png' " -"md5='30853b3e86cfd386bbc32e5b8b45a378'" +"md5='f72753a963e3449129718e3d824a8ac8'" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -654,12 +654,12 @@ msgstr "" msgctxt "_" msgid "" "external ref='media/first-time/proxy.png' " -"md5='13f21a351cd0aa1cf11aada690f3dc90'" +"md5='9a5cf5c044b1dfc5f006a9d1ff77507b'" msgstr "" "external ref='media/first-time/proxy.png' " -"md5='13f21a351cd0aa1cf11aada690f3dc90'" +"md5='9a5cf5c044b1dfc5f006a9d1ff77507b'" -#: index.page:6 +#: index.page:8 msgid "Tor Browser User Manual" msgstr "Manual de Usuario del Navegador Tor" @@ -1059,13 +1059,13 @@ msgstr "" #: onionsites.page:50 msgid "" "Just like any other website, you will need to know the address of an onion " -"service in order to connect to it. An onion address is a string of sixteen " -"mostly random letters and numbers, followed by “.onion”." +"service in order to connect to it. An onion address is a string of 16 (and " +"in V3 format, 56) mostly random letters and numbers, followed by “.onion”." msgstr "" "Tal como cualquier otro sitio web, necesitarás saber la dirección de un " "servicio Cebolla en orden a conectarte a él. Una dirección Cebolla es una " -"cadena de dieciseis letras y números mayormente aleatorios, seguidos por " -"\".onion\"." +"cadena de 16 (y en formato V3, 56) letras y números mayormente aleatorios, " +"seguidos por \".onion\"." #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" @@ -1074,12 +1074,12 @@ msgstr "Solución de problemas" #: onionsites.page:59 msgid "" "If you cannot reach the onion service you require, make sure that you have " -"entered the 16-character onion address correctly: even a small mistake will " -"stop Tor Browser from being able to reach the site." +"entered the onion address correctly: even a small mistake will stop Tor " +"Browser from being able to reach the site." msgstr "" "Si no podés alcanzar el servicio cebolla que requerís, asegurate que hayas " -"entrado la dirección cebolla de 16 caracteres correctamente: aún un pequeño " -"error detendrá al navegador Tor de ser capaz de alcanzar el sitio." +"entrado la dirección cebolla correctamente: aún un pequeño error evitará que" +" el navegador Tor sea capaz de alcanzar el sitio." #: onionsites.page:64 msgid "" @@ -1161,19 +1161,20 @@ msgstr "" #: plugins.page:39 msgid "" "Tor Browser includes an add-on called NoScript, accessed through the “S” " -"icon at the top-left of the window, which allows you to control the " -"JavaScript that runs on individual web pages, or to block it entirely." +"icon at the top-left of the window. NoScript allows you to control the " +"JavaScript (and other scripts) that runs on individual web pages, or block " +"it entirely." msgstr "" "El navegador Tor incluye una adición llamada NoScript, accedida a través del" " icono \"S\" en la esquina superior izquierda de la ventana, la cual te " -"permite controlar al JavaScript que corre en páginas web individuales, o " -"bloquearlo enteramente." +"permite controlar al JavaScript (y otros scripts) que corre en páginas web " +"individuales, o bloquearlo enteramente." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to #. update your localized copy. The msgstr is not used at all. Set it to #. whatever you like once you have updated your copy of the file. -#: plugins.page:45 +#: plugins.page:46 msgctxt "_" msgid "" "external ref='media/plugins/noscript_menu.png' " @@ -1182,29 +1183,29 @@ msgstr "" "external ref='media/plugins/noscript_menu.png' " "md5='df9e684b76a3c2e2bdcb879a19c20471'" -#: plugins.page:47 +#: plugins.page:48 msgid "" "Users who require a high degree of security in their web browsing should set" " Tor Browser’s <link xref=\"security-slider\">Security Slider</link> to " -"“Medium-High” (which disables JavaScript for non-HTTPS websites) or “High” " +"“Safer” (which disables JavaScript for non-HTTPS websites) or “Safest” " "(which does so for all websites). However, disabling JavaScript will prevent" " many websites from displaying correctly, so Tor Browser’s default setting " -"is to allow all websites to run scripts." +"is to allow all websites to run scripts in \"Standard\" mode." msgstr "" "Usuarios que requieren un alto grado de seguridad en su navegación web " -"deberían ajustar la <link xref=\"security-slider\">regla deslizante de " -"seguridad</link> del navegador Tor a \"Medio-Alto\" (que deshabilita " -"JavaScript para sitios web no-HTTPS) o \"Alto\" (que lo hace para todos los " -"sitios web). Sin embargo, deshabilitando JavaScript prevendrá que muchos " -"sitios web sean mostrados correctamente, de manera que el ajuste por defecto" -" del navegador Tor es permitir a todos los sitios web correr código en " -"JavaScript." - -#: plugins.page:58 +"deberían ajustar la <link xref=\"security-slider\"> regla deslizante de " +"seguridad</link> del navegador Tor a \"Más-Seguro\" (que deshabilita " +"JavaScript para sitios web no-HTTPS) o \"El-Más-Seguro\" (que lo hace para " +"todos los sitios web). Sin embargo, deshabilitando JavaScript prevendrá que " +"muchos sitios web sean mostrados correctamente, de manera que el ajuste por " +"defecto del navegador Tor es permitir a todos los sitios web correr código " +"en JavaScript en el modo \"Estándar\"." + +#: plugins.page:59 msgid "Browser Add-ons" msgstr "Adiciones del navegador" -#: plugins.page:59 +#: plugins.page:60 msgid "" "Tor Browser is based on Firefox, and any browser add-ons or themes that are " "compatible with Firefox can also be installed in Tor Browser." @@ -1212,7 +1213,7 @@ msgstr "" "El navegador Tor está basado en Firefox, y cualquier adición o tema que sean" " compatibles con Firefox pueden también ser instalados en el navegador Tor." -#: plugins.page:64 +#: plugins.page:65 msgid "" "However, the only add-ons that have been tested for use with Tor Browser are" " those included by default. Installing any other browser add-ons may break " @@ -1370,18 +1371,17 @@ msgstr "Accediendo la regla deslizante de seguridad" msgctxt "_" msgid "" "external ref='media/security-slider/slider.png' " -"md5='3c469cd3ed9f60ebb6bbbc63daa90082'" +"md5='026da7c021ba5b85caf04bbf45530667'" msgstr "" "external ref='media/security-slider/slider.png' " -"md5='3c469cd3ed9f60ebb6bbbc63daa90082'" +"md5='026da7c021ba5b85caf04bbf45530667'" #: security-slider.page:25 msgid "" -"The Security Slider is located in Torbutton’s “Privacy and Security " -"Settings” menu." +"The Security Slider is located in Torbutton’s “Security Settings” menu." msgstr "" "La regla deslizante de seguridad está localizada en el menú \"Ajustes de " -"privacidad y seguridad\" del botón Tor." +"seguridad\" del botón Tor." #: security-slider.page:32 msgid "Security Levels" @@ -1395,10 +1395,10 @@ msgstr "Niveles de seguridad" msgctxt "_" msgid "" "external ref='media/security-slider/slider_window.png' " -"md5='c733bdccd1731ed1a772777b25bae7a1'" +"md5='d5faf391c99f88aff8541a68bdc6a776'" msgstr "" "external ref='media/security-slider/slider_window.png' " -"md5='c733bdccd1731ed1a772777b25bae7a1'" +"md5='d5faf391c99f88aff8541a68bdc6a776'" #: security-slider.page:36 msgid "" @@ -1410,8 +1410,8 @@ msgstr "" "contra de posibles ataques." #: security-slider.page:42 -msgid "High" -msgstr "Alto" +msgid "Safest" +msgstr "En extremo seguro" #: security-slider.page:43 msgid "" @@ -1432,8 +1432,8 @@ msgstr "" "letra e iconos puede que no se muestren correctamente." #: security-slider.page:53 -msgid "Medium-High" -msgstr "Medio-Alto" +msgid "Safer" +msgstr "Más seguro" #: security-slider.page:54 msgid "" @@ -1453,34 +1453,180 @@ msgstr "" "xref=\"secure-connections\">HTTPS</link>." #: security-slider.page:64 -msgid "Medium-Low" -msgstr "Medio-bajo" +msgid "Standard" +msgstr "Estándar" #: security-slider.page:65 msgid "" -"At this level, HTML5 video and audio media become click-to-play via " -"NoScript; some <link xref=\"plugins\">JavaScript</link> performance " -"optimizations are disabled, causing some websites to run more slowly; and " -"some mathematical equations may not display properly." -msgstr "" -"A éste nivel, medios de video y audio HTML5 se transforman en cliquear-para-" -"reproducir vía NoScript; algunas optimizaciones de rendimiento de <link " -"xref=\"plugins\">JavaScript</link> son deshabilitadas, causando que algunos " -"sitios web corran más lentamente; y algunas ecuaciones matemáticas pueden no" -" mostrarse apropiadamente." - -#: security-slider.page:73 -msgid "Low" -msgstr "Bajo" - -#: security-slider.page:74 -msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" "En éste nivel, todas las caracteristicas del navegador están habilitadas. " "Esta es la opción más utilizable." +#: translate.page:6 +msgid "Becoming a translator for the Tor Project" +msgstr "Siendo traductor para el proyecto Tor" + +#: translate.page:10 +msgid "Becoming a Tor Translator" +msgstr "Siendo traductor para Tor" + +#: translate.page:12 +msgid "" +"If you are interested in helping out the project by translating the manual " +"or the Tor Browser to your language, your help would be greatly appreciated!" +" In order to begin contributing you will have to sign up with Transifex, the" +" third-party that faciliates our translations. Below is an outline of how to" +" sign up and begin." +msgstr "" +"Si estás interesado en ayudar al proyecto traduciendo el manual o el " +"navegador Tor a tu lenguaje, ¡tu ayuda sería grandemente apreciada! En orden" +" a empezar a contribuir deberás registrarte con Transifex, la organización " +"tercerizada que facilita nuestras traducciones. Debajo hay un lineamiento de" +" cómo registrarse y empezar." + +#: translate.page:21 +msgid "Signing up on Transifex" +msgstr "Registrándose en Transifex" + +#: translate.page:24 +msgid "" +"Head over to the <link href=\"https://transifex.com/signup/\">Transifex " +"signup page</link>." +msgstr "" +"Andá a la <link href=\"https://transifex.com/signup/\">página de registro de" +" Transifex</link>." + +#: translate.page:30 +msgid "Enter your information into the fields and click the 'Sign Up' button:" +msgstr "Entrá tu información en los campos y cliqueá el botón 'Registrarse':" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: translate.page:34 +msgctxt "_" +msgid "" +"external ref='media/translate/tr1.png' " +"md5='a94cfd90c9982916a987e2807ae5e4f6'" +msgstr "" +"external ref='media/translate/tr1.png' " +"md5='a94cfd90c9982916a987e2807ae5e4f6'" + +#: translate.page:38 +msgid "" +"Fill out the next page with your name and select \"Localization\" and " +"\"Translator\" from the drop-down menus:" +msgstr "" +"Llená la página siguiente con tu nombre y seleccioná 'Localización' y " +"'Traductor' con los menúes desplegables:" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: translate.page:43 +msgctxt "_" +msgid "" +"external ref='media/translate/tr2.png' " +"md5='06debc9e9dbc7ac198103a89a6961774'" +msgstr "" +"external ref='media/translate/tr2.png' " +"md5='06debc9e9dbc7ac198103a89a6961774'" + +#: translate.page:47 +msgid "On the next page, select 'Join an existing project' and continue." +msgstr "" +"En la siguiente página, seleccioná 'Unirse a un proyecto existente' y " +"continuá." + +#: translate.page:52 +msgid "" +"On the next page, select the languages you speak from the drop-down menu and" +" continue." +msgstr "" +"En la siguiente página, seleccioná los lenguajes que hablás con los menúes " +"desplegables y continuá." + +#: translate.page:58 +msgid "" +"You are now signed up! Go to the <link " +"href=\"https://www.transifex.com/otf/torproject/\">Tor Transifex " +"page</link>." +msgstr "" +"¡Ya estás registrado! Andá a la <link " +"href=\"https://www.transifex.com/otf/torproject/\">página Tor de " +"Transifex</link>." + +#: translate.page:64 +msgid "Click the blue 'Join Team' button on the far right:" +msgstr "Cliqueá el botón azul 'Unirse a equipo' en el extremo derecho:" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: translate.page:68 +msgctxt "_" +msgid "" +"external ref='media/translate/tr3.png' " +"md5='7da6c9968cabbe9c1ecc7cdf645407e8'" +msgstr "" +"external ref='media/translate/tr3.png' " +"md5='7da6c9968cabbe9c1ecc7cdf645407e8'" + +#: translate.page:72 +msgid "" +"Select the language you would like to translate from the dropdown menu:" +msgstr "" +"Seleccioná el lenguaje que te gustaría traducir con los menúes desplegables:" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: translate.page:76 +msgctxt "_" +msgid "" +"external ref='media/translate/tr4.png' " +"md5='835a266a5d4c368a2777cf171980f0b4'" +msgstr "" +"external ref='media/translate/tr4.png' " +"md5='835a266a5d4c368a2777cf171980f0b4'" + +#: translate.page:80 +msgid "A notification will now show up on the top of the page like so:" +msgstr "" +"Una notificación aparecerá ahora al tope de la página como la siguiente:" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: translate.page:84 +msgctxt "_" +msgid "" +"external ref='media/translate/tr5.png' " +"md5='935417a5d3b4a89e5d00508ea671a1fc'" +msgstr "" +"external ref='media/translate/tr5.png' " +"md5='935417a5d3b4a89e5d00508ea671a1fc'" + +#: translate.page:88 +msgid "" +"After your membership is approved you can begin translating; simply navigate" +" back to the <link href=\"https://www.transifex.com/otf/torproject/\">Tor " +"Transifex page</link> when you are ready to begin. Thanks for your interest " +"in helping the project!" +msgstr "" +"Luego que tu membresía sea aprobada, podés empezar a traducir; simplemente " +"navegá hasta la <link " +"href=\"https://www.transifex.com/otf/torproject/\">página Tor de " +"Transifex</link> cuando estés listo para empezar. ¡Gracias por tu interés en" +" ayudar al proyecto!" + #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" msgstr "Tipos de transporte insertable" @@ -1516,17 +1662,19 @@ msgstr "obfs3" #: transports.page:33 msgid "" "obfs3 makes Tor traffic look random, so that it does not look like Tor or " -"any other protocol. obfs3 bridges will work in most places." +"any other protocol. While still included by default, it is reccomended to " +"use obfs4 instead, as it has several security improvements over obfs3." msgstr "" "obfs3 hace que el tráfico Tor luzca aleatorio, de manera que no parezca como" -" Tor o cualquier otro protocolo. Puentes obfs3 funcionarán en la mayoría de " -"los lugares." +" Tor o cualquier otro protocolo. Mientras que está incluido aún por defecto," +" es recomendado en vez usar obfs4, ya que éste último tiene varias mejoras " +"de seguridad sobre obfs3." -#: transports.page:42 +#: transports.page:43 msgid "obfs4" msgstr "obfs4" -#: transports.page:47 +#: transports.page:48 msgid "" "obfs4 makes Tor traffic look random like obfs3, and also prevents censors " "from finding bridges by Internet scanning. obfs4 bridges are less likely to " @@ -1536,20 +1684,20 @@ msgstr "" " a los censores de encontrar puentes mediante el escaneo de Internet. " "Puentes obfs4 son menos probables de ser bloqueados que puentes obfs3." -#: transports.page:56 +#: transports.page:57 msgid "Scramblesuit" msgstr "Scramblesuit" -#: transports.page:61 +#: transports.page:62 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." msgstr "" "ScrambleSuit es similar a obfs4 pero tiene un conjunto diferente de puentes." -#: transports.page:69 +#: transports.page:70 msgid "FTE" msgstr "FTE" -#: transports.page:74 +#: transports.page:75 msgid "" "FTE (format-transforming encryption) disguises Tor traffic as ordinary web " "(HTTP) traffic." @@ -1557,11 +1705,11 @@ msgstr "" "FTE (encriptación por transformación de formato) enmascara tráfico Tor como " "tráfico web ordinario (HTTP)." -#: transports.page:82 +#: transports.page:83 msgid "meek" msgstr "meek" -#: transports.page:87 +#: transports.page:88 msgid "" "These transports all make it look like you are browsing a major web site " "instead of using Tor. meek-amazon makes it look like you are using Amazon " @@ -1574,6 +1722,18 @@ msgstr "" "sitio web de Microsoft y meek-google hace parecer que estás usando la " "búsqueda de Google." +#: transports.page:100 +msgid "Snowflake" +msgstr "Snowflake" + +#: transports.page:105 +msgid "" +"Snowflake is an improvement upon Flashproxy. It sends your traffic through " +"WebRTC, a peer-to-peer protocol with built-in NAT punching." +msgstr "" +"Snowflake es una mejora sobre Flashproxy. Envía tu tráfico a través de " +"WebRTC, un protocolo par-a-par con atravesamiento de NAT incorporado." + #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" msgstr "Qué hacer si el navegador Tor no funciona" @@ -1782,10 +1942,10 @@ msgstr "" msgctxt "_" msgid "" "external ref='media/updating/update3.png' " -"md5='4bd08622b0cacf20b13f75c432176ed3'" +"md5='19b1f46d748dbcd9250883044165d218'" msgstr "" "external ref='media/updating/update3.png' " -"md5='4bd08622b0cacf20b13f75c432176ed3'" +"md5='19b1f46d748dbcd9250883044165d218'" #: updating.page:41 msgid "" @@ -1803,10 +1963,10 @@ msgstr "" msgctxt "_" msgid "" "external ref='media/updating/update4.png' " -"md5='1d795e7b695738531db9d4b2b0fb5313'" +"md5='7e8ead67c03597f00c580c77c3103fbb'" msgstr "" "external ref='media/updating/update4.png' " -"md5='1d795e7b695738531db9d4b2b0fb5313'" +"md5='7e8ead67c03597f00c580c77c3103fbb'" #: updating.page:50 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 11 Sep '18

11 Sep '18

commit 581c16e7f592e31c29aecda2b22cf1db7c9f889a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 18:47:19 2018 +0000 Update translations for tor-browser-manual --- es_AR/es_AR.po | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index 7bfa1e0a4..6731aec93 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -1665,6 +1665,10 @@ msgid "" "any other protocol. While still included by default, it is reccomended to " "use obfs4 instead, as it has several security improvements over obfs3." msgstr "" +"obfs3 hace que el tráfico Tor luzca aleatorio, de manera que no parezca como" +" Tor o cualquier otro protocolo. Mientras que está incluido aún por defecto," +" es recomendado en vez usar obfs4, ya que éste último tiene varias mejoras " +"de seguridad sobre obfs3." #: transports.page:43 msgid "obfs4" @@ -1720,13 +1724,15 @@ msgstr "" #: transports.page:100 msgid "Snowflake" -msgstr "" +msgstr "Snowflake" #: transports.page:105 msgid "" "Snowflake is an improvement upon Flashproxy. It sends your traffic through " "WebRTC, a peer-to-peer protocol with built-in NAT punching." msgstr "" +"Snowflake es una mejora sobre Flashproxy. Envía tu tráfico a través de " +"WebRTC, un protocolo par-a-par con atravesamiento de NAT incorporado." #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" @@ -1938,6 +1944,8 @@ msgid "" "external ref='media/updating/update3.png' " "md5='19b1f46d748dbcd9250883044165d218'" msgstr "" +"external ref='media/updating/update3.png' " +"md5='19b1f46d748dbcd9250883044165d218'" #: updating.page:41 msgid "" @@ -1957,6 +1965,8 @@ msgid "" "external ref='media/updating/update4.png' " "md5='7e8ead67c03597f00c580c77c3103fbb'" msgstr "" +"external ref='media/updating/update4.png' " +"md5='7e8ead67c03597f00c580c77c3103fbb'" #: updating.page:50 msgid ""

1 0

[tor/master] Bug 25505: Check circuitmux queues before padding.
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 578aaa7f122df32cdf4ffe713bc8aa179433fb0b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 13 13:50:35 2018 +0000 Bug 25505: Check circuitmux queues before padding. --- changes/bug25505 | 3 +++ src/or/channelpadding.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug25505 b/changes/bug25505 new file mode 100644 index 000000000..101c7d524 --- /dev/null +++ b/changes/bug25505 @@ -0,0 +1,3 @@ + o Minor bugfixes (netflow padding): + - Ensure circuitmux queues are empty before scheduling or sending padding. + Fixes bug 25505; bugfix on 0.3.1.1-alpha. diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index 5da3009e6..ba432e716 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -379,7 +379,8 @@ channelpadding_send_padding_cell_for_callback(channel_t *chan) chan->pending_padding_callback = 0; if (monotime_coarse_is_zero(&chan->next_padding_time) || - chan->has_queued_writes(chan)) { + chan->has_queued_writes(chan) || + (chan->cmux && circuitmux_num_cells(chan->cmux))) { /* We must have been active before the timer fired */ monotime_coarse_zero(&chan->next_padding_time); return; @@ -755,7 +756,11 @@ channelpadding_decide_to_pad_channel(channel_t *chan) return CHANNELPADDING_WONTPAD; } - if (!chan->has_queued_writes(chan)) { + /* There should always be a cmux on the circuit. After that, + * only schedule padding if there are no queued writes and no + * queued cells in circuitmux queues. */ + if (chan->cmux && !chan->has_queued_writes(chan) && + !circuitmux_num_cells(chan->cmux)) { int is_client_channel = 0; if (CHANNEL_IS_CLIENT(chan, options)) {

1 0

[tor/master] Merge remote-tracking branch 'mikeperry/bug25505'
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 2d0a6d76916d61e6264d8537e0d99daeae9829ba Merge: 785249981 578aaa7f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 14:32:39 2018 -0400 Merge remote-tracking branch 'mikeperry/bug25505' changes/bug25505 | 3 +++ src/core/or/channelpadding.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --cc src/core/or/channelpadding.c index 1a8f8209d,000000000..0a7e93d39 mode 100644,000000..100644 --- a/src/core/or/channelpadding.c +++ b/src/core/or/channelpadding.c @@@ -1,784 -1,0 +1,789 @@@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/* TOR_CHANNEL_INTERNAL_ define needed for an O(1) implementation of + * channelpadding_channel_to_channelinfo() */ +#define TOR_CHANNEL_INTERNAL_ + +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/channelpadding.h" +#include "core/or/channeltls.h" +#include "app/config/config.h" +#include "feature/nodelist/networkstatus.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "core/mainloop/main.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "lib/time/compat_time.h" +#include "feature/rend/rendservice.h" +#include "lib/evloop/timers.h" + +#include "core/or/cell_st.h" +#include "core/or/or_connection_st.h" + +STATIC int32_t channelpadding_get_netflow_inactive_timeout_ms( + const channel_t *); +STATIC int channelpadding_send_disable_command(channel_t *); +STATIC int64_t channelpadding_compute_time_until_pad_for_netflow(channel_t *); + +/** The total number of pending channelpadding timers */ +static uint64_t total_timers_pending; + +/** These are cached consensus parameters for netflow */ +/** The timeout lower bound that is allowed before sending padding */ +static int consensus_nf_ito_low; +/** The timeout upper bound that is allowed before sending padding */ +static int consensus_nf_ito_high; +/** The timeout lower bound that is allowed before sending reduced padding */ +static int consensus_nf_ito_low_reduced; +/** The timeout upper bound that is allowed before sending reduced padding */ +static int consensus_nf_ito_high_reduced; +/** The connection timeout between relays */ +static int consensus_nf_conntimeout_relays; +/** The connection timeout for client connections */ +static int consensus_nf_conntimeout_clients; +/** Should we pad before circuits are actually used for client data? */ +static int consensus_nf_pad_before_usage; +/** Should we pad relay-to-relay connections? */ +static int consensus_nf_pad_relays; +/** Should we pad rosos connections? */ +static int consensus_nf_pad_single_onion; + +#define TOR_MSEC_PER_SEC 1000 +#define TOR_USEC_PER_MSEC 1000 + +/** + * How often do we get called by the connection housekeeping (ie: once + * per second) */ +#define TOR_HOUSEKEEPING_CALLBACK_MSEC 1000 +/** + * Additional extra time buffer on the housekeeping callback, since + * it can be delayed. This extra slack is used to decide if we should + * schedule a timer or wait for the next callback. */ +#define TOR_HOUSEKEEPING_CALLBACK_SLACK_MSEC 100 + +/** + * This macro tells us if either end of the channel is connected to a client. + * (If we're not a server, we're definitely a client. If the channel thinks + * it's a client, use that. Then finally verify in the consensus). + */ +#define CHANNEL_IS_CLIENT(chan, options) \ + (!public_server_mode((options)) || channel_is_client(chan) || \ + !connection_or_digest_is_known_relay((chan)->identity_digest)) + +/** + * This function is called to update cached consensus parameters every time + * there is a consensus update. This allows us to move the consensus param + * search off of the critical path, so it does not need to be evaluated + * for every single connection, every second. + */ +void +channelpadding_new_consensus_params(networkstatus_t *ns) +{ +#define DFLT_NETFLOW_INACTIVE_KEEPALIVE_LOW 1500 +#define DFLT_NETFLOW_INACTIVE_KEEPALIVE_HIGH 9500 +#define DFLT_NETFLOW_INACTIVE_KEEPALIVE_MIN 0 +#define DFLT_NETFLOW_INACTIVE_KEEPALIVE_MAX 60000 + consensus_nf_ito_low = networkstatus_get_param(ns, "nf_ito_low", + DFLT_NETFLOW_INACTIVE_KEEPALIVE_LOW, + DFLT_NETFLOW_INACTIVE_KEEPALIVE_MIN, + DFLT_NETFLOW_INACTIVE_KEEPALIVE_MAX); + consensus_nf_ito_high = networkstatus_get_param(ns, "nf_ito_high", + DFLT_NETFLOW_INACTIVE_KEEPALIVE_HIGH, + consensus_nf_ito_low, + DFLT_NETFLOW_INACTIVE_KEEPALIVE_MAX); + +#define DFLT_NETFLOW_REDUCED_KEEPALIVE_LOW 9000 +#define DFLT_NETFLOW_REDUCED_KEEPALIVE_HIGH 14000 +#define DFLT_NETFLOW_REDUCED_KEEPALIVE_MIN 0 +#define DFLT_NETFLOW_REDUCED_KEEPALIVE_MAX 60000 + consensus_nf_ito_low_reduced = + networkstatus_get_param(ns, "nf_ito_low_reduced", + DFLT_NETFLOW_REDUCED_KEEPALIVE_LOW, + DFLT_NETFLOW_REDUCED_KEEPALIVE_MIN, + DFLT_NETFLOW_REDUCED_KEEPALIVE_MAX); + + consensus_nf_ito_high_reduced = + networkstatus_get_param(ns, "nf_ito_high_reduced", + DFLT_NETFLOW_REDUCED_KEEPALIVE_HIGH, + consensus_nf_ito_low_reduced, + DFLT_NETFLOW_REDUCED_KEEPALIVE_MAX); + +#define CONNTIMEOUT_RELAYS_DFLT (60*60) // 1 hour +#define CONNTIMEOUT_RELAYS_MIN 60 +#define CONNTIMEOUT_RELAYS_MAX (7*24*60*60) // 1 week + consensus_nf_conntimeout_relays = + networkstatus_get_param(ns, "nf_conntimeout_relays", + CONNTIMEOUT_RELAYS_DFLT, + CONNTIMEOUT_RELAYS_MIN, + CONNTIMEOUT_RELAYS_MAX); + +#define CIRCTIMEOUT_CLIENTS_DFLT (30*60) // 30 minutes +#define CIRCTIMEOUT_CLIENTS_MIN 60 +#define CIRCTIMEOUT_CLIENTS_MAX (24*60*60) // 24 hours + consensus_nf_conntimeout_clients = + networkstatus_get_param(ns, "nf_conntimeout_clients", + CIRCTIMEOUT_CLIENTS_DFLT, + CIRCTIMEOUT_CLIENTS_MIN, + CIRCTIMEOUT_CLIENTS_MAX); + + consensus_nf_pad_before_usage = + networkstatus_get_param(ns, "nf_pad_before_usage", 1, 0, 1); + + consensus_nf_pad_relays = + networkstatus_get_param(ns, "nf_pad_relays", 0, 0, 1); + + consensus_nf_pad_single_onion = + networkstatus_get_param(ns, + CHANNELPADDING_SOS_PARAM, + CHANNELPADDING_SOS_DEFAULT, 0, 1); +} + +/** + * Get a random netflow inactive timeout keepalive period in milliseconds, + * the range for which is determined by consensus parameters, negotiation, + * configuration, or default values. The consensus parameters enforce the + * minimum possible value, to avoid excessively frequent padding. + * + * The ranges for this value were chosen to be low enough to ensure that + * routers do not emit a new netflow record for a connection due to it + * being idle. + * + * Specific timeout values for major routers are listed in Proposal 251. + * No major router appeared capable of setting an inactive timeout below 10 + * seconds, so we set the defaults below that value, since we can always + * scale back if it ends up being too much padding. + * + * Returns the next timeout period (in milliseconds) after which we should + * send a padding packet, or 0 if padding is disabled. + */ +STATIC int32_t +channelpadding_get_netflow_inactive_timeout_ms(const channel_t *chan) +{ + int low_timeout = consensus_nf_ito_low; + int high_timeout = consensus_nf_ito_high; + int X1, X2; + + if (low_timeout == 0 && low_timeout == high_timeout) + return 0; // No padding + + /* If we have negotiated different timeout values, use those, but + * don't allow them to be lower than the consensus ones */ + if (chan->padding_timeout_low_ms && chan->padding_timeout_high_ms) { + low_timeout = MAX(low_timeout, chan->padding_timeout_low_ms); + high_timeout = MAX(high_timeout, chan->padding_timeout_high_ms); + } + + if (low_timeout == high_timeout) + return low_timeout; // No randomization + + /* + * This MAX() hack is here because we apply the timeout on both the client + * and the server. This creates the situation where the total time before + * sending a packet in either direction is actually + * min(client_timeout,server_timeout). + * + * If X is a random variable uniform from 0..R-1 (where R=high-low), + * then Y=max(X,X) has Prob(Y == i) = (2.0*i + 1)/(R*R). + * + * If we create a third random variable Z=min(Y,Y), then it turns out that + * Exp[Z] ~= Exp[X]. Here's a table: + * + * R Exp[X] Exp[Z] Exp[min(X,X)] Exp[max(X,X)] + * 2000 999.5 1066 666.2 1332.8 + * 3000 1499.5 1599.5 999.5 1999.5 + * 5000 2499.5 2666 1666.2 3332.8 + * 6000 2999.5 3199.5 1999.5 3999.5 + * 7000 3499.5 3732.8 2332.8 4666.2 + * 8000 3999.5 4266.2 2666.2 5332.8 + * 10000 4999.5 5328 3332.8 6666.2 + * 15000 7499.5 7995 4999.5 9999.5 + * 20000 9900.5 10661 6666.2 13332.8 + * + * In other words, this hack makes it so that when both the client and + * the guard are sending this padding, then the averages work out closer + * to the midpoint of the range, making the overhead easier to tune. + * If only one endpoint is padding (for example: if the relay does not + * support padding, but the client has set ConnectionPadding 1; or + * if the relay does support padding, but the client has set + * ReducedConnectionPadding 1), then the defense will still prevent + * record splitting, but with less overhead than the midpoint + * (as seen by the Exp[max(X,X)] column). + * + * To calculate average padding packet frequency (and thus overhead), + * index into the table by picking a row based on R = high-low. Then, + * use the appropriate column (Exp[Z] for two-sided padding, and + * Exp[max(X,X)] for one-sided padding). Finally, take this value + * and add it to the low timeout value. This value is the average + * frequency which padding packets will be sent. + */ + + X1 = crypto_rand_int(high_timeout - low_timeout); + X2 = crypto_rand_int(high_timeout - low_timeout); + return low_timeout + MAX(X1, X2); +} + +/** + * Update this channel's padding settings based on the PADDING_NEGOTIATE + * contents. + * + * Returns -1 on error; 1 on success. + */ +int +channelpadding_update_padding_for_channel(channel_t *chan, + const channelpadding_negotiate_t *pad_vars) +{ + if (pad_vars->version != 0) { + static ratelim_t version_limit = RATELIM_INIT(600); + + log_fn_ratelim(&version_limit,LOG_PROTOCOL_WARN,LD_PROTOCOL, + "Got a PADDING_NEGOTIATE cell with an unknown version. Ignoring."); + return -1; + } + + // We should not allow malicious relays to disable or reduce padding for + // us as clients. In fact, we should only accept this cell at all if we're + // operating as a relay. Bridges should not accept it from relays, either + // (only from their clients). + if ((get_options()->BridgeRelay && + connection_or_digest_is_known_relay(chan->identity_digest)) || + !get_options()->ORPort_set) { + static ratelim_t relay_limit = RATELIM_INIT(600); + + log_fn_ratelim(&relay_limit,LOG_PROTOCOL_WARN,LD_PROTOCOL, + "Got a PADDING_NEGOTIATE from relay at %s (%s). " + "This should not happen.", + chan->get_remote_descr(chan, 0), + hex_str(chan->identity_digest, DIGEST_LEN)); + return -1; + } + + chan->padding_enabled = (pad_vars->command == CHANNELPADDING_COMMAND_START); + + /* Min must not be lower than the current consensus parameter + nf_ito_low. */ + chan->padding_timeout_low_ms = MAX(consensus_nf_ito_low, + pad_vars->ito_low_ms); + + /* Max must not be lower than ito_low_ms */ + chan->padding_timeout_high_ms = MAX(chan->padding_timeout_low_ms, + pad_vars->ito_high_ms); + + log_fn(LOG_INFO,LD_OR, + "Negotiated padding=%d, lo=%d, hi=%d on %"PRIu64, + chan->padding_enabled, chan->padding_timeout_low_ms, + chan->padding_timeout_high_ms, + (chan->global_identifier)); + + return 1; +} + +/** + * Sends a CELL_PADDING_NEGOTIATE on the channel to tell the other side not + * to send padding. + * + * Returns -1 on error, 0 on success. + */ +STATIC int +channelpadding_send_disable_command(channel_t *chan) +{ + channelpadding_negotiate_t disable; + cell_t cell; + + tor_assert(BASE_CHAN_TO_TLS(chan)->conn->link_proto >= + MIN_LINK_PROTO_FOR_CHANNEL_PADDING); + + memset(&cell, 0, sizeof(cell_t)); + memset(&disable, 0, sizeof(channelpadding_negotiate_t)); + cell.command = CELL_PADDING_NEGOTIATE; + + channelpadding_negotiate_set_command(&disable, CHANNELPADDING_COMMAND_STOP); + + if (channelpadding_negotiate_encode(cell.payload, CELL_PAYLOAD_SIZE, + &disable) < 0) + return -1; + + if (chan->write_cell(chan, &cell) == 1) + return 0; + else + return -1; +} + +/** + * Sends a CELL_PADDING_NEGOTIATE on the channel to tell the other side to + * resume sending padding at some rate. + * + * Returns -1 on error, 0 on success. + */ +int +channelpadding_send_enable_command(channel_t *chan, uint16_t low_timeout, + uint16_t high_timeout) +{ + channelpadding_negotiate_t enable; + cell_t cell; + + tor_assert(BASE_CHAN_TO_TLS(chan)->conn->link_proto >= + MIN_LINK_PROTO_FOR_CHANNEL_PADDING); + + memset(&cell, 0, sizeof(cell_t)); + memset(&enable, 0, sizeof(channelpadding_negotiate_t)); + cell.command = CELL_PADDING_NEGOTIATE; + + channelpadding_negotiate_set_command(&enable, CHANNELPADDING_COMMAND_START); + channelpadding_negotiate_set_ito_low_ms(&enable, low_timeout); + channelpadding_negotiate_set_ito_high_ms(&enable, high_timeout); + + if (channelpadding_negotiate_encode(cell.payload, CELL_PAYLOAD_SIZE, + &enable) < 0) + return -1; + + if (chan->write_cell(chan, &cell) == 1) + return 0; + else + return -1; +} + +/** + * Sends a CELL_PADDING cell on a channel if it has been idle since + * our callback was scheduled. + * + * This function also clears the pending padding timer and the callback + * flags. + */ +static void +channelpadding_send_padding_cell_for_callback(channel_t *chan) +{ + cell_t cell; + + /* Check that the channel is still valid and open */ + if (!chan || chan->state != CHANNEL_STATE_OPEN) { + if (chan) chan->pending_padding_callback = 0; + log_fn(LOG_INFO,LD_OR, + "Scheduled a netflow padding cell, but connection already closed."); + return; + } + + /* We should have a pending callback flag set. */ + if (BUG(chan->pending_padding_callback == 0)) + return; + + chan->pending_padding_callback = 0; + + if (monotime_coarse_is_zero(&chan->next_padding_time) || - chan->has_queued_writes(chan)) { ++ chan->has_queued_writes(chan) || ++ (chan->cmux && circuitmux_num_cells(chan->cmux))) { + /* We must have been active before the timer fired */ + monotime_coarse_zero(&chan->next_padding_time); + return; + } + + { + monotime_coarse_t now; + monotime_coarse_get(&now); + + log_fn(LOG_INFO,LD_OR, + "Sending netflow keepalive on %"PRIu64" to %s (%s) after " + "%"PRId64" ms. Delta %"PRId64"ms", + (chan->global_identifier), + safe_str_client(chan->get_remote_descr(chan, 0)), + safe_str_client(hex_str(chan->identity_digest, DIGEST_LEN)), + (monotime_coarse_diff_msec(&chan->timestamp_xfer,&now)), + ( + monotime_coarse_diff_msec(&chan->next_padding_time,&now))); + } + + /* Clear the timer */ + monotime_coarse_zero(&chan->next_padding_time); + + /* Send the padding cell. This will cause the channel to get a + * fresh timestamp_active */ + memset(&cell, 0, sizeof(cell)); + cell.command = CELL_PADDING; + chan->write_cell(chan, &cell); +} + +/** + * tor_timer callback function for us to send padding on an idle channel. + * + * This function just obtains the channel from the callback handle, ensures + * it is still valid, and then hands it off to + * channelpadding_send_padding_cell_for_callback(), which checks if + * the channel is still idle before sending padding. + */ +static void +channelpadding_send_padding_callback(tor_timer_t *timer, void *args, + const struct monotime_t *when) +{ + channel_t *chan = channel_handle_get((struct channel_handle_t*)args); + (void)timer; (void)when; + + if (chan && CHANNEL_CAN_HANDLE_CELLS(chan)) { + /* Hrmm.. It might be nice to have an equivalent to assert_connection_ok + * for channels. Then we could get rid of the channeltls dependency */ + tor_assert(TO_CONN(BASE_CHAN_TO_TLS(chan)->conn)->magic == + OR_CONNECTION_MAGIC); + assert_connection_ok(TO_CONN(BASE_CHAN_TO_TLS(chan)->conn), approx_time()); + + channelpadding_send_padding_cell_for_callback(chan); + } else { + log_fn(LOG_INFO,LD_OR, + "Channel closed while waiting for timer."); + } + + total_timers_pending--; +} + +/** + * Schedules a callback to send padding on a channel in_ms milliseconds from + * now. + * + * Returns CHANNELPADDING_WONTPAD on error, CHANNELPADDING_PADDING_SENT if we + * sent the packet immediately without a timer, and + * CHANNELPADDING_PADDING_SCHEDULED if we decided to schedule a timer. + */ +static channelpadding_decision_t +channelpadding_schedule_padding(channel_t *chan, int in_ms) +{ + struct timeval timeout; + tor_assert(!chan->pending_padding_callback); + + if (in_ms <= 0) { + chan->pending_padding_callback = 1; + channelpadding_send_padding_cell_for_callback(chan); + return CHANNELPADDING_PADDING_SENT; + } + + timeout.tv_sec = in_ms/TOR_MSEC_PER_SEC; + timeout.tv_usec = (in_ms%TOR_USEC_PER_MSEC)*TOR_USEC_PER_MSEC; + + if (!chan->timer_handle) { + chan->timer_handle = channel_handle_new(chan); + } + + if (chan->padding_timer) { + timer_set_cb(chan->padding_timer, + channelpadding_send_padding_callback, + chan->timer_handle); + } else { + chan->padding_timer = timer_new(channelpadding_send_padding_callback, + chan->timer_handle); + } + timer_schedule(chan->padding_timer, &timeout); + + rep_hist_padding_count_timers(++total_timers_pending); + + chan->pending_padding_callback = 1; + return CHANNELPADDING_PADDING_SCHEDULED; +} + +/** + * Calculates the number of milliseconds from now to schedule a padding cell. + * + * Returns the number of milliseconds from now (relative) to schedule the + * padding callback. If the padding timer is more than 1.1 seconds in the + * future, we return -1, to avoid scheduling excessive callbacks. If padding + * is disabled in the consensus, we return -2. + * + * Side-effects: Updates chan->next_padding_time_ms, storing an (absolute, not + * relative) millisecond representation of when we should send padding, unless + * other activity happens first. This side-effect allows us to avoid + * scheduling a libevent callback until we're within 1.1 seconds of the padding + * time. + */ +#define CHANNELPADDING_TIME_LATER -1 +#define CHANNELPADDING_TIME_DISABLED -2 +STATIC int64_t +channelpadding_compute_time_until_pad_for_netflow(channel_t *chan) +{ + monotime_coarse_t now; + monotime_coarse_get(&now); + + if (monotime_coarse_is_zero(&chan->next_padding_time)) { + /* If the below line or crypto_rand_int() shows up on a profile, + * we can avoid getting a timeout until we're at least nf_ito_lo + * from a timeout window. That will prevent us from setting timers + * on connections that were active up to 1.5 seconds ago. + * Idle connections should only call this once every 5.5s on average + * though, so that might be a micro-optimization for little gain. */ + int32_t padding_timeout = + channelpadding_get_netflow_inactive_timeout_ms(chan); + + if (!padding_timeout) + return CHANNELPADDING_TIME_DISABLED; + + monotime_coarse_add_msec(&chan->next_padding_time, + &chan->timestamp_xfer, + padding_timeout); + } + + const int64_t ms_till_pad = + monotime_coarse_diff_msec(&now, &chan->next_padding_time); + + /* If the next padding time is beyond the maximum possible consensus value, + * then this indicates a clock jump, so just send padding now. This is + * better than using monotonic time because we want to avoid the situation + * where we wait around forever for monotonic time to move forward after + * a clock jump far into the past. + */ + if (ms_till_pad > DFLT_NETFLOW_INACTIVE_KEEPALIVE_MAX) { + tor_fragile_assert(); + log_warn(LD_BUG, + "Channel padding timeout scheduled %"PRId64"ms in the future. " + "Did the monotonic clock just jump?", + (ms_till_pad)); + return 0; /* Clock jumped: Send padding now */ + } + + /* If the timeout will expire before the next time we're called (1000ms + from now, plus some slack), then calculate the number of milliseconds + from now which we should send padding, so we can schedule a callback + then. + */ + if (ms_till_pad < (TOR_HOUSEKEEPING_CALLBACK_MSEC + + TOR_HOUSEKEEPING_CALLBACK_SLACK_MSEC)) { + /* If the padding time is in the past, that means that libevent delayed + * calling the once-per-second callback due to other work taking too long. + * See https://bugs.torproject.org/22212 and + * https://bugs.torproject.org/16585. This is a systemic problem + * with being single-threaded, but let's emit a notice if this + * is long enough in the past that we might have missed a netflow window, + * and allowed a router to emit a netflow frame, just so we don't forget + * about it entirely.. */ +#define NETFLOW_MISSED_WINDOW (150000 - DFLT_NETFLOW_INACTIVE_KEEPALIVE_HIGH) + if (ms_till_pad < 0) { + int severity = (ms_till_pad < -NETFLOW_MISSED_WINDOW) + ? LOG_NOTICE : LOG_INFO; + log_fn(severity, LD_OR, + "Channel padding timeout scheduled %"PRId64"ms in the past. ", + (-ms_till_pad)); + return 0; /* Clock jumped: Send padding now */ + } + + return ms_till_pad; + } + return CHANNELPADDING_TIME_LATER; +} + +/** + * Returns a randomized value for channel idle timeout in seconds. + * The channel idle timeout governs how quickly we close a channel + * after its last circuit has disappeared. + * + * There are three classes of channels: + * 1. Client+non-canonical. These live for 3-4.5 minutes + * 2. relay to relay. These live for 45-75 min by default + * 3. Reduced padding clients. These live for 1.5-2.25 minutes. + * + * Also allows the default relay-to-relay value to be controlled by the + * consensus. + */ +unsigned int +channelpadding_get_channel_idle_timeout(const channel_t *chan, + int is_canonical) +{ + const or_options_t *options = get_options(); + unsigned int timeout; + + /* Non-canonical and client channels only last for 3-4.5 min when idle */ + if (!is_canonical || CHANNEL_IS_CLIENT(chan, options)) { +#define CONNTIMEOUT_CLIENTS_BASE 180 // 3 to 4.5 min + timeout = CONNTIMEOUT_CLIENTS_BASE + + crypto_rand_int(CONNTIMEOUT_CLIENTS_BASE/2); + } else { // Canonical relay-to-relay channels + // 45..75min or consensus +/- 25% + timeout = consensus_nf_conntimeout_relays; + timeout = 3*timeout/4 + crypto_rand_int(timeout/2); + } + + /* If ReducedConnectionPadding is set, we want to halve the duration of + * the channel idle timeout, since reducing the additional time that + * a channel stays open will reduce the total overhead for making + * new channels. This reduction in overhead/channel expense + * is important for mobile users. The option cannot be set by relays. + * + * We also don't reduce any values for timeout that the user explicitly + * set. + */ + if (options->ReducedConnectionPadding + && !options->CircuitsAvailableTimeout) { + timeout /= 2; + } + + return timeout; +} + +/** + * This function controls how long we keep idle circuits open, + * and how long we build predicted circuits. This behavior is under + * the control of channelpadding because circuit availability is the + * dominant factor in channel lifespan, which influences total padding + * overhead. + * + * Returns a randomized number of seconds in a range from + * CircuitsAvailableTimeout to 2*CircuitsAvailableTimeout. This value is halved + * if ReducedConnectionPadding is set. The default value of + * CircuitsAvailableTimeout can be controlled by the consensus. + */ +int +channelpadding_get_circuits_available_timeout(void) +{ + const or_options_t *options = get_options(); + int timeout = options->CircuitsAvailableTimeout; + + if (!timeout) { + timeout = consensus_nf_conntimeout_clients; + + /* If ReducedConnectionPadding is set, we want to halve the duration of + * the channel idle timeout, since reducing the additional time that + * a channel stays open will reduce the total overhead for making + * new connections. This reduction in overhead/connection expense + * is important for mobile users. The option cannot be set by relays. + * + * We also don't reduce any values for timeout that the user explicitly + * set. + */ + if (options->ReducedConnectionPadding) { + // half the value to 15..30min by default + timeout /= 2; + } + } + + // 30..60min by default + timeout = timeout + crypto_rand_int(timeout); + + return timeout; +} + +/** + * Calling this function on a channel causes it to tell the other side + * not to send padding, and disables sending padding from this side as well. + */ +void +channelpadding_disable_padding_on_channel(channel_t *chan) +{ + chan->padding_enabled = 0; + + // Send cell to disable padding on the other end + channelpadding_send_disable_command(chan); +} + +/** + * Calling this function on a channel causes it to tell the other side + * not to send padding, and reduces the rate that padding is sent from + * this side. + */ +void +channelpadding_reduce_padding_on_channel(channel_t *chan) +{ + /* Padding can be forced and reduced by clients, regardless of if + * the channel supports it. So we check for support here before + * sending any commands. */ + if (chan->padding_enabled) { + channelpadding_send_disable_command(chan); + } + + chan->padding_timeout_low_ms = consensus_nf_ito_low_reduced; + chan->padding_timeout_high_ms = consensus_nf_ito_high_reduced; + + log_fn(LOG_INFO,LD_OR, + "Reduced padding on channel %"PRIu64": lo=%d, hi=%d", + (chan->global_identifier), + chan->padding_timeout_low_ms, chan->padding_timeout_high_ms); +} + +/** + * This function is called once per second by run_connection_housekeeping(), + * but only if the channel is still open, valid, and non-wedged. + * + * It decides if and when we should send a padding cell, and if needed, + * schedules a callback to send that cell at the appropriate time. + * + * Returns an enum that represents the current padding decision state. + * Return value is currently used only by unit tests. + */ +channelpadding_decision_t +channelpadding_decide_to_pad_channel(channel_t *chan) +{ + const or_options_t *options = get_options(); + + /* Only pad open channels */ + if (chan->state != CHANNEL_STATE_OPEN) + return CHANNELPADDING_WONTPAD; + + if (chan->channel_usage == CHANNEL_USED_FOR_FULL_CIRCS) { + if (!consensus_nf_pad_before_usage) + return CHANNELPADDING_WONTPAD; + } else if (chan->channel_usage != CHANNEL_USED_FOR_USER_TRAFFIC) { + return CHANNELPADDING_WONTPAD; + } + + if (chan->pending_padding_callback) + return CHANNELPADDING_PADDING_ALREADY_SCHEDULED; + + /* Don't pad the channel if we didn't negotiate it, but still + * allow clients to force padding if options->ChannelPadding is + * explicitly set to 1. + */ + if (!chan->padding_enabled && options->ConnectionPadding != 1) { + return CHANNELPADDING_WONTPAD; + } + + if (rend_service_allow_non_anonymous_connection(options) && + !consensus_nf_pad_single_onion) { + /* If the consensus just changed values, this channel may still + * think padding is enabled. Negotiate it off. */ + if (chan->padding_enabled) + channelpadding_disable_padding_on_channel(chan); + + return CHANNELPADDING_WONTPAD; + } + - if (!chan->has_queued_writes(chan)) { ++ /* There should always be a cmux on the circuit. After that, ++ * only schedule padding if there are no queued writes and no ++ * queued cells in circuitmux queues. */ ++ if (chan->cmux && !chan->has_queued_writes(chan) && ++ !circuitmux_num_cells(chan->cmux)) { + int is_client_channel = 0; + + if (CHANNEL_IS_CLIENT(chan, options)) { + is_client_channel = 1; + } + + /* If nf_pad_relays=1 is set in the consensus, we pad + * on *all* idle connections, relay-relay or relay-client. + * Otherwise pad only for client+bridge cons */ + if (is_client_channel || consensus_nf_pad_relays) { + int64_t pad_time_ms = + channelpadding_compute_time_until_pad_for_netflow(chan); + + if (pad_time_ms == CHANNELPADDING_TIME_DISABLED) { + return CHANNELPADDING_WONTPAD; + } else if (pad_time_ms == CHANNELPADDING_TIME_LATER) { + chan->currently_padding = 1; + return CHANNELPADDING_PADLATER; + } else { + if (BUG(pad_time_ms > INT_MAX)) { + pad_time_ms = INT_MAX; + } + /* We have to schedule a callback because we're called exactly once per + * second, but we don't want padding packets to go out exactly on an + * integer multiple of seconds. This callback will only be scheduled + * if we're within 1.1 seconds of the padding time. + */ + chan->currently_padding = 1; + return channelpadding_schedule_padding(chan, (int)pad_time_ms); + } + } else { + chan->currently_padding = 0; + return CHANNELPADDING_WONTPAD; + } + } else { + return CHANNELPADDING_PADLATER; + } +}

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 11 Sep '18

11 Sep '18

commit 6cc84a16da93a1fe2a1a4c7a050c4b83a7d2a8e6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 18:18:59 2018 +0000 Update translations for support-portal --- contents+pt_BR.po | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/contents+pt_BR.po b/contents+pt_BR.po index 459c6c04b..c0ea98e99 100644 --- a/contents+pt_BR.po +++ b/contents+pt_BR.po @@ -25,13 +25,14 @@ # Malkon F <malkon.inf(a)gmail.com>, 2018 # Thiago Dantas <dantasthiago(a)protonmail.com>, 2018 # RAFAEL GAUNA <rafaelgt.mbin(a)gmail.com>, 2018 +# Kordycepts, The Night City <kordycepts(a)protonmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-08 10:58+CET\n" +"POT-Creation-Date: 2018-09-07 17:41+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: RAFAEL GAUNA <rafaelgt.mbin(a)gmail.com>, 2018\n" +"Last-Translator: Kordycepts, The Night City <kordycepts(a)protonmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -296,7 +297,7 @@ msgstr "Não." #: http//localhost/tbb/tbb-25/ #: (content/tbb/tbb-25/contents+en.lrquestion.seo_slug) msgid "problem-noscript" -msgstr "" +msgstr "problema-noscript" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -327,7 +328,7 @@ msgstr "" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.title) @@ -390,7 +391,7 @@ msgstr "" #: http//localhost/tbb/tbb-8/ #: (content/tbb/tbb-8/contents+en.lrquestion.seo_slug) msgid "website-blocked-by-censor-can-tor-browser-help" -msgstr "" +msgstr "website-bloqueado-pela-censura-tor-browser-pode-me-ajudar" #: http//localhost/misc/misc-3/ #: (content/misc/misc-3/contents+en.lrquestion.description) @@ -463,7 +464,7 @@ msgstr "* Alemão (de)" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.seo_slug) msgid "how-do-i-run-a-middle-or-guard-on-freebsd" -msgstr "" +msgstr "como-rodar-um-intermediario-ou-guarda-no-freebsd" #: http//localhost/misc/misc-15/ #: (content/misc/misc-15/contents+en.lrquestion.description) @@ -503,6 +504,12 @@ msgid "" "href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> and " "<a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>." msgstr "" +"Para <a " +"href=\"https://www.torproject.org/docs/android.html.en\">Android " +"</a>,<a href=\"https://guardianproject.info/\">The Guardian " +"Project</a>mantém os Tor-powered apps <a " +"href=\"https://guardianproject.info/apps/orbot/\">Orbot</a>e<a " +"href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>." #: http//localhost/faq/faq-5/ #: (content/faq/faq-5/contents+en.lrquestion.seo_slug) @@ -527,6 +534,8 @@ msgstr "" msgid "" "* Make sure tor starts on boot by running \"sysrc tor_enable=YES\" (as root)" msgstr "" +"* Tenha certeza que o tor iniciara durante o boot executando o comando " +"\"sysrc tor_enable=\"YES\" (como root)" #: http//localhost/connecting/connecting-3/ #: (content/connecting/connecting-3/contents+en.lrquestion.description) @@ -583,6 +592,8 @@ msgid "" "<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " "with a padlock\">" msgstr "" +"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " +"with a padlock\">" #: http//localhost/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.description) @@ -638,7 +649,7 @@ msgstr "" #: http//localhost/connecting/connecting-1/ #: (content/connecting/connecting-1/contents+en.lrquestion.seo_slug) msgid "tor-browser-wont-connect" -msgstr "" +msgstr "tor-browser-não-conecta" #: http//localhost/onionservices/ #: (content/onionservices/contents+en.lrtopic.seo_slug) @@ -692,6 +703,9 @@ msgid "" "which prevents Onion Browser from having the same privacy protections as Tor" " Browser." msgstr "" +"No entanto, a Apple exige que os navegadores para iOS utilizem algo chamado " +"Webkit, o que inviabiliza os navegadores onion de possuir as mesmas " +"proteções de privacidade que o navegador Tor." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) @@ -719,6 +733,8 @@ msgid "" "You should see one of these common log errors (look for the following lines " "in your Tor log):" msgstr "" +"Você deve ver um desses comuns logs de erros (veja as seguintes linhas no " +"seu log do Tor):" #: http//localhost/tbb/tbb-3/ #: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug) @@ -749,6 +765,10 @@ msgid "" "href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Tor " "Relay Guide</a>." msgstr "" +"Para ver recursos mais detalhados sobre a operação de um relay, veja " +"<a " +"href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Guia " +"Tor Relay</a>." #: http//localhost/misc/misc-2/ #: (content/misc/misc-2/contents+en.lrquestion.description) @@ -830,6 +850,8 @@ msgid "" "2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with " "directory server" msgstr "" +"2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"directory server" #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -950,6 +972,8 @@ msgid "" "If you see lines like this in your Tor log, it means that Tor failed to " "complete a TLS handshake with the directory authorities." msgstr "" +"Se você vê linhas como essa em seu log do Tor, isso significa que o Tor " +"falhou em completar o TLS handshake com o directory authorities." #: http//localhost/tbb/tbb-19/ #: (content/tbb/tbb-19/contents+en.lrquestion.description)

1 0