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

[translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd
by translation＠torproject.org 05 Oct '18

05 Oct '18

commit 5600c40e725e8e8868535fc755f619a8559f4ce5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 5 21:46:47 2018 +0000 Update translations for tba-android_stringsdtd --- pt/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/android_strings.dtd b/pt/android_strings.dtd index 0843b1c67..dfcdb4f8b 100644 --- a/pt/android_strings.dtd +++ b/pt/android_strings.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY firstrun_panel_title_welcome "Welcome"> +<!ENTITY firstrun_panel_title_welcome "Bem-vindo"> <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> <!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacidade">

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 Oct '18

05 Oct '18

commit ff822f08923e2825324ec5541c818363c604a328 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 5 21:45:55 2018 +0000 Update translations for tails-misc --- pt.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pt.po b/pt.po index 11b20af27..2c2d7a2bf 100644 --- a/pt.po +++ b/pt.po @@ -12,21 +12,22 @@ # Henrique Rodrigues, 2015 # Koh Pyreit <inactive+kohpyreit(a)transifex.com>, 2013 # Lídia Martins <lolplayer713(a)gmail.com>, 2015 -# Manuela Silva <manuela.silva(a)sky.com>, 2017-2018 +# MS, 2017-2018 # Marco de Carvalho <enf.minos(a)gmail.com>, 2015 # Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 # Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 +# MS, 2018 # Drew Melim <nokostya.translation(a)gmail.com>, 2014 # Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2014-2015 # Sérgio Marques <smarquespt(a)gmail.com>, 2016 # TiagoJMMC <tiagojmmc(a)gmail.com>, 2014 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-04 11:37+0200\n" -"PO-Revision-Date: 2018-09-05 12:40+0000\n" -"Last-Translator: Manuela Silva <manuela.silva(a)sky.com>\n" +"PO-Revision-Date: 2018-10-05 21:40+0000\n" +"Last-Translator: MS\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -185,11 +186,11 @@ msgstr "Configurar" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:216 #, python-brace-format msgid "{beginning} and {last}" -msgstr "" +msgstr "{beginning} e {last}" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:217 msgid ", " -msgstr "" +msgstr ", " #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:281 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:309 @@ -205,18 +206,18 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285 msgid "Install Every Time" -msgstr "" +msgstr "Instalar Sempre" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315 msgid "Install Only Once" -msgstr "" +msgstr "Instalar Uma Vez" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:355 msgid "The configuration of your additional software failed." -msgstr "" +msgstr "A configuração do seu software adicional falhou." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:311 msgid "" @@ -277,7 +278,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:553 msgid "Additional software installed successfully" -msgstr "" +msgstr "Software adicional instalado com sucesso" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:573 msgid "The check for upgrades of your additional software failed" @@ -631,7 +632,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:137 msgid "Error opening file" -msgstr "" +msgstr "Erro ao abrir o ficheiro" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:159 msgid "Not a VeraCrypt container" @@ -718,7 +719,7 @@ msgstr "Para iniciar um 'Terminal Root' precisa de autenticar-se." #: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1 msgid "Remove an additional software package" -msgstr "" +msgstr "Remover um pacote de software adicional" #: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2 msgid "" @@ -732,7 +733,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:80 msgid "_Add" -msgstr "" +msgstr "_Adicionar" #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:86 msgid "Add a file container" @@ -740,7 +741,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:103 msgid "Partitions and Drives" -msgstr "" +msgstr "Partições e Unidades" #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:121 msgid "" @@ -750,11 +751,11 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:38 msgid "Lock this volume" -msgstr "" +msgstr "Bloquear este volume" #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:61 msgid "Detach this volume" -msgstr "" +msgstr "Desanexar este volume" #: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1 msgid "TrueCrypt/VeraCrypt container"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 05 Oct '18

05 Oct '18

commit 91d049be229784461ece775b148ba65534fa5536 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 5 21:45:34 2018 +0000 Update translations for https_everywhere_completed --- pt/https-everywhere.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index a430989dc..88919312f 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -18,6 +18,7 @@ <!ENTITY https-everywhere.options.enableMixedRulesets "Ativar conjuntos de regras de conteúdo misto"> <!ENTITY https-everywhere.options.showDevtoolsTab "Mostrar separador de 'Ferramentas de Desenvolvimento"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Atualizar automaticamente os conjuntos de regras"> +<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere - Sites Desativados"> <!ENTITY https-everywhere.options.updateChannelsWarning "Aviso: adicionar canais de atualização pode fazer com que os invasores tomem conta do seu navegador. Edite esta seção apenas se souber o que está a fazer!"> <!ENTITY https-everywhere.options.addUpdateChannel "Adicionar Canais de Atualização"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Insira o nome do canal de atualização"> @@ -38,6 +39,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Forçar ligações encriptadas para estes sites da Web;"> <!ENTITY https-everywhere.chrome.experimental_rules "Regras experimentais"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Pode causar alertas ou danos. Desativadas por predefinição."> +<!ENTITY https-everywhere.chrome.disable_on_this_site "Desativar HTTPS Everywhere neste site"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "Ativar HTTPS Everywhere neste site"> <!ENTITY https-everywhere.chrome.add_rule "Adicionar uma regra para este site"> <!ENTITY https-everywhere.chrome.add_new_rule "Adicionar uma nova regra para este site"> <!ENTITY https-everywhere.chrome.always_https_for_host "Utilizar sempre HTTPS para este hospedeiro">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 05 Oct '18

05 Oct '18

commit 4d83e3560328be485581f71e628ff1718dd033ed Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 5 21:45:26 2018 +0000 Update translations for https_everywhere --- pt/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index e63aa18d0..88919312f 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -18,7 +18,7 @@ <!ENTITY https-everywhere.options.enableMixedRulesets "Ativar conjuntos de regras de conteúdo misto"> <!ENTITY https-everywhere.options.showDevtoolsTab "Mostrar separador de 'Ferramentas de Desenvolvimento"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Atualizar automaticamente os conjuntos de regras"> -<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sites Disabled"> +<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere - Sites Desativados"> <!ENTITY https-everywhere.options.updateChannelsWarning "Aviso: adicionar canais de atualização pode fazer com que os invasores tomem conta do seu navegador. Edite esta seção apenas se souber o que está a fazer!"> <!ENTITY https-everywhere.options.addUpdateChannel "Adicionar Canais de Atualização"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Insira o nome do canal de atualização"> @@ -39,8 +39,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Forçar ligações encriptadas para estes sites da Web;"> <!ENTITY https-everywhere.chrome.experimental_rules "Regras experimentais"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Pode causar alertas ou danos. Desativadas por predefinição."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Disable HTTPS Everywhere on this site"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Enable HTTPS Everywhere on this site"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "Desativar HTTPS Everywhere neste site"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "Ativar HTTPS Everywhere neste site"> <!ENTITY https-everywhere.chrome.add_rule "Adicionar uma regra para este site"> <!ENTITY https-everywhere.chrome.add_new_rule "Adicionar uma nova regra para este site"> <!ENTITY https-everywhere.chrome.always_https_for_host "Utilizar sempre HTTPS para este hospedeiro">

1 0

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

05 Oct '18

commit e7beb75cd4f71a85610362232bc5f0b57865c383 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 5 20:18:45 2018 +0000 Update translations for support-portal --- contents+ko.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+ko.po b/contents+ko.po index 9703c2f66..adbc6c4fd 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -610,11 +610,13 @@ msgid "" "which prevents Onion Browser from having the same privacy protections as Tor" " Browser." msgstr "" +"그렇지만 Apple은 iOS에서 실행하는 브라우저를 Webkit이라는 것을 사용함을 요구합니다. 이처럼 Onion 브라우저가 Tor " +"브라우저와 동일한 사생활 보호를 있기 가로막습니다." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) msgid "They need to be configured separately to use Tor." -msgstr "" +msgstr "그들은 Tor을 사용하려면 별도로 구성하야 됩니다." #: http//localhost/tbb/ (content/tbb/contents+en.lrtopic.seo_slug) msgid "tor-browser"

