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

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/70'
by nickm＠torproject.org 21 Jul '20

21 Jul '20

commit 7a2fe935293fa50d7a9db0897450ba1e24f758af Merge: 92fc0d3699 fbee4d25cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 21 09:03:38 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/70' src/feature/relay/router.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Edit AddressDisableIPv6 man entry
by nickm＠torproject.org 21 Jul '20

21 Jul '20

commit 92fc0d36998d685fe5b7143838283d50c6126d18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 21 09:01:31 2020 -0400 Edit AddressDisableIPv6 man entry --- doc/man/tor.1.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 43fef69466..edb8593142 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2140,9 +2140,10 @@ is non-zero): [[AddressDisableIPv6]] **AddressDisableIPv6** **0**|**1**:: By default, Tor will attempt to find the IPv6 of the relay if there is no - IPv4Only ORPort. If set, this options disable IPv6 auto discovery which - means no IPv6 address resolution, no IPv6 ORPorts, no IPv6 reachability - checks, and won't publish an IPv6 ORPort in its descriptor. (Default: 0) + IPv4Only ORPort. If set, this option disables IPv6 auto discovery. This + disables IPv6 address resolution, IPv6 ORPorts, and IPv6 reachability + checks. Also, the relay won't publish an IPv6 ORPort in its + descriptor. (Default: 0) [[AssumeReachable]] **AssumeReachable** **0**|**1**:: This option is used when bootstrapping a new Tor network. If set to 1,

1 0

[tor/master] relay: Add AddressDisableIPv6 torrc option
by nickm＠torproject.org 21 Jul '20

21 Jul '20

commit c3d113a464d4f2e994ae6d1c876875b542f90d5c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 21 07:57:21 2020 -0400 relay: Add AddressDisableIPv6 torrc option This option controls if a tor relay will attempt address auto discovery and thus ultimately publish an IPv6 ORPort in the descriptor. Behavior is from proposal 312 section 3.2.6. Closes #33245 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/man/tor.1.txt | 6 ++++++ src/app/config/config.c | 1 + src/app/config/or_options_st.h | 4 ++++ src/app/config/resolve_addr.c | 7 +++++++ src/feature/relay/relay_find_addr.c | 7 +++++++ src/test/test_config.c | 19 +++++++++++++++++++ src/test/test_relay.c | 2 ++ 7 files changed, 46 insertions(+) diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index ca54fa125b..43fef69466 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2138,6 +2138,12 @@ is non-zero): binds to. To bind to a different address, use the ORPort and OutboundBindAddress options. +[[AddressDisableIPv6]] **AddressDisableIPv6** **0**|**1**:: + By default, Tor will attempt to find the IPv6 of the relay if there is no + IPv4Only ORPort. If set, this options disable IPv6 auto discovery which + means no IPv6 address resolution, no IPv6 ORPorts, no IPv6 reachability + checks, and won't publish an IPv6 ORPort in its descriptor. (Default: 0) + [[AssumeReachable]] **AssumeReachable** **0**|**1**:: This option is used when bootstrapping a new Tor network. If set to 1, don't do self-reachability testing; just upload your server descriptor diff --git a/src/app/config/config.c b/src/app/config/config.c index 7d147ef456..9e7d1179ba 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -315,6 +315,7 @@ static const config_var_t option_vars_[] = { VAR("AccountingRule", STRING, AccountingRule_option, "max"), V(AccountingStart, STRING, NULL), V(Address, LINELIST, NULL), + V(AddressDisableIPv6, BOOL, "0"), OBSOLETE("AllowDotExit"), OBSOLETE("AllowInvalidNodes"), V(AllowNonRFC953Hostnames, BOOL, "0"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 07126cc6ce..68be5711ce 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -75,6 +75,10 @@ struct or_options_t { * options is accepted as in IPv4 and IPv6. */ struct config_line_t *Address; + /** Boolean: If set, disable IPv6 address resolution, IPv6 ORPorts, IPv6 + * reachability checks, and publishing an IPv6 ORPort in its descriptor. */ + int AddressDisableIPv6; + char *PidFile; /**< Where to store PID of Tor process. */ struct routerset_t *ExitNodes; /**< Structure containing nicknames, digests, diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index ba1c854d77..d23e39b62d 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -632,6 +632,13 @@ find_my_address(const or_options_t *options, int family, int warn_severity, if (method_out) *method_out = NULL; if (hostname_out) *hostname_out = NULL; + /* If an IPv6 is requested, check if IPv6 address discovery is disabled and + * if so we always return a failure. It is done here so we don't populate + * the resolve cache or do any DNS resolution. */ + if (family == AF_INET6 && options->AddressDisableIPv6) { + return false; + } + /* * Step 1: Discover address by attempting 3 different methods consecutively. */ diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c index 48f28b182a..43b958d563 100644 --- a/src/feature/relay/relay_find_addr.c +++ b/src/feature/relay/relay_find_addr.c @@ -105,6 +105,13 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, tor_addr_make_unspec(addr_out); + /* If an IPv6 is requested, check if IPv6 address discovery is disabled on + * this instance. If so, we return a failure. It is done here so we don't + * query the suggested cache that might be populated with an IPv6. */ + if (family == AF_INET6 && options->AddressDisableIPv6) { + return false; + } + /* First, check our resolved address cache. It should contain the address * we've discovered from the periodic relay event. */ resolved_addr_get_last(family, addr_out); diff --git a/src/test/test_config.c b/src/test/test_config.c index 71b2cdf2f4..376200827d 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1260,6 +1260,7 @@ get_interface_address6_failure(int severity, sa_family_t family, do { \ config_free_lines(options->Address); \ config_free_lines(options->ORPort_lines); \ + options->AddressDisableIPv6 = 0; \ options->ORPort_set = 0; \ tor_free(options->DirAuthorities); \ tor_free(hostname_out); \ @@ -1455,6 +1456,24 @@ test_config_find_my_address(void *arg) options = options_new(); options_init(options); + /* + * Case 0: + * AddressDisableIPv6 is set. + * + * Only run this if we are in the IPv6 test. + */ + if (p->family == AF_INET6) { + options->AddressDisableIPv6 = 1; + /* Set a valid IPv6. However, the discovery should still fail. */ + config_line_append(&options->Address, "Address", p->public_ip); + tor_addr_parse(&test_addr, p->public_ip); + + retval = find_my_address(options, p->family, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(false, NULL, NULL); + CLEANUP_FOUND_ADDRESS; + } + /* * Case 1: * 1. Address is a valid address. diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 60db98aec3..ee704ceb8c 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -302,6 +302,8 @@ test_find_addr_to_publish(void *arg) (void) arg; + memset(&options, 0, sizeof(options)); + /* Populate our resolved cache with a valid IPv4 and IPv6. */ family = tor_addr_parse(&ipv4_addr, "1.2.3.4"); tt_int_op(family, OP_EQ, AF_INET);

