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

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 26 Feb '21

26 Feb '21

commit 93eb38aa1d4adfdc0eb0d347d28424b069ce3ac4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 26 13:16:19 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- id/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/id/messages.json b/id/messages.json index e7dde022f8..7852f4f08e 100644 --- a/id/messages.json +++ b/id/messages.json @@ -36,7 +36,7 @@ "message": "Cookies tidak aktif." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentation wiki</a>." + "message": "Snowflake adalah sebuah sistem untuk merobohkan penyensoran internet. Orang-rang yang disensor dapat menggunakan Snowflake untuk mengakses internet. Koneksi mereka dilangsungkan melalui proksi Snowflake, dimana dijalankan oleh para relawan. Untuk informasi lebih lanjut mengenai bagaimana Snowflake bekerja, tinjau <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">dokumentasi wiki</a> kami." }, "browser": { "message": "Peramban" @@ -63,10 +63,10 @@ "message": "Jika Anda mengalami kendala dengan Snowflake sebagai pengguna atau proksi, mohon pertimbangkan untuk melaporkan bug. Ada dua cara untuk melakukan pelaporan bug:" }, "sharedAccount": { - "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the List of all projects and create a new issue." + "message": "Buat sebuah <a href=\"https://anonticket.onionize.space/\">tiket anonim</a> dengan menghasilkan sebuah pengidentifikasi dan log masuk dengan itu. Lalu, cari proyek Snowflake di dalam daftar semua proyek dan buat sebuah isu baru." }, "bugTracker": { - "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "<a href=\"https://gitlab.onionize.space/\">Meminta akun</a> di Proyek Tor GitLab, lalu <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">buka isu baru</a> di dalam proyek Snowflake." }, "descriptive": { "message": "Mohon untuk sedeskriptif mungkin dengan tiket Anda dan bila memungkinkan catat pesan yang akan membantu kami meniru bug." @@ -84,6 +84,6 @@ "message": "FAQ " }, "support": { - "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." + "message": "Lihat Topik <a href=\"https://support.torproject.org/censorship/\">Penyensoran</a> di <a href=\"https://support.torproject.org/\">Portal Dukungan</a> Tor." } }

1 0

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

26 Feb '21