1 0

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

05 Oct '18

commit c05b251ccda2b87b81856ed643f4d7bf4d72a085 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 5 19:48:45 2018 +0000 Update translations for support-portal --- contents+ko.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index 84d31c1cb..9703c2f66 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -586,11 +586,13 @@ msgid "" "See our page on <a href=\"https://www.torproject.org/docs/pluggable-" "transports.html.en\">pluggable transports</a> for more info." msgstr "" +"더 자세한 정보를 원하시면<a href=\"https://www.torproject.org/docs/pluggable-" +"transports.html.en\">pluggable transports</a>에 대해 페이지를 참조하십시오." #: http//localhost/tormobile/tormobile-2/ #: (content/tormobile/tormobile-2/contents+en.lrquestion.title) msgid "Who is the Guardian Project?" -msgstr "" +msgstr "Guardian Project는 누구입니까?" #: http//localhost/connecting/connecting-3/ #: (content/connecting/connecting-3/contents+en.lrquestion.description) @@ -599,7 +601,7 @@ msgstr "" msgid "" "If you are still unable to connect to the onion service, please try again " "later." -msgstr "" +msgstr "그런데도 onion 서비스에 연결할 수 없으면 나중에 다시 시도해 주십시오." #: http//localhost/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description)

1 0

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

