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

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

24 Jun '21

commit cf5273e790ecf1dbfd3e13f62f6937beb9133e99 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 24 01:16:22 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- th.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th.po b/th.po index 7e354c690a..21eb8ff821 100644 --- a/th.po +++ b/th.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-24 00:45+0000\n" +"PO-Revision-Date: 2021-06-24 01:06+0000\n" "Last-Translator: Tee de Jatt\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\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 24 Jun '21

24 Jun '21

commit 1ace596f9382513e0fde90377fa1dffd4db3cab5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 24 01:15:44 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- th.po | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/th.po b/th.po index da936ce749..a2786b8d91 100644 --- a/th.po +++ b/th.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-24 00:45+0000\n" +"PO-Revision-Date: 2021-06-24 01:06+0000\n" "Last-Translator: Tee de Jatt\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -502,7 +502,7 @@ msgstr "เปิดใช้งานอยู่" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:350 msgid "Disabled (default)" -msgstr "" +msgstr "ปิดใช้งานแล้ว (ตั้งค่าเดิม)" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:401 msgid "On (default)" @@ -625,12 +625,12 @@ msgstr "ไม่สามารถคัดลอก %(infile)s ไปที่ #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:497 msgid "Removing existing Tails system" -msgstr "" +msgstr "กำลังลบระบบ Tails ที่ได้ติดตั้งอยู่ก่อนแล้วออก" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:507 #, python-format msgid "Unable to remove file from previous Tails system: %(message)s" -msgstr "" +msgstr "ไม่สามารถลบไฟล์จากระบบ Tails ที่ได้ติดตั้งอยู่ก่อนหน้านี้: %(message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:514 #, python-format @@ -785,7 +785,7 @@ msgstr "ตัวติดตั้ง Tails" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:316 #: ../config/chroot_local-includes/usr/share/tails-installer/tails-installer.ui.in:163 msgid "Clone the current Tails" -msgstr "" +msgstr "ทำสำเนา Tails ที่มีอยู่นี้" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:323 #: ../config/chroot_local-includes/usr/share/tails-installer/tails-installer.ui.in:184 @@ -799,7 +799,7 @@ msgstr "ปรับรุ่น" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:362 msgid "Manual Upgrade Instructions" -msgstr "" +msgstr "คู่มือแสดงวิธีการปรับรุ่น" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:371 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:569 @@ -833,7 +833,7 @@ msgstr "ไม่พบอุปกรณ์ที่เหมาะสมสำ #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:437 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." -msgstr "" +msgstr "โปรดเสียบแฟลชไดรฟ์ USB หรือการด์ SD ที่มีความจุอย่างน้อย %0.1fกิกะไบต์" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:468 #, python-format @@ -918,7 +918,7 @@ msgstr "%(filename)s ถูกเลือก" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:31 msgid "Unable to find Tails on ISO" -msgstr "" +msgstr "ไม่พบ Tails ในไฟล์ ISO " #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:37 #, python-format @@ -946,18 +946,18 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:77 #, python-format msgid "Skipping \"%(filename)s\"" -msgstr "" +msgstr "กำลังข้าม '%(filename)s'" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/utils.py:54 #, python-format msgid "" "There was a problem executing `%(cmd)s`.%(out)s\n" "%(err)s" -msgstr "" +msgstr "เกิดปัญหาในการดำเนินการขึ้น ` %(cmd)s`%(out)s\n%(err)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/utils.py:126 msgid "Could not open device for writing." -msgstr "" +msgstr "ไม่สามารเปิดอุปกรณ์เพื่อการเขียนข้อความ" #: config/chroot_local-includes/usr/local/bin/keepassxc:17 #, sh-format @@ -975,11 +975,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/keepassxc:28 msgid "Rename" -msgstr "" +msgstr "เปลี่ยนชื่่อ" #: config/chroot_local-includes/usr/local/bin/keepassxc:30 msgid "Keep current name" -msgstr "" +msgstr "ใช้ชื่อปัจจุบันนี้" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:94 msgid "Persistence wizard - Persistent volume creation" @@ -1160,19 +1160,19 @@ msgstr "" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:133 msgid "Printers" -msgstr "" +msgstr "เครื่องพิมพ์เอกสาร" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135 msgid "Printers configuration" -msgstr "" +msgstr "การตั้งค่าเครื่องพิมพ์เอกสาร" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "Thunderbird" -msgstr "" +msgstr "บริการอีเมล Thunderbird" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Thunderbird emails, feeds, and OpenPGP keys" -msgstr "" +msgstr "อีเมลจาก Thunderbird ฟีดต่างๆ และกุญแจ OpenPGP" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:163 msgid "GnuPG" @@ -1184,7 +1184,7 @@ msgstr "" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Bitcoin Client" -msgstr "" +msgstr "ลูกข่ายบิตคอยน์" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180 msgid "Electrum's bitcoin wallet and configuration" @@ -1289,7 +1289,7 @@ msgstr "" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:711 msgid "Restart Now" -msgstr "" +msgstr "เริ่มการใช้ใหม่อีกครั้ง" #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:19 msgid "su is disabled. Please use sudo instead." @@ -1309,7 +1309,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42 msgid "Import Failed" -msgstr "" +msgstr "การนำเข้าข้อมูลไม่สำเร็จ" #. Translators: Don't translate {path} or {error}, #. they are placeholders and will be replaced. @@ -1336,7 +1336,7 @@ msgstr[0] "" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Lock screen" -msgstr "" +msgstr "ล็อคหน้าจอ" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79 msgid "Suspend" @@ -1425,12 +1425,12 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 msgid "Install Every Time" -msgstr "" +msgstr "ติดตั้งทุกครั้ง" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326 msgid "Install Only Once" -msgstr "" +msgstr "ติดตั้งเพียงแค่ครั้งเดียว" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:301 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:331

1 0

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

24 Jun '21

commit 047dd90df3e95c29be6830b4ed868fe39ba17ae7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 24 00:46:25 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- th.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th.po b/th.po index f4eb8c7287..7e354c690a 100644 --- a/th.po +++ b/th.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-06 01:20+0000\n" +"PO-Revision-Date: 2021-06-24 00:45+0000\n" "Last-Translator: Tee de Jatt\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\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 24 Jun '21

24 Jun '21

commit d47d07bf6f2eca672075910fc5cd3141280ed08f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 24 00:45:44 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- th.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/th.po b/th.po index 45faaf65e3..da936ce749 100644 --- a/th.po +++ b/th.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-06 01:20+0000\n" +"PO-Revision-Date: 2021-06-24 00:45+0000\n" "Last-Translator: Tee de Jatt\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -278,7 +278,7 @@ msgid "" "Download size: {size}\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "คุณควรปรับรุ่นไปยัง {เวอร์ชัน} {ชื่อ} \n\nไปที่ {รายละเอียด_url} เพื่่อเรียนรู้เพิ่มเติมเกี่ยวกับเวอร์ชันใหม่นี้\n\nเราแนะนำให้คุณปิดแอปพลิเคชันอื่นๆในระหว่างการปรับรุ่น\nการดาวน์โหลดเพื่อปรับรุ่นอาจใช้เวลาเพียงไม่กี่นาทีหรือจนถึง 2-3 ชั่วโมง\n\nขนาดของการดาวน์โหลดข้อมูล: {ขนาด}\n\nคุณต้องการปรับรุ่นในตอนนี้เลยหรือไม่?" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:500 msgid "Upgrade available" @@ -302,7 +302,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: {explanation}.\n" "\n" "To learn how to do a manual upgrade, go to {manual_upgrade_url}" -msgstr "" +msgstr "คุณควรปรับรุ่นไปยัง {เวอร์ชัน} {ชื่อ} ด้วยตัวของคุณเอง \n\nไปที่ {รายละเอียด_url} เพื่่อเรียนรู้เพิ่มเติมเกี่ยวกับเวอร์ชันใหม่นี้\n\nมันเป็นไปไม่ได้ที่จะปรับรุ่นอุปกรณ์ของคุณอย่างอัตโนมัติเพื่อใช้งานกับเวอร์ชันใหม่นี้: {คำอธิบาย}\n\nไปที่ {คู่มือการปรับรุ่น_url} เพื่่อเรียนรู้เพิ่มเติมเกี่ยวกับการปรับรุ่นด้วยตนเอง" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:520 msgid "New version available" @@ -315,7 +315,7 @@ msgstr "กำลังดาวน์โหลดการอัพเกรด #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:603 #, perl-brace-format msgid "Downloading the upgrade to {name} {version}..." -msgstr "" +msgstr "กำลังปรับรุ่นไปยัง {เวอร์ชัน} {ชื่อ}... " #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:692 msgid "" @@ -363,15 +363,15 @@ msgid "" "The network connection will be disabled when applying the upgrade.\n" "\n" "Please save your work and close all other applications." -msgstr "" +msgstr "การดาวน์โหลดเพื่อการปรับรุ่นเสร็จสิ้นแล้ว\n\nจะหยุดการเชื่อมต่อกับเครือข่ายในระหว่างดำเนินการปรับรุ่น\n\nโปรดบันทึกงานของคุณและปิดแอปพลิเคชั่นตัวอื่น" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:778 msgid "Upgrade successfully downloaded" -msgstr "" +msgstr "การดาวน์โหลดเพื่อการปรับรุ่นเสร็จสิ้นแล้ว" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:779 msgid "Apply upgrade" -msgstr "" +msgstr "ใช้การปรับรุ่น" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:786 msgid "" @@ -413,11 +413,11 @@ msgstr "การปิดเครือข่ายล้มเหลว" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:828 msgid "Error while cancelling the upgrade download" -msgstr "" +msgstr "เกิดข้อผิดพลาดในระหว่างการยกเลิกการโหลดเพื่อปรับรุ่น" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:829 msgid "Failed to cancel the upgrade download" -msgstr "" +msgstr "การยกเลิกการโหลดเพื่อปรับรุ่นไม่สำเร็จ" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:835 msgid "Upgrading the system" @@ -428,7 +428,7 @@ msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the network connection is now disabled." -msgstr "" +msgstr "กำลังปรับรุ่นอุปกรณ์ Tails ของคุณ... \n\nการเชื่อมต่อเครือข่ายได้ถูกระงับไว้เพื่อความปลอดภัย" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:874 msgid "" @@ -464,7 +464,7 @@ msgstr "ย้อนกลับ" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64 msgid "_Administration Password" -msgstr "" +msgstr "_รหัสผ่านผู้ดูแลระบบ" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:187 msgid "_MAC Address Anonymization" @@ -486,15 +486,15 @@ msgstr "ปิดใช้งานการเชื่อมต่อเคร #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:316 msgid "_Network Connection" -msgstr "" +msgstr "_การเชื่อมต่อเครือข่าย" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:324 msgid "Obsolete" -msgstr "" +msgstr "ล้าสมัยแล้ว" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:339 msgid "_Unsafe Browser" -msgstr "" +msgstr "_เบราว์เซอร์ไม่ปลอดภัย" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:348 msgid "Enabled" @@ -568,7 +568,7 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164 msgid "_Language" -msgstr "" +msgstr "_ภาษา" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207 msgid "_Formats" @@ -1736,7 +1736,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/thunderbird:46 msgid "_Migrate Later" -msgstr "" +msgstr "_ย้ายข้อมูลภายหลัง" #: config/chroot_local-includes/usr/bin/tor-browser:47 msgid "Tor is not ready" @@ -1749,7 +1749,7 @@ msgstr "" #: config/chroot_local-includes/usr/bin/tor-browser:49 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1464 msgid "Start Tor Browser" -msgstr "" +msgstr "เริ่มต้นใช้งาน Tor Browser" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:35 msgid "Tor Status" @@ -1897,7 +1897,7 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138 msgid "Error opening file" -msgstr "" +msgstr "เกิดข้อผิดพลาดระหว่างการเปิดไฟล์" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160 msgid "Not a VeraCrypt container"

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit b61c939ceef2ed8e5cfa788f495a978883c02404 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 22 19:16:28 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/BrowserGlue.jsm | 19 ++++++++++++++++++- .../onionservices/HttpsEverywhereControl.jsm | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 2bd28ec1b04c..adc8e5edb07a 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2506,7 +2506,24 @@ BrowserGlue.prototype = { { task: () => { - OnionAliasStore.init(); + if (Services.io.offline === false) { + // we will take this path when the user is using the legacy tor launcher + OnionAliasStore.init(); + } else { + // this path is taken when using about:torconnect, we start in offline mode + // and only switch to online after bootstrapping completes + const topic = "network:offline-status-changed"; + let offlineStatusChangedObserver = { + observe(aSubject, aTopic, aData) { + if (aTopic === topic && aData === "online") { + OnionAliasStore.init(); + // we only need to init once, so remove ourselves as an obvserver + Services.obs.removeObserver(this, topic); + } + } + }; + Services.obs.addObserver(offlineStatusChangedObserver, topic); + } }, }, diff --git a/browser/components/onionservices/HttpsEverywhereControl.jsm b/browser/components/onionservices/HttpsEverywhereControl.jsm index 60c3b5fca282..c91db3e8de87 100644 --- a/browser/components/onionservices/HttpsEverywhereControl.jsm +++ b/browser/components/onionservices/HttpsEverywhereControl.jsm @@ -27,6 +27,7 @@ const SECUREDROP_TOR_ONION_CHANNEL = { class HttpsEverywhereControl { constructor() { this._extensionMessaging = null; + this._init(); } async _sendMessage(type, object) { @@ -47,7 +48,6 @@ class HttpsEverywhereControl { * Installs the .tor.onion update channel in https-everywhere */ async installTorOnionUpdateChannel(retries = 5) { - this._init(); // TODO: https-everywhere store is initialized asynchronously, so sending a message // immediately results in a `store.get is undefined` error. @@ -115,5 +115,20 @@ class HttpsEverywhereControl { if (!this._extensionMessaging) { this._extensionMessaging = new ExtensionMessaging(); } + + // update all of the existing https-everywhere channels + setTimeout(async () => { + let pinnedChannels = await this._sendMessage("get_pinned_update_channels"); + for(let channel of pinnedChannels.update_channels) { + this._sendMessage("update_update_channel", channel); + } + + let storedChannels = await this._sendMessage("get_stored_update_channels"); + for(let channel of storedChannels.update_channels) { + this._sendMessage("update_update_channel", channel); + } + }, 0); + + } }

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40455' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit d03456f9cd90665c20f146437962d6e8138cc754 Merge: 8157aa761f34 b61c939ceef2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 00:41:34 2021 +0000 Merge remote-tracking branch 'richardgl/40455' into tor-browser-78.11.0esr-10.5-1 browser/components/BrowserGlue.jsm | 19 ++++++++++++++++++- .../onionservices/HttpsEverywhereControl.jsm | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-)

1 0

[snowflake/main] Bump version of kcp and smux libraries
by cohosh＠torproject.org 23 Jun '21

23 Jun '21

commit e84bc81e310f9ba95b6aab6c5d3b8be4ecbae030 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jun 23 19:39:52 2021 -0400 Bump version of kcp and smux libraries --- go.mod | 4 ++-- go.sum | 46 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index ed07394..36585aa 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,8 @@ require ( github.com/prometheus/client_golang v1.10.0 github.com/prometheus/client_model v0.2.0 github.com/smartystreets/goconvey v1.6.4 - github.com/xtaci/kcp-go/v5 v5.5.12 - github.com/xtaci/smux v1.5.12 + github.com/xtaci/kcp-go/v5 v5.6.1 + github.com/xtaci/smux v1.5.15 golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e // indirect diff --git a/go.sum b/go.sum index 8067425..f0b3927 100644 --- a/go.sum +++ b/go.sum @@ -95,6 +95,7 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -152,10 +153,11 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid v1.2.2 h1:1xAgYebNnsb9LKCdLOvFWtAxGU/33mjJtyOVbmUa0Us= -github.com/klauspost/cpuid v1.2.2/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/reedsolomon v1.9.3 h1:N/VzgeMfHmLc+KHMD1UL/tNkfXAt8FnUqlgXGIduwAY= -github.com/klauspost/reedsolomon v1.9.3/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4= +github.com/klauspost/cpuid v1.2.4/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s= +github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= +github.com/klauspost/reedsolomon v1.9.9 h1:qCL7LZlv17xMixl55nq2/Oa1Y86nfO8EqDfv2GHND54= +github.com/klauspost/reedsolomon v1.9.9/go.mod h1:O7yFFHiQwDR6b2t63KPUpccPtNdp5ADgh1gg4fd12wo= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -181,6 +183,8 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mmcloughlin/avo v0.0.0-20200803215136-443f81d77104 h1:ULR/QWMgcgRiZLUjSSJMU+fW+RDMstRdmnDWj9Q+AsA= +github.com/mmcloughlin/avo v0.0.0-20200803215136-443f81d77104/go.mod h1:wqKykBG2QzQDJEzvRkcS8x6MiSJkF52hXZsXcjaB3ls= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -336,20 +340,24 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/templexxx/cpu v0.0.1 h1:hY4WdLOgKdc8y13EYklu9OUTXik80BkxHoWvTO6MQQY= github.com/templexxx/cpu v0.0.1/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk= +github.com/templexxx/cpu v0.0.7 h1:pUEZn8JBy/w5yzdYWgx+0m0xL9uk6j4K91C5kOViAzo= +github.com/templexxx/cpu v0.0.7/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk= github.com/templexxx/xorsimd v0.4.1 h1:iUZcywbOYDRAZUasAs2eSCUW8eobuZDy0I9FJiORkVg= github.com/templexxx/xorsimd v0.4.1/go.mod h1:W+ffZz8jJMH2SXwuKu9WhygqBMbFnp14G2fqEr8qaNo= -github.com/tjfoc/gmsm v1.0.1 h1:R11HlqhXkDospckjZEihx9SW/2VW0RgdwrykyWMFOQU= -github.com/tjfoc/gmsm v1.0.1/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc= +github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM= +github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xtaci/kcp-go/v5 v5.5.12 h1:iALGyvti/oBbl1TbVoUpHEUHCorDEb3tEKl1CPY3KXM= -github.com/xtaci/kcp-go/v5 v5.5.12/go.mod h1:H0T/EJ+lPNytnFYsKLH0JHUtiwZjG3KXlTM6c+Q4YUo= +github.com/xtaci/kcp-go/v5 v5.6.1 h1:Pwn0aoeNSPF9dTS7IgiPXn0HEtaIlVb6y5UKWPsx8bI= +github.com/xtaci/kcp-go/v5 v5.6.1/go.mod h1:W3kVPyNYwZ06p79dNwFWQOVFrdcBpDBsdyvK8moQrYo= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= -github.com/xtaci/smux v1.5.12 h1:n9OGjdqQuVZXLh46+L4IR5tR2wvuUFwRABnN/V55bIY= -github.com/xtaci/smux v1.5.12/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY= +github.com/xtaci/smux v1.5.15 h1:6hMiXswcleXj5oNfcJc+DXS8Vj36XX2LaX98udog6Kc= +github.com/xtaci/smux v1.5.15/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -362,14 +370,16 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/arch v0.0.0-20190909030613-46d78d1859ac/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= @@ -384,6 +394,9 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -401,10 +414,10 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7 h1:3uJsdck53FDIpWwLeAXlia9p4C8j0BO2xZrqzKpL0D8= @@ -423,6 +436,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -444,13 +458,12 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8 h1:JA8d3MPx/IToSyXZG/RhwYEtfrKO1Fxrqe8KrkiLXKM= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= @@ -481,7 +494,11 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200425043458-8463f397d07c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200808161706-5bf02b21f123 h1:4JSJPND/+4555t1HfXYF4UEqDqiSKCgeV0+hbA8hMs4= +golang.org/x/tools v0.0.0-20200808161706-5bf02b21f123/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= @@ -540,5 +557,6 @@ honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=

1 0

[tpo/master] Update DRL link
by gus＠torproject.org 23 Jun '21

23 Jun '21

commit 2cad2b1ef8d9ae4b0f7f19943c70d5f52396105e Author: gus <gus(a)torproject.org> Date: Wed Jun 23 15:59:42 2021 -0300 Update DRL link --- content/about/sponsors/USSD-DHRL-harvard/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/sponsors/USSD-DHRL-harvard/contents.lr b/content/about/sponsors/USSD-DHRL-harvard/contents.lr index 7d762834..7bad4ac1 100644 --- a/content/about/sponsors/USSD-DHRL-harvard/contents.lr +++ b/content/about/sponsors/USSD-DHRL-harvard/contents.lr @@ -12,7 +12,7 @@ logo: /static/images/sponsors/USSD.png --- _hidden: yes --- -link: https://www.state.gov/j/drl/ +link: https://www.state.gov/about-us-bureau-of-democracy-human-rights-and-labor/ --- description:

1 0

[tpo/master] Merge branch 'issue189-sponsor-order'
by gus＠torproject.org 23 Jun '21

23 Jun '21

commit 7c47353e10b9d3930b5174d212d02187a2de1ba5 Merge: 80cf1efc 5689832a Author: gus <gus(a)torproject.org> Date: Wed Jun 23 15:58:19 2021 -0300 Merge branch 'issue189-sponsor-order' templates/sponsors.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/master] Order past sponsors by first donation year, descending
by gus＠torproject.org 23 Jun '21

23 Jun '21

commit 5689832aea6b6d1383621c2a81e56734bb8277a9 Author: kez <kez(a)torproject.org> Date: Fri Jun 18 10:20:10 2021 -0400 Order past sponsors by first donation year, descending --- templates/sponsors.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sponsors.html b/templates/sponsors.html index b67432de..04a39af6 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -21,7 +21,7 @@ <div class="col-12"> <ul class="jobs-ul"> {% set items = site.query('/about/sponsors').include_undiscoverable(true).filter(F.active == False) %} - {% for item in items %} + {% for item in items.order_by('-time') %} <li><a href="{{ item.link}}">{{ item.name }}</a> - {{ item.time }}</li> {% endfor %} </ul>

1 0