commit 162a13477b232e9e6730e470b30a7b2c3914bf40 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 26 13:15:11 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- id/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 58e712e121..00cedc2e11 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/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-26 12:44+0000\n" +"PO-Revision-Date: 2021-02-26 12:47+0000\n" "Last-Translator: Sidiq Pangestu <sani21bimo(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" @@ -226,7 +226,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun yang melihat lalu-lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n" +msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari \"Pluggable Transports\"%s,\nyang dapat membantu menyamarkan sambungan Anda ke Jaringan Tor, mempersulit\nsiapa pun yang melihat lalu-lintas internet Anda dan bahwa Anda menggunakan Tor.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:57 @@ -307,7 +307,7 @@ msgid "" "the pseudo-mechanism \"None\". The following list briefly explains how these\n" "mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" "mechanisms is." -msgstr "BridgeDB memiliki empat mekanisme untuk menyalurkan jembatan: \"HTTPS\", \"Moat\"\n\"Surel\" dan \"Telah Direservasi\". Jembatan yang tidak disalurkan melalui BridgeDB menggunakan\npseudo-mekanisme \"Tidak Ada\". Daftar berikut sedikit menjelaskan bagaimana\nmekanisme-mekanisme ini bekerja dan %smetrik BridgeDB%s memvisualisasikan kepopuleran masing-masing mekanisme." +msgstr "BridgeDB memiliki empat mekanisme untuk menyalurkan jembatan : \"HTTPS\", \"Moat\"\n\"Surel\" dan \"Reserved\". Jembatan yang tidak disalurkan melalui BridgeDB menggunakan\npseudo-mekanisme \"Tidak Ada\". Daftar berikut menyinggung tentang bagaimana\nmekanisme-mekanisme ini bekerja dan %smetrik BridgeDB%s memvisualisasikan kepopuleran masing-masing mekanisme." #: bridgedb/strings.py:115 #, python-format

1 0

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

26 Feb '21

commit 68cb497c467ade75d670fa0a61164380811d0833 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 26 12:45:07 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- id/LC_MESSAGES/bridgedb.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 88ca485285..58e712e121 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -18,6 +18,7 @@ # Ngalim Siregar <ngalim.siregar(a)gmail.com>, 2015 # km242saya <pencurimangga(a)gmail.com>, 2014 # Ridhwan Ikhwanto, 2020 +# Sidiq Pangestu <sani21bimo(a)gmail.com>, 2021 # Suryadi Harun <suryadiharun08(a)gmail.com>, 2019 # Wahyu Utomo Nurindrayanto <wahyutomo66(a)gmail.com>, 2016 # Yerry Borang <yerry.borang(a)gmail.com>, 2019 @@ -27,8 +28,8 @@ 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-02 22:11+0000\n" -"Last-Translator: Arif Budiman <arifbudiman(a)gmail.com>\n" +"PO-Revision-Date: 2021-02-26 12:44+0000\n" +"Last-Translator: Sidiq Pangestu <sani21bimo(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +76,7 @@ msgstr "Bahasa" #: bridgedb/distributors/https/templates/base.html:94 msgid "Report a Bug" -msgstr "Laporkan Bug" +msgstr "Laporkan Masalah" #: bridgedb/distributors/https/templates/base.html:97 msgid "Source Code" @@ -99,17 +100,17 @@ msgstr "Kode QR untuk jembatan Anda" #: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." -msgstr "Tampaknya ada kesalahan dalam mendapatkan Kode QR Anda." +msgstr "Terjadi kesalahan saat memproses Kode QR Anda." #: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Kode QR ini berisi baris jembatan Anda. Pindai dengan pembaca Kode QR untuk menyalin baris jembatan Anda ke perangkat seluler dan lainnya." +msgstr "Kode QR ini berisi baris-baris jembatan Anda. Pindai dengan pembaca Kode QR untuk menyalin baris jembatan Anda ke perangkat seluler dan lainnya." #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "BridgeDB mengalami error." +msgstr "BridgeDB mengalami kesalahan." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." @@ -121,7 +122,7 @@ msgstr "Belum ada jembatan yang tersedia..." msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr " Mungkin Anda harus mencoba %s kembali %s dan memilih tipe jembatan yang berbeda!" +msgstr " Sepertinya Anda harus mencoba %s kembali %s dan memilih tipe jembatan yang berbeda!" #: bridgedb/distributors/https/templates/index.html:11 #, python-format @@ -131,7 +132,7 @@ msgstr "Langkah %s1%s" #: bridgedb/distributors/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Unduh %s Tor Browser %s" +msgstr "Unduh %s Penjelajah Tor%s" #: bridgedb/distributors/https/templates/index.html:25 #, python-format @@ -324,7 +325,7 @@ msgid "" "your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" "subsequent CAPTCHA, and Tor Browser will automatically add your new\n" "bridges." -msgstr "Mekanisme penyaluran \"Moat\" adalah bagian dari Tor Browser, memungkinan pengguna untuk\nmeminta jembatan langsung dari pengaturan Tor Browser. Untuk mendapatkan jembatan, buka\n%spengaturan Tor%s pada Tor Browser Anda, klik \"request a new bridge\", selesaikan\nCAPTCHA dan Tor Browser akan secara otomatis menambahkan jembatan baru Anda." +msgstr "Mekanisme penyaluran \"Moat\" adalah bagian dari Penjelajah Tor, memungkinkan pengguna untuk\nmeminta jembatan langsung dari pengaturan Penjelajah Tor. Untuk mendapatkan jembatan, buka\n%spengaturan Tor%s pada Penjelajah Tor Anda, klik \"request a new bridge\", selesaikan\nCAPTCHA dan Penjelajah Tor akan secara otomatis menambahkan jembatan baru Anda." #: bridgedb/strings.py:125 #, python-format @@ -402,7 +403,7 @@ msgid "" "Add these bridges to your Tor Browser by opening your browser\n" "preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" "bridge\" field." -msgstr "Tambahkan jembatan-jembatan berikut ke Tor Browser Anda dengan membuka pengaturan peramban Anda, klik \"Tor\", dan tambahkan jembatan-jembatan ke bidang \"Provide a bridge\"." +msgstr "Tambahkan jembatan-jembatan berikut ke Penjelajah Tor Anda dengan membuka pengaturan penjelajah Anda, klik \"Tor\", dan tambahkan jembatan-jembatan ke bagian \"Provide a bridge\"." #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)" @@ -410,7 +411,7 @@ msgstr "(Minta jembatan Tor yang tidak disamarkan)" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)" -msgstr "(Minta jembatan IPv6)" +msgstr "(Minta jembatan IPv6.)" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)"

1 0

[translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
by translation＠torproject.org 26 Feb '21

26 Feb '21

commit ba9bbbb40fee5e61d09f5e2b067478be068051b1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 26 11:46:00 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- sv_SE/messages.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sv_SE/messages.json b/sv_SE/messages.json index ebeb1e9f92..0a8925ed8a 100644 --- a/sv_SE/messages.json +++ b/sv_SE/messages.json @@ -36,10 +36,7 @@ "message": "Cookies are not enabled." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>." - }, - "docWiki": { - "message": "documentation wiki" + "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentation wiki</a>." }, "browser": { "message": "Browser" @@ -66,10 +63,10 @@ "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug report. There are two ways to file a bug report:" }, "sharedAccount": { - "message": "Edit the <a href=\"https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\">public bug-reporting pad</a> of the anti-censorship team." + "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the List of all projects and create a new issue." }, "bugTracker": { - "message": "<a href=\"https://gitlab.torproject.org/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." }, "descriptive": { "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug." @@ -82,5 +79,11 @@ }, "looksLike": { "message": "Which looks like this:" + }, + "faq": { + "message": "FAQ" + }, + "support": { + "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." } }

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 26 Feb '21

