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

[tor/maint-0.3.4] test: Update approx_time before the test starts
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 38599de2dd4d7bc4e8e8e888ff3731c1ffac7255 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 24 09:48:28 2018 -0400 test: Update approx_time before the test starts This way we have the same time source when the IP is created and tested later. Fixes #27810 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27810 | 5 +++++ src/test/test_hs_service.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/ticket27810 b/changes/ticket27810 new file mode 100644 index 000000000..119f781cb --- /dev/null +++ b/changes/ticket27810 @@ -0,0 +1,5 @@ + o Minor bugfixes (test, hidden service v3): + - Make the the hs_service tests uses the same time source when creating + the introduction point and testing it. This helps make test work on very + slow system like ARM or Travis. Fixes bug 27810; bugfix on + 0.3.2.1-alpha. diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index d715f90d9..7972434d6 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -492,6 +492,8 @@ test_helper_functions(void *arg) MOCK(node_get_by_id, mock_node_get_by_id); hs_service_init(); + time_t now = time(NULL); + update_approx_time(now); service = helper_create_service(); @@ -551,7 +553,6 @@ test_helper_functions(void *arg) /* Testing can_service_launch_intro_circuit() */ { - time_t now = time(NULL); /* Put the start of the retry period back in time, we should be allowed. * to launch intro circuit. */ service->state.num_intro_circ_launched = 2; @@ -575,7 +576,6 @@ test_helper_functions(void *arg) /* Testing intro_point_should_expire(). */ { - time_t now = time(NULL); /* Just some basic test of the current state. */ tt_u64_op(ip->introduce2_max, OP_GE, INTRO_POINT_MIN_LIFETIME_INTRODUCTIONS);

1 0

[tor/master] test: Update approx_time before the test starts
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 38599de2dd4d7bc4e8e8e888ff3731c1ffac7255 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 24 09:48:28 2018 -0400 test: Update approx_time before the test starts This way we have the same time source when the IP is created and tested later. Fixes #27810 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27810 | 5 +++++ src/test/test_hs_service.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/ticket27810 b/changes/ticket27810 new file mode 100644 index 000000000..119f781cb --- /dev/null +++ b/changes/ticket27810 @@ -0,0 +1,5 @@ + o Minor bugfixes (test, hidden service v3): + - Make the the hs_service tests uses the same time source when creating + the introduction point and testing it. This helps make test work on very + slow system like ARM or Travis. Fixes bug 27810; bugfix on + 0.3.2.1-alpha. diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index d715f90d9..7972434d6 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -492,6 +492,8 @@ test_helper_functions(void *arg) MOCK(node_get_by_id, mock_node_get_by_id); hs_service_init(); + time_t now = time(NULL); + update_approx_time(now); service = helper_create_service(); @@ -551,7 +553,6 @@ test_helper_functions(void *arg) /* Testing can_service_launch_intro_circuit() */ { - time_t now = time(NULL); /* Put the start of the retry period back in time, we should be allowed. * to launch intro circuit. */ service->state.num_intro_circ_launched = 2; @@ -575,7 +576,6 @@ test_helper_functions(void *arg) /* Testing intro_point_should_expire(). */ { - time_t now = time(NULL); /* Just some basic test of the current state. */ tt_u64_op(ip->introduce2_max, OP_GE, INTRO_POINT_MIN_LIFETIME_INTRODUCTIONS);

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit b7fbd1f3297d548b16a18bbc7a5636c80fff70de Merge: 8b3ec74e5 38599de2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 08:04:34 2018 -0400 Merge branch 'maint-0.3.4' changes/ticket27810 | 5 +++++ src/test/test_hs_service.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

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

16 Oct '18

