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

[tor/master] Merge branch 'bug32765_041' into bug32771_042
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit df5c81fec0f25a684f1f7e68e80abcde5402d3ef Merge: bd11fb109 1b619a627 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:27:18 2019 -0500 Merge branch 'bug32765_041' into bug32771_042 changes/ticket32765 | 4 ++++ src/lib/log/util_bug.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 48f734178362d3a8b490a23ceff202a2027a27fc Merge: 13216f848 6da989cfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:24:01 2020 -0500 Merge branch 'maint-0.4.2' changes/bug32771 | 4 ++++ changes/ticket32765 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- src/lib/log/util_bug.h | 6 ++++-- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 6da989cfe8323418ee1f888287d0d65b21b60c1d Merge: 2d8d6d1eb b4977d1aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:20:57 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2 changes/bug32771 | 4 ++++ changes/ticket32765 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- src/lib/log/util_bug.h | 6 ++++-- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/master] Fix formatting in tor_assertf() message in struct_check_magic().
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit b4977d1aa9366cdb1475664bcf1486fbfdf5a166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:31:23 2019 -0500 Fix formatting in tor_assertf() message in struct_check_magic(). Closes 32771; bugfix on 0.4.2.1-alpha. --- changes/bug32771 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug32771 b/changes/bug32771 new file mode 100644 index 000000000..606bcf4be --- /dev/null +++ b/changes/bug32771 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging, crash): + - Avoid a possible crash when trying to log a (fatal) assertion failure + about mismatched magic numbers in configuration objects. Fixes bug 32771; + bugfix on 0.4.2.1-alpha. diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index de678d18c..7a3b8c7df 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -53,8 +53,8 @@ struct_check_magic(const void *object, const struct_magic_decl_t *decl) const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset); tor_assertf(*ptr == decl->magic_val, "Bad magic number on purported %s object. " - "Expected %"PRIu32"x but got "PRIu32"x.", - decl->magic_val, *ptr); + "Expected %"PRIu32"x but got %"PRIu32"x.", + decl->typename, decl->magic_val, *ptr); } /**

1 0

[tor/release-0.4.2] Use CHECK_PRINTF() for printf-like functions in util_bug.h
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 1b619a627ca1ee11d1680dc56e90e9fc1af2ddb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:14:13 2019 -0500 Use CHECK_PRINTF() for printf-like functions in util_bug.h --- changes/ticket32765 | 4 ++++ src/lib/log/util_bug.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/ticket32765 b/changes/ticket32765 new file mode 100644 index 000000000..a9663a5df --- /dev/null +++ b/changes/ticket32765 @@ -0,0 +1,4 @@ + o Minor bugfixes (correctness checks): + - Use GCC/Clang's printf-checking feature to make sure that + tor_assertf() arguments are correctly typed. Fixes bug 32765; + bugfix on 0.4.1.1-alpha. diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 546ae1e3e..993a4e3ab 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -242,10 +242,12 @@ void tor_assertion_failed_(const char *fname, unsigned int line, const char *func, const char *expr, - const char *fmt, ...); + const char *fmt, ...) + CHECK_PRINTF(5,6); void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, - int once, const char *fmt, ...); + int once, const char *fmt, ...) + CHECK_PRINTF(6,7); void tor_abort_(void) ATTR_NORETURN;

1 0

[tor/release-0.4.2] Fix formatting in tor_assertf() message in struct_check_magic().
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit b4977d1aa9366cdb1475664bcf1486fbfdf5a166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:31:23 2019 -0500 Fix formatting in tor_assertf() message in struct_check_magic(). Closes 32771; bugfix on 0.4.2.1-alpha. --- changes/bug32771 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug32771 b/changes/bug32771 new file mode 100644 index 000000000..606bcf4be --- /dev/null +++ b/changes/bug32771 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging, crash): + - Avoid a possible crash when trying to log a (fatal) assertion failure + about mismatched magic numbers in configuration objects. Fixes bug 32771; + bugfix on 0.4.2.1-alpha. diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index de678d18c..7a3b8c7df 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -53,8 +53,8 @@ struct_check_magic(const void *object, const struct_magic_decl_t *decl) const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset); tor_assertf(*ptr == decl->magic_val, "Bad magic number on purported %s object. " - "Expected %"PRIu32"x but got "PRIu32"x.", - decl->magic_val, *ptr); + "Expected %"PRIu32"x but got %"PRIu32"x.", + decl->typename, decl->magic_val, *ptr); } /**

1 0

[tor/release-0.4.2] Merge branch 'bug32765_041' into bug32771_042
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit df5c81fec0f25a684f1f7e68e80abcde5402d3ef Merge: bd11fb109 1b619a627 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:27:18 2019 -0500 Merge branch 'bug32765_041' into bug32771_042 changes/ticket32765 | 4 ++++ src/lib/log/util_bug.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit f1173a63fb905922a2ef13588a1999d85a24a9f6 Merge: 77188ef36 6da989cfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:24:01 2020 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32771 | 4 ++++ changes/ticket32765 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- src/lib/log/util_bug.h | 6 ++++-- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 6da989cfe8323418ee1f888287d0d65b21b60c1d Merge: 2d8d6d1eb b4977d1aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:20:57 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2 changes/bug32771 | 4 ++++ changes/ticket32765 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- src/lib/log/util_bug.h | 6 ++++-- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit 6a4f3d047ca32e910b5d78302cc271cedf6f38d3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 18:25:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+de.po | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/contents+de.po b/contents+de.po index 67398ae686..67e2e5afc3 100644 --- a/contents+de.po +++ b/contents+de.po @@ -3209,6 +3209,11 @@ msgid "" "[Firewalled](https://2019.www.torproject.org/docs/faq.html.en#FirewallPorts)" " clients for how to restrict what ports your Tor will try to access." msgstr "" +"Falls dein Proxy es nur erlaubt sich mit bestimmten Punkten zu verbinden, " +"schau dir den Eintrag über [Clients mit " +"Firewall](https://2019.www.torproject.org/docs/faq.html.en#FirewallPorts) " +"an, um zu lernen, wie du beschränkst, auf welche Ports deine Tor-" +"Installation versuchen wird zuzugreifen," #: https//support.torproject.org/tbb/tbb-5/ #: (content/tbb/tbb-5/contents+en.lrquestion.title) @@ -3391,6 +3396,8 @@ msgid "" "What is the difference between using Tor Browser and 'Incognito mode' or " "private tabs?" msgstr "" +"Was ist der Unterschied zwischen Tor Browser und \"Inkognitomodus\", oder " +"privaten Tabs?" #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3398,6 +3405,8 @@ msgid "" "While the names may imply otherwise, 'Incognito mode' and 'private tabs' do " "not make you anonymous on the Internet." msgstr "" +"Auch wenn die Namen vielleicht etwas anderes suggerieren, \"Inkognitomodus\"" +" und \"private Tabs\" machen dich nicht anonym im Internet." #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3406,6 +3415,10 @@ msgid "" "session after they are closed, but have no measures in place to hide your " "activity or digital fingerprint online." msgstr "" +"Sie entfernen alle Informationen auf deiner Maschine, die etwas mit der " +"Browser-Sitzung zu tun haben, nachdem sie geschlossen werden, aber sie haben" +" keine Mittel um deine Aktivität oder deinen digitalen Fingerabdruck online " +"zu verstecken." #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3413,6 +3426,8 @@ msgid "" "This means that an observer can collect your traffic just as easily as any " "regular browser." msgstr "" +"Das bedeutet, dass ein Beobachter deinen Datenverkehr so einfach " +"mitschreiben kann, wie bei jedem normalen Browser." #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3422,6 +3437,11 @@ msgid "" " used to fingerprint activity across the web, allowing for a truly private " "browsing session that's fully obfuscated from end-to-end." msgstr "" +"Tor Browser bietet alle diese amnestischen Funktionen von privaten Tabs, " +"während er die ursprüngliche IP, Surfgewohnheiten und Details über ein " +"Gerät, die dafür benutzt werden könnten es im Netz wiederzuerkennen, " +"verbirgt. Was wirklich private Sitzungen erlaubt, welche vollständig von " +"Ende zu Ende verschleiert sind." #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3431,17 +3451,23 @@ msgid "" "Browsing](https://support.mozilla.org/en-US/kb/common-myths-about-private-" "browsing)." msgstr "" +"Für mehr Informationen über die Limitationen des Inkognitomoduses und der " +"privaten Tabs, schau dir Mozilla's Artikel über [gewöhnliche Mythen über " +"privates Browsing](https://support.mozilla.org/en-US/kb/common-myths-about-" +"private-browsing) an." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.title) msgid "I'm supposed to \"edit my torrc\". What does that mean?" -msgstr "" +msgstr "Ich soll \"meine torrc bearbeiten\". Was bedeutet das?" #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) msgid "" "WARNING: Do NOT follow random advice instructing you to edit your `torrc`!" msgstr "" +"WARNUNG: Folge NICHT irgendwelchen Anleitungen, um deine \"torrc\" zu " +"editieren!" #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)

1 0