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

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit 0eef37cc0d4f24049ac5c719f56f88812a80dccd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 14:15:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fa.po | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index aa43bdf65e..9b026f6ded 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -2963,7 +2963,7 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 0: Get a working Tor" -msgstr "" +msgstr "## قدم 0: تور را راه بیاندازید" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -2986,7 +2986,7 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 1: Get a web server working" -msgstr "" +msgstr "## قدم 1: یک سرور وب راه بیاندازید" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3059,7 +3059,7 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "You will need to put the following two lines in your torrc:" -msgstr "" +msgstr "باید دو خط زیر را در torrc خود قرار دهید:" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3099,7 +3099,7 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 3: Restart Tor and check that it worked" -msgstr "" +msgstr "## قدم 3: تور را مجدداً راه اندازی کنید و مطمئن شوید که کار می کند" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3177,7 +3177,7 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 5: More advanced tips" -msgstr "" +msgstr "## قدم 5: نکات پیشرفته بیشتر" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3216,7 +3216,7 @@ msgstr "https://2019.www.torproject.org/docs/tor-onion-service.html.en#three" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "- Advanced onion service security" -msgstr "" +msgstr "- امنیت پیشرفته سرویس پیازی" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3404,12 +3404,12 @@ msgstr "" #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) msgid "" "1. Select the language you would like to translate from the dropdown menu:" -msgstr "" +msgstr "1. زبانی که می خواهید از آن ترجمه کنید را از منو انتخاب کنید:" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) msgid "![Choose Language](/static/images/localization/tr4.png)" -msgstr "" +msgstr "![انتخاب زبان](/static/images/localization/tr4.png)" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) @@ -4068,7 +4068,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "## Backup Tor Identity Keys" -msgstr "" +msgstr "## پشتیبان‌گیری از کلید های هویت تور" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4076,6 +4076,8 @@ msgid "" "After your initial installation and start of the tor daemon it is a good " "idea to make a backup of your relay's long term identity keys." msgstr "" +"بعد از نصب آغازین و شروع دیمن تور ایده خوبی است تا از کلید های هویت بلند مدت" +" رله تور پشتیبان بگیرید." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4095,17 +4097,17 @@ msgstr "" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "Default locations of the keys folder:" -msgstr "" +msgstr "موقعیت پیش‌فرض پوشه کلید‌ها:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* Debian/Ubuntu: `/var/lib/tor/keys`" -msgstr "" +msgstr "* دبیان/اوبونتو: `/var/lib/tor/keys`" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* FreeBSD: `/var/db/tor/keys`" -msgstr "" +msgstr "* فری‌بی‌اس‌دی: `/var/db/tor/keys`" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4193,7 +4195,7 @@ msgstr "* پهنای باند" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* Established TCP Connections" -msgstr "" +msgstr "* اتصال های TCP برقرار شد" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4254,7 +4256,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* Numbers are worse than graphs." -msgstr "" +msgstr "* اعداد بدتر از گراف می باشند." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4617,12 +4619,12 @@ msgstr "apt install unbound" #: https//community.torproject.org/relay/setup/exit/ #: (content/relay-operations/technical-setup/exit/contents+en.lrpage.body) msgid "cp /etc/resolv.conf /etc/resolv.conf.backup" -msgstr "" +msgstr "cp /etc/resolv.conf /etc/resolv.conf.backup" #: https//community.torproject.org/relay/setup/exit/ #: (content/relay-operations/technical-setup/exit/contents+en.lrpage.body) msgid "echo nameserver 127.0.0.1 > /etc/resolv.conf" -msgstr "" +msgstr "echo nameserver 127.0.0.1 > /etc/resolv.conf" #: https//community.torproject.org/relay/setup/exit/ #: (content/relay-operations/technical-setup/exit/contents+en.lrpage.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit bc642c6d5b64689a1b6a497a454dee6e43cb8135 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 13:50:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+hr.po | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/contents+hr.po b/contents+hr.po index 3e1db4f8be..ebc8315259 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -81,7 +81,7 @@ msgstr "Preuzimanje" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Running Tor Browser for the First Time" -msgstr "" +msgstr "Prvo pokretanje Tor preglednika" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -101,7 +101,7 @@ msgstr "Mostovi" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Managing Identities" -msgstr "" +msgstr "Upravljanje identitetima" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -150,7 +150,7 @@ msgstr "Poznati problemi" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.title) msgid "Mobile Tor" -msgstr "" +msgstr "Tor za mobitele" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -160,7 +160,7 @@ msgstr "Kako postati Tor prevodilac" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Making Tor Browser Portable" -msgstr "" +msgstr "Kako učiniti Tor preglednik prenosivim" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -597,6 +597,9 @@ msgid "" "at a certain point, see the [Troubleshooting](../troubleshooting) page for " "help solving the problem." msgstr "" +"Ako si na relativno brzoj vezi, ali ti se čini da se ova traka u određenom " +"trenutku zaglavila, pogledaj stranicu [Otklanjanje " +"problema](/troubleshooting) za pomoć u rješavanju problema." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -614,6 +617,8 @@ msgid "" "If you know that your connection is censored or uses a proxy, you should " "select this option." msgstr "" +"Ako znaš da je tvoja veza cenzurirana ili da koristi proxy poslužitelja, " +"odaberi ovu opciju." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -625,12 +630,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Tor Browser will take you through a series of configuration options." -msgstr "" +msgstr "Tor preglednik će te provesti kroz niz opcija konfiguracije." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" -msgstr "" +msgstr "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -2407,7 +2412,7 @@ msgstr "" msgid "" "If you know that your connection is censored, you should select the settings" " icon." -msgstr "" +msgstr "Ako znaš da je tvoja veza cenzurirana, odaberi ikonu postavki." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2529,12 +2534,12 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### MANAGING IDENTITIES" -msgstr "" +msgstr "### UPRAVLJANJE IDENTITETIMA" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### New Identity" -msgstr "" +msgstr "#### Novi identitet" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2542,6 +2547,8 @@ msgid "" "<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" "/android-new-identity.png\" alt=\"New Identity on Tor Browser for Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-new-identity.png\" alt=\"New Identity on Tor Browser for Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit 72e4ea547e61b1d764447db868244a943210ed6e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 13:45:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fa.po | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index 0d0213a83f..aa43bdf65e 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -1,3 +1,4 @@ +# # Translators: # Arya Abidi <arya.abidi(a)gmail.com>, 2019 # Goudarz Jafari <goudarz.jafari(a)gmail.com>, 2019 @@ -227,6 +228,8 @@ msgid "" "We want Tor to work for everyone in the world, which means our software must" " be translated into a lot of languages." msgstr "" +"ما میخواهیم تور برای همه افراد در جهان کار کند، این یعنی نرم افزار ما لازم " +"است به زبان های زیادی ترجمه شود." #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.cta) @@ -236,14 +239,14 @@ msgstr "کمک به ما در ترجمه" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) msgid "##Localization is how we reach a global community." -msgstr "" +msgstr "## بومی سازی نحوه ارتباطی ما با جامعه جهانی است." #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) msgid "" "In order for Tor to work for everyone, it needs to speak everyone's " "languages." -msgstr "" +msgstr "برای اینکه تور برای همه کار کند، باید به زبان همه افراد موجود باشد." #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) @@ -399,7 +402,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body) msgid "This information will be made public." -msgstr "" +msgstr "این اطلاعات عمومی خواهد بود." #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body) @@ -491,7 +494,7 @@ msgstr "" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "The minimum requirements for a relay are 10 Mbit/s (Mbps)." -msgstr "" +msgstr "حداقل نیازمندی برای یک رله 10 مگابیت/ثانیه (Mbps) می باشد." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -620,6 +623,7 @@ msgstr "" msgid "" "* On an exit relay we recommend at least 1.5 GB of RAM per tor instance." msgstr "" +"* روی یک رله خروج ما حداقل 1.5 گیگ رم برای هر نمونه تور توصیه می کنیم." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -717,6 +721,8 @@ msgid "" "All nodes are important, but they have different technical requirements and " "legal implications." msgstr "" +"تمام گره‌ها مهم هستند، ولی نیازمندی‌ های فنی و پیامد های قانونی متفاوتی " +"دارند." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -724,6 +730,7 @@ msgid "" "Understanding the different kinds of nodes is the first step to learning " "which one is right for you." msgstr "" +"درک تفاوت بین گره های مختلف اولین قدم برای تشخیص گره مناسب برای شما می باشد." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1036,7 +1043,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Responding to abuse complaints" -msgstr "" +msgstr "# پاسخ به شکایت های سو استفاده" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1848,6 +1855,8 @@ msgstr "" #: (content/training/risks/contents+en.lrpage.body) msgid "* [EFF Know your rights](https://www.eff.org/issues/know-your-rights)" msgstr "" +"* [بنیاد مرز‌های الکترونیکی حقوق خود را بدانید](https://www.eff.org/issues" +"/know-your-rights)" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -1864,7 +1873,7 @@ msgstr "" #: https//community.torproject.org/training/code-of-conduct/ #: (content/training/code-of-conduct/contents+en.lrpage.title) msgid "Code of Conduct for Trainers" -msgstr "" +msgstr "قواعد رفتاری برای مربیان" #: https//community.torproject.org/training/code-of-conduct/ #: (content/training/code-of-conduct/contents+en.lrpage.subtitle) @@ -2040,12 +2049,12 @@ msgstr "## پس از آموزش" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Collect participants feedback" -msgstr "" +msgstr "[ ] گرفتن بازخورد از افرادی که مشارکت کرده اند" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Leave an e-mail for further contact and support" -msgstr "" +msgstr "[ ] ارائه یک پست الکترونیکی برای ارتباط و پشتیبانی" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body)

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit f45e66d1b38421b9520d566ce592552828d552ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 12:53:38 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+es.po | 1 + contents+fr.po | 1 + contents+pt-BR.po | 1 + contents+pt-PT.po | 1 + contents+tr.po | 1 + contents+zh-CN.po | 1 + 6 files changed, 6 insertions(+) diff --git a/contents+es.po b/contents+es.po index 5c32a175ac..6c5498b023 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1,3 +1,4 @@ +# # Translators: # Edward Navarro, 2019 # Martus Translations <translations(a)martus.org>, 2019 diff --git a/contents+fr.po b/contents+fr.po index 6c4af4f323..ee26f2a098 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1,3 +1,4 @@ +# # Translators: # Martus Translations <translations(a)martus.org>, 2019 # ducki2p <ducki2p(a)gmail.com>, 2019 diff --git a/contents+pt-BR.po b/contents+pt-BR.po index c1f2ad326a..2a4b88b275 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -1,3 +1,4 @@ +# # Translators: # Danton Medrado, 2019 # Joeffison Silvério de Andrade <joeffison(a)gmail.com>, 2019 diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 390b292725..b36f97989f 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -1,3 +1,4 @@ +# # Translators: # alfalb_mansil, 2019 # Rui Melo <viper5000pt(a)gmail.com>, 2019 diff --git a/contents+tr.po b/contents+tr.po index f421038581..01a0fc48ba 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1,3 +1,4 @@ +# # Translators: # T. E. Kalayci <tekrei(a)gmail.com>, 2019 # erinm, 2019 diff --git a/contents+zh-CN.po b/contents+zh-CN.po index c3c9eefa1a..0d501c8c24 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1,3 +1,4 @@ +# # Translators: # Chi-Hsun Tsai, 2019 # Xiaoyu Huang <007pig(a)gmail.com>, 2019

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit 83579f90788628afa7a00a0bbcba2e365d6bb90f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 12:50:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+hr.po | 1 + 1 file changed, 1 insertion(+) diff --git a/contents+hr.po b/contents+hr.po index d241d41865..3e1db4f8be 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -1,3 +1,4 @@ +# # Translators: # erinm, 2019 # Josip Domšić <josip.domsic(a)gmail.com>, 2019

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit 3ff69e01f564c66312448fb3991f38bd49a89d0d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 12:45:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+hr.po | 1 + 1 file changed, 1 insertion(+) diff --git a/contents+hr.po b/contents+hr.po index a073e196be..4b8eb26e85 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -1,3 +1,4 @@ +# # Translators: # Karlo Prikratki <karlo(a)karloprikratki.com>, 2019 # erinm, 2019

