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

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 20 Dec '18

20 Dec '18

commit 52366ce2625d50c50a4add16ae4558df28fecd32 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 18:45:24 2018 +0000 Update translations for donatepages-messagespot --- locale/pt_BR/LC_MESSAGES/messages.po | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index f07905bd0..0f5c19098 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -411,6 +411,8 @@ msgstr "" msgid "" "The paid staff of the Tor Project is very small: about 47 people in total." msgstr "" +"A equipe remunerada do Projeto Tor é muito pequena: cerca de 47 pessoas no " +"total." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90 msgid "" @@ -573,6 +575,8 @@ msgid "" "I would like to know more about how Tor works, what onion services are, or " "how to run a relay." msgstr "" +"Eu gostaria de saber mais sobre como o Tor funciona, o que são serviços de " +"Onion ou como executar um retransmissor." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158 msgid "" @@ -700,6 +704,9 @@ msgid "" " foundations, research institutions, private companies, and over 20,000 " "personal donations from people like you." msgstr "" +"O Tor é apoiado por agências de financiamento do governo dos Estados Unidos," +" ONGs, fundações privadas, instituições de pesquisa, empresas privadas, e " +"quase 20,000 doações pessoais de pessoas como você. " #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:212 msgid "" @@ -746,7 +753,7 @@ msgstr "Quanto dinheiro o Projeto Tor gasta anualmente e para que é usado?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:228 msgid "The Tor Project spends about $4 million annually." -msgstr "" +msgstr "O Projeto Tor gasta cerca de $4 milhões de dólares anualmente. " #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:230 #, php-format @@ -1081,6 +1088,8 @@ msgid "" "(Also, if you wanted, you could give us $4,999 in late 2018 and $4,999 in " "early 2019.)" msgstr "" +"(No entanto, se você quiser, você poderá nos dar US $4.999 no final de 2018 " +"e US $4.999 no início de 2019;)" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:403 msgid "" @@ -1254,6 +1263,8 @@ msgid "" "Our mailing address is The Tor Project, 217 First Avenue South #4903, " "Seattle WA 98194, USA" msgstr "" +"O nosso endereço para correspondência é, Projeto Tor, 217 First Avenue South" +" #4903, Seattle WA 98194, USA" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486 msgid "Do you accept cash donations?" @@ -1841,7 +1852,7 @@ msgstr "Comentários" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:463 msgid "Donating:" -msgstr "" +msgstr "Doando:" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:470 msgid "Donate" @@ -1907,7 +1918,7 @@ msgstr "Endereço de e-mail inválido." #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:537 msgid "per month" -msgstr "" +msgstr "por mês" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:551 msgid "One moment while we shovel coal into our servers." @@ -1918,6 +1929,8 @@ msgid "" "Stand up for the universal human rights to privacy and freedom and help keep" " Tor robust and secure." msgstr "" +"Defenda os direitos humanos universais à privacidade e liberdade e ajude a " +"manter o Tor robusto e seguro." #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:640 msgid "Mozilla will match your gift and double your impact."

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 20 Dec '18

20 Dec '18

commit b2a9993b42d5f058f43a68ffcba612e7be20ebf6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 17:17:31 2018 +0000 Update translations for tor-and-https --- gl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gl.po b/gl.po index f5d1ad1e1..98a8a5e65 100644 --- a/gl.po +++ b/gl.po @@ -3,10 +3,10 @@ # Ero Balsa <ero.balsa(a)gmail.com>, 2015 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2017-12-26 11:49+0000\n" -"Last-Translator: Ero Balsa <ero.balsa(a)gmail.com>\n" +"PO-Revision-Date: 2018-12-20 17:02+0000\n" +"Last-Translator: Rodrigo Boado <rboadogarcia(a)gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,7 +61,7 @@ msgstr "" #: C/tor-and-https.svg:363 #, no-wrap msgid "WiFi" -msgstr "" +msgstr "WiFi" #. (itstool) path: defs/text #. Keep it short: 4em max.

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 20 Dec '18

20 Dec '18