05 Oct '18

commit 5c855881e86d55f6a6d09fc75678c21515cdc672 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 5 18:48:45 2018 +0000 Update translations for support-portal --- contents+ru.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index fc3ecba3f..5f3b9400d 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1596,6 +1596,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=\"Новая " +"цепочка для этого сайта\"/>" #: http//localhost/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -1650,6 +1652,8 @@ msgid "" "Please make sure your clock is set accurately, including the correct " "timezone. Then restart Tor." msgstr "" +"Пожалуйста, убедитесь, что ваши часы настроены верно (включая временной " +"пояс). Потом перезапустите Tor." #: http//localhost/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.seo_slug) @@ -3993,7 +3997,7 @@ msgstr "" #: http//localhost/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.title) msgid "How do I run an exit relay on Debian?" -msgstr "" +msgstr "Как запустить выходной узел на Debian?" #: http//localhost/tbb/ (content/tbb/contents+en.lrtopic.title) msgid "Tor Browser"

1 0

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

05 Oct '18

commit 7729cf954d795f9e95815981fa545bf3890fd5fa Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 5 18:18:46 2018 +0000 Update translations for support-portal --- contents+ru.po | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 1a2c34a45..fc3ecba3f 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-30 22:02+CET\n" +"POT-Creation-Date: 2018-09-14 21:15+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: 45Green Anonymous <45tanaa(a)gmail.com>, 2018\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" @@ -636,6 +636,9 @@ msgid "" "See our page on <a href=\"https://www.torproject.org/docs/pluggable-" "transports.html.en\">pluggable transports</a> for more info." msgstr "" +"Подробнее о подключаемых транспортах рассказано <a " +"href=\"https://www.torproject.org/docs/pluggable-" +"transports.html.en\">здесь</a>." #: http//localhost/tormobile/tormobile-2/ #: (content/tormobile/tormobile-2/contents+en.lrquestion.title) @@ -1307,6 +1310,7 @@ msgstr "" #: (content/operators/operators-3/contents+en.lrquestion.title) msgid "How do I run a middle or guard relay on FreeBSD or HardenedBSD?" msgstr "" +"Как запустить промежуточный или выходной узел на FreeBSD или HardenedBSD?" #: http//localhost/tbb/tbb-25/ #: (content/tbb/tbb-25/contents+en.lrquestion.title) @@ -1349,6 +1353,8 @@ msgid "" "Tor Browser has two ways to change your relay circuit — \"New Identity\" and" " \"New Tor Circuit for this Site\"." msgstr "" +"В Tor есть два способа изменить набор узлов: \"Новая личность\" и \"Новая " +"цепочка Tor для этого сайта\"." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -1419,6 +1425,8 @@ msgid "" "Please take a strong stance in favor of digital privacy and internet " "freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" +"Пожалуйста, будьте на стороне защитников цифровой приватности и онлайновых " +"свобод. Разрешите пользователям Tor доступ к xyz.com. Спасибо\"." #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.seo_slug) @@ -1432,7 +1440,7 @@ msgstr "" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "* Edit /etc/tor/torrc to look like the following:" -msgstr "" +msgstr "* Измените /etc/tor/torrc следующим образом:" #: http//localhost/tbb/tbb-39/ #: (content/tbb/tbb-39/contents+en.lrquestion.title) @@ -1461,6 +1469,8 @@ msgid "" "If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" +"Если вы видите подобные строчки в логе Tor, значит, не удалось соединение с " +"SOCKS-прокси." #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) @@ -3356,6 +3366,10 @@ msgid "" "protection is blocking me from accessing Tor Browser</a>, it is " "common for anti-virus / anti-malware software to cause this type of issue." msgstr "" +"Если у вас работает антивирус, пожалуйста, обратите внимание на раздел " +"<a href=\"http://support.torproject.org/#tbb-10\">Мой антивирус " +"блокирует доступ к Tor Browser</a>. Антивирусы нередко вызывают " +"такого рода проблемы." #: http//localhost/tbb/tbb-26/ #: (content/tbb/tbb-26/contents+en.lrquestion.seo_slug) @@ -3390,8 +3404,8 @@ msgid "" "<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " "Browser Update\">" msgstr "" -"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " -"Browser Update\">" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Проверка " +"обновлений Tor Browser\"/>" #: http//localhost/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) @@ -3415,8 +3429,8 @@ msgid "" "<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " "Browser Menu\">" msgstr "" -"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Меню Tor " -"Browser\"/>" +"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " +"Browser Menu\">" #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.description) @@ -3595,6 +3609,8 @@ msgid "" "To get links for downloading Tor Browser, send a message to " "gettor(a)torproject.org with one of the following codes in it:" msgstr "" +"Чтобы получить ссылки для скачивания Tor Browser, отправьте на " +"gettor(a)torproject.org сообщение с одним из следующих кодов:" #: http//localhost/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -3604,9 +3620,8 @@ msgid "" "\"Hi! I tried to access your site xyz.com while using Tor Browser and " "discovered that you don't allow Tor users to access your site." msgstr "" -"\"Здравствуйте! Я пытался получить доступ к вашему сайту xyz.com во время " -"использования Tor Browser и обнаружил, что вы не позволяете пользователям " -"Tor получить доступ к вашему сайту." +"\"Здравствуйте! Я пытался зайти на ваш сайт xyz.com с помощью Tor Browser и " +"обнаружил, что вы не разрешаете пользователям Tor доступ к вашему сайту." #: http//localhost/gettor/gettor-3/ #: (content/gettor/gettor-3/contents+en.lrquestion.description)