26 Feb '21

commit 190de8f9ebfde02b3377f4c178eb4dce63da0bb6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 26 11:45:58 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- sv_SE/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv_SE/messages.json b/sv_SE/messages.json index 52d36b79a3..0ca5e2759d 100644 --- a/sv_SE/messages.json +++ b/sv_SE/messages.json @@ -36,7 +36,7 @@ "message": "Kakor är inte aktiverade." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentation wiki</a>." + "message": "Snowflake är ett system för att besegra internet censur. Människor som är censurerade kan använda Snowflake för att komma åt internet. Deras anslutning går genom Snowflake-proxyer, som drivs av volontärer. För mer detaljerad information om hur Snowflake fungerar se vår <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">dokumentation wiki</a>." }, "browser": { "message": "Webbläsare" @@ -63,10 +63,10 @@ "message": "Om du stöter på problem med Snowflake som klient eller proxy kan du överväga att skicka en felrapport. Det finns två sätt att skicka en felrapport:" }, "sharedAccount": { - "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the List of all projects and create a new issue." + "message": "Registrera ett <a href=\"https://anonticket.onionize.space/\">anonymt ärende</a> genom att skapa en identifierare och logga in med den. Hitta sedan Snowflake-projektet i listan över alla projekt och skapa ett nytt ärende." }, "bugTracker": { - "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "<a href=\"https://gitlab.torproject.org/\">Skapa ett konto</a> på Tor Project GitLab och <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">öppna sedan ett nytt ärende</a> i Snowflake-projektet." }, "descriptive": { "message": "Försök att vara så beskrivande som möjligt med ditt ärende och om möjligt inkludera loggmeddelanden som hjälper oss att reproducera felet." @@ -84,6 +84,6 @@ "message": "Vanliga frågor" }, "support": { - "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." + "message": "Se <a href=\"https://support.torproject.org/censorship/\">censurämnet</a> i Tors <a href=\"https://support.torproject.org/\">supportportal</a>." } }

1 0

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

26 Feb '21

commit 1c6d24637ee4c8f6c5bbfca7bce2dc9a4e326482 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 26 11:45:13 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+ka.po b/contents+ka.po index 46f9a209a4..9a33e133ab 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -17923,6 +17923,9 @@ msgid "" "Word of mouth is critical to reaching new people and helping them protect " "themselves online. Here's how you can help: " msgstr "" +"ზეპირსიტყვიერი კავშირი უკიდურესად მნიშვნელოვანია მეტი ადამიანისთვის ხმის " +"მისაწვდენად და მათთვის, ინტერნეტში თავდაცვის გზების შესასწავლად. აქ იხილავთ," +" როგორ შეგიძლიათ დახმარება:" #: templates/outreach-talk.html:11 msgid "Privacy and freedom are human rights."

1 0

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

26 Feb '21

