February 2021 - tor-commits - lists.torproject.org

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 09 Feb '21

09 Feb '21

commit 6fb4820436a3391f140dbe062d2e0ec2d17f843f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 9 12:15:06 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ko/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index 6f24c6c834..b1f17bdb4f 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -28,7 +28,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2021-02-05 11:55+0000\n" +"PO-Revision-Date: 2021-02-09 12:00+0000\n" "Last-Translator: 장민준\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -361,7 +361,7 @@ msgid "" "users. Note that on Relay Search, a freshly set up bridge's distribution\n" "mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" "it will then change to the bridge's actual distribution mechanism.\n" -msgstr "분배 메커니즘이 \"없음\"인 브릿지는 BridgeDB에 의해 분배되지 않습니다.\n브릿지 운영자는 사용자에게 브릿지를 분배할 책임이 있습니다.\n릴레이 검색에서는 새로 설정된 브릿지의 분배 메커니즘이\n최대 하루 동안 \"없음\"으로 표시됩니다. 조금만 참으면 브릿지의 실제 분배\n메커니즘으로 바뀝니다.\n" +msgstr "분배 메커니즘이 \"없음\"인 브릿지는 BridgeDB에 의해 분배되지 않습니다.\n브릿지 운영자는 사용자에게 브릿지를 분배할 책임이 있습니다.\n중계서버 검색에서는 새로 설정된 브릿지의 분배 메커니즘이\n최대 하루 동안 \"없음\"으로 표시됩니다. 조금만 참으면 브릿지의 실제 분배\n메커니즘으로 바뀝니다.\n" #: bridgedb/strings.py:148 msgid "Please select options for bridge type:"

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 09 Feb '21

09 Feb '21

commit 7aad280ed6d28108c54fd0646c323edf4bea7be1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 9 11:48:31 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ko.po b/contents+ko.po index 031e7d8df6..e4fecb2f64 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -5751,7 +5751,7 @@ msgstr "'브릿지'란?" msgid "" "Bridge relays are Tor relays that are not listed in the public Tor " "directory." -msgstr "" +msgstr "브릿지 중계서버는 공개 Tor 디렉토리에 나열되지 않은 Tor 중계서버입니다." #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 09 Feb '21

09 Feb '21

commit fb07ec3204116eaffdfb0e583a679137b7a10395 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 9 11:47:26 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ko.po | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index bb65fcb9da..784c177f13 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -2305,6 +2305,8 @@ msgid "" "connect directly to the Tor network, or to configure Tor Browser for your " "connection with the settings icon." msgstr "" +"Tor 브라우저를 처음 실행하면 Tor 네트워크에 직접 연결하거나 설정 아이콘과의 연결을 위해 Tor 브라우저를 구성하는 옵션이 " +"표시됩니다." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2325,7 +2327,7 @@ msgstr "" msgid "" "Once clicked, changing sentences will appear at the bottom of the screen, " "indicating Tor’s connection progress." -msgstr "" +msgstr "클릭하면 화면 하단에 변경 문장이 나타나 Tor의 연결 진행률을 나타냅니다." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2334,6 +2336,8 @@ msgid "" " at a certain point, see the [Troubleshooting](https://tb-" "manual.torproject.org/troubleshooting) page for help solving the problem." msgstr "" +"연결 속도가 비교적 빠르지만 이 텍스트가 특정 지점에 고착된 것 같으면 [문제 해결](https://tb-" +"manual.torproject.org/troubleshooting) 페이지에서 문제 해결을 참조하십시오." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2354,14 +2358,14 @@ msgstr "" msgid "" "If you know that your connection is censored, you should select the settings" " icon." -msgstr "" +msgstr "만약 연결이 검열된 경우 설정 아이콘을 선택해야 합니다." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "" "The first screen asks if access to the Tor network is blocked or censored on" " your connection." -msgstr "" +msgstr "첫 번째 화면은 연결에서 Tor 네트워크에 대한 액세스가 차단되었는지 또는 차단되었는지 여부를 묻습니다." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2370,13 +2374,14 @@ msgid "" "connect to the Tor network and no other solutions have worked, click the " "switch." msgstr "" +"연결이 차단되어 있거나 Tor 네트워크에 연결하려고 시도했지만 실패한 경우 다른 솔루션이 작동하지 않은 경우 스위치를 클릭합니다." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "" "You will then be taken to the [Circumvention](/mobile-tor/#circumvention) " "screen to configure a pluggable transport." -msgstr "" +msgstr "그런 다음 [검열](/mobile-tor/#circuvention) 화면으로 이동하여 플러그형 전송을 구성합니다." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[tor/maint-0.4.5] relay: Look at the omit IPv6 flag when publishing
by nickm＠torproject.org 08 Feb '21

