February 2019 - tor-commits - lists.torproject.org

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

28 Feb '19

commit 2461d454defdc1cb730d1e832cc151b07bea7ad8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 28 16:45:46 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/fr/LC_MESSAGES/messages.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index c2a3d10cf..a6ef44006 100644 --- a/locale/fr/LC_MESSAGES/messages.po … [View More]+++ b/locale/fr/LC_MESSAGES/messages.po @@ -1257,13 +1257,13 @@ msgid "" " Phone number: 206-420-3136 \n" " Contact person: Isabela Bagueros, Executive Director " msgstr "" -"Numéro d’identification fiscale du Projet Tor (EIN #): 20-8096820 \n" -" Adresse: \n" -" Le Projet Tor, Inc. \n" +"Numéro d’identification fiscale du Projet Tor (no EIN) : 20-8096820 \n" +" Adresse : \n" +" The Tor Project, Inc. \n" " 217 First Avenue South #4903 \n" " Seattle, WA 98194 \n" -" Téléphone : 206-420-3136 \n" -" Personne à contacter : Isabela Bagueros, directrice générale " +" Téléphone : 206-420-3136 \n" +" Personne-ressource : Isabela Bagueros, directrice générale " #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:264 msgid "If I am not in the United States, can I still donate?" @@ -1271,16 +1271,16 @@ msgstr "Si je ne suis pas aux États-Unis, puis-je quand même faire un don ?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:268 msgid "Yes, definitely." -msgstr "Oui, sans aucun doute." +msgstr "Oui, absolument." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:270 msgid "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." msgstr "" -"Votre don n’est probablement pas déductible d’impôt (à moins que vous ne " -"payiez des impôts sur le revenu américain) mais nous apprécierions beaucoup " -"votre soutien." +"Votre don n’est probablement pas déductible du revenu imposable (à moins que" +" vous ne payiez des impôts sur un revenu états-unien), mais nous vous " +"serions très reconnaissants de votre soutien." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:276 msgid "" @@ -1608,8 +1608,8 @@ msgid "" "It's important to me that my donation be tax-deductible, but I don't pay " "taxes in the United States." msgstr "" -"Il est important pour moi que mon don soit déductible d’impôt, mais je ne " -"paie pas d’impôt aux États-Unis." +"Il est important pour moi que mon don soit déductible du revenu imposable, " +"mais je ne paie pas d’impôt aux États-Unis." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:427 msgid "" @@ -1625,9 +1625,9 @@ msgid "" "different country, let us know and we will try to offer tax-deductibility in" " your country in future." msgstr "" -"S’il est important pour vous que vos dons soient déductibles d’impôt dans un" -" autre pays, faites-le nous savoir et nous essaierons d’offrir la " -"déductibilité fiscale dans votre pays à l’avenir." +"S’il est important pour vous que vos dons soient déductibles du revenu " +"imposable dans un autre pays, faites-le-nous savoir et nous essaierons " +"d’offrir la déductibilité du revenu imposable dans votre pays à l’avenir." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:431 msgid "" [View Less]

1 0

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

28 Feb '19

