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

[tor/release-0.3.1] Merge remote-tracking branch 'teor/bug22502' into maint-0.3.1
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit 1c0459f19a9abf3b3c33ce28923fb567d5c5dfe1 Merge: eff5e29 7d535ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 10:04:16 2017 -0400 Merge remote-tracking branch 'teor/bug22502' into maint-0.3.1 src/common/compress.c | 28 ++++++++++++++++++++++++-- src/common/compress_zstd.c | 20 +++++++++++++++---- src/or/directory.c | 49 ++++++++++++++++++++++++++++++---------------- 3 files changed, 74 insertions(+), 23 deletions(-)

1 0

[tor/release-0.3.1] Move a comment to the right place in tor_zstd_compress_process
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit 7605bd528e64898d8d62fd89f414185f465d9999 Author: teor <teor2345(a)gmail.com> Date: Fri Jun 16 09:45:58 2017 +1000 Move a comment to the right place in tor_zstd_compress_process Part of #22502 --- src/common/compress_zstd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index 99d05c3..9143615 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -312,6 +312,8 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state, return TOR_COMPRESS_ERROR; } + // ZSTD_flushStream returns 0 if the frame is done, or >0 if it + // is incomplete. if (retval > 0) return TOR_COMPRESS_BUFFER_FULL; } @@ -339,8 +341,6 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state, return TOR_COMPRESS_DONE; } else { - // ZSTD_flushStream returns 0 if the frame is done, or >0 if it - // is incomplete. return (retval == 0) ? TOR_COMPRESS_DONE : TOR_COMPRESS_OK; }

1 0

