- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 1585351 - Bug 1460357 disabled AVX instructions for the mingw build; this is no longer needed r=lsalzman
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit f6b7218543a748a5f49c67dc397bb6348756a7a3 Author: Tom Ritter <tom(a)mozilla.com> Date: Thu Oct 3 21:02:16 2019 +0000 Bug 1585351 - Bug 1460357 disabled AVX instructions for the mingw build; this is no longer needed r=lsalzman Bug 1460357 disabled AVX because gcc was generating unaligned instructions. But clang doesn't seem to do that. Differential Revision: https://phabricator.services.mozilla.com/D48072 --HG-- extra : moz-landing-system : lando --- gfx/skia/skia/src/opts/SkOpts_hsw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp index b04eaa91f8dc..d87ad1eb0503 100644 --- a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp +++ b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp @@ -7,7 +7,7 @@ // As described in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85525, MinGW will produce // unaligned instructions for this code, resulting in a crash. -#if defined(__AVX2__) && !defined(__MINGW32__) +#if defined(__AVX2__) #include <immintrin.h> #include <stdint.h>

1 0

[tor-browser-build/maint-9.0] Pick up new tag for Tor Launcher for build2
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit 803d014ed9be0ff5a2ee253798f3c3e9b0fc1723 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 21:21:39 2019 +0000 Pick up new tag for Tor Launcher for build2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++- projects/tor-launcher/config | 2 +- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cf41275..e2e668f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -38,8 +38,9 @@ Tor Browser 9.0 -- October 22 2019 * Update Tor to 0.4.1.6 * Update OpenSSL to 1.1.1d * Bug 31844: OpenSSL 1.1.1d fails to compile for some platforms/architectures - * Update Tor Launcher to 0.2.20 + * Update Tor Launcher to 0.2.20.1 * Bug 28044: Integrate Tor Launcher into tor-browser + * Bug 32154: Custom bridge field only allows one line of input * Bug 31286: New strings for about:preferences#tor * Bug 31303: Do not launch tor in browser toolbox * Bug 32112: Fix bad & escaping in translations diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 54e4973..c4010e7 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.20 +version: 0.2.20.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index ab0bbb5..926e3aa 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5.5 project_name: tor-browser

1 0