commit 5584c6c2acb35177522b32447d7abd10a7a8879f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 28 16:45:36 2019 +0000 Update translations for donatepages-messagespot --- locale/fr/LC_MESSAGES/messages.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index c2a3d10cf..a6ef44006 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/… [View More]locale/fr/LC_MESSAGES/messages.po @@ -1257,13 +1257,13 @@ msgid "" " Phone number: 206-420-3136 \n" " Contact person: Isabela Bagueros, Executive Director " msgstr "" -"Numéro d’identification fiscale du Projet Tor (EIN #): 20-8096820 \n" -" Adresse: \n" -" Le Projet Tor, Inc. \n" +"Numéro d’identification fiscale du Projet Tor (no EIN) : 20-8096820 \n" +" Adresse : \n" +" The Tor Project, Inc. \n" " 217 First Avenue South #4903 \n" " Seattle, WA 98194 \n" -" Téléphone : 206-420-3136 \n" -" Personne à contacter : Isabela Bagueros, directrice générale " +" Téléphone : 206-420-3136 \n" +" Personne-ressource : Isabela Bagueros, directrice générale " #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:264 msgid "If I am not in the United States, can I still donate?" @@ -1271,16 +1271,16 @@ msgstr "Si je ne suis pas aux États-Unis, puis-je quand même faire un don ?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:268 msgid "Yes, definitely." -msgstr "Oui, sans aucun doute." +msgstr "Oui, absolument." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:270 msgid "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." msgstr "" -"Votre don n’est probablement pas déductible d’impôt (à moins que vous ne " -"payiez des impôts sur le revenu américain) mais nous apprécierions beaucoup " -"votre soutien." +"Votre don n’est probablement pas déductible du revenu imposable (à moins que" +" vous ne payiez des impôts sur un revenu états-unien), mais nous vous " +"serions très reconnaissants de votre soutien." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:276 msgid "" @@ -1608,8 +1608,8 @@ msgid "" "It's important to me that my donation be tax-deductible, but I don't pay " "taxes in the United States." msgstr "" -"Il est important pour moi que mon don soit déductible d’impôt, mais je ne " -"paie pas d’impôt aux États-Unis." +"Il est important pour moi que mon don soit déductible du revenu imposable, " +"mais je ne paie pas d’impôt aux États-Unis." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:427 msgid "" @@ -1625,9 +1625,9 @@ msgid "" "different country, let us know and we will try to offer tax-deductibility in" " your country in future." msgstr "" -"S’il est important pour vous que vos dons soient déductibles d’impôt dans un" -" autre pays, faites-le nous savoir et nous essaierons d’offrir la " -"déductibilité fiscale dans votre pays à l’avenir." +"S’il est important pour vous que vos dons soient déductibles du revenu " +"imposable dans un autre pays, faites-le-nous savoir et nous essaierons " +"d’offrir la déductibilité du revenu imposable dans votre pays à l’avenir." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:431 msgid "" [View Less]

1 0

[tor/maint-0.4.0] Fix crash bug in PT subsystem.
by nickm＠torproject.org 28 Feb '19

28 Feb '19

commit aa360b255bc1c262486500655bac70c4f0f00118 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Feb 26 15:26:33 2019 +0100 Fix crash bug in PT subsystem. This patch fixes a crash bug (assertion failure) in the PT subsystem that could get triggered if the user cancels bootstrap via the UI in TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which called `process_free()` after it had called `process_terminate()`. This leads to a … [View More]crash when the various process callbacks returns with data after the `process_t` have been freed using `process_free()`. We solve this issue by ensuring that everywhere we call `process_terminate()` we make sure to detach the `managed_proxy_t` from the `process_t` (by calling `process_set_data(process, NULL)`) and avoid calling `process_free()` at all in the transports code. Instead we just call `process_terminate()` and let the process exit callback in `managed_proxy_exit_callback()` handle the `process_free()` call by returning true to the process subsystem. See: https://bugs.torproject.org/29562 --- changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/changes/bug29562 b/changes/bug29562 new file mode 100644 index 000000000..0621cd09a --- /dev/null +++ b/changes/bug29562 @@ -0,0 +1,4 @@ + o Minor bugfixes (pluggable transports): + - Fix an assertion failure crash bug when a pluggable transport process is + terminated during the bootstrap phase. Fixes bug 29562; bugfix on + 0.4.0.1-alpha. diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index e24705516..e7ff3bf34 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -713,10 +713,13 @@ managed_proxy_destroy(managed_proxy_t *mp, tor_free(mp->proxy_uri); /* do we want to terminate our process if it's still running? */ - if (also_terminate_process && mp->process) + if (also_terminate_process && mp->process) { + /* Note that we do not call process_free(mp->process) here because we let + * the exit handler in managed_proxy_exit_callback() return `true` which + * makes the process subsystem deallocate the process_t. */ + process_set_data(mp->process, NULL); process_terminate(mp->process); - - process_free(mp->process); + } tor_free(mp); } @@ -1823,6 +1826,9 @@ managed_proxy_stdout_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); + if (BUG(mp == NULL)) + return; + handle_proxy_line(line, mp); if (proxy_configuration_finished(mp)) { @@ -1846,6 +1852,9 @@ managed_proxy_stderr_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); + if (BUG(mp == NULL)) + return; + log_warn(LD_PT, "Managed proxy at '%s' reported: %s", mp->argv[0], line); } @@ -1862,18 +1871,8 @@ managed_proxy_exit_callback(process_t *process, process_exit_code_t exit_code) "Pluggable Transport process terminated with status code %" PRIu64, exit_code); - /* We detach ourself from the MP (if we are attached) and free ourself. */ - managed_proxy_t *mp = process_get_data(process); - - /* If we are still attached to the process, it is probably because our PT - * process crashed before we got to call process_set_data(p, NULL); */ - if (BUG(mp != NULL)) { - /* FIXME(ahf): Our process stopped without us having told it to stop - * (crashed). Should we restart it here? */ - mp->process = NULL; - process_set_data(process, NULL); - } - + /* Returning true here means that the process subsystem will take care of + * calling process_free() on our process_t. */ return true; } [View Less]

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
by nickm＠torproject.org 28 Feb '19