1 0

[stem/master] Recache manual data
by atagar＠torproject.org 05 Oct '18

05 Oct '18

commit 684cc37d3fa7276b556bbfc95c56dd5977e36981 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 5 10:19:52 2018 -0700 Recache manual data Syncing ourselves with tor's manual data in preparation for release. --- stem/cached_manual.sqlite | Bin 240640 -> 243712 bytes stem/settings.cfg | 4 ++-- test/integ/manual.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stem/cached_manual.sqlite b/stem/cached_manual.sqlite index be6f8253..9fe8c7ad 100644 Binary files a/stem/cached_manual.sqlite and b/stem/cached_manual.sqlite differ diff --git a/stem/settings.cfg b/stem/settings.cfg index 12ffe8b4..c64541c2 100644 --- a/stem/settings.cfg +++ b/stem/settings.cfg @@ -145,6 +145,7 @@ manual.summary.StrictNodes Never uses notes outside of Entry/ExitNodes manual.summary.FascistFirewall Only make outbound connections on FirewallPorts manual.summary.FirewallPorts Ports used by FascistFirewall manual.summary.HidServAuth Authentication credentials for connecting to a hidden service +manual.summary.ClientOnionAuthDir Path containing hidden service authorization files manual.summary.ReachableAddresses Rules for bypassing the local firewall manual.summary.ReachableDirAddresses Rules for bypassing the local firewall (directory fetches) manual.summary.ReachableORAddresses Rules for bypassing the local firewall (OR connections) @@ -188,8 +189,6 @@ manual.summary.DownloadExtraInfo Toggles fetching of extra information about rel manual.summary.WarnPlaintextPorts Toggles warnings for using risky ports manual.summary.RejectPlaintextPorts Prevents connections on risky ports manual.summary.OptimisticData Use exits without confirmation that prior connections succeeded -manual.summary.Tor2webMode Establish non-anonymous hidden service connections -manual.summary.Tor2webRendezvousPoints Rendezvous points to use for hidden services when in Tor2webMode manual.summary.HSLayer2Nodes permissible relays for the second hop of HS circuits manual.summary.HSLayer3Nodes permissible relays for the third hop of HS circuits manual.summary.UseMicrodescriptors Retrieve microdescriptors rather than server descriptors @@ -320,6 +319,7 @@ manual.summary.PublishHidServDescriptors Toggles automated publishing of the hid manual.summary.HiddenServiceVersion Version for published hidden service descriptors manual.summary.HiddenServiceAuthorizeClient Restricts access to the hidden service manual.summary.HiddenServiceAllowUnknownPorts Allow rendezvous circuits on unrecognized ports +manual.summary.HiddenServiceExportCircuitID Exposes incoming client circuits via the given protocol manual.summary.HiddenServiceMaxStreams Maximum streams per rendezvous circuit manual.summary.HiddenServiceMaxStreamsCloseCircuit Closes rendezvous circuits that exceed the maximum number of streams manual.summary.RendPostPeriod Period at which the rendezvous service descriptors are refreshed diff --git a/test/integ/manual.py b/test/integ/manual.py index fa7e0ca5..4806082b 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -28,6 +28,7 @@ EXPECTED_CATEGORIES = set([ 'DIRECTORY AUTHORITY SERVER OPTIONS', 'HIDDEN SERVICE OPTIONS', 'DENIAL OF SERVICE MITIGATION OPTIONS', + 'CLIENT AUTHORIZATION', 'TESTING NETWORK OPTIONS', 'NON-PERSISTENT OPTIONS', 'SIGNALS',

