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

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

27 Aug '18

commit 243f3911e14e2ac42fc923c14cbfb89f64a58f40 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 27 19:18:54 2018 +0000 Update translations for support-portal --- contents+ru.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 5c4f3bafc..7b15a7a1b 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -32,7 +32,7 @@ msgstr "" msgid "" "Modifying the way that Tor creates its circuits is strongly discouraged." msgstr "" -"Не рекомендуем менять способ, по которому Tor создает цепочку промежуточных " +"Не следует менять способ, которым Tor создает цепочку промежуточных " "серверов." #: http//localhost/tbb/tbb-17/ @@ -52,6 +52,7 @@ msgstr "" #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "This could mean that you’re on a network that’s censored." msgstr "" +"Это может значить, что сеть, в которой вы работаете, находится под цензурой." #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -69,11 +70,11 @@ msgid "" "relay on the other side of the world, your account may be locked or " "suspended)." msgstr "" -"В случае банков и других конфиденциальных веб-сайтов также часто можно " -"увидеть географическую блокировку (если банк знает, что вы обычно получаете " -"доступ к своим услугам из одной страны, и вдруг вы подключаетесь из " -"выходного узла на другом конце света, ваша учетная запись может быть " -"заблокирована или приостановлена)." +"У банков и других сайтов, работающих с особо важными данными, часто " +"применяется географическая блокировка. Если банк знает, что вы обычно " +"получаете доступ к его услугам из конкретной страны, и вдруг вы " +"подключаетесь на другом конце света, ваша учетная запись может быть " +"заблокирована или приостановлена." #: http//localhost/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.description) @@ -100,7 +101,7 @@ msgstr "" #: http//localhost/misc/misc-15/ #: (content/misc/misc-15/contents+en.lrquestion.title) msgid "How can I donate to Tor Project?" -msgstr "Как помочь деньгами Tor Project?" +msgstr "Как поддержать Tor Project?" #: http//localhost/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -125,7 +126,7 @@ msgid "" "both block Javascript on HTTP sites." msgstr "" "В нижней позиции Javascript разрешен, а в средней и верхней Javascript " -"отключен на HTTP-сайтах." +"отключен (на HTTP-сайтах)." #: http//localhost/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description)

1 0

[tor/maint-0.3.3] When running make test-network-all, use the mixed+hs-v2 network
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 70a07fa90b3aa908e2878356464dd5c889066a4c Author: teor <teor(a)torproject.org> Date: Mon Aug 27 23:06:04 2018 +1000 When running make test-network-all, use the mixed+hs-v2 network No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha. --- changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 000000000..d98f4afbc --- /dev/null +++ b/changes/bug27345 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When running make test-network-all, use the mixed+hs-v2 network. + (A previous fix to chutney removed v3 onion services from the + mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is + confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 230845a1e..2f6789c58 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor -TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23 +TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2 ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet.

1 0

[tor/maint-0.3.4] When running make test-network-all, use the mixed+hs-v2 network
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 70a07fa90b3aa908e2878356464dd5c889066a4c Author: teor <teor(a)torproject.org> Date: Mon Aug 27 23:06:04 2018 +1000 When running make test-network-all, use the mixed+hs-v2 network No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha. --- changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 000000000..d98f4afbc --- /dev/null +++ b/changes/bug27345 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When running make test-network-all, use the mixed+hs-v2 network. + (A previous fix to chutney removed v3 onion services from the + mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is + confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 230845a1e..2f6789c58 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor -TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23 +TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2 ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet.

1 0

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

27 Aug '18

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457 Merge: 33e4e30d0 70a07fa90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

27 Aug '18

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457 Merge: 33e4e30d0 70a07fa90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] When running make test-network-all, use the mixed+hs-v2 network
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 70a07fa90b3aa908e2878356464dd5c889066a4c Author: teor <teor(a)torproject.org> Date: Mon Aug 27 23:06:04 2018 +1000 When running make test-network-all, use the mixed+hs-v2 network No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha. --- changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 000000000..d98f4afbc --- /dev/null +++ b/changes/bug27345 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When running make test-network-all, use the mixed+hs-v2 network. + (A previous fix to chutney removed v3 onion services from the + mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is + confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 230845a1e..2f6789c58 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor -TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23 +TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2 ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet.

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 0483f7f64c80fe18c922415ae6062149a2ebb9f7 Merge: 4c1c818ff 64c3c6a79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

27 Aug '18

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457 Merge: 33e4e30d0 70a07fa90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] When running make test-network-all, use the mixed+hs-v2 network
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 70a07fa90b3aa908e2878356464dd5c889066a4c Author: teor <teor(a)torproject.org> Date: Mon Aug 27 23:06:04 2018 +1000 When running make test-network-all, use the mixed+hs-v2 network No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha. --- changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 000000000..d98f4afbc --- /dev/null +++ b/changes/bug27345 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When running make test-network-all, use the mixed+hs-v2 network. + (A previous fix to chutney removed v3 onion services from the + mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is + confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 230845a1e..2f6789c58 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor -TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23 +TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2 ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet.

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 0483f7f64c80fe18c922415ae6062149a2ebb9f7 Merge: 4c1c818ff 64c3c6a79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0