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

[manual/translations] Update lego
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit f9745ff78ed3edfab708a9c4a11eb4c30dd7e9e2 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 16:12:02 2019 +0100 Update lego --- databags/alternatives.ini | 1 - lego | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 76049ad..965b367 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -141,4 +141,3 @@ direction = text-left order = order-last url = /zh-CN/ language = 简体中文 (zh-CN) - diff --git a/lego b/lego index c722b34..f0ea955 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit c722b346e16884df3bedc93cffba8887cfcb65e1 +Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523

1 0

[manual/translations] fix link
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit bb6735a6746b145e4f34d6c56b1088e349905778 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Nov 28 17:55:28 2019 +0100 fix link --- content/security-settings/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/security-settings/contents.lr b/content/security-settings/contents.lr index 60bf22b..09aa940 100644 --- a/content/security-settings/contents.lr +++ b/content/security-settings/contents.lr @@ -37,7 +37,7 @@ You can enable these settings again at any time by adjusting your Security Level * This level disables website features that are often dangerous. This may cause some sites to lose functionality. -* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some fonts and math symbols are disabled; audio and video (HTML5 media) are click-to-play. +* JavaScript is disabled on all non-[HTTPS](/secure-connections) sites; some fonts and math symbols are disabled; audio and video (HTML5 media) are click-to-play. ###### Safest

1 0

[manual/translations] update lego
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit bef9a078c8cb15075fe53e30086cf88d7f2ece6f Author: emma peel <emma.peel(a)riseup.net> Date: Tue Dec 24 15:49:18 2019 +0100 update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index f0ea955..620c586 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523 +Subproject commit 620c5866a641f76a8eab06eeb5809b625bcac890

1 0

[manual/translations] add Lithuanian translation
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 871d23f4375173a2f1e69cb077df0d6bb484a18f Author: emma peel <emma.peel(a)riseup.net> Date: Tue Dec 24 15:50:01 2019 +0100 add Lithuanian translation --- .htaccess | 4 ++-- databags/alternatives.ini | 6 ++++++ manual.lektorproject | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index c055b0a..0651b31 100644 --- a/.htaccess +++ b/.htaccess @@ -19,8 +19,8 @@ RewriteRule ^(es-ES|es-MX|es-CO)/(.*) /es/$2 [R=302,L] # Rewrites for languages that have a Tor Browser release # but don't have a translated manual # this languages are the priority for translation of the Tor Browser User Manual! -RewriteRule ^(cs|da|fa|hu|ja|ko|ms|lt|nb-NO|nl|pl|sv-SE|vi|zh-TW)$ / [R=302,L] -RewriteRule ^(cs|da|fa|hu|ja|ko|ms|lt|nb-NO|nl|pl|sv-SE|vi|zh-TW)/(.*) /$2 [R=302,L] +RewriteRule ^(cs|da|fa|hu|ja|ko|ms|nb-NO|nl|pl|sv-SE|vi|zh-TW)$ / [R=302,L] +RewriteRule ^(cs|da|fa|hu|ja|ko|ms|nb-NO|nl|pl|sv-SE|vi|zh-TW)/(.*) /$2 [R=302,L] # we have only one translation for this locales RewriteRule ^bn-(BD|IN)$ /bn [R=302,L] diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 965b367..a0c0a8c 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -94,6 +94,12 @@ order = order-last language = ქართული ენა (ka) url = /ka/ +[lt] +direction = text-left +order = order-last +language = lietuvių (lt) +url = /lt/ + [mk] direction = text-left order = order-last diff --git a/manual.lektorproject b/manual.lektorproject index 63769e6..b6c87dc 100644 --- a/manual.lektorproject +++ b/manual.lektorproject @@ -80,6 +80,11 @@ name = Georgian (ka) url_prefix = /ka/ locale = ka +[alternatives.lt] +name = lietuvių (lt) +url_prefix = /lt/ +locale = lt + [alternatives.mk] name = Macedonian (mk) url_prefix = /mk/

1 0

