September 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 6f47734ea8dde2d05160644dfcfcd34ee1a63505 Merge: 8f689e0eb a546e0760 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 12:56:30 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit c1e0206365bbd0210b149357aec5ec054155539f Merge: 1ab85566d 6f47734ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 12:56:30 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] hs-v3: Don't BUG() on directory permission check failure
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 0971b3ce4d03929ef09838209ab87de4f9dfcf1f Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Sep 14 10:56:34 2018 -0400 hs-v3: Don't BUG() on directory permission check failure In hs_config.c, we do validate the permission of the hidden service directory but we do not try to create it. So, in the event that the directory doesn't exists, we end up in the loading key code path which checks for the permission and possibly creates the directory. On failure, don't BUG() since there is a perfectly valid use case for that function to fail. Fixes #27335 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug27335 b/changes/bug27335 new file mode 100644 index 000000000..dcc55a945 --- /dev/null +++ b/changes/bug27335 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service v3): + - In case the hidden service directory can't be created or has wrong + permissions, do not BUG() on it which lead to a non fatal stacktrace. + Fixes bug 27335; bugfix on 0.3.2.1. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 33088480d..408625c3a 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -974,9 +974,9 @@ load_service_keys(hs_service_t *service) * files to that directory so make sure it exists and has the right * permissions. We do this here because at this stage we know that Tor is * actually running and the service we have has been validated. */ - if (BUG(hs_check_service_private_dir(get_options()->User, - config->directory_path, - config->dir_group_readable, 1) < 0)) { + if (hs_check_service_private_dir(get_options()->User, + config->directory_path, + config->dir_group_readable, 1) < 0) { goto end; }

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit a546e07600151be275e6134407c2bcb833a3dd97 Merge: 281854bab 0971b3ce4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 12:56:30 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.2] hs-v3: Don't BUG() on directory permission check failure
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 0971b3ce4d03929ef09838209ab87de4f9dfcf1f Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Sep 14 10:56:34 2018 -0400 hs-v3: Don't BUG() on directory permission check failure In hs_config.c, we do validate the permission of the hidden service directory but we do not try to create it. So, in the event that the directory doesn't exists, we end up in the loading key code path which checks for the permission and possibly creates the directory. On failure, don't BUG() since there is a perfectly valid use case for that function to fail. Fixes #27335 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug27335 b/changes/bug27335 new file mode 100644 index 000000000..dcc55a945 --- /dev/null +++ b/changes/bug27335 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service v3): + - In case the hidden service directory can't be created or has wrong + permissions, do not BUG() on it which lead to a non fatal stacktrace. + Fixes bug 27335; bugfix on 0.3.2.1. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 33088480d..408625c3a 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -974,9 +974,9 @@ load_service_keys(hs_service_t *service) * files to that directory so make sure it exists and has the right * permissions. We do this here because at this stage we know that Tor is * actually running and the service we have has been validated. */ - if (BUG(hs_check_service_private_dir(get_options()->User, - config->directory_path, - config->dir_group_readable, 1) < 0)) { + if (hs_check_service_private_dir(get_options()->User, + config->directory_path, + config->dir_group_readable, 1) < 0) { goto end; }

1 0

[tor/maint-0.3.3] hs-v3: Don't BUG() on directory permission check failure
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 0971b3ce4d03929ef09838209ab87de4f9dfcf1f Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Sep 14 10:56:34 2018 -0400 hs-v3: Don't BUG() on directory permission check failure In hs_config.c, we do validate the permission of the hidden service directory but we do not try to create it. So, in the event that the directory doesn't exists, we end up in the loading key code path which checks for the permission and possibly creates the directory. On failure, don't BUG() since there is a perfectly valid use case for that function to fail. Fixes #27335 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug27335 b/changes/bug27335 new file mode 100644 index 000000000..dcc55a945 --- /dev/null +++ b/changes/bug27335 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service v3): + - In case the hidden service directory can't be created or has wrong + permissions, do not BUG() on it which lead to a non fatal stacktrace. + Fixes bug 27335; bugfix on 0.3.2.1. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 33088480d..408625c3a 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -974,9 +974,9 @@ load_service_keys(hs_service_t *service) * files to that directory so make sure it exists and has the right * permissions. We do this here because at this stage we know that Tor is * actually running and the service we have has been validated. */ - if (BUG(hs_check_service_private_dir(get_options()->User, - config->directory_path, - config->dir_group_readable, 1) < 0)) { + if (hs_check_service_private_dir(get_options()->User, + config->directory_path, + config->dir_group_readable, 1) < 0) { goto end; }

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit a546e07600151be275e6134407c2bcb833a3dd97 Merge: 281854bab 0971b3ce4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 12:56:30 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket27040_035_01'
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 6e940829cce9e822f7fbd07e260a62a195a94143 Merge: 79f8641ee 33c99cf56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 12:54:13 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket27040_035_01' changes/ticket27040 | 5 +++++ src/feature/rend/rendcommon.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] hs-v2: Demote log warning to info when we don't have a consensus
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 33c99cf56539a077723940f3ef4f1d54ddd5c5bc Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Sep 14 12:04:01 2018 -0400 hs-v2: Demote log warning to info when we don't have a consensus Fixes #27040 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27040 | 5 +++++ src/feature/rend/rendcommon.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/ticket27040 b/changes/ticket27040 new file mode 100644 index 000000000..160556a76 --- /dev/null +++ b/changes/ticket27040 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden service v2): + - Demote a log warning to info in case we do not have a consensus when a + .onion request comes in. This can happen while bootstrapping for + instance. The request will follow through after so we really don't need + to warn the user loudly. Fixes bug 27040; bugfix on 0.2.8.2-alpha. diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c index 8cb5fd91e..b48ba87cb 100644 --- a/src/feature/rend/rendcommon.c +++ b/src/feature/rend/rendcommon.c @@ -843,7 +843,7 @@ hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, int start, found, n_added = 0, i; networkstatus_t *c = networkstatus_get_latest_consensus(); if (!c || !smartlist_len(c->routerstatus_list)) { - log_warn(LD_REND, "We don't have a consensus, so we can't perform v2 " + log_info(LD_REND, "We don't have a consensus, so we can't perform v2 " "rendezvous operations."); return -1; }

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit 095d69b60e3b8171e0a9762ecf14d9ea8444a681 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 16:49:29 2018 +0000 Update translations for support-portal --- contents+id.po | 7 +++++-- contents+zh_CN.po | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/contents+id.po b/contents+id.po index 98d22af32..6257e20de 100644 --- a/contents+id.po +++ b/contents+id.po @@ -723,7 +723,7 @@ msgstr "" #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "<h4 class=\"card-title\">New Circuit for this Site</h4>" -msgstr "" +msgstr "<h4 class=\"card-title\">Sirkuit Baru untuk Situs Ini</h4>" #: http//localhost/tbb/tbb-3/ #: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug) @@ -3365,6 +3365,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a></mark> in the following languages:" msgstr "" +"Saat ini kami menawarkan <mark><a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " +"Browser</a></mark> dalam bahasa-bahasa berikut:" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) @@ -3409,7 +3412,7 @@ msgstr "Bagaimana cara mencopot pemasangan Tor Browser?" #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "<h4 class=\"card-title\">New Identity</h4>" -msgstr "" +msgstr "<h4 class=\"card-title\">Identitas Baru</h4>" #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.title) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index 2a7e3b7a7..c51681b8b 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -27,7 +27,7 @@ msgstr "" #: (content/tbb/tbb-16/contents+en.lrquestion.description) msgid "" "Modifying the way that Tor creates its circuits is strongly discouraged." -msgstr "" +msgstr "我们强烈反对您更改tor线路。使用tor为您选择的线路可以享受最佳的隐私防护。" #: http//localhost/tbb/tbb-17/ #: (content/tbb/tbb-17/contents+en.lrquestion.description) @@ -69,7 +69,7 @@ msgstr "" #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "Tor prevents eavesdroppers from learning sites that you visit." -msgstr "" +msgstr "Tor Browser防止人们获知您访问过的网站。" #: http//localhost/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.description) @@ -1655,6 +1655,7 @@ msgid "" "information such as cookies and browsing history, and use new Tor circuits " "for all connections." msgstr "" +"运行此功能将会关闭所有已经打开的浏览器窗口及标签页，清除所有的浏览器 Cookie 与历史记录等个人信息，并且为后续所有的网络连接创建新的洋葱路由回路。" #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1671,7 +1672,7 @@ msgstr "使用tor浏览器能够保护我电脑上的其他应用吗？" msgid "" "It is a fast and stable relay that remains the first one in your circuit for" " 2-3 months in order to protect against a known anonymity-breaking attack." -msgstr "" +msgstr "它是一个快速且稳定的节点，并且将会在您的中继回路中维持两到三个月，用来抵挡破解匿名攻击。" #: http//localhost/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.seo_slug) @@ -1860,6 +1861,8 @@ msgid "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">volunteer " "page</a></mark> for how to get involved!" msgstr "" +"请参见我们的<mark><a " +"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">志愿者页面</a></mark>以了解参与项目的方法！" #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.title) @@ -1884,7 +1887,7 @@ msgstr "" #: http//localhost/tbb/tbb-4/ (content/tbb/tbb-4/contents+en.lrquestion.title) msgid "Why is Tor Browser built from Firefox and not some other browser?" -msgstr "" +msgstr "为什么Tor浏览器是基于火狐而不是其他的浏览器呢？" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.title) @@ -1910,6 +1913,9 @@ msgid "" "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." msgstr "" +"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " +"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," +" 1 minutes, or that theirs is ahead." #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.description) @@ -1941,6 +1947,8 @@ msgid "" "You can find more information about donating on our <mark><a " "href=\"https://donate.torproject.org/donor-faq\">donor FAQ</a></mark>." msgstr "" +"您可以访问<mark><a href=\"https://donate.torproject.org/donor-" +"faq\">捐款常见问题界面</a></mark>，以了解更多捐款方面的信息。" #: http//localhost/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.seo_slug) @@ -2493,7 +2501,7 @@ msgstr "我在使用或是升级vidalia的时候出现问题。" msgid "" "One of the most common issues that causes connection errors in Tor Browser " "is an incorrect system clock." -msgstr "" +msgstr "造成Tor连接失败的最常见的问题之一是系统时间设置错误。" #: http//localhost/tbb/tbb-2/ (content/tbb/tbb-2/contents+en.lrquestion.title) msgid "Why is the first IP address in my relay circuit always the same?" @@ -2530,6 +2538,8 @@ msgid "" "<mark><a href=\"https://tb-manual.torproject.org/en-" "US/troubleshooting.html\">Tor Browser manual</a></mark>." msgstr "" +"如果这个问题还没有被解决，请查看位于<mark><a href=\"https://tb-manual.torproject.org/en-" +"US/troubleshooting.html\">Tor浏览器手册</a></mark>的故障排查界面。" #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description)

1 0