- tbb-commits - lists.torproject.org

[torbutton/master] Merge remote-tracking branch 'bradetpo/bug33482-01'
by sysrqb＠torproject.org 24 Mar '20

24 Mar '20

commit 248204701c25ed3250bd9b7ca827d2d0e41ad310 Merge: ce150c56 01366d7b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 24 15:23:15 2020 +0000 Merge remote-tracking branch 'bradetpo/bug33482-01' chrome/content/aboutTor/aboutTor.xhtml | 2 +- chrome/locale/en-US/aboutTor.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Release preparations for 9.5a9
by sysrqb＠torproject.org 23 Mar '20

23 Mar '20

commit cdc5890c358806b107f72479b4792a3865ba31ee Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 23 16:50:34 2020 +0000 Release preparations for 9.5a9 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 4 ++-- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index f7efacc..0dad227 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_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 247e8f6..2c95450 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 9.5a9 -- March 25 2020 + * All Platforms + * Translations update + * Bump NoScript to 11.0.21 + * Bug 33613: Disable Javascript on Safest security level + * Bug 33342: Avoid disconnect search addon error after removal + * Windows + OS X + Linux + * Bump Tor to 0.4.3.3-alpha + * Update Tor Launcher to 0.2.21.5 + * Translations update + Tor Browser 9.5a8 -- March 13 2020 * All Platforms * Update Firefox to 68.6.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 4888399..2c9eabf 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 5e795f711275f9162957321e5245cb0176ce36ce8a2410de95496670af51603d + sha256sum: 00ee2dab3951a9afe3d255c38669114b676f3176e1efd6bba5eacd69cb18fd5b - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 84c5b17..e0f0113 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.3 +version: 0.2.21.5 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 9b5ba3d..a491ba0 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.3.2-alpha +version: 0.4.3.3-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index f8d1d0b..9a9888f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a8' + torbrowser_version: '9.5a9' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a6 - 9.5a7 + - 9.5a8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] We didn't actually pick up Tor Launcher 0.2.21.4
by sysrqb＠torproject.org 23 Mar '20

23 Mar '20

commit 42f03278e9e32b640ab3ce01c6edbdceb9056216 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 23 16:49:43 2020 +0000 We didn't actually pick up Tor Launcher 0.2.21.4 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9a6bd34..247e8f6 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,9 +4,6 @@ Tor Browser 9.5a8 -- March 13 2020 * Bump NoScript to 11.0.15 * Bug 33430: Disable downloadable fonts on Safest security level * Translations update - * Windows + OS X + Linux - * Update Tor Launcher to 0.2.21.4 - * Translations update * Build System * Windows * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year

1 0

[tor-browser/tor-browser-68.6.0esr-9.5-1] Bug 33342: Avoid disconnect search addon error after removal.
by sysrqb＠torproject.org 23 Mar '20

23 Mar '20