28 Feb '19

commit dc19d65c3bd02e4b406388939a9f57bac8010c2c Merge: aef6e6134 aa360b255 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:20:26 2019 -0500 Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0 changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 28 Feb '19

28 Feb '19

commit d5f61375470c9c9ee949e4ff03c7a4cbd51b7224 Merge: cec555f44 dc19d65c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:22:06 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
by nickm＠torproject.org 28 Feb '19

28 Feb '19

commit dc19d65c3bd02e4b406388939a9f57bac8010c2c Merge: aef6e6134 aa360b255 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:20:26 2019 -0500 Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0 changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-)

1 0

[tor/master] Fix crash bug in PT subsystem.
by nickm＠torproject.org 28 Feb '19

28 Feb '19

commit aa360b255bc1c262486500655bac70c4f0f00118 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Feb 26 15:26:33 2019 +0100 Fix crash bug in PT subsystem. This patch fixes a crash bug (assertion failure) in the PT subsystem that could get triggered if the user cancels bootstrap via the UI in TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which called `process_free()` after it had called `process_terminate()`. This leads to a … [View More]crash when the various process callbacks returns with data after the `process_t` have been freed using `process_free()`. We solve this issue by ensuring that everywhere we call `process_terminate()` we make sure to detach the `managed_proxy_t` from the `process_t` (by calling `process_set_data(process, NULL)`) and avoid calling `process_free()` at all in the transports code. Instead we just call `process_terminate()` and let the process exit callback in `managed_proxy_exit_callback()` handle the `process_free()` call by returning true to the process subsystem. See: https://bugs.torproject.org/29562 --- changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/changes/bug29562 b/changes/bug29562 new file mode 100644 index 000000000..0621cd09a --- /dev/null +++ b/changes/bug29562 @@ -0,0 +1,4 @@ + o Minor bugfixes (pluggable transports): + - Fix an assertion failure crash bug when a pluggable transport process is + terminated during the bootstrap phase. Fixes bug 29562; bugfix on + 0.4.0.1-alpha. diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index e24705516..e7ff3bf34 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -713,10 +713,13 @@ managed_proxy_destroy(managed_proxy_t *mp, tor_free(mp->proxy_uri); /* do we want to terminate our process if it's still running? */ - if (also_terminate_process && mp->process) + if (also_terminate_process && mp->process) { + /* Note that we do not call process_free(mp->process) here because we let + * the exit handler in managed_proxy_exit_callback() return `true` which + * makes the process subsystem deallocate the process_t. */ + process_set_data(mp->process, NULL); process_terminate(mp->process); - - process_free(mp->process); + } tor_free(mp); } @@ -1823,6 +1826,9 @@ managed_proxy_stdout_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); + if (BUG(mp == NULL)) + return; + handle_proxy_line(line, mp); if (proxy_configuration_finished(mp)) { @@ -1846,6 +1852,9 @@ managed_proxy_stderr_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); + if (BUG(mp == NULL)) + return; + log_warn(LD_PT, "Managed proxy at '%s' reported: %s", mp->argv[0], line); } @@ -1862,18 +1871,8 @@ managed_proxy_exit_callback(process_t *process, process_exit_code_t exit_code) "Pluggable Transport process terminated with status code %" PRIu64, exit_code); - /* We detach ourself from the MP (if we are attached) and free ourself. */ - managed_proxy_t *mp = process_get_data(process); - - /* If we are still attached to the process, it is probably because our PT - * process crashed before we got to call process_set_data(p, NULL); */ - if (BUG(mp != NULL)) { - /* FIXME(ahf): Our process stopped without us having told it to stop - * (crashed). Should we restart it here? */ - mp->process = NULL; - process_set_data(process, NULL); - } - + /* Returning true here means that the process subsystem will take care of + * calling process_free() on our process_t. */ return true; } [View Less]