commit b54510903068a8b560d9359935375963b7178f85 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 17:16:59 2018 +0000 Update translations for tails-persistence-setup --- gl/gl.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gl/gl.po b/gl/gl.po index 7b4bf89b5..f25ef787d 100644 --- a/gl/gl.po +++ b/gl/gl.po @@ -10,11 +10,11 @@ # Xnake, 2016 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2018-08-16 11:14+0200\n" -"PO-Revision-Date: 2018-08-16 14:16+0000\n" -"Last-Translator: Miguel Anxo Bouzada <mbouzada(a)gmail.com>\n" +"POT-Creation-Date: 2018-11-01 12:21+0100\n" +"PO-Revision-Date: 2018-12-20 17:12+0000\n" +"Last-Translator: Rodrigo Boado <rboadogarcia(a)gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -212,65 +212,65 @@ msgstr "Crearase un volume persistente %s no dispositivo %s %s. Os datos msgid "Create" msgstr "Crear" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:141 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:142 msgid "" "Beware! Using persistence has consequences that must be well " "understood. Tails can't help you if you use it wrong! See the Encrypted " "persistence page of the Tails documentation to learn more." msgstr "" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:169 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:170 msgid "Passphrase:" msgstr "Frase de acceso:" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:177 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:178 msgid "Verify Passphrase:" msgstr "Comprobe a frase de acceso:" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:188 -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:244 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:189 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:245 msgid "Passphrase can't be empty" msgstr "A frase de acceso non pode estar baleira" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:235 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:236 msgid "Passphrases do not match" msgstr "As frases de acceso non coinciden" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:284 #: ../lib/Tails/Persistence/Step/Delete.pm:103 #: ../lib/Tails/Persistence/Step/Configure.pm:181 msgid "Failed" msgstr "Fracasou" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:291 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:292 msgid "Mounting Tails persistence partition." msgstr "Montaxe da partición de persistencia do Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:294 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "The Tails persistence partition will be mounted." msgstr "Montarase a partición de persistencia do Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:303 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 msgid "Correcting permissions of the persistent volume." msgstr "A corrixir os permisos do volume persistente." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:306 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 msgid "The permissions of the persistent volume will be corrected." msgstr "Os permisos de volume persistente serán corrixidos." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:314 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:315 msgid "Creating default persistence configuration." msgstr "" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:317 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:318 msgid "The default persistence configuration will be created." msgstr "" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:332 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:333 msgid "Creating..." msgstr "Creando ..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:335 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:336 msgid "Creating the persistent volume..." msgstr "Creando o volume persistente ..."

1 0

[tor/master] Document the output of --version
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit 508837b62bcb31afbba711ec3dd7b7c18630d604 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 17:54:01 2018 -0500 Document the output of --version Closes 28889 --- changes/document_version | 2 ++ doc/tor.1.txt | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/document_version b/changes/document_version new file mode 100644 index 000000000..a45992b6b --- /dev/null +++ b/changes/document_version @@ -0,0 +1,2 @@ + o Documentation: + - Document the exact output of "tor --version". Closes ticket 28889. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8c419b1a6..4ecc4ee38 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -89,7 +89,8 @@ COMMAND-LINE OPTIONS future version. (This is a warning, not a promise.) [[opt-version]] **--version**:: - Display Tor version and exit. + Display Tor version and exit. The output is a line of the format, + "Tor version [version number]." [[opt-quiet]] **--quiet**|**--hush**:: Override the default console log. By default, Tor starts out logging

1 0

[tor/master] Even more clarify on --version.
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit 4d9b55907c4a5223ea7ef603a87ba6089bf5b3e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 20 11:50:40 2018 -0500 Even more clarify on --version. --- doc/tor.1.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4ecc4ee38..5c0138117 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -89,8 +89,9 @@ COMMAND-LINE OPTIONS future version. (This is a warning, not a promise.) [[opt-version]] **--version**:: - Display Tor version and exit. The output is a line of the format, - "Tor version [version number]." + Display Tor version and exit. The output is a single line of the format + "Tor version [version number]." (The version number format + is as specified in version-spec.txt.) [[opt-quiet]] **--quiet**|**--hush**:: Override the default console log. By default, Tor starts out logging

1 0

