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

[tor-browser/tor-browser-85.0-10.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 26 Jan '21

26 Jan '21

commit cbad6095b5740bfeb6b2a8fc00c616b5b1d2366b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 08:03:10 2021 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40308: Disable network partitioning until we evaluate dFPI --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 19991a801fcd..5ffdc386042b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -190,6 +190,7 @@ pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: dis // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation +pref("privacy.partition.network_state", false); // Disable for now until audit pref("network.cookie.cookieBehavior", 1); pref("network.http.spdy.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127 pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633

1 0

[tor-browser-build/maint-10.0-android] Pick up tor-browser -build2
by gk＠torproject.org 26 Jan '21

26 Jan '21

commit a4244c3f9ec18e3a28cb61b749c709a1de82bb1f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 09:48:09 2021 +0000 Pick up tor-browser -build2 --- projects/geckoview/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + rbm.conf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index 5ebe6c4..475385b 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7228ed7..935c1a6 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser 10.0.9 -- January 26 2021 * Update NoScript to 11.1.9 * Bug 40137: Remove EOY 2020 Campaign [fenix] * Bug 40165: Update zstd to 1.4.8 [tor-browser-build] + * Bug 40308: Disable network state partitioning until audit [tor-browser] * Build System * Android * Bug 40190: Update toolchain for Fenix 85 [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index 9048bf3..8fc7ebd 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0.9' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 10.5a1 project_name: tor-browser

1 0

[tor-browser/tor-browser-85.0-10.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 26 Jan '21

26 Jan '21

commit 6018ee49083c876636a1084426a5741944a8ba42 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 08:03:10 2021 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40308: Disable network partitioning until we evaluate dFPI --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 19991a801fcd..5ffdc386042b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -190,6 +190,7 @@ pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: dis // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation +pref("privacy.partition.network_state", false); // Disable for now until audit pref("network.cookie.cookieBehavior", 1); pref("network.http.spdy.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127 pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633

1 0

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

26 Jan '21

commit d04eefe9294fc2e4f4ac8c0a74acad0e19d2ab29 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 05:16:47 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index dbf988568a..92a8be410f 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -40,7 +40,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-26 04:45+0000\n" +"PO-Revision-Date: 2021-01-26 04:48+0000\n" "Last-Translator: Siyuan Xu <mf20070535(a)126.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\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 26 Jan '21

26 Jan '21

commit e7b6abd1a65729c8768c91d6630f36f3e23dd0a0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 05:16:00 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 1e43533f5a..a0519a7006 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -40,7 +40,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-26 04:45+0000\n" +"PO-Revision-Date: 2021-01-26 04:48+0000\n" "Last-Translator: Siyuan Xu <mf20070535(a)126.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -1641,15 +1641,15 @@ msgid "" "Thunderbird 78 now replaces the Enigmail extension with built-" "in support for OpenPGP encryption. To continue using your OpenPGP keys in " "Thunderbird, follow our migration instructions." -msgstr "" +msgstr "Thunderbird78 现在将Enigmail拓展替换为内置的 OpenPGP 加密支持。为在 Thunderbird中继续使用你的 OpenPGP 密钥，请遵循我们的迁移指南。" #: config/chroot_local-includes/usr/local/bin/thunderbird:44 msgid "_Open Migration Instructions" -msgstr "" +msgstr "_打开迁移指南" #: config/chroot_local-includes/usr/local/bin/thunderbird:45 msgid "_Migrate Later" -msgstr "" +msgstr "_以后迁移" #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Tor is not ready"

1 0

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

26 Jan '21

commit c32d0d1da59f3eebb0da2d72a813a90178a2f5df Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 05:15:33 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- zh_CN/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index 7c0a5c20e2..d6c09e06e1 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -49,8 +49,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "网络降级攻击"> <!ENTITY https-everywhere.cancel.copy_url "复制URL"> <!ENTITY https-everywhere.cancel.copied_url "已复制到剪贴板"> -<!ENTITY https-everywhere.cancel.open_page "打开不安全页面"> -<!ENTITY https-everywhere.cancel.http_once "仅打开该会话的不安全页面"> +<!ENTITY https-everywhere.cancel.open_page ""> +<!ENTITY https-everywhere.cancel.http_once ""> <!ENTITY https-everywhere.onboarding.intro "加密网络浏览，自动使用 HTTPS 连接访问站点，更加安全。"> <!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere 已更新！"> @@ -63,8 +63,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "强制对这些网站加密连接："> <!ENTITY https-everywhere.chrome.experimental_rules "实验性规则"> <!ENTITY https-everywhere.chrome.experimental_rules_description "可能引发警告或异常。默认被禁用。"> -<!ENTITY https-everywhere.chrome.disable_on_this_site "在此网站上禁用HTTPS Everywhere"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "在此网站上使用HTTPS Everywhere"> +<!ENTITY https-everywhere.chrome.disable_on_this_site ""> +<!ENTITY https-everywhere.chrome.enable_on_this_site ""> <!ENTITY https-everywhere.chrome.add_rule "为此站点添加规则"> <!ENTITY https-everywhere.chrome.add_new_rule "为此站点添加新规则"> <!ENTITY https-everywhere.chrome.always_https_for_host "对此主机始终使用 https">

1 0

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

26 Jan '21

commit ba5c14e9cfbd5e17743240841e55f4a9560eaa99 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 05:15:30 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- zh_CN/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index 7264738477..bbdf93b178 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -49,8 +49,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "网络降级攻击"> <!ENTITY https-everywhere.cancel.copy_url "复制URL"> <!ENTITY https-everywhere.cancel.copied_url "已复制到剪贴板"> -<!ENTITY https-everywhere.cancel.open_page "Disable on this site"> -<!ENTITY https-everywhere.cancel.http_once "Proceed anyway (unsafe)"> +<!ENTITY https-everywhere.cancel.open_page "在此网站上禁用"> +<!ENTITY https-everywhere.cancel.http_once "仍要继续（不安全）"> <!ENTITY https-everywhere.onboarding.intro "加密网络浏览，自动使用 HTTPS 连接访问站点，更加安全。"> <!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere 已更新！"> @@ -63,8 +63,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "强制对这些网站加密连接："> <!ENTITY https-everywhere.chrome.experimental_rules "实验性规则"> <!ENTITY https-everywhere.chrome.experimental_rules_description "可能引发警告或异常。默认被禁用。"> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Disable on this site"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Enable on this site"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "在此网站上禁用"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "在此网站上启用"> <!ENTITY https-everywhere.chrome.add_rule "为此站点添加规则"> <!ENTITY https-everywhere.chrome.add_new_rule "为此站点添加新规则"> <!ENTITY https-everywhere.chrome.always_https_for_host "对此主机始终使用 https">

1 0

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

26 Jan '21

commit 5a3a15df23bc0f600db94bcc321649a19de1aee0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 04:46:37 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- zh_CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 64cb57425f..dbf988568a 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -26,6 +26,7 @@ # Sanya chang <408070986(a)qq.com>, 2013 # Scott Rhodes <starring169(a)gmail.com>, 2020 # Simon Koch <werfaultx(a)gmail.com>, 2020 +# Siyuan Xu <mf20070535(a)126.com>, 2021 # khi, 2014 # Xiaolan <xiaolan(a)protonmail.ch>, 2014 # YFdyh000 <yfdyh000(a)gmail.com>, 2016 @@ -39,8 +40,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-15 07:26+0000\n" -"Last-Translator: ff98sha\n" +"PO-Revision-Date: 2021-01-26 04:45+0000\n" +"Last-Translator: Siyuan Xu <mf20070535(a)126.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

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

26 Jan '21

commit bb9b01730092271b4e7602c3eb43d899831fb530 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 04:45:53 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- zh_CN.po | 61 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 64cb57425f..1e43533f5a 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -26,6 +26,7 @@ # Sanya chang <408070986(a)qq.com>, 2013 # Scott Rhodes <starring169(a)gmail.com>, 2020 # Simon Koch <werfaultx(a)gmail.com>, 2020 +# Siyuan Xu <mf20070535(a)126.com>, 2021 # khi, 2014 # Xiaolan <xiaolan(a)protonmail.ch>, 2014 # YFdyh000 <yfdyh000(a)gmail.com>, 2016 @@ -39,8 +40,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-15 07:26+0000\n" -"Last-Translator: ff98sha\n" +"PO-Revision-Date: 2021-01-26 04:45+0000\n" +"Last-Translator: Siyuan Xu <mf20070535(a)126.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -206,7 +207,7 @@ msgstr "可用的增量升级需要在 Tails 的系统分区有 %{space_needed}s msgid "" "The available incremental upgrade requires {memory_needed} of free memory, " "but only {free_memory} is available." -msgstr "" +msgstr "可用的增量升级，需要有 {memory_needed} 空闲内存，而目前仅有 {free_memory} 内存可用。" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:426 msgid "" @@ -231,7 +232,7 @@ msgid "" "Download size: {size}\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "您应该升级到 {name} {version}.\n\n请到{details_url}查看更多关于这个新版本的信息。\n\n我们建议您在升级过程中关闭所有打开的应用程序。\n下载更新可能需要很长时间，从数分钟到数小时不等。\n\n下载文件大小：{size}\n\n您想现在升级吗？" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:451 msgid "Upgrade available" @@ -255,7 +256,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 "您应该手动升级到 {name} {version}。\n\n有关此版本的更多信息请见 {details_url}。\n\n不能自动升级您的设备到新版本：{explanation}。\n\n关于如何进行手动升级，请见 {manual_upgrade_url}" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:471 msgid "New version available" @@ -268,7 +269,7 @@ msgstr "正在下载升级" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:554 #, perl-brace-format msgid "Downloading the upgrade to {name} {version}..." -msgstr "" +msgstr "正在下载到 {name} {version} 的升级包…" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:614 msgid "" @@ -316,7 +317,7 @@ 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:700 msgid "Upgrade successfully downloaded" @@ -366,11 +367,11 @@ msgstr "关闭网络失败" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:750 msgid "Error while cancelling the upgrade download" -msgstr "" +msgstr "在取消下载升级时出错" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:751 msgid "Failed to cancel the upgrade download" -msgstr "" +msgstr "取消下载升级失败" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:757 msgid "Upgrading the system" @@ -381,7 +382,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:796 msgid "" @@ -551,14 +552,14 @@ msgstr "写入设备，写入速度 %(speed)d MB/s" msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to \"%(filename)s\"." -msgstr "" +msgstr "在运行该命令时出错：`%(command)s`。\n更详细的错误日志已被写到 “%(filename)s”。" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:424 #, python-format msgid "" "Not enough free space on device.\n" "%(iso_size)dMB ISO + %(overlay_size)dMB overlay > %(free_space)dMB free space" -msgstr "" +msgstr "设备可用空间不足。\n%(iso_size)dMB ISO + %(overlay_size)dMB 覆盖 > %(free_space)dMB 可用空间" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:433 #, python-format @@ -572,12 +573,12 @@ msgstr "无法复制 %(infile)s 至 %(outfile)s : %(message)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 @@ -587,7 +588,7 @@ msgstr "无法更改权限 %(file)s：%(message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:521 #, python-format msgid "Unable to remove directory from previous Tails system: %(message)s" -msgstr "" +msgstr "无法从之前的 Tails 中移除目录：%(message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:569 #, python-format @@ -622,17 +623,17 @@ msgstr "未找到挂载点" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:661 #, python-format msgid "Entering unmount_device for \"%(device)s\"" -msgstr "" +msgstr "输入 “%(device)s” 的卸载设备" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:670 #, python-format msgid "Unmounting mounted filesystems on \"%(device)s\"" -msgstr "" +msgstr "卸载 “%(device)s” 上的已挂载文件系统" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:674 #, python-format msgid "Unmounting \"%(udi)s\" on \"%(device)s\"" -msgstr "" +msgstr "卸载 “%(device)s” 上的 “%(udi)s”" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:685 #, python-format @@ -802,7 +803,7 @@ msgstr "设备“%(pretty_name)s”太小，不足以安装 Tails（需要至少 msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "%(dl_url)s" -msgstr "" +msgstr "要更新 %(pretty_name)s 上的 Tails，你需要使用一个 Tails ISO 映像：\n%(dl_url)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:513 msgid "An error happened while installing Tails" @@ -865,7 +866,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 "在 ISO 镜像里找不到 Tails" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:37 #, python-format @@ -878,7 +879,7 @@ msgid "" "There was a problem executing `%(cmd)s`.\n" "%(out)s\n" "%(err)s" -msgstr "" +msgstr "执行 `%(cmd)s` 时发生错误。\n%(out)s\n%(err)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:64 #, python-format @@ -900,7 +901,7 @@ msgstr "跳过“%(filename)s”" 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." @@ -942,7 +943,7 @@ msgid "" "A {size} persistent volume will be created on the {vendor} {model} " "device. Data on this volume will be stored in an encrypted form protected by" " a passphrase." -msgstr "" +msgstr "系统将创建一个 {size} 的持久化卷保存于 {vendor} {model} 设备上。此卷中的数据将加密存储与此设备上并受密码短语保护。" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:105 msgid "Create" @@ -1028,7 +1029,7 @@ msgstr "设置要保存于永久卷中的文件" msgid "" "The selected files will be stored in the encrypted partition {partition} " "({size}), on the {vendor} {model} device." -msgstr "" +msgstr "所选文件将被保存于加密分区 {partition} （{size}）中，分区位于设备{vendor} {model}上。" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:98 msgid "Save" @@ -1055,7 +1056,7 @@ msgstr "您的存储于永久卷中的数据将被删除。" msgid "" "The persistent volume {partition} ({size}), on the {vendor} {model} " "device, will be deleted." -msgstr "" +msgstr "持久化卷 {partition}（{size}）将被删除，此卷位于设备 {vendor} {model} 上。" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Delete.pm:64 msgid "Delete" @@ -1119,7 +1120,7 @@ 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" @@ -1127,7 +1128,7 @@ msgstr "GnuPG" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165 msgid "OpenPGP keys outside of Thunderbird" -msgstr "" +msgstr "在 Thunderbird 外部的 OpenPGP 密钥" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Bitcoin Client" @@ -1600,7 +1601,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See {manual_upgrade_url}" -msgstr "" +msgstr "内存不足，无法检测更新。\n\n请确保系统满足 Tails 的最低运行要求。参阅文件：///usr/share/doc/tails/website/doc/about/requirements.en.html\n\n重启再次检测更新。\n\n或者手动更新。\n参阅： {manual_upgrade_url}" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 @@ -1625,7 +1626,7 @@ msgstr "主机的操作系统和虚拟化软件都可能监视您在使用 Tails #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:40 msgid "Don't Show Again" -msgstr "" +msgstr "不再显示" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:42 msgid "Learn More" @@ -1633,7 +1634,7 @@ msgstr "了解更多" #: config/chroot_local-includes/usr/local/bin/thunderbird:40 msgid "You need to migrate your OpenPGP keys" -msgstr "" +msgstr "你需要迁移你的 OpenPGP 密钥。" #: config/chroot_local-includes/usr/local/bin/thunderbird:42 msgid ""

1 0

[snowflake/master] Classify proxies with unknown NATs as restricted
by cohosh＠torproject.org 25 Jan '21

25 Jan '21

commit bae0bacbfdcd7d195e5ecff985bbff2361937170 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 15 11:50:56 2021 -0500 Classify proxies with unknown NATs as restricted --- broker/broker.go | 12 ++++++------ broker/snowflake-broker_test.go | 17 +++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 983f95d..b8c7b6c 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -144,10 +144,10 @@ func (ctx *BrokerContext) Broker() { ctx.snowflakeLock.Lock() defer ctx.snowflakeLock.Unlock() if snowflake.index != -1 { - if request.natType == NATRestricted { - heap.Remove(ctx.restrictedSnowflakes, snowflake.index) - } else { + if request.natType == NATUnrestricted { heap.Remove(ctx.snowflakes, snowflake.index) + } else { + heap.Remove(ctx.restrictedSnowflakes, snowflake.index) } delete(ctx.idToSnowflake, snowflake.id) close(request.offerChannel) @@ -169,10 +169,10 @@ func (ctx *BrokerContext) AddSnowflake(id string, proxyType string, natType stri snowflake.offerChannel = make(chan *ClientOffer) snowflake.answerChannel = make(chan []byte) ctx.snowflakeLock.Lock() - if natType == NATRestricted { - heap.Push(ctx.restrictedSnowflakes, snowflake) - } else { + if natType == NATUnrestricted { heap.Push(ctx.snowflakes, snowflake) + } else { + heap.Push(ctx.restrictedSnowflakes, snowflake) } ctx.snowflakeLock.Unlock() ctx.idToSnowflake[id] = snowflake diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 7b87313..3b59a0f 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -29,7 +29,7 @@ func TestBroker(t *testing.T) { Convey("Adds Snowflake", func() { So(ctx.snowflakes.Len(), ShouldEqual, 0) So(len(ctx.idToSnowflake), ShouldEqual, 0) - ctx.AddSnowflake("foo", "", NATUnknown) + ctx.AddSnowflake("foo", "", NATUnrestricted) So(ctx.snowflakes.Len(), ShouldEqual, 1) So(len(ctx.idToSnowflake), ShouldEqual, 1) }) @@ -37,6 +37,7 @@ func TestBroker(t *testing.T) { Convey("Broker goroutine matches clients with proxies", func() { p := new(ProxyPoll) p.id = "test" + p.natType = "unrestricted" p.offerChannel = make(chan *ClientOffer) go func(ctx *BrokerContext) { ctx.proxyPolls <- p @@ -55,7 +56,7 @@ func TestBroker(t *testing.T) { Convey("Request an offer from the Snowflake Heap", func() { done := make(chan *ClientOffer) go func() { - offer := ctx.RequestOffer("test", "", NATUnknown) + offer := ctx.RequestOffer("test", "", NATUnrestricted) done <- offer }() request := <-ctx.proxyPolls @@ -79,7 +80,7 @@ func TestBroker(t *testing.T) { Convey("with a proxy answer if available.", func() { done := make(chan bool) // Prepare a fake proxy to respond with. - snowflake := ctx.AddSnowflake("fake", "", NATUnknown) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) go func() { clientOffers(ctx, w, r) done <- true @@ -97,7 +98,7 @@ func TestBroker(t *testing.T) { return } done := make(chan bool) - snowflake := ctx.AddSnowflake("fake", "", NATUnknown) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) go func() { clientOffers(ctx, w, r) // Takes a few seconds here... @@ -147,7 +148,7 @@ func TestBroker(t *testing.T) { }) Convey("Responds to proxy answers...", func() { - s := ctx.AddSnowflake("test", "", NATUnknown) + s := ctx.AddSnowflake("test", "", NATUnrestricted) w := httptest.NewRecorder() data := bytes.NewReader([]byte(`{"Version":"1.0","Sid":"test","Answer":"test"}`)) @@ -260,7 +261,7 @@ func TestBroker(t *testing.T) { // Manually do the Broker goroutine action here for full control. p := <-ctx.proxyPolls So(p.id, ShouldEqual, "ymbcCMto7KHNGYlp") - s := ctx.AddSnowflake(p.id, "", NATUnknown) + s := ctx.AddSnowflake(p.id, "", NATUnrestricted) go func() { offer := <-s.offerChannel p.offerChannel <- offer @@ -437,7 +438,7 @@ func TestGeoip(t *testing.T) { if err := ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6"); err != nil { log.Printf("loading geo ip databases returned error: %v", err) } - ctx.metrics.UpdateCountryStats("127.0.0.1", "", NATUnknown) + ctx.metrics.UpdateCountryStats("127.0.0.1", "", NATUnrestricted) So(ctx.metrics.tablev4, ShouldEqual, nil) }) @@ -537,7 +538,7 @@ func TestMetrics(t *testing.T) { So(err, ShouldBeNil) // Prepare a fake proxy to respond with. - snowflake := ctx.AddSnowflake("fake", "", NATUnknown) + snowflake := ctx.AddSnowflake("fake", "", NATUnrestricted) go func() { clientOffers(ctx, w, r) done <- true

1 0