June 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b Merge: eef77227e b0bfee8c7 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 21cf91ee2c3bb664253cc096c1aaa45fd491594e Merge: feddba6f8 c57896a76 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 90f38a3c26290ce945eab7ca1ed6ade2046db282 Merge: 76e04a832 21cf91ee2 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.4.4' into release-0.4.4

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b Merge: eef77227e b0bfee8c7 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742 Merge: 0c0214bcc 4f6901d7c Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:35:13 2020 +0000 Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5 changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] When initializing pthreads, always set the main thread.
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 4f6901d7cc827e5bfa98467b7a568f725ce7fa9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 09:37:12 2020 -0500 When initializing pthreads, always set the main thread. Fixes bug 32884. This is a bugfix on 0.3.3.1-alpha, when we started allowing restart-in-process with tor_api.h. --- changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug32884 b/changes/bug32884 new file mode 100644 index 000000000..9ab1d2446 --- /dev/null +++ b/changes/bug32884 @@ -0,0 +1,5 @@ + o Minor bugfixes (embedded Tor): + - When starting Tor any time after the first time in a process, register + the thread in which it is running as the main thread. Previously, we + only did this on Windows, which could lead to bugs like 23081 on + non-Windows platforms. Fixes bug 32884; bugfix on 0.3.3.1-alpha. diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c index 05efe9cfd..6f7ecd17d 100644 --- a/src/lib/thread/compat_pthreads.c +++ b/src/lib/thread/compat_pthreads.c @@ -265,6 +265,6 @@ tor_threads_init(void) pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED); tor_assert(ret2 == 0); threads_initialized = 1; - set_main_thread(); } + set_main_thread(); }

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 30 Jun '20

30 Jun '20

commit 20e0a999e89859d8511604bf27f626502002cbe9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 12:15:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.po b/es.po index 5f6084b70d..bfa76d162d 100644 --- a/es.po +++ b/es.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-30 11:45+0000\n" +"PO-Revision-Date: 2020-06-30 11:46+0000\n" "Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -669,7 +669,7 @@ msgstr "Ajustes en la pantalla de bienvenida" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "Language, administration password, and additional settings" -msgstr "" +msgstr "Idioma, contraseña de administración y configuración adicional" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Browser Bookmarks"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 30 Jun '20

30 Jun '20

commit 2cd0489d91c976eb0321805642b321beb3b924ef Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 11:46:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.po b/es.po index 74e1d3dc5d..54204240dc 100644 --- a/es.po +++ b/es.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 00:35+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-06-30 11:46+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 30 Jun '20

30 Jun '20

commit d2628331c1552e1fffc7e29f2e4dac313c8ee5a9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 11:45:48 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index 1ff373f25c..5f6084b70d 100644 --- a/es.po +++ b/es.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 00:35+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-06-30 11:45+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -665,7 +665,7 @@ msgstr "Mantener archivos almacenados en la capeta 'Persistent'" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Settings on the Welcome Screen" -msgstr "" +msgstr "Ajustes en la pantalla de bienvenida" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "Language, administration password, and additional settings"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 30 Jun '20

30 Jun '20

commit 7b432db6cdd3d8643db9fe6675af529c8380fdd9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 10:16:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he.po b/he.po index 9bbe51f1db..5b78482b65 100644 --- a/he.po +++ b/he.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-30 09:41+0000\n" +"PO-Revision-Date: 2020-06-30 09:47+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0