tor-commits June 2019

tor-commits@lists.torproject.org

21 participants
1482 discussions

[tor/master] Merge branch 'tor-github/pr/1140'
by dgoulet＠torproject.org 26 Jun '19

26 Jun '19

commit 6afe1b00c9c73b1bfae4fede61791dff7e7be277 Merge: da1130413 4bac6b6e7 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 26 11:39:33 2019 -0400 Merge branch 'tor-github/pr/1140'

1 0

[tor/master] Remove the unused "exitcode" variable from test_rebind.sh
by dgoulet＠torproject.org 26 Jun '19

26 Jun '19

commit 4bac6b6e7de55138927d075433754ba305bb2479 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 13:49:19 2019 -0400 Remove the unused "exitcode" variable from test_rebind.sh Fixes a shellcheck issue; closes ticket 30964. No user-visible change. --- src/test/test_rebind.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index e0d8394d3..d6d9d8666 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -12,8 +12,6 @@ if test "$UNAME_OS" = 'CYGWIN' || \ fi fi -exitcode=0 - tmpdir= clean () { if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 26 Jun '19

26 Jun '19

commit 73675bcc67fc28109e74cd665214ace67dc51788 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 15:20:29 2019 +0000 Update translations for tpo-web --- contents+eu.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+eu.po b/contents+eu.po index 1d668ab57..cc57135e7 100644 --- a/contents+eu.po +++ b/contents+eu.po @@ -35,7 +35,7 @@ msgstr "" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "We are the Tor Project, a 501(c)3 US nonprofit." -msgstr "" +msgstr "Tor proiektua gara, 501(c)3 US irabazi asmorik gabeko bat." #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "" @@ -53,7 +53,7 @@ msgstr "Kontaktuan jarri." #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) msgid "The Tor Project" -msgstr "" +msgstr "Tor proiektua" #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.body) @@ -854,7 +854,7 @@ msgstr "" #: templates/meta.html:11 msgid "The Tor Project | Privacy & Freedom Online" -msgstr "" +msgstr "Tor proiektua | Pribatutasuna eta askatasuna sarean" #: templates/meta.html:16 msgid "Tor Project"

1 0

[translation/tor_outreach_md] Update translations for tor_outreach_md
by translation＠torproject.org 26 Jun '19

26 Jun '19

commit bdec45b6339fe78085c01e20ce27ae5fb5753b88 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 15:20:19 2019 +0000 Update translations for tor_outreach_md --- tor-outreach2019-2020-eu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-outreach2019-2020-eu.md b/tor-outreach2019-2020-eu.md index b8d703a56..aec0f7a7e 100644 --- a/tor-outreach2019-2020-eu.md +++ b/tor-outreach2019-2020-eu.md @@ -150,7 +150,7 @@ Learn more about Tor by visiting our website, our wiki, finding us on IRC, joini ## 8. Download Tor -Tor for Desktop +Tor mahaigainean torproject.org/download TOR ON MOBILE

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 26 Jun '19

26 Jun '19

commit 56244236a16544e534a4db4224a98a065c80a8c9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 14:15:50 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/fr/LC_MESSAGES/messages.po | 105 +++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 40 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 7895c37e4..40cc71010 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -241,6 +241,70 @@ msgstr "" "cryptomonnaie qui ne figure pas dans la liste ci-dessus, veuillez nous " "envoyer un courriel à giving(a)torproject.org." +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:110 +msgid "Copied" +msgstr "Copié" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:114 +msgid "Currency Amount must be a number." +msgstr "Le montant doit être un nombre." + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:118 +#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51 +msgid "Choose a Currency" +msgstr "Choisir une monnaie" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:122 +#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:73 +msgid "Currency Amount" +msgstr "Montant" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:124 +msgid "Estimated Donation Date" +msgstr "Date de don prévue" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:128 +msgid "I'd like to make my donation anonymous." +msgstr "Je souhaite faire un don anonyme." + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:132 +#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:46 +msgid "Email" +msgstr "Adresse courriel" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:136 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320 +#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:29 +msgid "First Name" +msgstr "Prénom" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:140 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:324 +#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:33 +msgid "Last Name" +msgstr "Nom de famille" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:144 +#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:80 +msgid "Report Donation" +msgstr "Reporter le don" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:148 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:370 +msgid "Start sending me email updates about the Tor Project!" +msgstr "Commencez à m’envoyer des nouvelles sur le Projet Tor par courriel !" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:152 +#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:87 +msgid "Wallet Addresses" +msgstr "Adresses de porte-monnaie" + +#: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:156 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:311 +#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:24 +msgid "Your Info" +msgstr "Vos renseignements" + #: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:29 msgid "" "The European shirt fits run a little small so you might want to consider " @@ -556,25 +620,10 @@ msgid "Want to donate Bitcoin, Stock, or via snail mail?" msgstr "" "Voulez-vous faire un don en bitcoins, en actions ou par courrier escargot ?" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:311 -#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:24 -msgid "Your Info" -msgstr "Vos renseignements" - #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:315 msgid "* required fields" msgstr "* champs obligatoires" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320 -#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:29 -msgid "First Name" -msgstr "Prénom" - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:324 -#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:33 -msgid "Last Name" -msgstr "Nom de famille" - #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:330 msgid "Street Address" msgstr "Adresse municipale " @@ -603,10 +652,6 @@ msgstr "Saisissez votre adresse courriel" msgid "We‘ll email you your receipt" msgstr "Nous vous enverrons votre reçu par courriel" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:370 -msgid "Start sending me email updates about the Tor Project!" -msgstr "Commencez à m’envoyer des nouvelles sur le Projet Tor par courriel !" - #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:377 msgid "Card Number" msgstr "Numéro de la carte" @@ -786,26 +831,6 @@ msgstr "Traitement du don. Veuillez patienter…" msgid "Estimated Donation Date:" msgstr "Date de don prévue :" -#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:46 -msgid "Email" -msgstr "Adresse courriel" - -#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51 -msgid "Choose a Currency" -msgstr "Choisir une monnaie" - -#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:73 -msgid "Currency Amount" -msgstr "Montant" - -#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:80 -msgid "Report Donation" -msgstr "Reporter le don" - -#: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:87 -msgid "Wallet Addresses" -msgstr "Adresses de porte-monnaie" - #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:52 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:75 #: tmp/cache_locale/2c/2c32942b896dd845bd6204d3104922983a843d726e231446ff21ddb2a33f6cda.php:29 @@ -860,7 +885,7 @@ msgstr "" #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:113 msgid "" "The Tor Project counts on the support of our Defenders of Privacy to " -"continue our mission to provide tools that protect peoples privacy and " +"continue our mission to provide tools that protect people's privacy and " "identity online." msgstr "" "Nous, le Projet Tor, comptons sur le soutien de nos défenseurs de la vie "

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 26 Jun '19

26 Jun '19

commit d728a00ccbab17b07c0811fa5f5dae238478cb5c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 14:15:42 2019 +0000 Update translations for donatepages-messagespot --- locale/fr/LC_MESSAGES/messages.po | 12 ++++++++---- locale/ka/LC_MESSAGES/messages.po | 17 ++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index c714621aa..40cc71010 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -243,11 +243,11 @@ msgstr "" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:110 msgid "Copied" -msgstr "" +msgstr "Copié" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:114 msgid "Currency Amount must be a number." -msgstr "" +msgstr "Le montant doit être un nombre." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:118 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51 @@ -261,11 +261,11 @@ msgstr "Montant" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:124 msgid "Estimated Donation Date" -msgstr "" +msgstr "Date de don prévue" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:128 msgid "I'd like to make my donation anonymous." -msgstr "" +msgstr "Je souhaite faire un don anonyme." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:132 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:46 @@ -888,6 +888,10 @@ msgid "" "continue our mission to provide tools that protect people's privacy and " "identity online." msgstr "" +"Nous, le Projet Tor, comptons sur le soutien de nos défenseurs de la vie " +"privée afin de poursuivre notre mission d’offrir des outils qui protègent la" +" vie privée, les données personnelles et l'identité des personnes sur " +"Internet." #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:115 msgid "With your help, we will make the Tor network accessible to everyone!" diff --git a/locale/ka/LC_MESSAGES/messages.po b/locale/ka/LC_MESSAGES/messages.po index b5834bcc2..da76ed91b 100644 --- a/locale/ka/LC_MESSAGES/messages.po +++ b/locale/ka/LC_MESSAGES/messages.po @@ -1,7 +1,7 @@ # Translators: # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2018 +# Giovanni Pellerano <giovanni.pellerano(a)evilaliv3.org>, 2018 # erinm, 2018 -# Giovanni Pellerano <giovanni.pellerano(a)evilaliv3.org>, 2019 # Georgianization, 2019 # msgid "" @@ -239,11 +239,11 @@ msgstr "" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:110 msgid "Copied" -msgstr "" +msgstr "ასლი აღებულია" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:114 msgid "Currency Amount must be a number." -msgstr "" +msgstr "ვალუტის ოდენობა რიცხვი უნდა იყოს." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:118 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51 @@ -257,16 +257,16 @@ msgstr "თანხის ოდენობა" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:124 msgid "Estimated Donation Date" -msgstr "" +msgstr "შემოწირულობის მიახლოებითი თარიღი" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:128 msgid "I'd like to make my donation anonymous." -msgstr "" +msgstr "მსურს შემოწირულობის გაღება ვინაობის გაუმხელად." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:132 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:46 msgid "Email" -msgstr "ელ-ფოსტის გაგზავნა" +msgstr "ელფოსტა" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:136 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320 @@ -875,6 +875,9 @@ msgid "" "continue our mission to provide tools that protect people's privacy and " "identity online." msgstr "" +"Tor-პროექტი მეტადაა დამოკიდებული ჩვენი პირადულობის გუშაგების მხარდაჭერაზე, " +"მიზნისკენ სწრაფვის გასაგრძელებლად და ხალხისთვის პირადი მონაცემების დაცვისა " +"და ვინაობის გაუმხელობისთვის საჭირო საშუალებების შესათავაზებლად." #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:115 msgid "With your help, we will make the Tor network accessible to everyone!" @@ -2186,7 +2189,7 @@ msgstr "" #: tmp/cache_locale/0d/0de73852fd4b6afe8a4f069f907a5e1e93a3159f5ffaddbf485db43dd4ce3a8a.php:57 msgid "Thanks for joining our email list - you'll hear from us soon!" -msgstr "" +msgstr "გმადლობთ ელფოსტის ჯგუფში გაწევრიანებისთვის – მალე შეგეხმიანებით!" #: tmp/cache_locale/0d/0de73852fd4b6afe8a4f069f907a5e1e93a3159f5ffaddbf485db43dd4ce3a8a.php:59 msgid ""

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 26 Jun '19

26 Jun '19

commit 4ff08309866e62cd6ace83813843c95177f60433 Merge: 89ca35ff5 3ccf91027 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 26 10:06:02 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug30649 | 4 ++++ src/core/or/circuitpadding.c | 33 +++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1
by nickm＠torproject.org 26 Jun '19

26 Jun '19

commit 3ccf91027b9fa39182372060e3e92841403f4b5b Merge: 648d5df62 a15ec8bf8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 26 10:05:51 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1 changes/bug30649 | 4 ++++ src/core/or/circuitpadding.c | 33 +++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-)