[manual/translations] translators input, thanks!
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 534754592dd961a4595d8dc6ae0c946d2b66f30d Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 15 15:46:09 2020 +0100 translators input, thanks! --- content/plugins/contents.lr | 2 +- content/security-settings/contents.lr | 2 +- lego | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/plugins/contents.lr b/content/plugins/contents.lr index 0801640..b0379dd 100644 --- a/content/plugins/contents.lr +++ b/content/plugins/contents.lr @@ -21,7 +21,7 @@ JavaScript is a programming language that websites use to offer interactive elem Tor Browser includes an add-on called NoScript. It's accessible through 'Preferences' on hamburger menu (main menu), then select 'Customize' and drag the “S” icon to the top-right of the window. NoScript allows you to control the JavaScript (and other scripts) that runs on individual web pages, or block it entirely. -Users who require a high degree of security in their web browsing should set Tor Browser’s [Security Slider](/security-slider) to “Safer” (which disables JavaScript for non-HTTPS websites) or “Safest” (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browser’s default setting is to allow all websites to run scripts in "Standard" mode. +Users who require a high degree of security in their web browsing should set Tor Browser’s [Security Level](../security-settings/) to “Safer” (which disables JavaScript for non-HTTPS websites) or “Safest” (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browser’s default setting is to allow all websites to run scripts in "Standard" mode. ### BROWSER ADD-ONS diff --git a/content/security-settings/contents.lr b/content/security-settings/contents.lr index 09aa940..ade3242 100644 --- a/content/security-settings/contents.lr +++ b/content/security-settings/contents.lr @@ -11,7 +11,7 @@ key: 11 body: By default, Tor Browser protects your security by encrypting your browsing data. You can further increase your security by choosing to disable certain web features that can be used to attack your security and anonymity. -You can do this by increasing Tor Browser's Security Settings in the shield menu. +You can do this by increasing Tor Browser's Security Levels in the shield menu. Increasing Tor Browser's security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require. ### ACCESSING THE SECURITY SETTINGS diff --git a/lego b/lego index 620c586..abbf18c 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 620c5866a641f76a8eab06eeb5809b625bcac890 +Subproject commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287

1 0

[manual/translations] Merge branch 'master' into translations
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit bebf3c76dad2c2159b6ba1bcde883a1034aaf6dc Merge: 56910b6 5347545 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 15 15:48:01 2020 +0100 Merge branch 'master' into translations content/plugins/contents.lr | 2 +- content/security-settings/contents.lr | 4 ++-- lego | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[manual/translations] changes for consistency, see https://trac.torproject.org/projects/tor/wiki/doc/translation/developers#Actuallist
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 2397c19dd90196b82d5aa845f8a6749019a3dd90 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Dec 24 15:50:49 2019 +0100 changes for consistency, see https://trac.torproject.org/projects/tor/wiki/doc/translation/developers#Ac… --- manual.lektorproject | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manual.lektorproject b/manual.lektorproject index b6c87dc..70fa926 100644 --- a/manual.lektorproject +++ b/manual.lektorproject @@ -46,7 +46,7 @@ url_prefix = /es-AR/ locale = es-AR [alternatives.fr] -name = Français +name = Français (fr) url_prefix = /fr/ locale = fr @@ -61,12 +61,12 @@ url_prefix = /he/ locale = he [alternatives.id] -name = Indonesia +name = Indonesia (id) url_prefix = /id/ locale = id [alternatives.it] -name = Italia +name = Italiano (it) url_prefix = /it/ locale = it @@ -76,7 +76,7 @@ url_prefix = /is/ locale = is [alternatives.ka] -name = Georgian (ka) +name = ქართული ენა (ka) url_prefix = /ka/ locale = ka

1 0

[manual/translations] more configs for Lithuanian
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 469ffec017f34e6429f34488a3d29b90730cc76f Author: emma peel <emma.peel(a)riseup.net> Date: Thu Jan 9 10:06:43 2020 +0100 more configs for Lithuanian --- configs/i18n.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 6c31d97..e32d8b7 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = ar,bn,ca,de,el,es,fr,ga,he,id,is,it,ka,mk,pt-BR,pt-PT,ro,ru,th,tr,zh-CN +translations = ar,bn,ca,de,el,es,fr,ga,he,id,is,it,ka,lt,mk,pt-BR,pt-PT,ro,ru,th,tr,zh-CN i18npath = i18n url_prefix = https://tb-manual.torproject.org/ translate_paragraphwise = False

1 0

[tor/master] Replace an assertion with a check-and-log
by teor＠torproject.org 15 Jan '20

15 Jan '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 000000000..34476078b --- /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 e31abb247..7b9e241e5 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/master] Merge remote-tracking branch 'tor-github/pr/1661'
by teor＠torproject.org 15 Jan '20

15 Jan '20

commit 5fa7c1b13fbefcfd9b71a1f95922cf4e92b5e141 Merge: d430b5a07 165a92e33 Author: teor <teor(a)torproject.org> Date: Thu Jan 16 00:46:31 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1661' changes/log_32868 | 4 +++ src/feature/nodelist/node_select.c | 54 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-)

1 0