08 Feb '21

commit 685c4866acf8489c58aca41ec01aa5a53e39220a Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 8 11:51:45 2021 -0500 relay: Look at the omit IPv6 flag when publishing In two instances we must look at this flag: 1. When we build the descriptor so the IPv6 is NOT added to the descriptor in case we judge that we need to omit the address but still publish. 2. When we are deciding if the descriptor is publishable. This flags tells us that the IPv6 was not found reachable but we should still publish. Fixes #40279 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40279 | 4 ++++ src/feature/relay/router.c | 33 +++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/changes/ticket40279 b/changes/ticket40279 new file mode 100644 index 0000000000..351db40789 --- /dev/null +++ b/changes/ticket40279 @@ -0,0 +1,4 @@ + o Major bugfixes (IPv6, relay): + - Fix a bug that prevented a relay to publish its descriptor in the case of + an auto-discovered IPv6 that was found unreachable for which we always + publish if the IPv4 is correct. Fixes bug 40279; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 4bc71eb486..0be3eec1dd 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -138,6 +138,18 @@ static authority_cert_t *legacy_key_certificate = NULL; * used by tor-gencert to sign new signing keys and make new key * certificates. */ +/** Indicate if the IPv6 address should be omitted from the descriptor when + * publishing it. This can happen if the IPv4 is reachable but the + * auto-discovered IPv6 is not. We still publish the descriptor. + * + * Only relays should look at this and only for their descriptor. + * + * XXX: The real harder fix is to never put in the routerinfo_t a non + * reachable address and instead use the last resolved address cache to do + * reachability test or anything that has to do with what address tor thinks + * it has. */ +static bool omit_ipv6_on_publish = false; + /** Return a readonly string with human readable description * of err. */ @@ -1396,7 +1408,11 @@ decide_if_publishable_server(void) return 0; } } - if (!router_orport_seems_reachable(options, AF_INET6)) { + /* We could be flagged to omit the IPv6 and if so, don't check for + * reachability on the IPv6. This can happen if the address was + * auto-discovered but turns out to be non reachable. */ + if (!omit_ipv6_on_publish && + !router_orport_seems_reachable(options, AF_INET6)) { // We have an ipv6 orport, and it doesn't seem reachable. if (!publish_even_when_ipv6_orport_unreachable) { return 0; @@ -2085,7 +2101,8 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)) ri->ipv4_dirport = routerconf_find_dir_port(options, 0); /* Optionally check for an IPv6. We still publish without one. */ - if (relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, + if (!omit_ipv6_on_publish && + relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, &ri->ipv6_addr)) { ri->ipv6_orport = routerconf_find_or_port(options, AF_INET6); router_check_descriptor_address_consistency(&ri->ipv6_addr); @@ -2459,18 +2476,6 @@ router_new_consensus_params(const networkstatus_t *ns) publish_even_when_ipv6_orport_unreachable = ar || ar6; } -/** Indicate if the IPv6 address should be omitted from the descriptor when - * publishing it. This can happen if the IPv4 is reachable but the - * auto-discovered IPv6 is not. We still publish the descriptor. - * - * Only relays should look at this and only for their descriptor. - * - * XXX: The real harder fix is to never put in the routerinfo_t a non - * reachable address and instead use the last resolved address cache to do - * reachability test or anything that has to do with what address tor thinks - * it has. */ -static bool omit_ipv6_on_publish = false; - /** Mark our descriptor out of data iff the IPv6 omit status flag is flipped * it changes from its previous value. *

1 0

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5
by nickm＠torproject.org 08 Feb '21

08 Feb '21