1 0

[tor/release-0.4.1] Make some warns into protocol warns
by nickm＠torproject.org 26 Jun '19

26 Jun '19

commit 6263755728f62b2535535f68960e601dccaead9d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 30 16:20:56 2019 -0700 Make some warns into protocol warns I'm not sure I agree with this option. --- src/core/or/circuitpadding.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index ae32713bf..84650a5a9 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -2805,14 +2805,14 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) circpad_negotiate_t *negotiate; if (CIRCUIT_IS_ORIGIN(circ)) { - log_fn(LOG_WARN, LD_PROTOCOL, + log_fn(LOG_WARN, LD_CIRC, "Padding negotiate cell unsupported at origin."); return -1; } if (circpad_negotiate_parse(&negotiate, cell->payload+RELAY_HEADER_SIZE, CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE) < 0) { - log_fn(LOG_WARN, LD_CIRC, + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, "Received malformed PADDING_NEGOTIATE cell; dropping."); return -1; } @@ -2823,7 +2823,7 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) negotiate->machine_type)) { goto done; } - log_fn(LOG_WARN, LD_CIRC, + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, "Received circuit padding stop command for unknown machine."); goto err; } else if (negotiate->command == CIRCPAD_COMMAND_START) { @@ -2864,21 +2864,21 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell, circpad_negotiated_t *negotiated; if (!CIRCUIT_IS_ORIGIN(circ)) { - log_fn(LOG_WARN, LD_PROTOCOL, + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, "Padding negotiated cell unsupported at non-origin."); return -1; } /* Verify this came from the expected hop */ if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) { - log_fn(LOG_WARN, LD_PROTOCOL, + log_fn(LOG_WARN, LD_CIRC, "Padding negotiated cell from wrong hop!"); return -1; } if (circpad_negotiated_parse(&negotiated, cell->payload+RELAY_HEADER_SIZE, CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE) < 0) { - log_fn(LOG_WARN, LD_CIRC, + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, "Received malformed PADDING_NEGOTIATED cell; " "dropping."); return -1;