commit d456be80a55f235e92c3c3c407211c2e59ac70dd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 26 11:15:14 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/contents+ka.po b/contents+ka.po index 448266e815..46f9a209a4 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -17272,6 +17272,18 @@ msgid "" "vicarious liability. Therefore, you should continue to be protected under " "the DMCA 512(a) safe harbor without taking any further action." msgstr "" +"თუნდაც Tor-კვანძი, რომელიც გაშვებული მაქვს, შეიძლება შეცდომით მიჩნეული იყოს " +"ისეთი მასალის წყაროდ, რომელიც არღვევს საავტორო უფლებებს, აღვნიშნავ რომ მე არ" +" ვფლობ ამ მასალას. ამასთან, მე არ ვირჩევ მასალებს, რომლებიც გადაიცემა ჩემ " +"მიერ გაშვებული Tor-კვანძით და არ გამაჩნია რამე სახის ხელშესახები " +"შესაძლებლობა, არც ამ მასალის წყაროს დადგენისა და არც მისი გადაცემის " +"აღკვეთის. მე არავის მოვუწოდებ და არ ვეხმარები Tor-ქსელით სარგებლობაში, " +"საავტორო უფლებების დასარღვევად. სწორედ ამ მიზეზებიდან გამომდინარე, მე არ " +"წარმოვადგენ საავტორო უფლებების დამრღვევს იმ მასალებთან დაკავშირებით, " +"რომლებიც გადაიცემა ჩემ მიერ გაშვებული Tor-კვანძის გავლით, არც პირდაპირი და " +"არც ირიბი ან ხელშემწყობის პასუხისმგებლობით. მაშასადამე, თქვენც ასევე " +"სარგებლობთ DMCA 512(a) კანონის ხელშეუხებლობის პირობებით, დამატებით რომც " +"არაფერი მოიმოქმედოთ." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents+en.lrpage.body) @@ -17827,6 +17839,8 @@ msgid "" "None of these ideas seem appealing? You may also want to propose your own " "project idea — which often results in the best projects." msgstr "" +"არცერთი არაა თქვენთვის მომხიბვლელი? შესაძლოა თავად გსურდეთ საკუთარი " +"მოსაზრების შემოთავაზება — რაც ხშირად საუკეთესო შედეგის საწინდარია ხოლმე." #: templates/gsoc.html:22 msgid "We invite you to contact us to discuss your own project idea."

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/317'
by asn＠torproject.org 26 Feb '21

26 Feb '21

commit 8020ae02abb105db8480022b6f47b65e832c1e63 Merge: f75baf5ea5 85dcd4ce07 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 26 12:56:14 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/317' scripts/maint/geoip/README.geoip | 25 ++++ scripts/maint/geoip/geoip-db-tool/.gitignore | 1 + scripts/maint/geoip/geoip-db-tool/Cargo.toml | 14 +++ scripts/maint/geoip/geoip-db-tool/src/db.rs | 126 +++++++++++++++++++ scripts/maint/geoip/geoip-db-tool/src/main.rs | 165 +++++++++++++++++++++++++ scripts/maint/geoip/update_and_commit_geoip.sh | 34 +++++ scripts/maint/geoip/update_geoip.sh | 16 +++ 7 files changed, 381 insertions(+)

1 0

[tor/master] Rust tool to convert IPFire Location dump into CSV format.
by asn＠torproject.org 26 Feb '21

26 Feb '21