1 0

[stem/master] Better normalize ORPort SSL connection failures
by atagar＠torproject.org 05 Oct '18

05 Oct '18

commit 0f0ba5d53468223ea8ca42887f103af16fc37291 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 4 11:10:01 2018 -0700 Better normalize ORPort SSL connection failures On reflection the assertion failure addressed in commit 0e08db7 was a legitimate one. It was exposing a bug in our error response normalization. Reverting the change to the test and doing a proper fix. --- stem/client/__init__.py | 14 +++++++++++--- test/integ/client/connection.py | 16 +--------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index aaa62f5b..6cadc098 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -82,10 +82,18 @@ class Relay(object): except stem.SocketError as exc: if 'Connection refused' in str(exc): raise stem.SocketError("Failed to connect to %s:%i. Maybe it isn't an ORPort?" % (address, port)) - elif 'SSL: ' in str(exc): + + # If not an ORPort (for instance, mistakenly connecting to a ControlPort + # instead) we'll likely fail during SSL negotiation. This can result + # in a variety of responses so normalizing what we can... + # + # Ubuntu 16.04: [SSL: UNKNOWN_PROTOCOL] unknown protocol (_ssl.c:590) + # Ubuntu 12.04: [Errno 1] _ssl.c:504: error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol + + if 'unknown protocol' in str(exc): raise stem.SocketError("Failed to SSL authenticate to %s:%i. Maybe it isn't an ORPort?" % (address, port)) - else: - raise + + raise # To negotiate our link protocol the first VERSIONS cell is expected to use # a circuit ID field size from protocol version 1-3 for backward diff --git a/test/integ/client/connection.py b/test/integ/client/connection.py index ca8853c7..a43283b9 100644 --- a/test/integ/client/connection.py +++ b/test/integ/client/connection.py @@ -31,21 +31,7 @@ class TestConnection(unittest.TestCase): # connect to our ControlPort like it's an ORPort if test.runner.Torrc.PORT in test.runner.get_runner().get_options(): - try: - Relay.connect('127.0.0.1', test.runner.CONTROL_PORT) - self.fail('Connecting to a non-ORPort should raise a stem.SocketError') - except stem.SocketError as exc: - if str(exc) == "Failed to SSL authenticate to 127.0.0.1:1111. Maybe it isn't an ORPort?": - pass # good, this is the usual response - elif 'SSL23_GET_SERVER_HELLO:unknown protocol' in str(exc): - # Less common, but still ok. This arises on older systems that do not - # support tor's ssl version. The full response is... - # - # [Errno 1] _ssl.c:504: error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol - - pass - else: - self.fail('Unexpected response when connecting to a non-ORPort: %s' % exc) + self.assertRaisesWith(stem.SocketError, "Failed to SSL authenticate to 127.0.0.1:1111. Maybe it isn't an ORPort?", Relay.connect, '127.0.0.1', test.runner.CONTROL_PORT) def test_no_common_link_protocol(self): """

1 0