1 0

[tor/master] core/or: Remove unused function prototype
by nickm＠torproject.org 24 Apr '20

24 Apr '20

commit ab8ff32bec055d938ec53ca31df00bfdedcf8fe7 Author: teor <teor(a)torproject.org> Date: Tue Apr 14 10:37:20 2020 +1000 core/or: Remove unused function prototype Remove the unused function prototype for connection_or_get_for_extend(). There is no function implementation. Part of 33817. --- src/core/or/connection_or.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/core/or/connection_or.h b/src/core/or/connection_or.h index 02bc87a86..e9ace56ab 100644 --- a/src/core/or/connection_or.h +++ b/src/core/or/connection_or.h @@ -22,10 +22,6 @@ or_connection_t *TO_OR_CONN(connection_t *); void connection_or_clear_identity(or_connection_t *conn); void connection_or_clear_identity_map(void); void clear_broken_connection_map(int disable); -or_connection_t *connection_or_get_for_extend(const char *digest, - const tor_addr_t *target_addr, - const char **msg_out, - int *launch_out); void connection_or_block_renegotiation(or_connection_t *conn); int connection_or_reached_eof(or_connection_t *conn);

1 0

[tor/master] core/or: Accurately log remote relay IPv6 addresses
by nickm＠torproject.org 24 Apr '20

