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

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 14 Feb '20

14 Feb '20

commit a010dbf94c061d17b6c0225c1b3e52ca0df84b5e Merge: 98899f20a a79841fd8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:17:16 2020 -0500 Merge branch 'maint-0.4.3' src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'ticket33290_v2_042' into maint-0.4.3
by nickm＠torproject.org 14 Feb '20

14 Feb '20

commit a79841fd83b6d800796c04855841170c364ff2a9 Merge: 6c5307e42 393bbd823 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:16:22 2020 -0500 Merge branch 'ticket33290_v2_042' into maint-0.4.3 src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
by nickm＠torproject.org 14 Feb '20

14 Feb '20

commit 393bbd823ec32f8fb3636391945e6c6663ff1408 Merge: fd1686c7d c1649ab01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:16:01 2020 -0500 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Wipe the entire hashent structure, not just the first sizeof(void*)
by nickm＠torproject.org 14 Feb '20

14 Feb '20

commit c1649ab01522f6258fc2555869cbf3abb7535515 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:15:37 2020 -0500 Wipe the entire hashent structure, not just the first sizeof(void*) --- src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index 72f6ba662..4b19a12e3 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -978,7 +978,7 @@ circuitmux_detach_circuit,(circuitmux_t *cmux, circuit_t *circ)) /* Wipe and free the hash entry */ // This isn't sensitive, but we want to be sure to know if we're accessing // this accidentally. - memwipe(hashent, 0xef, sizeof(hashent)); + memwipe(hashent, 0xef, sizeof(*hashent)); tor_free(hashent); } }

1 0

[translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
by translation＠torproject.org 14 Feb '20

14 Feb '20

commit 41373fd02c9bb644bcd87ce525b13271137c28ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 13:17:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ru/messages.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ru/messages.json b/ru/messages.json index 13a7926a21..c36e88364a 100644 --- a/ru/messages.json +++ b/ru/messages.json @@ -15,10 +15,10 @@ "message": "Number of users currently connected: $1" }, "popupStatusReady": { - "message": "Your Snowflake is ready to help users circumvent censorship" + "message": "Ваш Snowflake готов помочь пользователям обойти цензуру" }, "popupWebRTCOff": { - "message": "WebRTC feature is not detected." + "message": "WebRTC не обнаружен." }, "popupBridgeUnreachable": { "message": "Не удалось подключиться к мосту." @@ -54,7 +54,7 @@ "message": "Install in Chrome" }, "reportingBugs": { - "message": "Reporting Bugs" + "message": "Сообщить об ошибке" }, "fileBug": { "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug. To do so, you will have to," @@ -69,12 +69,12 @@ "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug. Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> to let us know how which part of the Snowflake system is experiencing problems." }, "embed": { - "message": "Embed" + "message": "Встроить" }, "possible": { - "message": "It is now possible to embed the Snowflake badge on any website:" + "message": "Можно вставить значок Snowflake на сайт:" }, "looksLike": { - "message": "Which looks like this:" + "message": "Выглядеть будет примерно так:" } }

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 14 Feb '20

14 Feb '20

commit 70bf1771b0587eb8246d8102e9cc17804925d831 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 13:17:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ru/messages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/messages.json b/ru/messages.json index 18bcfc6840..a082295700 100644 --- a/ru/messages.json +++ b/ru/messages.json @@ -54,7 +54,7 @@ "message": "Установить в Chrome" }, "reportingBugs": { - "message": "Сообщить об ошибках" + "message": "Сообщить об ошибке" }, "fileBug": { "message": "Если у вас возникли проблемы с Snowflake в качестве клиента или прокси-сервера, пожалуйста, отправьте отчет об ошибке. Для этого вам нужно," @@ -72,9 +72,9 @@ "message": "Встроить" }, "possible": { - "message": "Теперь можно вставить значок Snowflake на любой сайт:" + "message": "Можно вставить значок Snowflake на сайт:" }, "looksLike": { - "message": "Который выглядит вот так:" + "message": "Выглядеть будет примерно так:" } }

1 0

[tor/maint-0.4.3] Wipe the entire hashent structure, not just the first sizeof(void*)
by nickm＠torproject.org 14 Feb '20

14 Feb '20

commit c1649ab01522f6258fc2555869cbf3abb7535515 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:15:37 2020 -0500 Wipe the entire hashent structure, not just the first sizeof(void*) --- src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index 72f6ba662..4b19a12e3 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -978,7 +978,7 @@ circuitmux_detach_circuit,(circuitmux_t *cmux, circuit_t *circ)) /* Wipe and free the hash entry */ // This isn't sensitive, but we want to be sure to know if we're accessing // this accidentally. - memwipe(hashent, 0xef, sizeof(hashent)); + memwipe(hashent, 0xef, sizeof(*hashent)); tor_free(hashent); } }

1 0

[tor/maint-0.4.3] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
by nickm＠torproject.org 14 Feb '20

14 Feb '20

commit 393bbd823ec32f8fb3636391945e6c6663ff1408 Merge: fd1686c7d c1649ab01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:16:01 2020 -0500 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'ticket33290_v2_042' into maint-0.4.3
by nickm＠torproject.org 14 Feb '20

14 Feb '20

commit a79841fd83b6d800796c04855841170c364ff2a9 Merge: 6c5307e42 393bbd823 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:16:22 2020 -0500 Merge branch 'ticket33290_v2_042' into maint-0.4.3 src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
by translation＠torproject.org 14 Feb '20

14 Feb '20

commit 07e7681326aac2ea1e3560e8d2fdec88ac441973 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 12:47:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ru/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ru/messages.json b/ru/messages.json index 0d638c7d48..13a7926a21 100644 --- a/ru/messages.json +++ b/ru/messages.json @@ -3,13 +3,13 @@ "message": "Snowflake is a WebRTC pluggable transport for Tor." }, "popupEnabled": { - "message": "Enabled" + "message": "Вкл / выкл" }, "popupLearnMore": { - "message": "Learn more" + "message": "Узнать больше" }, "popupStatusOff": { - "message": "Snowflake is off" + "message": "Snowflake выключен" }, "popupStatusOn": { "message": "Number of users currently connected: $1" @@ -21,7 +21,7 @@ "message": "WebRTC feature is not detected." }, "popupBridgeUnreachable": { - "message": "Could not connect to the bridge." + "message": "Не удалось подключиться к мосту." }, "popupDescOn": { "message": "Number of users your Snowflake has helped circumvent censorship in the last 24 hours: $1"

1 0