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

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 25 Nov '19

25 Nov '19

commit eb7cf177e0cf4b58e3c2f217681afff63b46ed02 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 25 08:15:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- zh-TW/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh-TW/aboutTor.dtd b/zh-TW/aboutTor.dtd index aa55d0f4d..76ddf0f2d 100644 --- a/zh-TW/aboutTor.dtd +++ b/zh-TW/aboutTor.dtd @@ -33,5 +33,5 @@  <!ENTITY aboutTor.ey2019.mozilla "今日您捐款，Mozilla 也會捐出相同數額。"> -<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online."> -<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor"> +<!ENTITY aboutTor.ey2019.tracking "在網路世界中，追蹤、監視和審查無所不在。"> +<!ENTITY aboutTor.ey2019.takeback "透過 Tor 找回對網際網路的自主權">

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 25 Nov '19

25 Nov '19

commit 6cf3cd082b55a16e6cb85221eeab035f367019df Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 25 07:23:12 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ml.po | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contents+ml.po b/contents+ml.po index 5466a2bab..155237324 100644 --- a/contents+ml.po +++ b/contents+ml.po @@ -6634,7 +6634,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "![Onion icon](/static/images/onion-website.png)" -msgstr "" +msgstr "![ഉള്ളി ഐക്കൺ](/static/images/onion-website.png)" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -6649,7 +6649,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "![Green onion with a padlock](/static/images/padlock-onion.png)" -msgstr "" +msgstr "![പാഡ്‌ലോക്കിനൊപ്പം പച്ച ഉള്ളി](/static/images/padlock-onion.png)" #: https//support.torproject.org/onionservices/onionservices-4/ #: (content/onionservices/onionservices-4/contents+en.lrquestion.title) @@ -6682,7 +6682,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "![Image of a green onion](/static/images/green-onion.png)" -msgstr "" +msgstr "![പച്ച ഉള്ളിയുടെ ചിത്രം](/static/images/green-onion.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -6704,6 +6704,8 @@ msgid "" "![Image of a green onion with a lock](/static/images/green-onion-with-" "lock.png)" msgstr "" +"![ലോക്കിനൊപ്പം പച്ച ഉള്ളിയുടെ ചിത്രം](/static/images/green-onion-with-" +"lock.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -6723,6 +6725,8 @@ msgid "" "![Image of a grey onion with a red slash](/static/images/grey-onion-with-" "red-slash.png)" msgstr "" +"![ചുവന്ന സ്ലാഷുള്ള ചാര സവാളയുടെ ചിത്രം](/static/images/grey-onion-with-red-" +"slash.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 25 Nov '19

25 Nov '19

commit 4e141de07ff4164dd3ce99886b704562223a256c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 25 06:53:24 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ml.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+ml.po b/contents+ml.po index 5a300b8c2..5466a2bab 100644 --- a/contents+ml.po +++ b/contents+ml.po @@ -1,8 +1,8 @@ # Translators: # abinabraham <mail2abin(a)aol.com>, 2019 # erinm, 2019 -# ameer pb <ameerpbekm(a)gmail.com>, 2019 # Emma Peel, 2019 +# ameer pb <ameerpbekm(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: ameer pb <ameerpbekm(a)gmail.com>, 2019\n" "Language-Team: Malayalam (https://www.transifex.com/otf/teams/1519/ml/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2411,7 +2411,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "![Tor Browser Menu](/static/images/menu-new-identity.png)" -msgstr "" +msgstr "![ടോർ ബ്രൗസർ മെനു](/static/images/menu-new-identity.png)" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -2460,6 +2460,7 @@ msgstr "" #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "![New Circuit for this Site](/static/images/new-circuit-display.png)" msgstr "" +"![ഈ സൈറ്റിനായി പുതിയ സർക്യൂട്ട്](/static/images/new-circuit-display.png)" #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.title)

1 0

[tor/release-0.4.2] CodingStandards: Use consistent spacing
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit eb81704081b92738216f3fadb172f9f55b2b3201 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:50:15 2019 +1000 CodingStandards: Use consistent spacing * 2 newlines before ====== headers * 1 newline before ------ headers --- doc/HACKING/CodingStandards.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index e483dd74b..2c273910d 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -42,6 +42,7 @@ If you have changed build system components: - For example, if you have changed Makefiles, autoconf files, or anything else that affects the build system. + License issues ============== @@ -58,7 +59,6 @@ Some compatible licenses include: - CC0 Public Domain Dedication - How we use Git branches ======================= @@ -350,7 +350,6 @@ for more information about trunnel. For information on adding new trunnel code to Tor, see src/trunnel/README - Calling and naming conventions ------------------------------ @@ -458,7 +457,6 @@ to use it as a function callback), define it with a name like abc_free_(obj); } - Doxygen comment conventions ---------------------------

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 189287e7bc3c4cb5080c4b6c177121c6e69569f3 Merge: aa73b30df eb8170408 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:50:59 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 doc/HACKING/CodingStandards.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[tor/maint-0.4.2] CodingStandards: Use consistent spacing
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit eb81704081b92738216f3fadb172f9f55b2b3201 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:50:15 2019 +1000 CodingStandards: Use consistent spacing * 2 newlines before ====== headers * 1 newline before ------ headers --- doc/HACKING/CodingStandards.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index e483dd74b..2c273910d 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -42,6 +42,7 @@ If you have changed build system components: - For example, if you have changed Makefiles, autoconf files, or anything else that affects the build system. + License issues ============== @@ -58,7 +59,6 @@ Some compatible licenses include: - CC0 Public Domain Dedication - How we use Git branches ======================= @@ -350,7 +350,6 @@ for more information about trunnel. For information on adding new trunnel code to Tor, see src/trunnel/README - Calling and naming conventions ------------------------------ @@ -458,7 +457,6 @@ to use it as a function callback), define it with a name like abc_free_(obj); } - Doxygen comment conventions ---------------------------