[tor-launcher/master] Release preparations for 0.2.20.1
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit c6e01ca0c243f7f9ba36f7d954c02732d3ed2f63 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 21:14:25 2019 +0000 Release preparations for 0.2.20.1 Version bump and translations update --- src/chrome/locale/da/network-settings.dtd | 26 ++++++++++----------- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/he/network-settings.dtd | 2 +- src/chrome/locale/ja/network-settings.dtd | 2 +- src/chrome/locale/ka/network-settings.dtd | 34 ++++++++++++++-------------- src/chrome/locale/lt/network-settings.dtd | 2 +- src/chrome/locale/mk/network-settings.dtd | 2 +- src/chrome/locale/mk/torlauncher.properties | 2 +- src/chrome/locale/ml/network-settings.dtd | 8 +++---- src/chrome/locale/pt-BR/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/network-settings.dtd | 4 ++-- src/install.rdf | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 3c986a6..f7d7111 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/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 "Computeren går gennem en firewall som kun tillader forbindelse til bestemte porte"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Tilladte porte"> <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> <!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Tor-indstillinger"> +<!ENTITY torPreferences.torSettingsDescription "Tor Browser sender din trafik over Tor-netværket som køres af tusindvis af frivillige verden over." > <!ENTITY torPreferences.learnMore "Læs mere"> <!ENTITY torPreferences.bridges "Broer"> -<!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.bridgesDescription "Broer hjælper dig med at tilgå Tor-netværket steder hvor Tor er blokeret. Afhængig af hvor du er, så kan en bro virke bedre end en anden."> +<!ENTITY torPreferences.useBridge "Brug en bro"> <!ENTITY torPreferences.requestNewBridge "Anmod om en ny bro…"> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Formidl en bro"> <!ENTITY torPreferences.advanced "Avanceret"> -<!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 "Konfigurer hvordan Tor Browser opretter forbindelse til internettet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Kommaseparerede værdier"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Anmod om bro"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vent venligst."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA'en for at anmode om en bro."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke korrekt. Prøv venligst igen."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Vis Tor-loggene."> +<!ENTITY torPreferences.viewLogs "Vis logge…"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor-logge"> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index dcbf959..22f103b 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -81,5 +81,5 @@ Selon votre position géographique, un pont pourrait fonctionner mieux qu’un a <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résoudre 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 "View Logs…"> +<!ENTITY torPreferences.viewLogs "Visualiser les journaux…"> <!ENTITY torPreferences.torLogsDialogTitle "Journaux Tor"> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 4289894..5a8e113 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "פתור את ה־CAPTCHA כדי לבקש גשר."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "הפתרון אינו נכון. אנא נסה שוב."> <!ENTITY torPreferences.viewTorLogs "הצג את יומני Tor."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "הצג יומנים..."> <!ENTITY torPreferences.torLogsDialogTitle "יומני Tor"> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 7a83a71..2d2dce7 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -69,7 +69,7 @@ <!ENTITY torPreferences.bridges "ブリッジ"> <!ENTITY torPreferences.bridgesDescription "ブリッジは Tor がブロックされる地域から Tor ネットワークにアクセスすることを手助けします。地域によって、あるブリッジが他のものよりうまく動作する可能性があります。"> <!ENTITY torPreferences.useBridge "ブリッジを使用する"> -<!ENTITY torPreferences.requestNewBridge "新たなブリッジをリクエスト。"> +<!ENTITY torPreferences.requestNewBridge "新しいブリッジを要求…"> <!ENTITY torPreferences.provideBridge "ブリッジを指定する"> <!ENTITY torPreferences.advanced "詳細"> <!ENTITY torPreferences.advancedDescription "Tor Browser がインターネットに接続する方法を設定します。"> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index 786a1e3..82ae5ad 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -26,18 +26,18 @@ <!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-მისამართი ან დასახელება"> -<!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username "ნიკი"> +<!ENTITY torsettings.useProxy.port "პორტი"> +<!ENTITY torsettings.useProxy.username "მეტსახელი"> <!ENTITY torsettings.useProxy.password "პაროლი"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "კომპიუტერი ინტერნეტს უკავშირდება ქსელის ფარის გავლით, რომელშიც მხოლოდ ცალკეული პორტებია დაშვებული"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "დაშვებული პორტები"> <!ENTITY torsettings.useBridges.checkbox "Tor შეზღუდულია ჩემს ქვეყანაში"> <!ENTITY torsettings.useBridges.default "ჩაშენებული გადამცემი ხიდის მითითება"> <!ENTITY torsettings.useBridges.default.placeholder "ხიდის მითითება"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Tor-ის პარამეტრები"> +<!ENTITY torPreferences.torSettingsDescription "Tor-ბრაუზერი თქვენს კავშირს ატარებს Tor-ქსელის გავლით, რომლის მუშაობასაც უზრუნველყოფს ათასობით მოხალისე მთელი მსოფლიოდან." > <!ENTITY torPreferences.learnMore "იხილეთ ვრცლად"> <!ENTITY torPreferences.bridges "გადამცემი ხიდები"> -<!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.bridgesDescription "გადამცემი ხიდების მეშვეობით შეგიძლიათ დაუკავშირდეთ Tor-ქსელს იქ, სადაც Tor-ს ზღუდავენ. იმისდა მიხედვით, თუ სად იმყოფებით, ზოგმა ხიდმა უკეთ შეიძლება იმუშაოს, ვიდრე სხვამ."> +<!ENTITY torPreferences.useBridge "ხიდის გამოყენება"> <!ENTITY torPreferences.requestNewBridge "ახალი გადამცემი ხიდის მოთხოვნა..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> -<!ENTITY torPreferences.advanced "Advanced"> -<!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.provideBridge "გადამცემი ხიდის მითითება"> +<!ENTITY torPreferences.advanced "დამატებით"> +<!ENTITY torPreferences.advancedDescription "მიუთითეთ, თუ როგორ დაუკავშირდეს Tor-ბრაუზერი ინტერნეტს."> +<!ENTITY torPreferences.firewallPortsPlaceholder "მძიმით გამოყოფილი მნიშვნელობები"> +<!ENTITY torPreferences.requestBridgeDialogTitle "ხიდის მოთხოვნა"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "უკავშირდება BridgeDB-ს. გთხოვთ, მოითმინოთ."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "გაიარეთ CAPTCHA, გადამცემი ხიდის მოთხოვნისთვის."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "გადაწყვეტა არასწორია. გთხოვთ სცადოთ ხელახლა."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "იხილეთ Tor-ის ჩანაწერები."> +<!ENTITY torPreferences.viewLogs "იხილეთ ჩანაწერები..."> +<!ENTITY torPreferences.torLogsDialogTitle "Tor-ის ჩანაწერები"> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index b7ea124..faf089e 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Norėdami užklausti tinklų tiltą, išspręskite saugos kodą."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Sprendimas neteisingas. Bandykite dar kartą."> <!ENTITY torPreferences.viewTorLogs "Žiūrėti Tor žurnalą."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Rodyti žurnalus…"> <!ENTITY torPreferences.torLogsDialogTitle "Tor žurnalas"> diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index add1b04..89dfcdc 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решете ја ЗАДАЧАТА за да побарате мост."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Решението е погрешно. Ве молиме обидете се повторно."> <!ENTITY torPreferences.viewTorLogs "Види ги Tor логовите."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Види логови..."> <!ENTITY torPreferences.torLogsDialogTitle "Tor Логови"> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 806ac8d..4055e24 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -52,7 +52,7 @@ torlauncher.forAssistance2=За помош, посетете ја %S torlauncher.copiedNLogMessages=Копирањето е завршено. %S Tor лог пораките се подготвени да бидат залепени во уредувач на текст или во порака за е-пошта. -torlauncher.bootstrapStatus.starting=Започнувањето +torlauncher.bootstrapStatus.starting=Започнување torlauncher.bootstrapStatus.conn_pt=Поврзување со мост torlauncher.bootstrapStatus.conn_done_pt=Поврзан со мост torlauncher.bootstrapStatus.conn_proxy=Поврзување со прокси diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index 8576c68..f8dbadf 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -26,9 +26,9 @@ <!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 "Address"> +<!ENTITY torsettings.useProxy.address "വിലാസം"> <!ENTITY torsettings.useProxy.address.placeholder "ഐ പി മേൽവിലാസം അല്ലെങ്കിൽ ഹോസ്റ്റ് നെയിം "> <!ENTITY torsettings.useProxy.port "പോര്‍ട്ട്"> <!ENTITY torsettings.useProxy.username "ഉപയോക്താവിന്റെ പേർ "> @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "എച് ടി ടി പി /എച് ടി ടി പി എസ് "> <!ENTITY torsettings.firewall.checkbox "ഈ കംപ്യൂട്ടർ ചില പ്രത്യേക പോർട്ടുകളിലൂടെ മാത്രം ബന്ധം അനുവദിക്കുന്ന ഫയർവാൾ വഴിയാണ് പോകുന്നത്"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "അനുവദനീയമായ പോർട്ടുകൾ"> <!ENTITY torsettings.useBridges.checkbox "എന്റെ രാജ്യത്തു ടോർ സെൻസർ ചെയ്തിട്ടുള്ളതാണ് "> <!ENTITY torsettings.useBridges.default "ഇതിനകത്തു തന്നെയുള്ള ഒരു ബ്രിഡ്ജ് തിരഞ്ഞെടുക്കുക "> <!ENTITY torsettings.useBridges.default.placeholder "ഒരു ബ്രിഡ്ജ് തിരഞ്ഞെടുക്കുക "> @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ബ്രിഡ്ജിനെ കിട്ടാൻ തന്നിരിക്കുന്ന കാപ്ച പരിഹരിക്കുക "> <!ENTITY torPreferences.requestBridgeErrorBadSolution "പരിഹാരം ശെരിയല്ല . ദയവായി ഒന്നുകൂടെ ശ്രെമിക്കുക "> <!ENTITY torPreferences.viewTorLogs "ടോർ ലോഗ്സ് കാണുക ."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "ലോഗുകൾ കാണുക…"> <!ENTITY torPreferences.torLogsDialogTitle "ടോർ ലോഗ്സ് "> diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 25c4d9a..b1c40d8 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente."> <!ENTITY torPreferences.viewTorLogs "Veja os logs do Tor."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Ver registros…"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 3f29971..8c9bc74 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/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 "该计算机的防火墙仅允许特定端口的互联网连接"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "允许的端口"> <!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查"> <!ENTITY torsettings.useBridges.default "选择内置网桥"> <!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。"> <!ENTITY torPreferences.requestBridgeErrorBadSolution "结果并不正确，请重试。"> <!ENTITY torPreferences.viewTorLogs "查看 Tor 日志。"> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "查看日志"> <!ENTITY torPreferences.torLogsDialogTitle "Tor 日志"> diff --git a/src/install.rdf b/src/install.rdf index e77f99e..7b456cd 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.20</em:version> + <em:version>0.2.20.1</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