commit 758000aa98432414847393420324fef983c66f1e Merge: 01c4abc2d4 685c4866ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 14:30:11 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5 changes/ticket40279 | 4 ++++ src/feature/relay/router.c | 33 +++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5
by nickm＠torproject.org 08 Feb '21

08 Feb '21

commit 758000aa98432414847393420324fef983c66f1e Merge: 01c4abc2d4 685c4866ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 14:30:11 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5 changes/ticket40279 | 4 ++++ src/feature/relay/router.c | 33 +++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-)

1 0

[tor/master] relay: Look at the omit IPv6 flag when publishing
by nickm＠torproject.org 08 Feb '21

08 Feb '21

commit 685c4866acf8489c58aca41ec01aa5a53e39220a Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 8 11:51:45 2021 -0500 relay: Look at the omit IPv6 flag when publishing In two instances we must look at this flag: 1. When we build the descriptor so the IPv6 is NOT added to the descriptor in case we judge that we need to omit the address but still publish. 2. When we are deciding if the descriptor is publishable. This flags tells us that the IPv6 was not found reachable but we should still publish. Fixes #40279 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40279 | 4 ++++ src/feature/relay/router.c | 33 +++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/changes/ticket40279 b/changes/ticket40279 new file mode 100644 index 0000000000..351db40789 --- /dev/null +++ b/changes/ticket40279 @@ -0,0 +1,4 @@ + o Major bugfixes (IPv6, relay): + - Fix a bug that prevented a relay to publish its descriptor in the case of + an auto-discovered IPv6 that was found unreachable for which we always + publish if the IPv4 is correct. Fixes bug 40279; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 4bc71eb486..0be3eec1dd 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -138,6 +138,18 @@ static authority_cert_t *legacy_key_certificate = NULL; * used by tor-gencert to sign new signing keys and make new key * certificates. */ +/** Indicate if the IPv6 address should be omitted from the descriptor when + * publishing it. This can happen if the IPv4 is reachable but the + * auto-discovered IPv6 is not. We still publish the descriptor. + * + * Only relays should look at this and only for their descriptor. + * + * XXX: The real harder fix is to never put in the routerinfo_t a non + * reachable address and instead use the last resolved address cache to do + * reachability test or anything that has to do with what address tor thinks + * it has. */ +static bool omit_ipv6_on_publish = false; + /** Return a readonly string with human readable description * of err. */ @@ -1396,7 +1408,11 @@ decide_if_publishable_server(void) return 0; } } - if (!router_orport_seems_reachable(options, AF_INET6)) { + /* We could be flagged to omit the IPv6 and if so, don't check for + * reachability on the IPv6. This can happen if the address was + * auto-discovered but turns out to be non reachable. */ + if (!omit_ipv6_on_publish && + !router_orport_seems_reachable(options, AF_INET6)) { // We have an ipv6 orport, and it doesn't seem reachable. if (!publish_even_when_ipv6_orport_unreachable) { return 0; @@ -2085,7 +2101,8 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)) ri->ipv4_dirport = routerconf_find_dir_port(options, 0); /* Optionally check for an IPv6. We still publish without one. */ - if (relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, + if (!omit_ipv6_on_publish && + relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, &ri->ipv6_addr)) { ri->ipv6_orport = routerconf_find_or_port(options, AF_INET6); router_check_descriptor_address_consistency(&ri->ipv6_addr); @@ -2459,18 +2476,6 @@ router_new_consensus_params(const networkstatus_t *ns) publish_even_when_ipv6_orport_unreachable = ar || ar6; } -/** Indicate if the IPv6 address should be omitted from the descriptor when - * publishing it. This can happen if the IPv4 is reachable but the - * auto-discovered IPv6 is not. We still publish the descriptor. - * - * Only relays should look at this and only for their descriptor. - * - * XXX: The real harder fix is to never put in the routerinfo_t a non - * reachable address and instead use the last resolved address cache to do - * reachability test or anything that has to do with what address tor thinks - * it has. */ -static bool omit_ipv6_on_publish = false; - /** Mark our descriptor out of data iff the IPv6 omit status flag is flipped * it changes from its previous value. *

1 0

[tor/master] Merge branch 'maint-0.4.5'
by nickm＠torproject.org 08 Feb '21