commit 69dfbacfa8b3d6abd6eb5e248fcd24a03c30a962 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Mar 13 18:19:30 2020 +0100 Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index b29a118f912a..ad9a6d924aed 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -982,6 +982,12 @@ var BuiltInLocation = new (class _BuiltInLocation extends XPIStateLocation { get enumerable() { return false; } + + restore(saved) { + super.restore(saved); + // Bug 33342: avoid restoring disconnect addon from addonStartup.json.lz4. + this.removeAddon("disconnect(a)search.mozilla.org"); + } })(); /**

1 0

[tor-browser/tor-browser-68.6.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 23 Mar '20

23 Mar '20

commit 2aea292d07bbdbb02447a2f216ccd6f294995f6f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 23 16:33:29 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 3a9dcce4e054..ce150c56c02a 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 3a9dcce4e054d695b548ba460b7463bed5cf064d +Subproject commit ce150c56c02a3bd48b345d104132b9d4868bd174

1 0

[tor-launcher/master] Translations update
by sysrqb＠torproject.org 23 Mar '20

23 Mar '20

commit c40434c67e5e96f025512cea238bf46ef5ff66ab Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 23 16:10:10 2020 +0000 Translations update --- src/chrome/locale/fa/torlauncher.properties | 16 ++++++++-------- src/chrome/locale/fr/network-settings.dtd | 4 ++-- src/chrome/locale/fr/torlauncher.properties | 2 +- src/chrome/locale/pl/network-settings.dtd | 22 +++++++++++----------- src/chrome/locale/pl/torlauncher.properties | 2 +- src/chrome/locale/th/torlauncher.properties | 2 +- src/chrome/locale/zh-CN/torlauncher.properties | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index c5674ab..0083965 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Tor قادر به اجرا شدن نیست\n\n%S torlauncher.tor_missing=فایل اجرایی Tor یافت نشد. torlauncher.torrc_missing=فایل torrc پیدا نشد و ساخت فایل جدید ناموفق بود. torlauncher.datadir_missing=دایرکتوری اطلاعات تٌر وجود ندارد و ساخت آن نیز ناموفق بود. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=فهرست تأیید هویت Tor onion وجود ندارد و نمی تواند ایجاد شود. torlauncher.password_hash_missing=کلمهٔ عبور رمزشده دریافت نشد. torlauncher.failed_to_get_settings=ناموفق در بازگردانی تنظیمات Tor.\n\n%S @@ -58,17 +58,17 @@ torlauncher.bootstrapStatus.conn_pt=در حال اتصال به پل torlauncher.bootstrapStatus.conn_done_pt=اتصال به پل برقرار شد torlauncher.bootstrapStatus.conn_proxy=در حال اتصال به پراکسی torlauncher.bootstrapStatus.conn_done_proxy=اتصال به پراکسی برقرار شد -torlauncher.bootstrapStatus.conn=در حال اتصال به یک پل Tor -torlauncher.bootstrapStatus.conn_done=به یک پل Tor متصل شد -torlauncher.bootstrapStatus.handshake=در حال مذاکره با یک پل Tor -torlauncher.bootstrapStatus.handshake_done=مذاکره با یک پل Tor انجام شد +torlauncher.bootstrapStatus.conn=در حال اتصال به یک رله ی Tor +torlauncher.bootstrapStatus.conn_done=به یک رله ی Tor متصل شد +torlauncher.bootstrapStatus.handshake=در حال مذاکره با یک رله ی Tor +torlauncher.bootstrapStatus.handshake_done=مذاکره با یک رله ی Tor به پایان رسید. torlauncher.bootstrapStatus.onehop_create=برپایی یک اتصال فهرست رمزبندی شده torlauncher.bootstrapStatus.requesting_status=بازیابی وضیعت شبکه torlauncher.bootstrapStatus.loading_status=بارگذاری وضیعت شبکه torlauncher.bootstrapStatus.loading_keys=بارگذاری مجوز ها torlauncher.bootstrapStatus.requesting_descriptors=درخواست اطلاعات باز پخش torlauncher.bootstrapStatus.loading_descriptors=بارگذاری اطلاعات بازپخش -torlauncher.bootstrapStatus.enough_dirinfo=بارگذاری اطلاعات پل انجام شد +torlauncher.bootstrapStatus.enough_dirinfo=بارگذاری اطلاعات رله به پایان رسید. torlauncher.bootstrapStatus.ap_conn_pt=برقراری مسیریاب: در حال اتصال به یک پل torlauncher.bootstrapStatus.ap_conn_done_pt=برقراری مسیریاب: به پل متصل شد torlauncher.bootstrapStatus.ap_conn_proxy=برقراری مسیریاب: در حال اتصال به پراکسی @@ -90,6 +90,6 @@ torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن torlauncher.bootstrapWarning.pt_missing=انتقال جایگزین مفقود است. -torlauncher.nsresult.NS_ERROR_NET_RESET=ارتباط با کارساز از دست رفت. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=اتصال به کارساز امکان پذیر نمی‌باشد. +torlauncher.nsresult.NS_ERROR_NET_RESET=ارتباط با سرور از دست رفت. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=اتصال به سرور امکان پذیر نمی‌باشد. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=اتصال به پروکسی امکان پذیر نمی‌باشد. diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 22f103b..fa11b59 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -42,7 +42,7 @@ <!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré"> <!ENTITY torsettings.useBridges.default.placeholder "Sélectionner un pont"> <!ENTITY torsettings.useBridges.bridgeDB "Demander un pont à torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Saisir les caractères de l’image"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Saisissez les caractères de l’image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtenir un nouveau test"> <!ENTITY torsettings.useBridges.captchaSubmit "Envoyer"> <!ENTITY torsettings.useBridges.custom "Utiliser un pont que je connais"> @@ -78,7 +78,7 @@ Selon votre position géographique, un pont pourrait fonctionner mieux qu’un a <!ENTITY torPreferences.firewallPortsPlaceholder "Valeurs séparées par des virgules"> <!ENTITY torPreferences.requestBridgeDialogTitle "Demander un pont"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Connexion à BridgeDB. Veuillez patienter."> -<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résoudre le captcha pour demander un pont."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résolvez le captcha pour demander un pont."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez ressayer."> <!ENTITY torPreferences.viewTorLogs "Visualiser les journaux Tor."> <!ENTITY torPreferences.viewLogs "Visualiser les journaux…"> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 10ab674..8549565 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -36,7 +36,7 @@ torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine) torlauncher.request_a_bridge=Demander un pont… torlauncher.request_a_new_bridge=Demander un nouveau pont… torlauncher.contacting_bridgedb=Connexion à BridgeDB. Veuillez patienter. -torlauncher.captcha_prompt=Résoudre le captcha pour demander un pont. +torlauncher.captcha_prompt=Résolvez le captcha pour demander un pont. torlauncher.bad_captcha_solution=La solution est erronée. Veuillez ressayer. torlauncher.unable_to_get_bridge=Impossible d’obtenir un pont de BridgeDB.\n\n%S torlauncher.no_meek=Ce navigateur n’est pas configuré pour meek, qui est nécessaire pour obtenir des ponts. diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index ed49fb0..dd42068 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Dozwolone Porty"> <!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju"> <!ENTITY torsettings.useBridges.default "Wybierz wbudowany most"> <!ENTITY torsettings.useBridges.default.placeholder "wybierz most"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> +<!ENTITY torPreferences.torSettings "Ustawienia Tor"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > <!ENTITY torPreferences.learnMore "Dowiedz się więcej"> <!ENTITY torPreferences.bridges "Mostki"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.useBridge "Użyj mostu"> <!ENTITY torPreferences.requestNewBridge "Poproś o nowy most..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Dodaj most"> <!ENTITY torPreferences.advanced "Zaawansowane"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Skonfiguruj jak Przeglądarka Tor łączy się z internetem."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Wartości oddzielone przecinkiem"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Poproś o Most"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Nawiązywanie połączenia z BridgeDB. Proszę czekać."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rozwiąż CAPTCHA, aby poprosić o most."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Zobacz dziennik Tor."> +<!ENTITY torPreferences.viewLogs "Wyświetl dziennik..."> +<!ENTITY torPreferences.torLogsDialogTitle "Dziennik Tor"> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 7539019..ce40f0d 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Nie można wystartować aplikacji Tor.\n\n%S torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora. torlauncher.torrc_missing=Brakuje pliku torrc i nie mógł on być utworzony. torlauncher.datadir_missing=Katalog Tora nie istnieje i nie mógł być utworzony. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Katalog uwierzytelniania cebulowego Tor nie istnieje i nie można go utworzyć. torlauncher.password_hash_missing=Nie można uzyskać hasha hasła. torlauncher.failed_to_get_settings=Nie można odzyskać ustawień Tora.\n\n%S diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index 6a4fdf9..30cc6e3 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=ไม่สามารถเริ่มกา torlauncher.tor_missing=แฟ้มโปรแกรม Tor ขาดหายไป torlauncher.torrc_missing=ไฟล์ torrc หายไปและไม่สามารถสร้างได้ torlauncher.datadir_missing=ไม่มีข้อมูลไดเรกทอรีของ Tor และไม่สามารถสร้างได้ -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=ไม่มีและไม่สามารถสร้างรายชื่อการยืนยันตัวตนของ Tor onion ได้ torlauncher.password_hash_missing=ล้มเหลวในการเรียกรหัสผ่านที่ถูกแฮช torlauncher.failed_to_get_settings=ไม่สามารถเรียกคืนการตั้งค่า Tor ได้\n\n%S diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 4f5e1d6..dbb5658 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 torlauncher.torrc_missing=torrc 文件丢失且无法被创建。 torlauncher.datadir_missing=Tor 数据目录不存在且无法被创建。 -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Tor 的洋葱验证文件夹不存在，且无法被创建。 torlauncher.password_hash_missing=无法获取哈希密码。 torlauncher.failed_to_get_settings=无法获取 Tor 设置。\n\n%S

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 23 Mar '20

23 Mar '20

commit ce150c56c02a3bd48b345d104132b9d4868bd174 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 23 16:08:05 2020 +0000 Translations update --- chrome/locale/fa/torbutton.dtd | 2 +- chrome/locale/fa/torbutton.properties | 6 +++--- chrome/locale/hu/torbutton.dtd | 4 ++-- chrome/locale/nl/torbutton.properties | 14 +++++++------- chrome/locale/pl/browserOnboarding.properties | 10 +++++----- chrome/locale/pl/torbutton.dtd | 4 ++-- chrome/locale/pl/torbutton.properties | 18 +++++++++--------- chrome/locale/sv-SE/browserOnboarding.properties | 4 ++-- chrome/locale/sv-SE/torbutton.dtd | 2 +- chrome/locale/zh-CN/torbutton.dtd | 2 +- chrome/locale/zh-CN/torbutton.properties | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/chrome/locale/fa/torbutton.dtd b/chrome/locale/fa/torbutton.dtd index 504e6576..c650f3df 100644 --- a/chrome/locale/fa/torbutton.dtd +++ b/chrome/locale/fa/torbutton.dtd @@ -50,4 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "اعلان احراز هویت مشتری در سرویس Onion را باز کن"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "این کلید را به خاطر بسپار"> diff --git a/chrome/locale/fa/torbutton.properties b/chrome/locale/fa/torbutton.properties index 10be5b19..573ac861 100644 --- a/chrome/locale/fa/torbutton.properties +++ b/chrome/locale/fa/torbutton.properties @@ -70,11 +70,11 @@ onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=لطفا یک کلید معتبر وارد نمایید( 52 کاراکتر در مبنای 32 یا 44 کاراکتر در مبنای 64) onionServices.authPrompt.failedToSetKey=امکان پیکر‌بندی Tor با کلید شما وجود ندارد onionServices.authPreferences.header=اصالت سنجی سرویس پیازی -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.overview=برخی از سرویس های پیازی به این نیاز دارند که شما قبل از دسترسی به آنها، خودتان را با یک کلید (یک نوعی از رمز عبور) بشناسانید. onionServices.authPreferences.savedKeys=کلیدهای ذخیره‌شده... onionServices.authPreferences.dialogTitle=کلیدهای سرویس پیازی -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.dialogIntro=کلیدهای مربوط به onionsites در رایانه ی شما ذخیره شدند. +onionServices.authPreferences.onionSite=سایت های پیازی onionServices.authPreferences.onionKey=کلید onionServices.authPreferences.remove=حذف onionServices.authPreferences.removeAll=حذف کردن همه diff --git a/chrome/locale/hu/torbutton.dtd b/chrome/locale/hu/torbutton.dtd index 2f650d52..2a0687a3 100644 --- a/chrome/locale/hu/torbutton.dtd +++ b/chrome/locale/hu/torbutton.dtd @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Új Tor áramkör ehhez az oldalhoz">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Az onion szerviz kliens authentikációs prompt megnyitása"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Jegyezd meg ezt a kulcsot"> diff --git a/chrome/locale/nl/torbutton.properties b/chrome/locale/nl/torbutton.properties index c19bfdcd..f78f128f 100644 --- a/chrome/locale/nl/torbutton.properties +++ b/chrome/locale/nl/torbutton.properties @@ -69,14 +69,14 @@ onionServices.authPrompt.done=Gereed onionServices.authPrompt.doneAccessKey=G onionServices.authPrompt.invalidKey=Voer een geldige sleutel in (52 base32-tekens of 44 base64-tekens) onionServices.authPrompt.failedToSetKey=Kan Tor niet configureren met uw sleutel -onionServices.authPreferences.header=Onion diensten Authenticatie -onionServices.authPreferences.overview=Voor sommige Onion diensten moet u zich identificeren met een sleutel (een soort wachtwoord) voordat u toegang kunt krijgen. +onionServices.authPreferences.header=Onion-servicesauthenticatie +onionServices.authPreferences.overview=Voor sommige Onion-services moet u zich identificeren met een sleutel (een soort wachtwoord) voordat u toegang kunt krijgen. onionServices.authPreferences.savedKeys=Opgeslagen sleutels… -onionServices.authPreferences.dialogTitle=Onion diensten sleutels -onionServices.authPreferences.dialogIntro=Sleutels voor de volgende onionsites zijn opgeslagen op je computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.dialogTitle=Onion-servicesleutels +onionServices.authPreferences.dialogIntro=Voor de volgende onion-websites zijn sleutels op uw computer opgeslagen +onionServices.authPreferences.onionSite=Onion-website onionServices.authPreferences.onionKey=Sleutel onionServices.authPreferences.remove=Verwijderen onionServices.authPreferences.removeAll=Alle verwijderen -onionServices.authPreferences.failedToGetKeys=Niet in staat om sleutels van tor te achterhalen -onionServices.authPreferences.failedToRemoveKey=Niet in staat om de sleutel te verwijderen +onionServices.authPreferences.failedToGetKeys=Kan geen sleutels van tor ophalen +onionServices.authPreferences.failedToRemoveKey=Kan sleutel niet verwijderen diff --git a/chrome/locale/pl/browserOnboarding.properties b/chrome/locale/pl/browserOnboarding.properties index a9534842..01ac6c4e 100644 --- a/chrome/locale/pl/browserOnboarding.properties +++ b/chrome/locale/pl/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Przejdź do Sieci Tor onboarding.tour-tor-network=Sieć Tor onboarding.tour-tor-network.title=Podrózuj po zdecentralizowanej sieci. onboarding.tour-tor-network.description=Tor Browser łączy się z Siecią Tor prowadzoną przez tysiące wolontariuszy na całym świecie. Inaczej niż w VPN, nie ma jednego punktu niepowodzenia lub scentralizowanej encji której musisz ufać aby korzystać z internetu w prywatności. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=NOWOŚĆ: Ustawienia Sieciowe Tor, zawierające możliwość proszenia o mosty, gdzie Tor jest zablokowany, znajdują się w Preferencjach. +onboarding.tour-tor-network.action-button=Dopasuj Swoje Ustawienia Sieci Tor onboarding.tour-tor-network.button=Przejdź do wyświetlacza obwodu onboarding.tour-tor-circuit-display=Wyświetlacz Obwodu @@ -50,9 +50,9 @@ onboarding.tour-tor-update.prefix-updated=Zaktualizowano onboarding.tour-tor-toolbar=Pasek narzędzi onboarding.tour-tor-toolbar-update-9.0.title=Pa pa przycisk onion -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.description=Chcemy aby twoje doświadczenia z używania Tor były w pełni zintegrowane z Przeglądarką Tor. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Właśnie dlatego, od teraz, zamiast używać przycisku cebuli możesz zobaczyć swój Obwód Tor przez [i] w pasku URL oraz zażądać Nową Tożsamość używając przycisk w pasku narzędzi lub [≡] menu. +onboarding.tour-tor-toolbar-update-9.0.button=Jak zażądać Nową Tożsamość onboarding.tour-tor-toolbar-update-9.0.next-button=Przejdź do Sieci Tor # Circuit Display onboarding. diff --git a/chrome/locale/pl/torbutton.dtd b/chrome/locale/pl/torbutton.dtd index 9ca52bb4..16d97cfd 100644 --- a/chrome/locale/pl/torbutton.dtd +++ b/chrome/locale/pl/torbutton.dtd @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Nowy obwód dla tej strony">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Otwórz dialog uwierzytelniania klienta usługi cebulowej"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Zapamiętaj ten klucz"> diff --git a/chrome/locale/pl/torbutton.properties b/chrome/locale/pl/torbutton.properties index f60d9c20..94e6c973 100644 --- a/chrome/locale/pl/torbutton.properties +++ b/chrome/locale/pl/torbutton.properties @@ -63,20 +63,20 @@ pageInfo_OnionEncryption=Połączenie zaszyfrowane (usługa Onion) # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.learnMore=Dowiedz się więcej onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.description= %S żąda twój klucz prywatny. +onionServices.authPrompt.keyPlaceholder=Wprowadź swój klucz prywatny dla tej usługi cebulowej onionServices.authPrompt.done=Skończone onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.failedToSetKey=Konfiguracja Tor przy użyciu twojego klucza nie powiodła się onionServices.authPreferences.header=Onion Services Authentication onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.savedKeys=Zapisane klucze... +onionServices.authPreferences.dialogTitle=Klucze Usługi Cebulowej onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionSite=Strona cebulowa onionServices.authPreferences.onionKey=Klucz onionServices.authPreferences.remove=Usuń -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Usuń wszystko +onionServices.authPreferences.failedToGetKeys=Nie można odebrać kluczy z Tor +onionServices.authPreferences.failedToRemoveKey=Usunięcie klucza nie powiodło się diff --git a/chrome/locale/sv-SE/browserOnboarding.properties b/chrome/locale/sv-SE/browserOnboarding.properties index 80b8534d..64585ef0 100644 --- a/chrome/locale/sv-SE/browserOnboarding.properties +++ b/chrome/locale/sv-SE/browserOnboarding.properties @@ -14,7 +14,7 @@ onboarding.tour-tor-privacy.button=Gå till Tor-nätverk onboarding.tour-tor-network=Tor-nätverk onboarding.tour-tor-network.title=Res ett decentraliserat nätverk. -onboarding.tour-tor-network.description=Tor Browser ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, finns det ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. +onboarding.tour-tor-network.description=Tor Browser ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN finns det ingen enskild punkt för misslyckande eller centraliserad enhet som du behöver lita på för att njuta av internet privat. onboarding.tour-tor-network.description-para2=NYTT: Tor-nätverksinställningar, inklusive möjligheten att begära broar där Tor är blockerad, kan nu hittas i Inställningar. onboarding.tour-tor-network.action-button=Justera Tor-nätverksinställningarna onboarding.tour-tor-network.button=Gå till Kretsvisning @@ -69,4 +69,4 @@ onboarding.tor-circuit-display.diagram.title=Kretsvisning onboarding.tor-circuit-display.diagram.msg=Detta diagram visar reläer som utgör kretsen för denna webbplats. För att förhindra länkning av aktivitet över olika platser, varje webbplats får en annan krets. onboarding.tor-circuit-display.new-circuit.title=Behöver du en ny krets? -onboarding.tor-circuit-display.new-circuit.msg=Om du inte kan ansluta till webbplatsen du försöker besöka eller det inte laddas ordentligt, kan du använda den här knappen för att ladda om webbplatsen med en ny krets. +onboarding.tor-circuit-display.new-circuit.msg=Om du inte kan ansluta till webbplatsen du försöker besöka eller den inte läses in ordentligt, kan du använda den här knappen för att läsa om webbplatsen med en ny krets. diff --git a/chrome/locale/sv-SE/torbutton.dtd b/chrome/locale/sv-SE/torbutton.dtd index d4e964d4..9c2bbeb7 100644 --- a/chrome/locale/sv-SE/torbutton.dtd +++ b/chrome/locale/sv-SE/torbutton.dtd @@ -1,6 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Ny identitet"> <!ENTITY torbutton.context_menu.new_identity_key "N"> -<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbplatsen"> +<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för denna webbplats"> <!ENTITY torbutton.context_menu.new_circuit_key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-nätverksinställningar..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> diff --git a/chrome/locale/zh-CN/torbutton.dtd b/chrome/locale/zh-CN/torbutton.dtd index eae74093..919e457c 100644 --- a/chrome/locale/zh-CN/torbutton.dtd +++ b/chrome/locale/zh-CN/torbutton.dtd @@ -50,4 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "打开洋葱服务客户端认证提示"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "记住此密钥"> diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index 1c9bbd13..ff530575 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -78,5 +78,5 @@ onionServices.authPreferences.onionSite=洋葱站 onionServices.authPreferences.onionKey=线图 onionServices.authPreferences.remove=移除 onionServices.authPreferences.removeAll=移除全部 -onionServices.authPreferences.failedToGetKeys=无法从Tor索回密钥 +onionServices.authPreferences.failedToGetKeys=无法从 Tor 获得密钥 onionServices.authPreferences.failedToRemoveKey=无法移除密钥

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0.7
by sysrqb＠torproject.org 19 Mar '20

19 Mar '20

commit ef40992f0bd23c6e331e730d35686cd1e9baf77a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Mar 19 13:58:59 2020 +0000 Release preparations for 9.0.7 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 6 +++--- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 36ec737..92e89d8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_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/https-everywhere/config b/projects/https-everywhere/config index 1bc6f98..424358a 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2019.11.7 +version: 2020.3.16 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 38a4fad..4e99fe7 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 9.0.7 -- March 20 2020 + * All Platforms + * Bump NoScript to 11.0.19 + * Bug 33613: Disable Javascript on Safest security level + * Windows + OS X + Linux + * Bump Tor to 0.4.2.7 + Tor Browser 9.0.6 -- March 11 2020 * All Platforms * Update Firefox to 68.6.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c526d59..3fbda88 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 5e795f711275f9162957321e5245cb0176ce36ce8a2410de95496670af51603d + sha256sum: eb06c8d548342ad623634cd5f40e7970e3e6c3218328c77c43716a8a5f61e680 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index 45e2a63..e551335 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.2.6 +version: 0.4.2.7 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 4fbcc85..89224e6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0.6' - torbrowser_build: 'build2' + torbrowser_version: '9.0.7' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0.5 + - 9.0.6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.6.0esr-9.0-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 18 Mar '20

18 Mar '20

commit 548667337447d5d410d20d136d61a73196f9ead4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Mar 18 18:32:33 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index e4fcf3067d24..690704a9bc3b 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit e4fcf3067d24d8abc0a00093529bbfefd71c8d0d +Subproject commit 690704a9bc3bd3a146db9689bc59d3b9e8702b15

1 0

[torbutton/master] Bug 33613 - Disable javascript on Safest security level
by sysrqb＠torproject.org 18 Mar '20

18 Mar '20

commit 39ca6d2c09d60aa04c798410186b6443d73df0eb Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Mar 13 21:08:30 2020 +0000 Bug 33613 - Disable javascript on Safest security level --- modules/security-prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/security-prefs.js b/modules/security-prefs.js index a51472e6..f6e397d4 100644 --- a/modules/security-prefs.js +++ b/modules/security-prefs.js @@ -35,6 +35,7 @@ const kSecuritySettings = { "svg.disabled" : [, true, false, false, false], "javascript.options.asmjs" : [, false, false, false, true ], "javascript.options.wasm" : [, false, false, false, true ], + "javascript.enabled" : [, false, true, true, true ], }; // The Security Settings prefs in question.

1 0

[torbutton/maint-9.0] Bug 33613 - Disable javascript on Safest security level
by sysrqb＠torproject.org 18 Mar '20

18 Mar '20

commit 690704a9bc3bd3a146db9689bc59d3b9e8702b15 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Mar 13 21:12:16 2020 +0000 Bug 33613 - Disable javascript on Safest security level --- modules/security-prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/security-prefs.js b/modules/security-prefs.js index f61f24aa..947520fb 100644 --- a/modules/security-prefs.js +++ b/modules/security-prefs.js @@ -33,6 +33,7 @@ const kSecuritySettings = { "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], "svg.disabled" : [, true, false, false, false], "javascript.options.asmjs" : [, false, false, false, true ], + "javascript.enabled" : [, false, true, true, true ], }; // The Security Settings prefs in question.

1 0

[tor-browser-build/master] Bug 33578: Bump Snowflake version to 58b52eb9f7
by boklm＠torproject.org 17 Mar '20

17 Mar '20

commit bbdb75f2417df66efecf66474bffc047ff557b48 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Mar 9 20:26:33 2020 +0000 Bug 33578: Bump Snowflake version to 58b52eb9f7 This commit bumps the version of Snowflake and includes a fix for removing the go.mod and go.sum files from the repository before building. --- projects/snowflake/build | 7 +++++++ projects/snowflake/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 76546d8..fe74e84 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -16,6 +16,13 @@ cd /var/tmp/build/[% project %]-[% c('version') %] mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" +# Remove go.mod and go.sum files until we can build using Go module versioning +rm -f go.mod go.sum + +# Fix gopath location of versioned dependencies +ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2" +ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2" + cd client go build -ldflags '-s' cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] diff --git a/projects/snowflake/config b/projects/snowflake/config index d800ee8..bf33032 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: b4f4b29a037fd2444423835da5999f39525f3d24 +git_hash: 58b52eb9f7987789d8e90a982a6df16013e200dd filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.6
by sysrqb＠torproject.org 17 Mar '20

17 Mar '20

commit 26c782f39f5eed7bb69fc98b015a58a5d0301391 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 17 15:02:20 2020 +0000 Fold in stable changelog for 9.0.6 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index eadcd2a..9a6bd34 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -11,6 +11,15 @@ Tor Browser 9.5a8 -- March 13 2020 * Windows * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year +Tor Browser 9.0.6 -- March 11 2020 + * All Platforms + * Update Firefox to 68.6.0esr + * Bump NoScript to 11.0.15 + * Bug 33430: Disable downloadable fonts on Safest security level + * Build System + * Windows + * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year + Tor Browser 9.5a7 -- March 6 2020 * All Platforms * Translations update

1 0

[tor-browser-build/master] Release preparations for 9.5a8
by sysrqb＠torproject.org 11 Mar '20

11 Mar '20

commit 7a9ec7814d44ba760be5554c66b68e517d0b946b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Mar 11 20:54:32 2020 +0000 Release preparations for 9.5a8 Versions bump and Changelog update --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 6 +++--- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 13c9307..f7efacc 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.5.0 + firefox_platform_version: 68.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7d7ad9f..eadcd2a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,16 @@ +Tor Browser 9.5a8 -- March 13 2020 + * All Platforms + * Update Firefox to 68.6.0esr + * Bump NoScript to 11.0.15 + * Bug 33430: Disable downloadable fonts on Safest security level + * Translations update + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.4 + * Translations update + * Build System + * Windows + * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year + Tor Browser 9.5a7 -- March 6 2020 * All Platforms * Translations update diff --git a/projects/tor-browser/config b/projects/tor-browser/config index eaacff7..4888399 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56 + sha256sum: 5e795f711275f9162957321e5245cb0176ce36ce8a2410de95496670af51603d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 106c669..f8d1d0b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a7' - torbrowser_build: 'build2' + torbrowser_version: '9.5a8' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a5 - 9.5a6 + - 9.5a7 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Release preparations for 0.2.21.4
by sysrqb＠torproject.org 11 Mar '20

11 Mar '20

commit a8ee552d9328bb503adf5fded383895f63d0d051 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Mar 11 20:37:22 2020 +0000 Release preparations for 0.2.21.4 Translations update and version bump --- src/chrome/locale/mk/torlauncher.properties | 2 +- src/chrome/locale/ro/torlauncher.properties | 2 +- src/chrome/locale/th/network-settings.dtd | 2 +- src/install.rdf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 7e0193e..f707171 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Не може да се стартува Tor.\n\ torlauncher.tor_missing=Извршната датотека на Tor недостасува. torlauncher.torrc_missing=torrc датотеката недостасува и не може да биде создадена. torlauncher.datadir_missing=Tor податочниот директориум не постои и не може да биде создаден. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Директориумот за Tor onion автентификација не постои или не може да биде создаден. torlauncher.password_hash_missing=Неуспешно добивање на хаш-лозинка. torlauncher.failed_to_get_settings=Невозможно е да се добијат Tor поставки.\n\n%S diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 1fa4732..ca3c8fa 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Tor nu a putut porni.\n\n%S torlauncher.tor_missing=Fișierul executabil Tor lipsește. torlauncher.torrc_missing=Fişierul torrc lipseşte şi nu a putut fi creat. torlauncher.datadir_missing=Directorul de date Tor nu există şi nu a putut fi creat. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Directorul de autentificare Tor Onion nu există și nu a putut fi creat. torlauncher.password_hash_missing=Eroare la obținerea hash-ului parolei. torlauncher.failed_to_get_settings=Nu s-au putut obține setările Tor.\n\n%S diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index e7445b0..bd74348 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "ไม่จำเป็น"> <!ENTITY torsettings.useProxy.checkbox "ฉันใช้พร็อกซีเพื่อเชื่อมต่อกับอินเทอร์เน็ต"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "ชนิดพร็อกซี"> <!ENTITY torsettings.useProxy.type.placeholder "เลือกชนิดพร็อกซี"> <!ENTITY torsettings.useProxy.address "ที่อยู่"> <!ENTITY torsettings.useProxy.address.placeholder "ที่อยู่ IP หรือชื่อโฮสต์"> diff --git a/src/install.rdf b/src/install.rdf index 919d5e8..b329c7c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21.3</em:version> + <em:version>0.2.21.4</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 11 Mar '20

11 Mar '20

commit 3a9dcce4e054d695b548ba460b7463bed5cf064d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Mar 11 20:09:44 2020 +0000 Translations update --- chrome/locale/ca/aboutTor.dtd | 2 +- chrome/locale/da/torbutton.properties | 8 ++++---- chrome/locale/fa/torbutton.properties | 12 ++++++------ chrome/locale/mk/torbutton.dtd | 2 +- chrome/locale/mk/torbutton.properties | 18 +++++++++--------- chrome/locale/nl/torbutton.properties | 12 ++++++------ chrome/locale/ro/torbutton.dtd | 2 +- chrome/locale/ro/torbutton.properties | 16 ++++++++-------- chrome/locale/sv-SE/aboutTBUpdate.dtd | 2 +- chrome/locale/sv-SE/browserOnboarding.properties | 6 +++--- chrome/locale/th/browserOnboarding.properties | 2 +- chrome/locale/th/torbutton.properties | 14 +++++++------- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd index 2885220c..5fbe857e 100644 --- a/chrome/locale/ca/aboutTor.dtd +++ b/chrome/locale/ca/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Quant a Tor"> -<!ENTITY aboutTor.viewChangelog.label "Visualitza el registre de canvis"> +<!ENTITY aboutTor.viewChangelog.label "Mostra el registre de canvis"> <!ENTITY aboutTor.ready.label "Exploreu. Privadament."> <!ENTITY aboutTor.ready2.label "Esteu preparat per a l'experiència de navegació més privada del món."> diff --git a/chrome/locale/da/torbutton.properties b/chrome/locale/da/torbutton.properties index e38e384a..63e9b37c 100644 --- a/chrome/locale/da/torbutton.properties +++ b/chrome/locale/da/torbutton.properties @@ -69,11 +69,11 @@ onionServices.authPrompt.done=Fuldført onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Indtast venligst en gyldig nøgle (52 base32-tegn eller 44 base64-tegn) onionServices.authPrompt.failedToSetKey=Kan ikke konfigurere Tor med din nøgle -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.header=Autentifikation for oniontjenester +onionServices.authPreferences.overview=Nogle oniontjenester kræver at du identificerer dig med en nøgle (en slags adgangskode) inden du kan tilgå dem. onionServices.authPreferences.savedKeys=Gemmer nøgler … -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.dialogTitle=Nøgler for oniontjeneste +onionServices.authPreferences.dialogIntro=Der gemmes nøgler til følgende onionsteder på din computer onionServices.authPreferences.onionSite=Onionsted onionServices.authPreferences.onionKey=Nøgle onionServices.authPreferences.remove=Fjern diff --git a/chrome/locale/fa/torbutton.properties b/chrome/locale/fa/torbutton.properties index 6bc2850d..10be5b19 100644 --- a/chrome/locale/fa/torbutton.properties +++ b/chrome/locale/fa/torbutton.properties @@ -69,14 +69,14 @@ onionServices.authPrompt.done=انجام شد onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=لطفا یک کلید معتبر وارد نمایید( 52 کاراکتر در مبنای 32 یا 44 کاراکتر در مبنای 64) onionServices.authPrompt.failedToSetKey=امکان پیکر‌بندی Tor با کلید شما وجود ندارد -onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.header=اصالت سنجی سرویس پیازی onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.savedKeys=کلیدهای ذخیره‌شده... +onionServices.authPreferences.dialogTitle=کلیدهای سرویس پیازی onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer onionServices.authPreferences.onionSite=Onionsite onionServices.authPreferences.onionKey=کلید onionServices.authPreferences.remove=حذف -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=حذف کردن همه +onionServices.authPreferences.failedToGetKeys=قادر به بازیابی کلیدها از تور نیستیم +onionServices.authPreferences.failedToRemoveKey=قادر به حذف کردن کلید نیستیم diff --git a/chrome/locale/mk/torbutton.dtd b/chrome/locale/mk/torbutton.dtd index 6dea8d58..82fd4629 100644 --- a/chrome/locale/mk/torbutton.dtd +++ b/chrome/locale/mk/torbutton.dtd @@ -50,4 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Отвори конзола за автентикација на onion клиентска услуга"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Зачувај го овој клуч"> diff --git a/chrome/locale/mk/torbutton.properties b/chrome/locale/mk/torbutton.properties index b88e6e22..189beead 100644 --- a/chrome/locale/mk/torbutton.properties +++ b/chrome/locale/mk/torbutton.properties @@ -69,14 +69,14 @@ onionServices.authPrompt.done=Завршено onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Ве молиме внесете валиден клуч (52 база32карактери или 44 база64 карактери) onionServices.authPrompt.failedToSetKey=Не може да се кофигурира Tor со вашиот клуч -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.header=Onion Услуги Автентикација +onionServices.authPreferences.overview=Некои onion услуги бараат да се идентификувате со клуч (некој вид на лозинка) пред да можете да им пристапите. +onionServices.authPreferences.savedKeys=Зачувани Клучеви... +onionServices.authPreferences.dialogTitle=Клучеви за Onion Услуги +onionServices.authPreferences.dialogIntro=Клучеви за следниве onion веб страни се складирани на вашиот компјутер +onionServices.authPreferences.onionSite=Onion веб страна onionServices.authPreferences.onionKey=Клуч onionServices.authPreferences.remove=Отстрани -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Избриши се +onionServices.authPreferences.failedToGetKeys=Не може да се повратат клучевите од Tor +onionServices.authPreferences.failedToRemoveKey=Не може да се избрише клуч diff --git a/chrome/locale/nl/torbutton.properties b/chrome/locale/nl/torbutton.properties index d2b7334a..c19bfdcd 100644 --- a/chrome/locale/nl/torbutton.properties +++ b/chrome/locale/nl/torbutton.properties @@ -69,14 +69,14 @@ onionServices.authPrompt.done=Gereed onionServices.authPrompt.doneAccessKey=G onionServices.authPrompt.invalidKey=Voer een geldige sleutel in (52 base32-tekens of 44 base64-tekens) onionServices.authPrompt.failedToSetKey=Kan Tor niet configureren met uw sleutel -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.header=Onion diensten Authenticatie +onionServices.authPreferences.overview=Voor sommige Onion diensten moet u zich identificeren met een sleutel (een soort wachtwoord) voordat u toegang kunt krijgen. onionServices.authPreferences.savedKeys=Opgeslagen sleutels… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.dialogTitle=Onion diensten sleutels +onionServices.authPreferences.dialogIntro=Sleutels voor de volgende onionsites zijn opgeslagen op je computer onionServices.authPreferences.onionSite=Onionsite onionServices.authPreferences.onionKey=Sleutel onionServices.authPreferences.remove=Verwijderen onionServices.authPreferences.removeAll=Alle verwijderen -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.failedToGetKeys=Niet in staat om sleutels van tor te achterhalen +onionServices.authPreferences.failedToRemoveKey=Niet in staat om de sleutel te verwijderen diff --git a/chrome/locale/ro/torbutton.dtd b/chrome/locale/ro/torbutton.dtd index 394c0468..995d2167 100644 --- a/chrome/locale/ro/torbutton.dtd +++ b/chrome/locale/ro/torbutton.dtd @@ -51,4 +51,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Deschideți promptul de autentificare a clientului de serviciu onion"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Țineți minte această cheie"> diff --git a/chrome/locale/ro/torbutton.properties b/chrome/locale/ro/torbutton.properties index 9a04ad6c..ba78a0c8 100644 --- a/chrome/locale/ro/torbutton.properties +++ b/chrome/locale/ro/torbutton.properties @@ -69,14 +69,14 @@ onionServices.authPrompt.done=Gata onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Vă rugăm să introduceți o cheie validă (52 de caractere base32 sau 44 de caractere base64) onionServices.authPrompt.failedToSetKey=Imposibil de configurat Tor cu cheia dvs. -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.header=Servicii de autentificare Onion +onionServices.authPreferences.overview=Unele servicii Onion necesită să vă identificați cu o cheie (un fel de parolă) înainte de a le putea accesa. +onionServices.authPreferences.savedKeys=Cheile salvate ... +onionServices.authPreferences.dialogTitle=Chei de servicii Onion +onionServices.authPreferences.dialogIntro=Cheile pentru următoarele saituri Onion sunt stocate pe computer onionServices.authPreferences.onionSite=Onionsite onionServices.authPreferences.onionKey=Cheie onionServices.authPreferences.remove=Eliminare -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Șterge tot +onionServices.authPreferences.failedToGetKeys=Imposibil de a prelua chei de la tor +onionServices.authPreferences.failedToRemoveKey=Nu se poate elimina cheia diff --git a/chrome/locale/sv-SE/aboutTBUpdate.dtd b/chrome/locale/sv-SE/aboutTBUpdate.dtd index ab88a911..82c035ea 100644 --- a/chrome/locale/sv-SE/aboutTBUpdate.dtd +++ b/chrome/locale/sv-SE/aboutTBUpdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-ändringsloggen"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-ändringslogg"> <!ENTITY aboutTBUpdate.updated "Tor Browser har uppdaterats."> <!ENTITY aboutTBUpdate.linkPrefix "För den senaste informationen om den här versionen, "> <!ENTITY aboutTBUpdate.linkLabel "besök vår webbplats"> diff --git a/chrome/locale/sv-SE/browserOnboarding.properties b/chrome/locale/sv-SE/browserOnboarding.properties index 9594de93..80b8534d 100644 --- a/chrome/locale/sv-SE/browserOnboarding.properties +++ b/chrome/locale/sv-SE/browserOnboarding.properties @@ -17,12 +17,12 @@ onboarding.tour-tor-network.title=Res ett decentraliserat nätverk. onboarding.tour-tor-network.description=Tor Browser ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, finns det ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. onboarding.tour-tor-network.description-para2=NYTT: Tor-nätverksinställningar, inklusive möjligheten att begära broar där Tor är blockerad, kan nu hittas i Inställningar. onboarding.tour-tor-network.action-button=Justera Tor-nätverksinställningarna -onboarding.tour-tor-network.button=Gå till kretsvisning +onboarding.tour-tor-network.button=Gå till Kretsvisning onboarding.tour-tor-circuit-display=Kretsvisning onboarding.tour-tor-circuit-display.title=Se din väg. onboarding.tour-tor-circuit-display.description=För varje domän du besöker förmedlas din trafik och krypteras i en krets över tre tor-reläer runt om i världen. Ingen webbplats vet var du ansluter från. Du kan begära en ny krets genom att klicka på "Ny krets för denna webbplats" på vår kretsvisning. -onboarding.tour-tor-circuit-display.button=Se Min väg +onboarding.tour-tor-circuit-display.button=Se min väg onboarding.tour-tor-circuit-display.next-button=Gå till Säkerhet onboarding.tour-tor-security=Säkerhet @@ -34,7 +34,7 @@ onboarding.tour-tor-security-level.next-button=Gå till Erfarenhets tips onboarding.tour-tor-expect-differences=Erfarenhets tips onboarding.tour-tor-expect-differences.title=Förvänta dig vissa skillnader. -onboarding.tour-tor-expect-differences.description=Med alla säkerhets- och sekretessfunktioner som Tor tillhandahåller kan din upplevelse när du surfar på internet vara lite annorlunda. Saker kan vara lite långsammare, och beroende på din säkerhetsnivå kanske vissa element inte fungerar eller läses in. Du kan också bli ombedd att bevisa att du är en människa och inte en robot. +onboarding.tour-tor-expect-differences.description=Med alla säkerhets- och sekretessfunktioner som Tor tillhandahåller kan din upplevelse när du surfar på internet vara lite annorlunda. Saker kan vara lite långsammare och beroende på din säkerhetsnivå kanske vissa element inte fungerar eller läses in. Du kan också bli ombedd att bevisa att du är en människa och inte en robot. onboarding.tour-tor-expect-differences.button=Se Vanliga frågor onboarding.tour-tor-expect-differences.next-button=Gå till Onion-tjänster diff --git a/chrome/locale/th/browserOnboarding.properties b/chrome/locale/th/browserOnboarding.properties index 60df93d6..1ae6bafc 100644 --- a/chrome/locale/th/browserOnboarding.properties +++ b/chrome/locale/th/browserOnboarding.properties @@ -49,7 +49,7 @@ onboarding.tour-tor-update.prefix-new=สร้างใหม่ onboarding.tour-tor-update.prefix-updated=อัพเดต onboarding.tour-tor-toolbar=แถบเครื่องมือ -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. +onboarding.tour-tor-toolbar-update-9.0.title=ลาก่อน Onion Button onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity diff --git a/chrome/locale/th/torbutton.properties b/chrome/locale/th/torbutton.properties index 2a2d8114..2a66ffc0 100644 --- a/chrome/locale/th/torbutton.properties +++ b/chrome/locale/th/torbutton.properties @@ -63,20 +63,20 @@ pageInfo_OnionEncryption=การเชื่อมต่อเข้ารห # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.learnMore=เรียนรู้เพิ่มเติม onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.description=%S ร้องขอกุญแจส่วนตัวของคุณ +onionServices.authPrompt.keyPlaceholder=ใส่กุญแจส่วนตัวของคุณสำหรับ onion service นี้ onionServices.authPrompt.done=เสร็จสิ้น onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.failedToSetKey=ไม่สามารถปรับแต่งค่า Tor ได้ด้วยกุญแจของคุณ onionServices.authPreferences.header=Onion Services Authentication onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.savedKeys=กุญแจที่ถูกบันทึก... onionServices.authPreferences.dialogTitle=Onion Service Keys onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer onionServices.authPreferences.onionSite=Onionsite onionServices.authPreferences.onionKey=รหัสกุญแจ onionServices.authPreferences.remove=ลบออก -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=ลบออกทั้งหมด +onionServices.authPreferences.failedToGetKeys=ไม่สามารถดึงกุญแจจาก Tor +onionServices.authPreferences.failedToRemoveKey=ไม่สามารถลบกุญแจได้

1 0

[tor-browser-build/master] Bug 33402: Set app.update.url for nightly
by boklm＠torproject.org 09 Mar '20

09 Mar '20

commit 2b608ad1a0fd704eb6c7a957638abc65508e1e2b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 24 17:04:42 2020 +0100 Bug 33402: Set app.update.url for nightly --- projects/firefox/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 8837cfc..cd0d6b5 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -112,6 +112,8 @@ fi # Add nightly mar signing key (#33403) cp $rootdir/nightly-marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der cp $rootdir/nightly-marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der + # Set app.update.url for nightly (#33402) + sed -i 's|pref("app\.update\.url",.*|pref("app.update.url", "https://nightlies.tbb.torproject.org/nightly-updates/updates/nightly-[% c("var/osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%");|' browser/app/profile/firefox.js [% END -%] rm -f configure

1 0

[tor-browser-build/master] Bug 33403: Add nightly mar key
by boklm＠torproject.org 09 Mar '20

09 Mar '20

commit e6d2903efa95a88e24e846dd30f2f076fec45ca5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 20 18:42:37 2020 +0100 Bug 33403: Add nightly mar key --- projects/firefox/build | 6 ++++++ projects/firefox/config | 2 ++ projects/firefox/nightly-marsigner.der | Bin 0 -> 1245 bytes 3 files changed, 8 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 800a0c4..8837cfc 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -108,6 +108,12 @@ fi popd [% END %] +[% IF c("var/nightly") -%] + # Add nightly mar signing key (#33403) + cp $rootdir/nightly-marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der + cp $rootdir/nightly-marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der +[% END -%] + rm -f configure rm -f js/src/configure diff --git a/projects/firefox/config b/projects/firefox/config index 5d6c05d..13c9307 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -177,6 +177,8 @@ input_files: - project: tba-translation name: tba-translation enable: '[% c("var/android") %]' + - filename: nightly-marsigner.der + enable: '[% c("var/nightly") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin diff --git a/projects/firefox/nightly-marsigner.der b/projects/firefox/nightly-marsigner.der new file mode 100644 index 0000000..a3a3077 Binary files /dev/null and b/projects/firefox/nightly-marsigner.der differ

1 0

[tor-browser-build/master] Bug 28764: OpenSSL Build for Android
by boklm＠torproject.org 09 Mar '20

09 Mar '20

commit b380d694e605e46500e411c792602e08cdbb6fb2 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Dec 10 18:36:08 2019 -0800 Bug 28764: OpenSSL Build for Android --- projects/openssl/build | 4 ++++ projects/openssl/config | 3 +++ 2 files changed, 7 insertions(+) diff --git a/projects/openssl/build b/projects/openssl/build index 5851ff8..984d14a 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -17,6 +17,10 @@ export CC='gcc -m32' patch -p1 < $rootdir/escape-openssldir.patch patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch [% END -%] +# OpenSSL expects the NDK home to include the pre-assembled architecture directory +[% IF c("var/android") -%] + export ANDROID_NDK_HOME=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %] +[% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] make diff --git a/projects/openssl/config b/projects/openssl/config index 450c4c9..c0861b6 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -22,6 +22,9 @@ targets: osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 + android: + var: + configure_opts: CC=clang android-[% c("var/toolchain_arch") %] -no-shared input_files: - project: container-image

1 0

[tor-browser-build/maint-9.0] Bump build2 for ChangeLog change
by sysrqb＠torproject.org 09 Mar '20

09 Mar '20

commit e0c84715fb706a7feaf2da84aac80364ce2309c8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 9 17:33:33 2020 +0000 Bump build2 for ChangeLog change --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 99c0de3..4fbcc85 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.6' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.5 project_name: tor-browser

1 0

[tor-browser-build/maint-9.0] Patch for bug 33535 is only applied on Windows
by sysrqb＠torproject.org 09 Mar '20

09 Mar '20

commit 36d11459e435ca2091cd8c07b501507c8dfcf108 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 9 17:32:06 2020 +0000 Patch for bug 33535 is only applied on Windows --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index be2559b..38a4fad 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,7 +4,7 @@ Tor Browser 9.0.6 -- March 11 2020 * Bump NoScript to 11.0.15 * Bug 33430: Disable downloadable fonts on Safest security level * Build System - * All Platforms + * Windows * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year Tor Browser 9.0.5 -- February 11 2020

1 0

[tor-browser-build/maint-9.0] Add #33430 in ChangeLog
by sysrqb＠torproject.org 09 Mar '20

09 Mar '20

commit 7f44d23d5fe6327aa813f1789ae3164dc60de609 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 9 17:21:14 2020 +0000 Add #33430 in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6b7748d..be2559b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 9.0.6 -- March 11 2020 * All Platforms * Update Firefox to 68.6.0esr * Bump NoScript to 11.0.15 + * Bug 33430: Disable downloadable fonts on Safest security level * Build System * All Platforms * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0.6
by sysrqb＠torproject.org 09 Mar '20

09 Mar '20

commit 1f1087cd9cc350585bc1f1737cf0030d4bf3b810 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Mar 7 19:14:32 2020 +0000 Release preparations for 9.0.6 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 6 +++--- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index 87010ee..36ec737 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.5.0 + firefox_platform_version: 68.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c542ef0..6b7748d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 9.0.6 -- March 11 2020 + * All Platforms + * Update Firefox to 68.6.0esr + * Bump NoScript to 11.0.15 + * Build System + * All Platforms + * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year + Tor Browser 9.0.5 -- February 11 2020 * All Platforms * Update Firefox to 68.5.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 4e8ee14..c526d59 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56 + sha256sum: 5e795f711275f9162957321e5245cb0176ce36ce8a2410de95496670af51603d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 123d1a8..99c0de3 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0.5' - torbrowser_build: 'build3' + torbrowser_version: '9.0.6' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0.4 + - 9.0.5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year
by sysrqb＠torproject.org 07 Mar '20

07 Mar '20

commit b5e9b4ad94be85ec581b8e7a8aaec42696519dc1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 5 20:19:48 2020 +0100 Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year --- projects/openssl/build | 1 + projects/openssl/config | 2 ++ projects/openssl/use-SOURCE_DATE_EPOCH.patch | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/projects/openssl/build b/projects/openssl/build index 3ee3571..5851ff8 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -15,6 +15,7 @@ export CC='gcc -m32' [% END -%] [% IF c("var/windows") -%] patch -p1 < $rootdir/escape-openssldir.patch + patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] diff --git a/projects/openssl/config b/projects/openssl/config index 0a60c24..450c4c9 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -31,3 +31,5 @@ input_files: sha256sum: 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 - filename: escape-openssldir.patch enable: '[% c("var/windows") %]' + - filename: use-SOURCE_DATE_EPOCH.patch + enable: '[% c("var/windows") %]' diff --git a/projects/openssl/use-SOURCE_DATE_EPOCH.patch b/projects/openssl/use-SOURCE_DATE_EPOCH.patch new file mode 100644 index 0000000..65533bb --- /dev/null +++ b/projects/openssl/use-SOURCE_DATE_EPOCH.patch @@ -0,0 +1,25 @@ +From a1625535fc5127ab8e94043280ef7a983bcfc161 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Thu, 5 Mar 2020 20:39:05 +0100 +Subject: [PATCH] If SOURCE_DATE_EPOCH is defined, use it for copyright year + +Using the date from SOURCE_DATE_EPOCH instead of the current date makes +it possible to reproduce a build that was built on a different year: +https://reproducible-builds.org/specs/source-date-epoch/ +--- + util/mkrc.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/mkrc.pl b/util/mkrc.pl +index 6762bc4a56..e15c071af7 100755 +--- a/util/mkrc.pl ++++ b/util/mkrc.pl +@@ -46,7 +46,7 @@ if ( $filename =~ /openssl/i ) { + $vft = "VFT_APP"; + } + +-my $YEAR = [localtime()]->[5] + 1900; ++my $YEAR = [localtime($ENV{SOURCE_DATE_EPOCH} || time())]->[5] + 1900; + print <<___; + #include <winver.h> +

1 0

[tor-browser-build/maint-9.0] Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year
by sysrqb＠torproject.org 07 Mar '20

07 Mar '20

commit 4a2ad0146f9ad09eca816f07335df2a627ede6a1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 5 20:19:48 2020 +0100 Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year --- projects/openssl/build | 1 + projects/openssl/config | 2 ++ projects/openssl/use-SOURCE_DATE_EPOCH.patch | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/projects/openssl/build b/projects/openssl/build index 3ee3571..5851ff8 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -15,6 +15,7 @@ export CC='gcc -m32' [% END -%] [% IF c("var/windows") -%] patch -p1 < $rootdir/escape-openssldir.patch + patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] diff --git a/projects/openssl/config b/projects/openssl/config index 0a60c24..450c4c9 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -31,3 +31,5 @@ input_files: sha256sum: 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 - filename: escape-openssldir.patch enable: '[% c("var/windows") %]' + - filename: use-SOURCE_DATE_EPOCH.patch + enable: '[% c("var/windows") %]' diff --git a/projects/openssl/use-SOURCE_DATE_EPOCH.patch b/projects/openssl/use-SOURCE_DATE_EPOCH.patch new file mode 100644 index 0000000..65533bb --- /dev/null +++ b/projects/openssl/use-SOURCE_DATE_EPOCH.patch @@ -0,0 +1,25 @@ +From a1625535fc5127ab8e94043280ef7a983bcfc161 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Thu, 5 Mar 2020 20:39:05 +0100 +Subject: [PATCH] If SOURCE_DATE_EPOCH is defined, use it for copyright year + +Using the date from SOURCE_DATE_EPOCH instead of the current date makes +it possible to reproduce a build that was built on a different year: +https://reproducible-builds.org/specs/source-date-epoch/ +--- + util/mkrc.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/mkrc.pl b/util/mkrc.pl +index 6762bc4a56..e15c071af7 100755 +--- a/util/mkrc.pl ++++ b/util/mkrc.pl +@@ -46,7 +46,7 @@ if ( $filename =~ /openssl/i ) { + $vft = "VFT_APP"; + } + +-my $YEAR = [localtime()]->[5] + 1900; ++my $YEAR = [localtime($ENV{SOURCE_DATE_EPOCH} || time())]->[5] + 1900; + print <<___; + #include <winver.h> +

1 0