1 0

[tor/master] CodingStandards: Use consistent spacing
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit eb81704081b92738216f3fadb172f9f55b2b3201 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:50:15 2019 +1000 CodingStandards: Use consistent spacing * 2 newlines before ====== headers * 1 newline before ------ headers --- doc/HACKING/CodingStandards.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index e483dd74b..2c273910d 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -42,6 +42,7 @@ If you have changed build system components: - For example, if you have changed Makefiles, autoconf files, or anything else that affects the build system. + License issues ============== @@ -58,7 +59,6 @@ Some compatible licenses include: - CC0 Public Domain Dedication - How we use Git branches ======================= @@ -350,7 +350,6 @@ for more information about trunnel. For information on adding new trunnel code to Tor, see src/trunnel/README - Calling and naming conventions ------------------------------ @@ -458,7 +457,6 @@ to use it as a function callback), define it with a name like abc_free_(obj); } - Doxygen comment conventions ---------------------------

1 0

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 68b6d852489157d94b14dcdc9ca729f5a7134c76 Merge: 03867b3dd eb8170408 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:52:10 2019 +1000 Merge branch 'maint-0.4.2' Merge tor_free() notes with whitespace fixes. doc/HACKING/CodingStandards.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --cc doc/HACKING/CodingStandards.md index 87ebbd2be,2c273910d..799972416 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@@ -498,10 -457,6 +497,9 @@@ to use it as a function callback), defi abc_free_(obj); } +When deallocating, don't say e.g. `if (x) tor_free(x)`. The convention is to +have deallocators do nothing when NULL pointer is passed. + - Doxygen comment conventions ---------------------------

1 0

[tor/release-0.4.1] tls: Log TLS read buffer length bugs once
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit ff304f3be7d6b5753d2066a0af9772b451f7f442 Author: teor <teor(a)torproject.org> Date: Fri Oct 4 12:33:34 2019 +1000 tls: Log TLS read buffer length bugs once Rather than filling the logs with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. --- changes/bug31939 | 3 +++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug31939 b/changes/bug31939 new file mode 100644 index 000000000..a36ea495d --- /dev/null +++ b/changes/bug31939 @@ -0,0 +1,3 @@ + o Minor bugfixes (tls, logging): + - Log TLS read buffer length bugs once, rather than filling the logs + with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index c176162c3..e92cb9163 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -68,9 +68,9 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) check_no_tls_errors(); - if (BUG(buf->datalen >= INT_MAX)) + IF_BUG_ONCE(buf->datalen >= INT_MAX) return -1; - if (BUG(buf->datalen >= INT_MAX - at_most)) + IF_BUG_ONCE(buf->datalen >= INT_MAX - at_most) return -1; while (at_most > total_read) {

1 0

[tor/release-0.4.1] hs-v3: Remove a BUG() caused by an acceptable race
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit ed57a04a65a59ee744910a9db22a81359dac3491 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 23 10:20:09 2019 -0400 hs-v3: Remove a BUG() caused by an acceptable race hs_client_purge_state() and hs_cache_clean_as_client() can remove a descriptor from the client cache with a NEWNYM or simply when the descriptor expires. Which means that for an INTRO circuit being established during that time, once it opens, we lookup the descriptor to get the IP object but hey surprised, no more descriptor. The approach here is minimalist that is accept the race and close the circuit since we can not continue. Before that, the circuit would stay opened and the client wait the SockTimeout. Fixers #28970. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket28970 | 6 ++++++ src/feature/hs/hs_client.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/ticket28970 b/changes/ticket28970 new file mode 100644 index 000000000..138c575fc --- /dev/null +++ b/changes/ticket28970 @@ -0,0 +1,6 @@ + o Minor bugfixes (clietn, hidden service v3): + - Fix a BUG() assertion that occurs within a very small race window between + a client intro circuit opens and its descriptor that gets cleaned up from + the cache. The circuit is now closed which will trigger a re-fetch of the + descriptor and continue the HS connection. Fixes bug 28970; bugfix on + 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 2a5765aec..fd2d26645 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -672,8 +672,12 @@ setup_intro_circ_auth_key(origin_circuit_t *circ) tor_assert(circ); desc = hs_cache_lookup_as_client(&circ->hs_ident->identity_pk); - if (BUG(desc == NULL)) { - /* Opening intro circuit without the descriptor is no good... */ + if (desc == NULL) { + /* There is a very small race window between the opening of this circuit + * and the client descriptor cache that gets purged (NEWNYM) or the + * cleaned up because it expired. Mark the circuit for close so a new + * descriptor fetch can occur. */ + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); goto end; }

1 0