commit 0d4237839b21b466526a01147538d09c117cc884 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 08:30:11 2021 -0500 Rust tool to convert IPFire Location dump into CSV format. The IPFire people provide a tool that collects data from several top-level sources, combines it into a single database, and annotates it with optional overrides. This tool transforms the "dump" format of their database into the form Tor expects. --- scripts/maint/geoip/README.geoip | 25 ++++ scripts/maint/geoip/geoip-db-tool/.gitignore | 1 + scripts/maint/geoip/geoip-db-tool/Cargo.toml | 16 +++ scripts/maint/geoip/geoip-db-tool/src/db.rs | 126 ++++++++++++++++++++ scripts/maint/geoip/geoip-db-tool/src/main.rs | 165 ++++++++++++++++++++++++++ scripts/maint/geoip/update_geoip.sh | 16 +++ 6 files changed, 349 insertions(+) diff --git a/scripts/maint/geoip/README.geoip b/scripts/maint/geoip/README.geoip new file mode 100644 index 0000000000..0ed94b2276 --- /dev/null +++ b/scripts/maint/geoip/README.geoip @@ -0,0 +1,25 @@ +To generate new geoip files, you'll need to install the +libloc/"location" tool provided by https://location.ipfire.org/. +I personally build it with: + + ./configure CFLAGS='-g -O2' --disable-perl --without-systemd --prefix=/opt/libloc + make + make install + +Then (after adjusting PATH and PYTHONPATH) you can get the latest +dump with: + + location update + location dump geoip-dump.txt + +And transform it into geoip files with + + cargo run --release -- -i geoip-dump.txt + + +============================== + +Note that the current version "0.1.9" of rangemap has a performance +bug, making this tool quite slow. Previous versions had a +correctness bug that made the output needlessly long. With luck, +there will soon be a fast correct rangemap version. \ No newline at end of file diff --git a/scripts/maint/geoip/geoip-db-tool/.gitignore b/scripts/maint/geoip/geoip-db-tool/.gitignore new file mode 100644 index 0000000000..eb5a316cbd --- /dev/null +++ b/scripts/maint/geoip/geoip-db-tool/.gitignore @@ -0,0 +1 @@ +target diff --git a/scripts/maint/geoip/geoip-db-tool/Cargo.toml b/scripts/maint/geoip/geoip-db-tool/Cargo.toml new file mode 100644 index 0000000000..b08863924a --- /dev/null +++ b/scripts/maint/geoip/geoip-db-tool/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "geoip-db-tool" +version = "0.1.0" +authors = ["Nick Mathewson <nickm(a)torproject.org>"] +edition = "2018" +license = "MIT OR Apache-2.0" +publish = false + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +ipnetwork= "0.17.0" +rangemap= "0.1.9" +# I use this for now to avoid a performance hit due to a bug on 0.1.9 +# rangemap = {version = "*", path = "/home/nickm/src/rangemap/" } +argh = "0.1.4" diff --git a/scripts/maint/geoip/geoip-db-tool/src/db.rs b/scripts/maint/geoip/geoip-db-tool/src/db.rs new file mode 100644 index 0000000000..eaadd4c612 --- /dev/null +++ b/scripts/maint/geoip/geoip-db-tool/src/db.rs @@ -0,0 +1,126 @@ +/// Code to parse a dump file +use std::collections::HashMap; +use std::convert::TryInto; +use std::iter::Peekable; + +use super::NetBlock; + +pub struct BlockReader +where + I: Iterator<Item = std::io::Result<String>>, +{ + iter: Peekable, +} + +enum AnyBlock { + NotNet, + NetBlock(NetBlock), +} + +impl BlockReader +where + I: Iterator<Item = std::io::Result<String>>, +{ + pub fn new(iter: I) -> Self { + BlockReader { + iter: iter.peekable(), + } + } + + /// Extract the initial header from the file. + pub fn extract_header(&mut self) -> String { + let mut res: String = "".to_string(); + + while let Some(Ok(line)) = self.iter.peek() { + if !line.starts_with('#') { + break; + } + res.push_str(line.as_str()); + res.push('\n'); + let _ = self.iter.next(); + } + + res + } + + /// Extract the next empty-line-delimited block from the file. + /// + /// This isn't terribly efficient, but it's "fast enough". + fn get_block(&mut self) -> Option<std::io::Result<AnyBlock>> { + let mut kv = HashMap::new(); + + while let Some(line) = self.iter.next() { + //dbg!(&line); + if let Err(e) = line { + return Some(Err(e)); + } + let line_orig = line.unwrap(); + let line = line_orig.splitn(2, '#').next().unwrap().trim(); + if line.is_empty() { + if kv.is_empty() { + continue; + } else { + break; + } + } + let kwds: Vec<_> = line.splitn(2, ':').collect(); + if kwds.len() != 2 { + return None; // XXXX handle the error better. + } + kv.insert(kwds[0].trim().to_string(), kwds[1].trim().to_string()); + } + + if kv.is_empty() { + return None; + } + + let net = if let Some(net) = kv.get("net") { + net.parse().unwrap() //XXXX handle the error better. + } else { + return Some(Ok(AnyBlock::NotNet)); + }; + + let cc = if let Some(country) = kv.get("country") { + assert!(country.as_bytes().len() == 2); + country.as_bytes()[0..2].try_into().unwrap() + } else { + return Some(Ok(AnyBlock::NotNet)); + }; + + fn is_true(v: Option<&String>) -> bool { + match v { + Some(s) => s == "true", + None => false, + } + } + + let is_anon_proxy = is_true(kv.get("is-anonymous-proxy")); + let is_anycast = is_true(kv.get("is-anycast-proxy")); + let is_satellite = is_true(kv.get("is-satellite-provider")); + + Some(Ok(AnyBlock::NetBlock(NetBlock { + net, + cc, + is_anon_proxy, + is_anycast, + is_satellite, + }))) + } +} + +impl Iterator for BlockReader +where + I: Iterator<Item = std::io::Result<String>>, +{ + type Item = NetBlock; + fn next(&mut self) -> Option<Self::Item> { + loop { + match self.get_block() { + None => return None, + Some(Err(_)) => return None, + Some(Ok(AnyBlock::NotNet)) => continue, + Some(Ok(AnyBlock::NetBlock(n))) => return Some(n), + } + } + } +} diff --git a/scripts/maint/geoip/geoip-db-tool/src/main.rs b/scripts/maint/geoip/geoip-db-tool/src/main.rs new file mode 100644 index 0000000000..38d70f7e1b --- /dev/null +++ b/scripts/maint/geoip/geoip-db-tool/src/main.rs @@ -0,0 +1,165 @@ +/// A basic tool to convert IPFire Location dumps into the CSV formats that Tor +/// expects. +mod db; + +use argh::FromArgs; +use ipnetwork::IpNetwork; +use rangemap::RangeInclusiveMap; + +use std::fs::File; +use std::io::{BufRead, BufReader, BufWriter, Write}; +use std::net::{IpAddr, Ipv6Addr}; +use std::path::{Path, PathBuf}; + +fn default_ipv4_path() -> PathBuf { + "./geoip".into() +} +fn default_ipv6_path() -> PathBuf { + "./geoip6".into() +} + +#[derive(FromArgs)] +/// Convert an IPFire Location dump into CSV geoip files. +struct Args { + /// where to store the IPv4 geoip output + #[argh(option, default = "default_ipv4_path()", short = '4')] + output_ipv4: PathBuf, + + /// where to store the IPv6 geoip6 output + #[argh(option, default = "default_ipv6_path()", short = '6')] + output_ipv6: PathBuf, + + /// where to find the dump file + #[argh(option, short = 'i')] + input: PathBuf, +} + +/// Represents a network block from running `location dump`. +#[derive(Debug, Clone)] +pub struct NetBlock { + pub net: IpNetwork, + pub cc: [u8; 2], + pub is_anon_proxy: bool, + pub is_anycast: bool, + pub is_satellite: bool, +} + +impl PartialEq for NetBlock { + fn eq(&self, other: &Self) -> bool { + self.net == other.net + } +} + +/// We define network blocks as being sorted first from largest to smallest, +/// then by address. +impl Ord for NetBlock { + fn cmp(&self, other: &Self) -> std::cmp::Ordering { + self.net + .prefix() + .cmp(&other.net.prefix()) + .then_with(|| self.net.network().cmp(&other.net.network())) + } +} + +impl PartialOrd for NetBlock { + fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> { + Some(self.cmp(other)) + } +} + +impl Eq for NetBlock {} + +const PROLOGUE: &str = "\ +# This file has been converted from the IPFire Location database +# using Tor's geoip-db-tool. For more information on the data, see +# https://location.ipfire.org/. +# +# Below is the header from the original export: +# +"; + +/// Read an input file in the `location dump` format, and write CSV ipv4 and ipv6 files. +/// +/// This code tries to be "efficient enough"; most of the logic is handled by +/// using the rangemap crate. +fn convert(input: &Path, output_v4: &Path, output_v6: &Path) -> std::io::Result<()> { + let f = File::open(input)?; + let f = BufReader::new(f); + let mut blocks = Vec::new(); + + let mut reader = db::BlockReader::new(f.lines()); + let hdr = reader.extract_header(); + // Read blocks, and then sort them by specificity and address. + for nb in reader { + blocks.push(nb); + } + blocks.sort(); + + // Convert the sorted blocks into a map from address ranges into + // country codes. + // + // Note that since we have sorted the blocks from least to most specific, + // we will be puttting them into the maps in the right order, so that the + // most specific rule "wins". + // + // We use u32 and u128 as the index types for these RangeInclusiveMaps, + // so that we don't need to implement a step function for IpAddr. + let mut v4map: RangeInclusiveMap<u32, [u8; 2], _> = RangeInclusiveMap::new(); + let mut v6map: RangeInclusiveMap<u128, [u8; 2], _> = RangeInclusiveMap::new(); + + let mut n = 0usize; + let num_blocks = blocks.len(); + for nb in blocks { + n += 1; + if n % 100000 == 0 { + println!("{}/{}", n, num_blocks); + } + let start = nb.net.network(); + let end = nb.net.broadcast(); + match (start, end) { + (IpAddr::V4(a), IpAddr::V4(b)) => { + v4map.insert(a.into()..=b.into(), nb.cc); + } + (IpAddr::V6(a), IpAddr::V6(b)) => { + v6map.insert(a.into()..=b.into(), nb.cc); + } + (_, _) => panic!("network started and ended in different families!?"), + } + } + + // Write the ranges out to the appropriate files, in order. + let mut v4 = BufWriter::new(File::create(output_v4)?); + let mut v6 = BufWriter::new(File::create(output_v6)?); + + v4.write_all(PROLOGUE.as_bytes())?; + v4.write_all(hdr.as_bytes())?; + for (r, cc) in v4map.iter() { + let a: u32 = *r.start(); + let b: u32 = *r.end(); + writeln!(&mut v4, "{},{},{}", a, b, std::str::from_utf8(cc).unwrap())?; + } + + v6.write_all(PROLOGUE.as_bytes())?; + v6.write_all(hdr.as_bytes())?; + for (r, cc) in v6map.iter() { + let a: Ipv6Addr = (*r.start()).into(); + let b: Ipv6Addr = (*r.end()).into(); + writeln!(&mut v6, "{},{},{}", a, b, std::str::from_utf8(cc).unwrap())?; + } + + // The documentation says you should always flush a BufWriter. + v4.flush()?; + v6.flush()?; + + Ok(()) +} + +fn main() -> std::io::Result<()> { + let args: Args = argh::from_env(); + + convert( + args.input.as_path(), + args.output_ipv4.as_path(), + args.output_ipv6.as_path(), + ) +} diff --git a/scripts/maint/geoip/update_geoip.sh b/scripts/maint/geoip/update_geoip.sh new file mode 100755 index 0000000000..9289e7a969 --- /dev/null +++ b/scripts/maint/geoip/update_geoip.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +DIR=$(cd "$(dirname "$0")" && pwd) +TMP=$(mktemp -d) + +location update +location dump "$TMP/geoip-dump.txt" + +OLDDIR=$(pwd) +cd "$DIR/geoip-db-tool/" +cargo build --release +cd "$OLDDIR" + +"$DIR/geoip-db-tool/target/release/geoip-db-tool" -i "$TMP/geoip-dump.txt"