1 0

[translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
by translation＠torproject.org 21 Jul '20

21 Jul '20

commit 5a093208e5b6b6f5178e31f280a5ed98c5acb689 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 21 12:47:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- ja/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/torcheck.po b/ja/torcheck.po index dac6fab552..b8a42ed56c 100644 --- a/ja/torcheck.po +++ b/ja/torcheck.po @@ -10,6 +10,7 @@ # Emma Peel, 2019 # タカハシ <indexial(a)outlook.jp>, 2014 # h345u37g3 h345u37g3, 2019 +# Ito Takeshi, 2020 # Masaki Saito <rezoolab(a)gmail.com>, 2013 # MS_H, 2019 # siomiz <>, 2012 @@ -18,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2020-06-03 07:40+0000\n" -"Last-Translator: 323484\n" +"PO-Revision-Date: 2020-07-21 12:19+0000\n" +"Last-Translator: Ito Takeshi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,7 +101,7 @@ msgid "Run a Relay" msgstr "リレーを実行する" msgid "Stay Anonymous" -msgstr "匿名のままでいる" +msgstr "匿名でいる" msgid "Relay Search" msgstr "リレー検索"

1 0

[translation/torbutton-abouttbupdatedtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 21 Jul '20

21 Jul '20

commit a80f41bbeae3dda5afb47e9693d296a9290d8d97 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 21 12:47:43 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbup… --- ja/abouttbupdate.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ja/abouttbupdate.dtd b/ja/abouttbupdate.dtd index 26c9820a9f..98171bee90 100644 --- a/ja/abouttbupdate.dtd +++ b/ja/abouttbupdate.dtd @@ -1,8 +1,8 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser 変更履歴"> -<!ENTITY aboutTBUpdate.updated "Tor Browser アップデート完了"> -<!ENTITY aboutTBUpdate.linkPrefix "このリリースについての最新情報を入手するため、"> -<!ENTITY aboutTBUpdate.linkLabel "我々のウェブサイトを見てください"> -<!ENTITY aboutTBUpdate.linkSuffix "。"> -<!ENTITY aboutTBUpdate.version "バージョン"> -<!ENTITY aboutTBUpdate.releaseDate "リリース日"> -<!ENTITY aboutTBUpdate.releaseNotes "リリースノート"> +<!ENTITY aboutTBUpdate.changelogTitle ""> +<!ENTITY aboutTBUpdate.updated ""> +<!ENTITY aboutTBUpdate.linkPrefix ""> +<!ENTITY aboutTBUpdate.linkLabel ""> +<!ENTITY aboutTBUpdate.linkSuffix ""> +<!ENTITY aboutTBUpdate.version ""> +<!ENTITY aboutTBUpdate.releaseDate ""> +<!ENTITY aboutTBUpdate.releaseNotes "">

1 0

[translation/torbutton-abouttbupdatedtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd
by translation＠torproject.org 21 Jul '20

21 Jul '20

commit 47f152c74c0032b2b92444a57a41682bb94e8349 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 21 12:47:41 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbup… --- ja/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/abouttbupdate.dtd b/ja/abouttbupdate.dtd index 26c9820a9f..53d7bb643b 100644 --- a/ja/abouttbupdate.dtd +++ b/ja/abouttbupdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser 変更履歴"> <!ENTITY aboutTBUpdate.updated "Tor Browser アップデート完了"> <!ENTITY aboutTBUpdate.linkPrefix "このリリースについての最新情報を入手するため、"> -<!ENTITY aboutTBUpdate.linkLabel "我々のウェブサイトを見てください"> +<!ENTITY aboutTBUpdate.linkLabel "私たちのウェブサイトを見てください"> <!ENTITY aboutTBUpdate.linkSuffix "。"> <!ENTITY aboutTBUpdate.version "バージョン"> <!ENTITY aboutTBUpdate.releaseDate "リリース日">

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 21 Jul '20

21 Jul '20

commit 31f93c3b602826338bbb13dfe1ae402c789be5c5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 21 12:47:38 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- ja/aboutdialog.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ja/aboutdialog.dtd b/ja/aboutdialog.dtd index f85fea1b0b..d8e538a849 100644 --- a/ja/aboutdialog.dtd +++ b/ja/aboutdialog.dtd @@ -9,11 +9,11 @@ <!ENTITY help.or "や">  <!ENTITY help.getInvolvedLink "参加"> -<!ENTITY help.end "で支援してください！"> +<!ENTITY help.end "で支援してください!">  -<!ENTITY bottomLinks.questions "質問がありますか？"> +<!ENTITY bottomLinks.questions "質問がありますか?">  -<!ENTITY bottomLinks.grow "Tor ネットワークを育てましょう！"> +<!ENTITY bottomLinks.grow "Tor ネットワークを育てましょう!">  <!ENTITY bottomLinks.license "ライセンス情報"> -<!ENTITY tor.TrademarkStatement "'Tor' と 'Onion Logo' は Tor Project, Inc. の登録商標です。"> +<!ENTITY tor.TrademarkStatement "「Tor」と「Onion Logo」は Tor Project, Inc. の登録商標です。">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 21 Jul '20

21 Jul '20

commit b977363d053cb813738f998eb7869bd4da6d9384 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 21 12:46:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja.po b/ja.po index fee980b2bb..60a3fb4649 100644 --- a/ja.po +++ b/ja.po @@ -31,7 +31,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-07-21 12:15+0000\n" +"PO-Revision-Date: 2020-07-21 12:17+0000\n" "Last-Translator: Ito Takeshi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 21 Jul '20

21 Jul '20

commit 41366f32e155144a3ccde8b47d1b18ce28fafbb6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 21 12:45:55 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja.po b/ja.po index 59695f48dc..5fe1a2ccc9 100644 --- a/ja.po +++ b/ja.po @@ -31,7 +31,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-07-21 12:15+0000\n" +"PO-Revision-Date: 2020-07-21 12:17+0000\n" "Last-Translator: Ito Takeshi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -89,7 +89,7 @@ msgid "" "To add more, install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " "href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." -msgstr "他のソフトウェアを追加するには、<a href=\"synaptic.desktop\">Synapticパッケージ・マネージャー</a>、あるいは<a href=\"org.gnome.Terminal.desktop\">APTでコマンドラインから</a>インストールして下さい。" +msgstr "他のソフトウェアを追加するには、<a href=\"synaptic.desktop\">Synaptic パッケージマネージャー</a>または<a href=\"org.gnome.Terminal.desktop\">APT でコマンドライン</a>からインストールしてください。" #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154 msgid "_Create persistent storage"

1 0

[community/master] Add CC documents links in homepage.
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit 90e80e8d25aafe6cc664b005743e2727dd74359b Author: antonela <antonela(a)torproject.org> Date: Tue Jul 21 08:54:32 2020 -0300 Add CC documents links in homepage. Close https://gitlab.torproject.org/tpo/web/community/-/issues/141 --- templates/homepage.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/homepage.html b/templates/homepage.html index 9f7db9e..d01c9ff 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -19,7 +19,13 @@ </main> </div> </div> - </div> + <div class="container"> + <div class="row p-5 m-3 border"> + <p> + {{ _('The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate.') }} Read our <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a> and learn about the <a href="https://gitweb.torproject.org/community/policies.git/tree/community_council…" title="Tor Commmunity Council" target="_blank">Tor Community Council</a>. + </p> + </div> + </div> <footer> {% include 'footer.html' %} </footer>

1 0