[tor-launcher/master] Bug 32154: Custom bridge field only allows one line of input
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit d3c66f516b07271ea4bb5f2481d9e02ff912b0ce Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Oct 18 13:39:15 2019 -0400 Bug 32154: Custom bridge field only allows one line of input Mozilla is working on removing XUL <textbox>, and prior to ESR68 they removed support for the multiline attribute. Switch to <html:textarea> and adjust styles to make the appearance closely match <textbox>. --- src/chrome/content/network-settings-shared.js | 6 +++--- src/chrome/content/network-settings-wizard.xul | 1 + src/chrome/content/network-settings.js | 4 +++- src/chrome/content/network-settings.xul | 1 + src/chrome/skin/network-settings.css | 11 ++++++++++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-shared.js b/src/chrome/content/network-settings-shared.js index f1bdb91..1575f3d 100644 --- a/src/chrome/content/network-settings-shared.js +++ b/src/chrome/content/network-settings-shared.js @@ -122,9 +122,9 @@ var bridgeSettings = ` <vbox id="bridgeCustomEntry"> <label id="bridgeListLabel" style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> - <textbox id="bridgeList" multiline="true" rows="3" wrap="off" - oninput="onCustomBridgesTextInput();" - placeholder="&torsettings.useBridges.placeholder;"/> + <html:textarea id="bridgeList" rows="3" wrap="off" + oninput="onCustomBridgesTextInput();" + placeholder="&torsettings.useBridges.placeholder;"/> </vbox> </groupbox> </vbox> diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index ec48bd0..98dbdd8 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -12,6 +12,7 @@ <wizard id="TorNetworkSettings" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" defaulttitle="&torsettings.wizard.title.default;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 8c1db0f..709c939 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2485,6 +2485,7 @@ function setElemValue(aID, aValue) elem.checked = val; toggleElemUI(elem); break; + case "html:textarea": case "textbox": if (Array.isArray(aValue)) { @@ -2534,7 +2535,7 @@ function setBridgeListElemValue(aBridgeArray) // Returns a Boolean (for checkboxes/radio buttons) or a -// string (textbox and menulist). +// string (textarea, textbox, and menulist). // Leading and trailing white space is trimmed from strings. function getElemValue(aID, aDefaultValue) { @@ -2550,6 +2551,7 @@ function getElemValue(aID, aDefaultValue) case "radio": rv = elem.selected; break; + case "html:textarea": case "textbox": case "menulist": case "richlistbox": diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 6a8fac4..1d3423e 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -13,6 +13,7 @@ <dialog id="TorNetworkSettings" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 9fed4f2..aae7c0b 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -5,6 +5,8 @@ * vim: set sw=2 sts=2 ts=8 et syntax=css: */ +@namespace html "http://www.w3.org/1999/xhtml"; + dialog { width: 45em; height: 41em; @@ -294,13 +296,20 @@ dialog .help { max-width: 34em; } +html|textarea { + padding: 4px !important; + margin-top: 4px; + font-family: inherit; +} + /* Increase font size on Windows for readability */ .os-windows div, .os-windows label, .os-windows description, +.os-windows html|textarea, .os-windows textbox { - font-size: 120%; + font-size: 120% !important; } .torWarning {

1 0

[tor-browser-build/maint-9.0] Fix typos and add missing items to 9.0 Changelog
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit dbc30cd448b3f38f732f5f1fece8ba40e518115a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 19:01:17 2019 +0000 Fix typos and add missing items to 9.0 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9a4666d..cf41275 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -11,7 +11,7 @@ Tor Browser 9.0 -- October 22 2019 * Bug 31602: Remove Pocket indicators in UI and disable it * Bug 31914: Fix eslint linter error * Bug 30429: Rebase patches for Firefox 68 ESR - * Bug 31444: Review network code changes for Firefox 68 ESR + * Bug 31144: Review network code changes for Firefox 68 ESR * Bug 10760: Integrate Torbutton into Tor Browser directly * Bug 25856: Remove XUL overlays from Torbutton * Bug 31322: Fix about:tor assertion failure debug builds @@ -32,6 +32,7 @@ Tor Browser 9.0 -- October 22 2019 * Bug 31015: Disabling SVG hides UI icons in extensions * Bug 30681: Set security.enterprise_roots.enabled to false * Bug 30538: Unable to comment on The Independent Newspaper + * Bug 31209: View PDF in Tor Browser is fuzzy * Translations update * Windows + OS X + Linux * Update Tor to 0.4.1.6 @@ -55,7 +56,7 @@ Tor Browser 9.0 -- October 22 2019 * Bug 32111: Fixed issue parsing user-provided bridge strings * Bug 31749: Fix security level panel spawning events * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow - * Bug 31748: Fix 'Learn More' links in Security Level preferences and panel + * Bug 31748+31961: Fix 'Learn More' links in Security Level preferences and panel * Bug 28044: Integrate Tor Launcher into tor-browser * Bug 31059: Enable Letterboxing * Bug 30468: Add mk locale @@ -120,6 +121,7 @@ Tor Browser 9.0 -- October 22 2019 * Bug 31822: Security slider is not really visible on Android anymore * Bug 24920: Only create Private tabs in permanent Private Browsing Mode * Bug 31730: Revert aarch64-workaround against JIT-related crashes + * Bug 32097: Fix conflicts in mobile onboarding while rebasing to 68.2.0esr * Build System * All Platforms * Bug 30585: Provide standalone clang 8 project across all platforms

1 0

[tor-browser-build/master] Bug 32132: Re-enable jemalloc for Windows users
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit f98c558493a6dc76915625a5c5eceefa020c0713 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 17 20:56:29 2019 +0000 Bug 32132: Re-enable jemalloc for Windows users Now that https://bugzilla.mozilla.org/show_bug.cgi?id=1547519 got backported (to esr68.2.0) we can re-enable jemalloc for Windows users. --- projects/firefox/mozconfig-windows-i686 | 3 +-- projects/firefox/mozconfig-windows-x86_64 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 685b294..fe3cc7d 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -38,8 +38,7 @@ ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-tests -ac_add_options --disable-jemalloc # Bug 154751 ac_add_options --disable-geckodriver # Bug 1489320 # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 92c774c..ef28c9b 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -38,8 +38,7 @@ ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-tests -ac_add_options --disable-jemalloc # Bug 1547519 ac_add_options --disable-geckodriver # Bug 1489320 # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING=

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit 81d2d351b4c93e139f13a6f21a9abadedc86ee6c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 10:22:56 2019 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 28709: Enable FuzzyFox --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3d0de789205b..96d14314eb24 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -169,6 +169,8 @@ pref("browser.cache.frecency_experiment", -1); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// Enable FuzzyFox +pref("privacy.fuzzyfox.enabled", true); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[torbutton/master] Bug 21549 - Enable WASM on the Standard security-level
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit 324e8fd7f73c7f97f8174713c6a112ec75669e56 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 18 12:50:09 2019 +0000 Bug 21549 - Enable WASM on the Standard 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..7fb2e0c4 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.options.wasm" : [, false, false, false, true ], }; // The Security Settings prefs in question.

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit 80134f6a3d2026ff95943e806cb424bf9eff2c2f Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Oct 18 15:47:04 2019 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. --- browser/app/profile/000-tor-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1501edf47b90..3d0de789205b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -245,8 +245,6 @@ pref("browser.policies.testing.disallowEnterprise", true); // Security slider pref("svg.in-content.enabled", true); pref("mathml.disabled", false); -// Unless we audit wasm properly in #21549 let's disable it. -pref("javascript.options.wasm", false); // Mozilla keeps still finding critical bugs in Graphite code. Disable it for // now, see bug 21726. pref("gfx.font_rendering.graphite.enabled", false);

1 0

[tor-browser-build/master] Bump tor-browser branch for nightly
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit d85ebd30305a598b2ed5fc8578cf004095056a2f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 09:32:46 2019 +0000 Bump tor-browser branch for nightly --- projects/firefox/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4370f01..fe1b5d4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,9 +8,9 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.1.0 + firefox_platform_version: 68.2.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 9.0 + torbrowser_branch: 9.5 torbrowser_update_channel: alpha branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' @@ -51,7 +51,7 @@ targets: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-3' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0