1 0

[tor/master] script to generate a commit for an updated geoip file
by asn＠torproject.org 26 Feb '21

26 Feb '21

commit dcad439e94359a547eb6655bcec202c0ad3dcd93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 12:41:03 2021 -0500 script to generate a commit for an updated geoip file --- scripts/maint/geoip/update_and_commit_geoip.sh | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/scripts/maint/geoip/update_and_commit_geoip.sh b/scripts/maint/geoip/update_and_commit_geoip.sh new file mode 100755 index 0000000000..a83f82433e --- /dev/null +++ b/scripts/maint/geoip/update_and_commit_geoip.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +set -e + +CMDDIR=$(cd "$(dirname "$0")" && pwd) + +if [ ! -e "./src/config/geoip" ] ; then + echo "Run this from inside the root dir of your oldest LTS repository" + exit 1 +fi + +if [ -n "$(git status --untracked-files=no --porcelain)" ]; then + echo "Working directory is not clean." + exit 1 +fi + +TOPDIR=$(pwd) +cd "./src/config/" +"${CMDDIR}/update_geoip.sh" +cd "${TOPDIR}" + +DASH_DATE=$(date -u +"%Y-%m-%d") +SLASH_DATE=$(date -u +"%Y/%m/%d") +CHANGESFILE="changes/geoip-$DASH_DATE" + +cat > "$CHANGESFILE" <<EOF + o Minor features (geoip data): + - Update the geoip files to match the IPFire Location Database, + as retrieved on ${SLASH_DATE}. +EOF + +git add "$CHANGESFILE" + +git commit -a -m "Update geoip files to match ipfire location db, $SLASH_DATE."

1 0