[tor/master] Merge branch 'document_--version'
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit 0e6e902cbc2e98028e58c73f7b1a8dece89fc03f Merge: 5c85ba307 4d9b55907 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 20 11:50:48 2018 -0500 Merge branch 'document_--version' changes/document_version | 2 ++ doc/tor.1.txt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Remember to check for whether we actually did exit in tests.
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit fe2f4f3ec58ef03e8d3fe802283b848d54b5eb76 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 12:45:52 2018 +0100 Remember to check for whether we actually did exit in tests. See: https://bugs.torproject.org/28179 --- src/test/test_process_slow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_process_slow.c b/src/test/test_process_slow.c index a1f99bff0..3f8c07f31 100644 --- a/src/test/test_process_slow.c +++ b/src/test/test_process_slow.c @@ -242,6 +242,7 @@ test_callbacks(void *arg) /* We returned. Let's see what our event loop said. */ tt_int_op(smartlist_len(process_data->stdout_data), OP_EQ, 12); tt_int_op(smartlist_len(process_data->stderr_data), OP_EQ, 3); + tt_assert(process_data->did_exit); tt_int_op(process_data->exit_code, OP_EQ, 0); /* Check stdout output. */

1 0

[tor/master] Delay checking process for termination until both stdout and stderr are closed.
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit 44586a89ef636b0d3f736e44a1d2fc6497080bfc Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 12:53:28 2018 +0100 Delay checking process for termination until both stdout and stderr are closed. This patch makes us delay checking for whether we have an exit code value (via GetExitCodeProcess()) until both stdout and stderr have been closed by the operating system either by the process itself or by process cleanup after termination. See: https://bugs.torproject.org/28179 --- src/lib/process/process_win32.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/lib/process/process_win32.c b/src/lib/process/process_win32.c index a09664b50..52acf4937 100644 --- a/src/lib/process/process_win32.c +++ b/src/lib/process/process_win32.c @@ -525,6 +525,28 @@ process_win32_timer_test_process(process_t *process) BOOL ret = FALSE; DWORD exit_code = 0; + /* Sometimes the Windows kernel wont give us the EOF/Broken Pipe error + * message until some time after the process have actually terminated. We + * make sure that our ReadFileEx() calls for the process have *all* returned + * and both standard out and error have been marked as EOF before we try to + * see if the process terminated. + * + * This ensures that we *never* call the exit callback of the `process_t`, + * which potentially ends up calling `process_free()` on our `process_t`, + * before all data have been received from the process. + * + * We do NOT have a check here for whether standard in reached EOF since + * standard in's WriteFileEx() function is only called on-demand when we have + * something to write and is thus usually not awaiting to finish any + * operations. If we WriteFileEx() to a file that has terminated we'll simply + * get an error from ReadFileEx() or its completion routine and move on with + * life. */ + if (! win32_process->stdout_handle.reached_eof) + return false; + + if (! win32_process->stderr_handle.reached_eof) + return false; + /* We start by testing whether our process is still running. */ ret = GetExitCodeProcess(win32_process->process_information.hProcess, &exit_code);

1 0