[tor/release-0.3.1] Add extra logging during compression and decompression
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit 7d535ea9d3a0b2706392425c13feac760dfccdee Author: teor <teor2345(a)gmail.com> Date: Fri Jun 16 09:48:18 2017 +1000 Add extra logging during compression and decompression This helps diagnose failures. Part of #22502. --- src/common/compress.c | 13 ++++++++++++- src/or/directory.c | 49 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/common/compress.c b/src/common/compress.c index ee9de6a..e65894d 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -102,8 +102,13 @@ tor_compress_impl(int compress, stream = tor_compress_new(compress, method, compression_level); - if (stream == NULL) + if (stream == NULL) { + log_warn(LD_GENERAL, "NULL stream while %scompressing", + compress?"":"de"); + log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", + method, compression_level, in_len); return -1; + } size_t in_len_orig = in_len; size_t out_remaining, out_alloc; @@ -137,6 +142,12 @@ tor_compress_impl(int compress, break; case TOR_COMPRESS_OK: if (compress || complete_only) { + log_fn(protocol_warn_level, LD_PROTOCOL, + "Unexpected %s while %scompressing", + complete_only?"end of input":"result", + compress?"":"de"); + log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", + method, compression_level, in_len); goto err; } else { if (in_len != 0) { diff --git a/src/or/directory.c b/src/or/directory.c index acd694f..ecd9811 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2327,30 +2327,40 @@ connection_dir_client_reached_eof(dir_connection_t *conn) plausible = body_is_plausible(body, body_len, conn->base_.purpose); if (compression != NO_METHOD || !plausible) { + int severity = LOG_DEBUG; char *new_body = NULL; size_t new_len = 0; + const char *description1, *description2; + int want_to_try_both = 0; + int tried_both = 0; compress_method_t guessed = detect_compression_method(body, body_len); - if (compression == UNKNOWN_METHOD || guessed != compression) { - /* Tell the user if we don't believe what we're told about compression.*/ - const char *description1, *description2; - description1 = compression_method_get_human_name(compression); + description1 = compression_method_get_human_name(compression); - if (BUG(description1 == NULL)) - description1 = compression_method_get_human_name(UNKNOWN_METHOD); + if (BUG(description1 == NULL)) + description1 = compression_method_get_human_name(UNKNOWN_METHOD); - if (guessed == UNKNOWN_METHOD && !plausible) - description2 = "confusing binary junk"; - else - description2 = compression_method_get_human_name(guessed); + if (guessed == UNKNOWN_METHOD && !plausible) + description2 = "confusing binary junk"; + else + description2 = compression_method_get_human_name(guessed); - log_info(LD_HTTP, "HTTP body from server '%s:%d' was labeled as %s, " - "but it seems to be %s.%s", - conn->base_.address, conn->base_.port, description1, - description2, - (compression>0 && guessed>0)?" Trying both.":""); + /* Tell the user if we don't believe what we're told about compression.*/ + want_to_try_both = (compression == UNKNOWN_METHOD || + guessed != compression); + if (want_to_try_both) { + severity = LOG_INFO; } + tor_log(severity, LD_HTTP, + "HTTP body from server '%s:%d' was labeled as %s, " + "%s it seems to be %s.%s", + conn->base_.address, conn->base_.port, description1, + guessed != compression?"but":"and", + description2, + (compression>0 && guessed>0 && want_to_try_both)? + " Trying both.":""); + /* Try declared compression first if we can. * tor_compress_supports_method() also returns true for NO_METHOD. * Ensure that the server is not sending us data compressed using a @@ -2376,14 +2386,19 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } if (!new_body && tor_compress_supports_method(guessed) && - compression != guessed) + compression != guessed) { tor_uncompress(&new_body, &new_len, body, body_len, guessed, !allow_partial, LOG_PROTOCOL_WARN); + tried_both = 1; + } /* If we're pretty sure that we have a compressed directory, and * we didn't manage to uncompress it, then warn and bail. */ if (!plausible && !new_body) { log_fn(LOG_PROTOCOL_WARN, LD_HTTP, - "Unable to decompress HTTP body (server '%s:%d').", + "Unable to decompress HTTP body (tried %s%s%s, server '%s:%d').", + description1, + tried_both?" and ":"", + tried_both?description2:"", conn->base_.address, conn->base_.port); rv = -1; goto done;

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit 3638550a6b57fa16b06b52fc8380b50284e8a0eb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 10:46:54 2017 +0000 Update translations for tails-iuk_completed --- da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.po b/da.po index 9244546..b8188a8 100644 --- a/da.po +++ b/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-04-18 12:13+0200\n" -"PO-Revision-Date: 2017-06-20 09:48+0000\n" +"PO-Revision-Date: 2017-06-20 10:27+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -115,7 +115,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "Du bør opgradere til %{name}s %{version}s.\n\nFor mere information om denne nye udgave, se %{details_url}s\n\nDet anbefales at lukke alle åbne applikationer under installationen.\nAt downloade opgraderingen kan tage fra nogle minutter til få timer.\nNetworking vil blive slået fra efter download af opgraderingen.\n\nDownloadstørrelse: %{size}s\n\nVil du at opgradere nu?" +msgstr "Du bør opgradere til %{name}s %{version}s.\n\nFor mere information om denne nye version, se %{details_url}s\n\nDet anbefales at lukke alle åbne applikationer under installationen.\nAt downloade opgraderingen kan tage fra nogle minutter til få timer.\nNetworking vil blive slået fra efter download af opgraderingen.\n\nDownloadstørrelse: %{size}s\n\nVil du at opgradere nu?" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade available"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit 071a77b7d480d310b774198f186ca4033203017d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 10:46:50 2017 +0000 Update translations for tails-iuk --- da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.po b/da.po index 9244546..b8188a8 100644 --- a/da.po +++ b/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-04-18 12:13+0200\n" -"PO-Revision-Date: 2017-06-20 09:48+0000\n" +"PO-Revision-Date: 2017-06-20 10:27+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -115,7 +115,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "Du bør opgradere til %{name}s %{version}s.\n\nFor mere information om denne nye udgave, se %{details_url}s\n\nDet anbefales at lukke alle åbne applikationer under installationen.\nAt downloade opgraderingen kan tage fra nogle minutter til få timer.\nNetworking vil blive slået fra efter download af opgraderingen.\n\nDownloadstørrelse: %{size}s\n\nVil du at opgradere nu?" +msgstr "Du bør opgradere til %{name}s %{version}s.\n\nFor mere information om denne nye version, se %{details_url}s\n\nDet anbefales at lukke alle åbne applikationer under installationen.\nAt downloade opgraderingen kan tage fra nogle minutter til få timer.\nNetworking vil blive slået fra efter download af opgraderingen.\n\nDownloadstørrelse: %{size}s\n\nVil du at opgradere nu?" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade available"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit 954bbccd8134f84e5e4403da1aebe07b16988d91 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 10:46:25 2017 +0000 Update translations for tails-misc_completed --- da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da.po b/da.po index 6fff113..ace9818 100644 --- a/da.po +++ b/da.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-05 11:57+0200\n" -"PO-Revision-Date: 2017-06-20 10:03+0000\n" +"PO-Revision-Date: 2017-06-20 10:27+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -100,14 +100,14 @@ msgstr "Om Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:35 msgid "The Amnesic Incognito Live System" -msgstr "Det Hukommelsestabende Inkognito Live System" +msgstr "The Amnesic Incognito Live System" #: config/chroot_local-includes/usr/local/bin/tails-about:36 #, python-format msgid "" "Build information:\n" "%s" -msgstr "Information om denne udgave:\n%s" +msgstr "Byggeinformation:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:54 msgid "not available"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit ca76b6f047469e9a7ccf17aefee6f985c7804ac2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 10:46:21 2017 +0000 Update translations for tails-misc --- da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da.po b/da.po index 6fff113..ace9818 100644 --- a/da.po +++ b/da.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-05 11:57+0200\n" -"PO-Revision-Date: 2017-06-20 10:03+0000\n" +"PO-Revision-Date: 2017-06-20 10:27+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -100,14 +100,14 @@ msgstr "Om Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:35 msgid "The Amnesic Incognito Live System" -msgstr "Det Hukommelsestabende Inkognito Live System" +msgstr "The Amnesic Incognito Live System" #: config/chroot_local-includes/usr/local/bin/tails-about:36 #, python-format msgid "" "Build information:\n" "%s" -msgstr "Information om denne udgave:\n%s" +msgstr "Byggeinformation:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:54 msgid "not available"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit 2b34d3c9e00efa7daf31d7dc6c2ba424bd841771 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 10:45:37 2017 +0000 Update translations for liveusb-creator_completed --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index ee98844..92ea1a3 100644 --- a/da/da.po +++ b/da/da.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-10 07:50+0200\n" -"PO-Revision-Date: 2017-06-20 09:48+0000\n" +"PO-Revision-Date: 2017-06-20 10:22+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -328,7 +328,7 @@ msgstr "Tails-installationsprogram" #: ../tails_installer/gui.py:440 msgid "No device suitable to install Tails could be found" -msgstr "Der kunne ikke findes noget egnet enhed til installation af Tails" +msgstr "Der kunne ikke findes nogen egnet enhed til installation af Tails" #: ../tails_installer/gui.py:442 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit 4919bb8023f0751795e7e3a834bd2f4bf8c1d586 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 10:45:30 2017 +0000 Update translations for liveusb-creator --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index ee98844..92ea1a3 100644 --- a/da/da.po +++ b/da/da.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-10 07:50+0200\n" -"PO-Revision-Date: 2017-06-20 09:48+0000\n" +"PO-Revision-Date: 2017-06-20 10:22+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -328,7 +328,7 @@ msgstr "Tails-installationsprogram" #: ../tails_installer/gui.py:440 msgid "No device suitable to install Tails could be found" -msgstr "Der kunne ikke findes noget egnet enhed til installation af Tails" +msgstr "Der kunne ikke findes nogen egnet enhed til installation af Tails" #: ../tails_installer/gui.py:442 #, python-format

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 20 Jun '17

20 Jun '17

commit 00d0f528c381cdcecefa142dd9f4cea2efa80a67 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 20 10:17:00 2017 +0000 Update translations for tails-iuk_completed --- da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da.po b/da.po index 6703317..9244546 100644 --- a/da.po +++ b/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-04-18 12:13+0200\n" -"PO-Revision-Date: 2017-06-20 09:46+0000\n" +"PO-Revision-Date: 2017-06-20 09:48+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -171,7 +171,7 @@ msgstr "Fejl under download af opgradering" msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "Outputfilen \"%{output_file}s\" eksisterer ikke, men tails-iuk-get-target-file meldte ingen fejl. Rapporter venligst fejlen." +msgstr "Outputfilen \"%{output_file}s\" eksisterer ikke, men tails-iuk-get-target-file meldte ingen fejl. Rapportér venligst en fejl." #: ../lib/Tails/IUK/Frontend.pm:560 msgid "Error while creating temporary downloading directory" @@ -186,7 +186,7 @@ msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "Kunne ikke vælge en downloadserver.\n\nDette burde ikke ske. Rapporter venligst fejlen." +msgstr "Kunne ikke vælge en downloadserver.\n\nDette burde ikke ske. Rapportérr venligst en fejl." #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server"

1 0