24 Apr '20

commit 8c55d34e0adfd9585befd7ce1f71fb219ed63146 Author: teor <teor(a)torproject.org> Date: Tue Apr 14 12:21:49 2020 +1000 core/or: Accurately log remote relay IPv6 addresses Log IPv6 addresses on connections where this relay is the responder. Previously, responding relays would replace the remote IPv6 address with the IPv4 address from the consensus. (The port is replaced with the IPv6 ORPort from the consensus, we will resolve this issue in 33898.) Fixes bug 33899; bugfix on 0.3.1.1-alpha. --- changes/bug33899 | 4 ++++ src/core/or/connection_or.c | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/changes/bug33899 b/changes/bug33899 index 319df45df..b9b7d7cf1 100644 --- a/changes/bug33899 +++ b/changes/bug33899 @@ -3,3 +3,7 @@ In 17604, relays assumed that a remote relay could consider an IPv6 connection canonical, but did not set the canonical flag on their side of the connection. Fixes bug 33899; bugfix on 0.3.1.1-alpha. + - Log IPv6 addresses on connections where this relay is the responder. + Previously, responding relays would replace the remote IPv6 address with + the IPv4 address from the consensus. + Fixes bug 33899; bugfix on 0.3.1.1-alpha. diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index 2eecbc50a..f059bae25 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -909,6 +909,13 @@ connection_or_check_canonicity(or_connection_t *conn, int started_here) tor_addr_eq(&conn->base_.addr, &node_ipv6_ap.addr)) { connection_or_set_canonical(conn, 1); } + /* Choose the correct canonical address and port. */ + tor_addr_port_t *node_ap; + if (tor_addr_family(&conn->base_.addr) == AF_INET) { + node_ap = &node_ipv4_ap; + } else { + node_ap = &node_ipv6_ap; + } if (!started_here) { /* Override the addr/port, so our log messages will make sense. * This is dangerous, since if we ever try looking up a conn by @@ -920,13 +927,14 @@ connection_or_check_canonicity(or_connection_t *conn, int started_here) * right IP address and port 56244, that wouldn't be as helpful. now we * log the "right" port too, so we know if it's moria1 or moria2. */ - tor_addr_copy(&conn->base_.addr, &node_ap.addr); - conn->base_.port = node_ap.port; + /* See #33898 for a ticket that resolves this technical debt. */ + tor_addr_copy(&conn->base_.addr, &node_ap->addr); + conn->base_.port = node_ap->port; } tor_free(conn->nickname); conn->nickname = tor_strdup(node_get_nickname(r)); tor_free(conn->base_.address); - conn->base_.address = tor_addr_to_str_dup(&node_ap.addr); + conn->base_.address = tor_addr_to_str_dup(&node_ap->addr); } else { tor_free(conn->nickname); conn->nickname = tor_malloc(HEX_DIGEST_LEN+2);

1 0

[tor/master] core/or: Allow IPv6 connections to be canonical
by nickm＠torproject.org 24 Apr '20

24 Apr '20

commit 41fa07f751aaf50297d3139c440f7fb3ed71338a Author: teor <teor(a)torproject.org> Date: Tue Apr 14 12:16:48 2020 +1000 core/or: Allow IPv6 connections to be canonical Consider IPv6 addresses when checking if a connection is canonical. In 17604, relays assumed that a remote relay could consider an IPv6 connection canonical, but did not set the canonical flag on their side of the connection. Fixes bug 33899; bugfix on 0.3.1.1-alpha. --- changes/bug33899 | 5 +++++ src/core/or/connection_or.c | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug33899 b/changes/bug33899 new file mode 100644 index 000000000..319df45df --- /dev/null +++ b/changes/bug33899 @@ -0,0 +1,5 @@ + o Minor bugfixes (IPv6, relay): + - Consider IPv6 addresses when checking if a connection is canonical. + In 17604, relays assumed that a remote relay could consider an IPv6 + connection canonical, but did not set the canonical flag on their side + of the connection. Fixes bug 33899; bugfix on 0.3.1.1-alpha. diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index 6b11f3323..2eecbc50a 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -901,12 +901,14 @@ connection_or_check_canonicity(or_connection_t *conn, int started_here) } if (r) { - tor_addr_port_t node_ap; - node_get_pref_orport(r, &node_ap); - /* XXXX proposal 186 is making this more complex. For now, a conn - is canonical when it uses the _preferred_ address. */ - if (tor_addr_eq(&conn->base_.addr, &node_ap.addr)) + tor_addr_port_t node_ipv4_ap; + tor_addr_port_t node_ipv6_ap; + node_get_prim_orport(r, &node_ipv4_ap); + node_get_pref_ipv6_orport(r, &node_ipv6_ap); + if (tor_addr_eq(&conn->base_.addr, &node_ipv4_ap.addr) || + tor_addr_eq(&conn->base_.addr, &node_ipv6_ap.addr)) { connection_or_set_canonical(conn, 1); + } if (!started_here) { /* Override the addr/port, so our log messages will make sense. * This is dangerous, since if we ever try looking up a conn by

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1862/head'
by nickm＠torproject.org 24 Apr '20

24 Apr '20

commit 7f9eaec538b7d01e0d1b130dc4cf2ec634252d46 Merge: b2849f449 8c55d34e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 24 08:14:59 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1862/head' changes/bug33899 | 9 +++++++++ src/core/or/connection_or.c | 26 ++++++++++++++++++-------- src/core/or/connection_or.h | 4 ---- 3 files changed, 27 insertions(+), 12 deletions(-)

1 0