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

[translation/tails-openpgp-applet] https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-applet
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 94789161cdb12fffdd8c88c1017e4e0741dff794 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:16:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-applet --- sw/openpgp-applet.pot | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sw/openpgp-applet.pot b/sw/openpgp-applet.pot index 7e67c93d61..5f09102ad8 100644 --- a/sw/openpgp-applet.pot +++ b/sw/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2020-10-07 11:44+0000\n" +"PO-Revision-Date: 2020-10-07 12:13+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -56,23 +56,23 @@ msgstr "_Fungua kihariri ujumbe" #: bin/openpgp-applet:292 msgid "The clipboard does not contain valid input data." -msgstr "" +msgstr "Klipubodi haina kiingizio cha data sahihi." #: bin/openpgp-applet:337 bin/openpgp-applet:339 bin/openpgp-applet:341 msgid "Unknown Trust" -msgstr "" +msgstr "Uaminifu usiojulikana" #: bin/openpgp-applet:343 msgid "Marginal Trust" -msgstr "" +msgstr "Uaminifu wenye mpaka" #: bin/openpgp-applet:345 msgid "Full Trust" -msgstr "" +msgstr "uaminifu kamili" #: bin/openpgp-applet:347 msgid "Ultimate Trust" -msgstr "" +msgstr "Uaminifu wa mwisho" #: bin/openpgp-applet:400 msgid "Name" @@ -80,7 +80,7 @@ msgstr "Jina" #: bin/openpgp-applet:401 msgid "Key ID" -msgstr "" +msgstr "Ufunguo tambuzi" #: bin/openpgp-applet:402 msgid "Status" @@ -93,26 +93,26 @@ msgstr "Alama za kidole" #: bin/openpgp-applet:436 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Kitambulisho cha Mtumiaji" +msgstr[1] "Mtumiaji wa kitambulisho" #: bin/openpgp-applet:465 msgid "None (Don't sign)" -msgstr "" +msgstr "Haipo (usijiunge)" #: bin/openpgp-applet:528 msgid "Select recipients:" -msgstr "" +msgstr "Chagua wapokeaji;" #: bin/openpgp-applet:536 msgid "Hide recipients" -msgstr "" +msgstr "Ficha wapokeaji" #: bin/openpgp-applet:539 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "" +msgstr "Ficha vitambulisho vyote vya wapokeaji wa meseji ficho. La sivyo mtumiaji yeyote anaweza akaona wapokeaji wa meseji ficho." #: bin/openpgp-applet:545 msgid "Sign message as:" @@ -120,11 +120,11 @@ msgstr "" #: bin/openpgp-applet:549 msgid "Choose keys" -msgstr "" +msgstr "Chagua funguo" #: bin/openpgp-applet:589 msgid "Do you trust these keys?" -msgstr "" +msgstr "Unaziamini funguo hizi?" #: bin/openpgp-applet:592 msgid "The following selected key is not fully trusted:"

1 0

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

07 Oct '20

commit 504cbcc35f769caf3cbe2e8c2537f39613b9d32f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:16:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sw.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw.po b/sw.po index a63b1cfa18..a7e40a2a29 100644 --- a/sw.po +++ b/sw.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-07 11:45+0000\n" +"PO-Revision-Date: 2020-10-07 12:14+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n"

1 0

[tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit a49373844cd3c7047759244a6a5c103304d88a7b Merge: 9587512578 98e14720b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3

1 0

[tor/release-0.4.4] Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 98e14720b5bc30a7cf9af15a1f618ddce0922ef9 Merge: 968b6c30c1 165a92e33f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:14:46 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5 changes/log_32868 | 4 +++ src/feature/nodelist/node_select.c | 54 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 361a4425cf1e2b7cf72da1d07274039893b3d403 Merge: d455b68909 a44bcc309d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:16:20 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit a44bcc309d3dea5f61306b6f2b2c55f85ce4382b Merge: c65f4eaf06 a49373844c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 98e14720b5bc30a7cf9af15a1f618ddce0922ef9 Merge: 968b6c30c1 165a92e33f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:14:46 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5 changes/log_32868 | 4 +++ src/feature/nodelist/node_select.c | 54 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.5] Replace an assertion with a check-and-log
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 165a92e33f3dc6123c1cd3326c6b183ac1c1d778 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 14 13:16:39 2020 -0500 Replace an assertion with a check-and-log We hit this assertion with bug 32868, but I'm stymied figuring out how we wound up with a routerstatus like this. This patch is a diagnostic to attempt to figure out what is going on, and to avoid a crash in the meantime. --- changes/log_32868 | 4 +++ src/feature/nodelist/node_select.c | 54 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/changes/log_32868 b/changes/log_32868 new file mode 100644 index 0000000000..34476078b2 --- /dev/null +++ b/changes/log_32868 @@ -0,0 +1,4 @@ + o Minor features (debugging, directory system): + - Don't crash when we find a non-guard with a guard-fraction value set. + Instead, log a bug warning, in an attempt to figure out how this + happened. Diagnostic for ticket 32868. diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index e31abb247f..7b9e241e5b 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -540,6 +540,51 @@ bridge_get_advertised_bandwidth_bounded(routerinfo_t *router) return result; } +/** + * We have found an instance of bug 32868: log our best guess about where the + * routerstatus was found. + **/ +static void +log_buggy_rs_source(const routerstatus_t *rs) +{ + static ratelim_t buggy_rs_ratelim = RATELIM_INIT(1200); + char *m; + if ((m = rate_limit_log(&buggy_rs_ratelim, approx_time()))) { + log_warn(LD_BUG, + "Found a routerstatus %p with has_guardfraction=%u " + " and guardfraction_percentage=%u, but is_possible_guard=%u.%s", + rs, + rs->has_guardfraction, + rs->guardfraction_percentage, + rs->is_possible_guard, + m); + tor_free(m); + networkstatus_t *ns; + int in_ns_count = 0; + if ((ns = networkstatus_get_latest_consensus_by_flavor(FLAV_NS))) { + int pos = smartlist_pos(ns->routerstatus_list, rs); + if (pos >= 0) { + ++in_ns_count; + log_warn(LD_BUG, "Found the routerstatus at position %d of the " + "NS consensus.", pos); + } + } + if ((ns = networkstatus_get_latest_consensus_by_flavor(FLAV_MICRODESC))) { + int pos = smartlist_pos(ns->routerstatus_list, rs); + if (pos >= 0) { + ++in_ns_count; + log_warn(LD_BUG, "Found the routerstatus at position %d of the " + "MD consensus.", pos); + } + } + if (in_ns_count == 0) { + log_warn(LD_BUG, "Could not find the routerstatus in any " + "latest consensus."); + } + tor_assert_nonfatal_unreached(); + } +} + /** Given a list of routers and a weighting rule as in * smartlist_choose_node_by_bandwidth_weights, compute weighted bandwidth * values for each node and store them in a freshly allocated @@ -715,10 +760,11 @@ compute_weighted_bandwidths(const smartlist_t *sl, * choose N proportionally to F*Wpf*B + (1-F)*Wpn*B. */ if (node->rs && node->rs->has_guardfraction && rule != WEIGHT_FOR_GUARD) { - /* XXX The assert should actually check for is_guard. However, - * that crashes dirauths because of #13297. This should be - * equivalent: */ - tor_assert(node->rs->is_possible_guard); + /* We should only have guardfraction set if the node has the Guard + flag. */ + if (! node->rs->is_possible_guard) { + log_buggy_rs_source(node->rs); + } guard_get_guardfraction_bandwidth(&guardfraction_bw, this_bw,

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit a49373844cd3c7047759244a6a5c103304d88a7b Merge: 9587512578 98e14720b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3

1 0

[tor/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 98e14720b5bc30a7cf9af15a1f618ddce0922ef9 Merge: 968b6c30c1 165a92e33f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:14:46 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5 changes/log_32868 | 4 +++ src/feature/nodelist/node_select.c | 54 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-)

1 0