[tor/master] Handle errors even after success from ReadFileEx() and WriteFileEx().
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit c6e041e3d8dcc6f887014f9dd8887faebf5f4a49 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 12:57:20 2018 +0100 Handle errors even after success from ReadFileEx() and WriteFileEx(). This patch adds some additional error checking after calls to ReadFileEx() and WriteFileEx(). I have not managed to get this code to reach the branch where `error_code` is NOT `ERROR_SUCCESS`, but MSDN says one should check for this condition so we do so just to be safe. See: https://bugs.torproject.org/28179 --- src/lib/process/process_win32.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/src/lib/process/process_win32.c b/src/lib/process/process_win32.c index 52acf4937..71dd4001c 100644 --- a/src/lib/process/process_win32.c +++ b/src/lib/process/process_win32.c @@ -329,6 +329,7 @@ process_win32_write(struct process_t *process, buf_t *buffer) process_win32_t *win32_process = process_get_win32_process(process); BOOL ret = FALSE; + DWORD error_code = 0; const size_t buffer_size = buf_datalen(buffer); /* Windows is still writing our buffer. */ @@ -350,6 +351,12 @@ process_win32_write(struct process_t *process, buf_t *buffer) /* Read data from the process_t buffer into our intermediate buffer. */ buf_get_bytes(buffer, win32_process->stdin_handle.buffer, write_size); + /* Because of the slightly weird API for WriteFileEx() we must set this to 0 + * before we call WriteFileEx() because WriteFileEx() does not reset the last + * error itself when it's succesful. See comment below after the call to + * GetLastError(). */ + SetLastError(0); + /* Schedule our write. */ ret = WriteFileEx(win32_process->stdin_handle.pipe, win32_process->stdin_handle.buffer, @@ -363,6 +370,24 @@ process_win32_write(struct process_t *process, buf_t *buffer) return 0; } + /* Here be dragons: According to MSDN's documentation for WriteFileEx() we + * should check GetLastError() after a call to WriteFileEx() even though the + * `ret` return value was successful. If everything is good, GetLastError() + * returns `ERROR_SUCCESS` and nothing happens. + * + * XXX(ahf): I have not managed to trigger this code while stress-testing + * this code. */ + error_code = GetLastError(); + + if (error_code != ERROR_SUCCESS) { + /* LCOV_EXCL_START */ + log_warn(LD_PROCESS, "WriteFileEx() failed after returning success: %s", + format_win32_error(error_code)); + win32_process->stdin_handle.reached_eof = true; + return 0; + /* LCOV_EXCL_STOP */ + } + /* This cast should be safe since our buffer can maximum be BUFFER_SIZE * large. */ return (int)write_size; @@ -864,6 +889,7 @@ process_win32_read_from_handle(process_win32_handle_t *handle, BOOL ret = FALSE; int bytes_available = 0; + DWORD error_code = 0; /* We already have a request to read data that isn't complete yet. */ if (BUG(handle->busy)) @@ -887,6 +913,12 @@ process_win32_read_from_handle(process_win32_handle_t *handle, memset(handle->buffer, 0, sizeof(handle->buffer)); } + /* Because of the slightly weird API for ReadFileEx() we must set this to 0 + * before we call ReadFileEx() because ReadFileEx() does not reset the last + * error itself when it's succesful. See comment below after the call to + * GetLastError(). */ + SetLastError(0); + /* Ask the Windows kernel to read data from our pipe into our buffer and call * the callback function when it is done. */ ret = ReadFileEx(handle->pipe, @@ -901,6 +933,24 @@ process_win32_read_from_handle(process_win32_handle_t *handle, return bytes_available; } + /* Here be dragons: According to MSDN's documentation for ReadFileEx() we + * should check GetLastError() after a call to ReadFileEx() even though the + * `ret` return value was successful. If everything is good, GetLastError() + * returns `ERROR_SUCCESS` and nothing happens. + * + * XXX(ahf): I have not managed to trigger this code while stress-testing + * this code. */ + error_code = GetLastError(); + + if (error_code != ERROR_SUCCESS) { + /* LCOV_EXCL_START */ + log_warn(LD_PROCESS, "ReadFileEx() failed after returning success: %s", + format_win32_error(error_code)); + handle->reached_eof = true; + return bytes_available; + /* LCOV_EXCL_STOP */ + } + /* We mark our handle as having a pending I/O request. */ handle->busy = true;

1 0

[tor/master] Remember to set `reached_eof` when our handles are reporting errors.
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit 36e24782f87c25d13b4c918c66cd4affaab8df79 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 13:02:22 2018 +0100 Remember to set `reached_eof` when our handles are reporting errors. This patch adds some missing calls to set `reached_eof` of our handles when various error conditions happens or when we close our handle (which happens at `process_terminate()`. See: https://bugs.torproject.org/28179 --- src/lib/process/process_win32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/process/process_win32.c b/src/lib/process/process_win32.c index 71dd4001c..358765f79 100644 --- a/src/lib/process/process_win32.c +++ b/src/lib/process/process_win32.c @@ -367,6 +367,7 @@ process_win32_write(struct process_t *process, buf_t *buffer) if (! ret) { log_warn(LD_PROCESS, "WriteFileEx() failed: %s", format_win32_error(GetLastError())); + win32_process->stdin_handle.reached_eof = true; return 0; } @@ -749,6 +750,7 @@ process_win32_cleanup_handle(process_win32_handle_t *handle) if (handle->pipe != INVALID_HANDLE_VALUE) { CloseHandle(handle->pipe); handle->pipe = INVALID_HANDLE_VALUE; + handle->reached_eof = true; } } @@ -930,6 +932,7 @@ process_win32_read_from_handle(process_win32_handle_t *handle, if (! ret) { log_warn(LD_PROCESS, "ReadFileEx() failed: %s", format_win32_error(GetLastError())); + handle->reached_eof = true; return bytes_available; }

1 0