commit bf1635d8cf292b5d589e991a92a3c8f09ec32e51 Merge: c8a7b7b58 38599de2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 08:04:34 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/ticket27810 | 5 +++++ src/test/test_hs_service.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.4] test: Update approx_time before the test starts
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 38599de2dd4d7bc4e8e8e888ff3731c1ffac7255 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 24 09:48:28 2018 -0400 test: Update approx_time before the test starts This way we have the same time source when the IP is created and tested later. Fixes #27810 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27810 | 5 +++++ src/test/test_hs_service.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/ticket27810 b/changes/ticket27810 new file mode 100644 index 000000000..119f781cb --- /dev/null +++ b/changes/ticket27810 @@ -0,0 +1,5 @@ + o Minor bugfixes (test, hidden service v3): + - Make the the hs_service tests uses the same time source when creating + the introduction point and testing it. This helps make test work on very + slow system like ARM or Travis. Fixes bug 27810; bugfix on + 0.3.2.1-alpha. diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index d715f90d9..7972434d6 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -492,6 +492,8 @@ test_helper_functions(void *arg) MOCK(node_get_by_id, mock_node_get_by_id); hs_service_init(); + time_t now = time(NULL); + update_approx_time(now); service = helper_create_service(); @@ -551,7 +553,6 @@ test_helper_functions(void *arg) /* Testing can_service_launch_intro_circuit() */ { - time_t now = time(NULL); /* Put the start of the retry period back in time, we should be allowed. * to launch intro circuit. */ service->state.num_intro_circ_launched = 2; @@ -575,7 +576,6 @@ test_helper_functions(void *arg) /* Testing intro_point_should_expire(). */ { - time_t now = time(NULL); /* Just some basic test of the current state. */ tt_u64_op(ip->introduce2_max, OP_GE, INTRO_POINT_MIN_LIFETIME_INTRODUCTIONS);

1 0

[tor/master] Add sys/time.h include back to procmon.c
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit d3d6c595571301ac75f15e4669c567929f785051 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 11:26:38 2018 -0400 Add sys/time.h include back to procmon.c --- changes/bug27990 | 3 +++ src/lib/evloop/procmon.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/changes/bug27990 b/changes/bug27990 new file mode 100644 index 000000000..763eef252 --- /dev/null +++ b/changes/bug27990 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, netbsd): + - Add a missing include back into procmon.c. Fixes bug 27990; + bugfix on 0.3.5.1-alpha. diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c index e0c26caab..02e167377 100644 --- a/src/lib/evloop/procmon.c +++ b/src/lib/evloop/procmon.c @@ -20,6 +20,9 @@ #ifdef HAVE_ERRNO_H #include <errno.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif #ifdef _WIN32 #include <winsock2.h>

1 0

[tor/master] Merge remote-tracking branch 'public/bug27990'
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 8b3ec74e5fb1963fb42fc2fd47c373fd1cd3fd27 Merge: 11161395a d3d6c5955 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 08:02:01 2018 -0400 Merge remote-tracking branch 'public/bug27990' changes/bug27990 | 3 +++ src/lib/evloop/procmon.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor-browser-build/master] Bug 28022: Use `/usr/bin/env bash` for bash invocation
by boklm＠torproject.org 16 Oct '18

16 Oct '18

commit c65b5af3d9c565d4e274fbd8606f0404623a19e1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 15 17:24:53 2018 +0000 Bug 28022: Use `/usr/bin/env bash` for bash invocation We use `/usr/bin/env` for invocation in other scripts already. Let's use it in `execdesktop` as well. --- projects/tor-browser/RelativeLink/execdesktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/execdesktop b/projects/tor-browser/RelativeLink/execdesktop index 27328b2..fa6dc0a 100755 --- a/projects/tor-browser/RelativeLink/execdesktop +++ b/projects/tor-browser/RelativeLink/execdesktop @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash TBB_START_PROG="$(grep '^X-TorBrowser-ExecShell' $1 | tail -1 | sed 's/^X-TorBrowser-ExecShell=//' | sed 's/%.//')"

1 0

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

16 Oct '18

commit 73bb8a7b6b7e1663d3bd5b62a704582f504a932b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 16 08:49:01 2018 +0000 Update translations for support-portal --- contents+zh_CN.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index b2135466f..a1bbcf22d 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -2,13 +2,14 @@ # erinm, 2018 # ヨイツの賢狼ホロ <kenookamihoro(a)gmail.com>, 2018 # Emma Peel, 2018 +# MD Rgiths <psychi2009(a)gmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 18:14+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Emma Peel, 2018\n" +"Last-Translator: MD Rgiths <psychi2009(a)gmail.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1726,7 +1727,7 @@ msgstr "它是一个快速且稳定的节点，并且将会在您的中继回路 #: http//localhost/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.seo_slug) msgid "tor-browser-firefox-not-working-error" -msgstr "" +msgstr "Tor 浏览器火狐无法工作的错误" #: http//localhost/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.seo_slug) @@ -1888,12 +1889,12 @@ msgstr "目前路径的长度为 3 加上你的路径中敏感路径的数量。 #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) msgid "* العربية (ar)" -msgstr "" +msgstr "阿拉伯语(ar)" #: http//localhost/misc/misc-6/ #: (content/misc/misc-6/contents+en.lrquestion.description) msgid "Tor doesn't keep any logs that could identify a particular user." -msgstr "" +msgstr "Tor 不会保留能识别用户身份的日志记录。" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -1904,7 +1905,7 @@ msgstr "" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "## Set your own contact info" -msgstr "" +msgstr "## 设置你的联系方式" #: http//localhost/misc/misc-14/ #: (content/misc/misc-14/contents+en.lrquestion.description) @@ -1928,7 +1929,7 @@ msgstr "当我使用Tor时，窃听者能够获取我分享给网站的信息（ msgid "" "Selecting it will cause the currently-active tab or window to be reloaded " "over a new Tor circuit." -msgstr "" +msgstr "选择它将会导致当前活跃的标签页或窗口被重新加载在新的 Tor 回路上。" #: http//localhost/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.description) @@ -1941,6 +1942,7 @@ msgid "" "Tor Browser already comes installed with two add-ons — HTTPS Everywhere and " "NoScript — and adding anything else could deanonymize you." msgstr "" +"Tor Browser 已经默认安装了两个插件——HTTPS Everywhere 和 NoScript——但再安装别的插件将会让你失去匿名性。" #: 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?"

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 16 Oct '18