1 0

[tor/release-0.4.1] More LOG_PROTOCOL_WARN.
by nickm＠torproject.org 26 Jun '19

26 Jun '19

commit e54ce03b4f439d7cdf9d0d0da3be11b72a1a83fd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 5 12:33:39 2019 -0700 More LOG_PROTOCOL_WARN. Make origin-side messages about padding negotiation failure into LOG_PROTOCOL_WARN. I'm not sure I like this either.. But the negotiation refusal case might happen naturally due to consensus drift, and is functionally no different than a corrupted cell. --- src/core/or/circuitpadding.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 84650a5a9..ebad6518b 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -2805,7 +2805,7 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) circpad_negotiate_t *negotiate; if (CIRCUIT_IS_ORIGIN(circ)) { - log_fn(LOG_WARN, LD_CIRC, + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, "Padding negotiate cell unsupported at origin."); return -1; } @@ -2871,7 +2871,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell, /* Verify this came from the expected hop */ if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) { - log_fn(LOG_WARN, LD_CIRC, + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, "Padding negotiated cell from wrong hop!"); return -1; } @@ -2898,7 +2898,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell, // and be sad free_circ_machineinfos_with_machine_num(circ, negotiated->machine_type); TO_ORIGIN_CIRCUIT(circ)->padding_negotiation_failed = 1; - log_fn(LOG_INFO, LD_CIRC, + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, "Middle node did not accept our padding request."); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
149
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2019