08 Feb '21

commit 14e1c2fe0a5b94cfc2db9be0185a3b09fd119e3c Merge: d6b82d79dc 758000aa98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 14:31:13 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40279 | 4 ++++ src/feature/relay/router.c | 33 +++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-)

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5
by nickm＠torproject.org 08 Feb '21

08 Feb '21

commit 758000aa98432414847393420324fef983c66f1e Merge: 01c4abc2d4 685c4866ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 14:30:11 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5 changes/ticket40279 | 4 ++++ src/feature/relay/router.c | 33 +++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-)

1 0

[tor/release-0.4.5] relay: Look at the omit IPv6 flag when publishing
by nickm＠torproject.org 08 Feb '21

08 Feb '21

commit 685c4866acf8489c58aca41ec01aa5a53e39220a Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 8 11:51:45 2021 -0500 relay: Look at the omit IPv6 flag when publishing In two instances we must look at this flag: 1. When we build the descriptor so the IPv6 is NOT added to the descriptor in case we judge that we need to omit the address but still publish. 2. When we are deciding if the descriptor is publishable. This flags tells us that the IPv6 was not found reachable but we should still publish. Fixes #40279 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40279 | 4 ++++ src/feature/relay/router.c | 33 +++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/changes/ticket40279 b/changes/ticket40279 new file mode 100644 index 0000000000..351db40789 --- /dev/null +++ b/changes/ticket40279 @@ -0,0 +1,4 @@ + o Major bugfixes (IPv6, relay): + - Fix a bug that prevented a relay to publish its descriptor in the case of + an auto-discovered IPv6 that was found unreachable for which we always + publish if the IPv4 is correct. Fixes bug 40279; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 4bc71eb486..0be3eec1dd 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -138,6 +138,18 @@ static authority_cert_t *legacy_key_certificate = NULL; * used by tor-gencert to sign new signing keys and make new key * certificates. */ +/** Indicate if the IPv6 address should be omitted from the descriptor when + * publishing it. This can happen if the IPv4 is reachable but the + * auto-discovered IPv6 is not. We still publish the descriptor. + * + * Only relays should look at this and only for their descriptor. + * + * XXX: The real harder fix is to never put in the routerinfo_t a non + * reachable address and instead use the last resolved address cache to do + * reachability test or anything that has to do with what address tor thinks + * it has. */ +static bool omit_ipv6_on_publish = false; + /** Return a readonly string with human readable description * of err. */ @@ -1396,7 +1408,11 @@ decide_if_publishable_server(void) return 0; } } - if (!router_orport_seems_reachable(options, AF_INET6)) { + /* We could be flagged to omit the IPv6 and if so, don't check for + * reachability on the IPv6. This can happen if the address was + * auto-discovered but turns out to be non reachable. */ + if (!omit_ipv6_on_publish && + !router_orport_seems_reachable(options, AF_INET6)) { // We have an ipv6 orport, and it doesn't seem reachable. if (!publish_even_when_ipv6_orport_unreachable) { return 0; @@ -2085,7 +2101,8 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)) ri->ipv4_dirport = routerconf_find_dir_port(options, 0); /* Optionally check for an IPv6. We still publish without one. */ - if (relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, + if (!omit_ipv6_on_publish && + relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, &ri->ipv6_addr)) { ri->ipv6_orport = routerconf_find_or_port(options, AF_INET6); router_check_descriptor_address_consistency(&ri->ipv6_addr); @@ -2459,18 +2476,6 @@ router_new_consensus_params(const networkstatus_t *ns) publish_even_when_ipv6_orport_unreachable = ar || ar6; } -/** Indicate if the IPv6 address should be omitted from the descriptor when - * publishing it. This can happen if the IPv4 is reachable but the - * auto-discovered IPv6 is not. We still publish the descriptor. - * - * Only relays should look at this and only for their descriptor. - * - * XXX: The real harder fix is to never put in the routerinfo_t a non - * reachable address and instead use the last resolved address cache to do - * reachability test or anything that has to do with what address tor thinks - * it has. */ -static bool omit_ipv6_on_publish = false; - /** Mark our descriptor out of data iff the IPv6 omit status flag is flipped * it changes from its previous value. *

1 0