16 Oct '18

commit 6c1ebf5ea4f980e10532964f2202f6df83025d40 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 16 08:48:20 2018 +0000 Update translations for torbutton-browseronboardingproperties --- ru/browserOnboarding.properties | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ru/browserOnboarding.properties b/ru/browserOnboarding.properties index b054d67df..0d4c6c4cf 100644 --- a/ru/browserOnboarding.properties +++ b/ru/browserOnboarding.properties @@ -20,22 +20,22 @@ onboarding.tour-tor-network.button=Посмотреть цепочку onboarding.tour-tor-circuit-display=Просмотр цепочки onboarding.tour-tor-circuit-display.title=Ваша цепочка. onboarding.tour-tor-circuit-display.description=Для каждого посещаемого вами домена ваш трафик передается и шифруется в цепочке через три ретранслятора Tor, разбросанных по всему миру. Ни одному вебсайту недоступно ваша точка подключения сети. Вы можете запросить новую цепочку, нажав на ‘Новая Цепочка для этого сайта’ в ‘Просмотре Цепочки’ . -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.button=Ваш цикл onboarding.tour-tor-security=Безопасность onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.description=Мы также предоставляем вам дополнительные настройки для повышения безопасности вашего браузера. Наши Параметры Безопасности позволяют блокировать элементы, которые могут быть использованы для атаки вашего компьютера. Нажмите ниже, чтобы посмотреть, что делают разные функции. +onboarding.tour-tor-security.button=Настройки Просмотра onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.title=Ждите небольших различий. +onboarding.tour-tor-expect-differences.description=Со всеми функциями безопасности и конфиденциальности, предоставляемыми Tor, ваш просмотр интернета может быть немного другим. Скорость может быть немного медленнее, и в зависимости от уровня безопасности некоторые элементы могут не работать или не загружаться. Вас также могут попросить доказать, что вы человек, а не робот. +onboarding.tour-tor-expect-differences.button=Посмотреть FAQ onboarding.tour-tor-onion-services=Onion-сервисы -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Станьте особенно защищены. +onboarding.tour-tor-onion-services.description=Onion Services - это сайты, которые заканчиваются на .onion, они обеспечивают дополнительную защиту владельцам и посетителям, предоставляя дополнительные гарантии против цензуры. Onion Services позволяют любому анонимно предоставлять контент и услуги. Нажмите ниже, чтобы посетить Onion сайт DuckDuckGo. +onboarding.tour-tor-onion-services.button=Посетите Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Вперёд @@ -45,10 +45,10 @@ onboarding.tor-circuit-display.two-of-three=2 из 3 onboarding.tor-circuit-display.three-of-three=3 из 3 onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.msg=Цикл состоит из случайно назначенных ретрансляторов, которые являются компьютерами по всему миру, сконфигурированными для пересылки трафика Tor. Цикл делает ваш браузер безопасным и позволяет подключаться к .onion сайтам. onboarding.tor-circuit-display.diagram.title=Просмотр Цепочки -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.msg=На этой диаграмме показаны ретрансляторы, которые составляют цикл для этого веб-сайта. Чтобы предотвратить привязку активности на разных сайтах, каждый веб-сайт получает другой цикл. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Нуждаетесь в новом цикле? +onboarding.tor-circuit-display.new-circuit.msg=Если вы не можете подключиться к веб-сайту, который вы пытаетесь посетить, или он не загружается должным образом, вы можете использовать эту кнопку, чтобы перезагрузить сайт с новым циклом.

1 0