1 0

[tor/release-0.4.0] Fix crash bug in PT subsystem.
by nickm＠torproject.org 28 Feb '19

28 Feb '19

commit aa360b255bc1c262486500655bac70c4f0f00118 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Feb 26 15:26:33 2019 +0100 Fix crash bug in PT subsystem. This patch fixes a crash bug (assertion failure) in the PT subsystem that could get triggered if the user cancels bootstrap via the UI in TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which called `process_free()` after it had called `process_terminate()`. This leads to a … [View More]crash when the various process callbacks returns with data after the `process_t` have been freed using `process_free()`. We solve this issue by ensuring that everywhere we call `process_terminate()` we make sure to detach the `managed_proxy_t` from the `process_t` (by calling `process_set_data(process, NULL)`) and avoid calling `process_free()` at all in the transports code. Instead we just call `process_terminate()` and let the process exit callback in `managed_proxy_exit_callback()` handle the `process_free()` call by returning true to the process subsystem. See: https://bugs.torproject.org/29562 --- changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/changes/bug29562 b/changes/bug29562 new file mode 100644 index 000000000..0621cd09a --- /dev/null +++ b/changes/bug29562 @@ -0,0 +1,4 @@ + o Minor bugfixes (pluggable transports): + - Fix an assertion failure crash bug when a pluggable transport process is + terminated during the bootstrap phase. Fixes bug 29562; bugfix on + 0.4.0.1-alpha. diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index e24705516..e7ff3bf34 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -713,10 +713,13 @@ managed_proxy_destroy(managed_proxy_t *mp, tor_free(mp->proxy_uri); /* do we want to terminate our process if it's still running? */ - if (also_terminate_process && mp->process) + if (also_terminate_process && mp->process) { + /* Note that we do not call process_free(mp->process) here because we let + * the exit handler in managed_proxy_exit_callback() return `true` which + * makes the process subsystem deallocate the process_t. */ + process_set_data(mp->process, NULL); process_terminate(mp->process); - - process_free(mp->process); + } tor_free(mp); } @@ -1823,6 +1826,9 @@ managed_proxy_stdout_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); + if (BUG(mp == NULL)) + return; + handle_proxy_line(line, mp); if (proxy_configuration_finished(mp)) { @@ -1846,6 +1852,9 @@ managed_proxy_stderr_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); + if (BUG(mp == NULL)) + return; + log_warn(LD_PT, "Managed proxy at '%s' reported: %s", mp->argv[0], line); } @@ -1862,18 +1871,8 @@ managed_proxy_exit_callback(process_t *process, process_exit_code_t exit_code) "Pluggable Transport process terminated with status code %" PRIu64, exit_code); - /* We detach ourself from the MP (if we are attached) and free ourself. */ - managed_proxy_t *mp = process_get_data(process); - - /* If we are still attached to the process, it is probably because our PT - * process crashed before we got to call process_set_data(p, NULL); */ - if (BUG(mp != NULL)) { - /* FIXME(ahf): Our process stopped without us having told it to stop - * (crashed). Should we restart it here? */ - mp->process = NULL; - process_set_data(process, NULL); - } - + /* Returning true here means that the process subsystem will take care of + * calling process_free() on our process_t. */ return true; } [View Less]

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
by nickm＠torproject.org 28 Feb '19

28 Feb '19

commit dc19d65c3bd02e4b406388939a9f57bac8010c2c Merge: aef6e6134 aa360b255 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:20:26 2019 -0500 Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0 changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 28 Feb '19

28 Feb '19

commit 35a2590f29dac06b829b07a54d3e3f3981fa9e44 Merge: a0ada65a3 dc19d65c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:22:03 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-)

1 0