June 2018 - tbb-commits - lists.torproject.org

[tor-browser-build/master] fixup! Bug 26039: <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit c21b1a526ac1e199990496c234532ed309b6209e Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 10:46:30 2018 +0000 fixup! Bug 26039: <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60 There is no `extension-overrides.js` in a profile direcory anymore. --- projects/tor-browser/build | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4068eae..0c3e583 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -90,8 +90,6 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files mkdir -p $SKELETON_TMP_RESOURCES/browser echo "[XRE]" > $SKELETON_TMP_RESOURCES/browser/override.ini echo "EnableProfileMigrator=0" >> $SKELETON_TMP_RESOURCES/browser/override.ini - mkdir -p $SKELETON_TMP_RESOURCES/distribution/preferences - cp -p Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js $SKELETON_TMP_RESOURCES/distribution/preferences mkdir -p $SKELETON_TMP_RESOURCES/TorBrowser/Tor cp -p Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults $SKELETON_TMP_RESOURCES/TorBrowser/Tor/ # Place a copy of the bookmarks.html file at the top. It will be moved into

1 0

[tor-browser-build/master] Bug 26186: Replace usage of `intl.locale.matchOS` in tor-browser's build script
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit 6da864eb71aa8271b7699023eba373a43a0eeccd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jun 22 11:11:09 2018 -0400 Bug 26186: Replace usage of `intl.locale.matchOS` in tor-browser's build script `intl.locale.matchOS` has been deprecated and the new preference is `intl.locale.requested`, which is set by commit 473342eefe. See bug 26073 for more information. --- projects/tor-browser/build | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index f3ed949..cca23c0 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -146,7 +146,6 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$EXTOVERRIDESPATH" - echo 'pref("intl.locale.matchOS", false);' >> "$EXTOVERRIDESPATH" [% END %] [% IF c("var/linux") %]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sukhe/bug-26186'
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit 552dcb823fa523449d4aa5022e1cf70fe785b8e0 Merge: bff4fd1 6da864e Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 10:07:15 2018 +0000 Merge remote-tracking branch 'sukhe/bug-26186' projects/tor-browser/build | 1 - 1 file changed, 1 deletion(-)

1 0

[tor-browser-build/master] bn-BD locale is currently broken in Tor Browser
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit bff4fd1fe7a4e1f105973e9af217b8fefc3db392 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 10:01:15 2018 +0000 bn-BD locale is currently broken in Tor Browser --- projects/tor-launcher/config | 2 +- rbm.conf | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c42e18c..013b897 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16 +version: 0.2.16.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 ae8dc96..d15415e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -52,7 +52,6 @@ var: locale_ja: ja locales: - ar - - bn-BD - da - de - es-ES

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit a0efd2fcd6e945919b46c9204846b14cdcc188bb Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 09:45:36 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We modify the language packs to add our own search engines etc. and therefore breaks Mozilla's signature, see: 26465. Thus, we need to disable the signing requirement for language packs right now. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index dd494b80ebe0..c3d83adf7d43 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -351,6 +351,9 @@ pref("security.family_safety.mode", 0); // Enforce SHA1 deprecation, see: bug 18042. pref("security.pki.sha1_enforcement_level", 2); +// Disable the language pack signing check for now, see: bug 26465 +pref("extensions.langpacks.signatures.required", false); + // Avoid report TLS errors to Mozilla. We might want to repurpose this feature // one day to help detecting bad relays (which is bug 19119). For now we just // hide the checkbox, see bug 22072.

1 0

[tor-launcher/master] Version bump and translation update
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 78001e61af52485ecfa20e6fe6a34f705ee3d91c Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 08:53:30 2018 +0000 Version bump and translation update --- src/chrome/locale/pt/network-settings.dtd | 6 +++--- src/chrome/locale/pt/torlauncher.properties | 28 ++++++++++++++-------------- src/install.rdf | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index b0b6e52..e528c95 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -52,11 +52,11 @@ <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> <!ENTITY torsettings.proxyHelpTitle "Ajuda de Proxy"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "é necessário um proxy local quando ligar através de uma rede de empresa, escolar ou universitária. Se não tiver a certeza de como responder a esta questão, verifique as definições da Internet em outro navegador ou verifique as definições de rede do seu sistema para ver se é necessário um proxy."> <!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "As pontes são retransmissões não listadas que dificultam o bloqueio de ligações à Rede Tor. Cada tipo de ponte utiliza um método diferente para evitar a censura. Os "obfs" fazem com que o seu tráfego pareça um ruído aleatório, e os pacíficos fazem com que o seu tráfego pareça que está a ligar-se ao serviço, em vez ao Tor."> +<!ENTITY torsettings.bridgeHelp2 "Por causa de como certos países tentam bloquear o Tor, certas pontes funcionam em certos países, mas não em outros. Se não tiver a certeza sobre quais as pontes que funcionam no seu país, visite torproject.org/about/contact.htmupport">  <!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index d90dca4..dd89633 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=O Tor fechou-se durante o arranque. Isto pode ter acontecido devido a erro no seu ficheiro torrc, um erro no Tor ou outro programa no seu sistema, ou falha de hardware. Até que corrija o problema em causa reinicie o Tor, o Tor Browser não irá iniciar. -torlauncher.tor_exited=O Tor encerrou inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Tor Browser não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte. +torlauncher.tor_exited=O Tor fechou.se inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Tor Browser não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte. torlauncher.tor_exited2=Ao reiniciar o Tor não irá fechar os separadores do seu navegador. torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. torlauncher.tor_failed_to_start=O Tor não foi iniciado. @@ -15,7 +15,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. torlauncher.torrc_missing=O ficheiro torc está em falta e não foi possível criá-lo. -torlauncher.datadir_missing=A diretoria de dados Tor não existe e não foi possível criá-la. +torlauncher.datadir_missing=A diretoria de dados do Tor não existe e não foi possível criá-la. torlauncher.password_hash_missing=Não foi possível obter a palavra-passe "hashed". torlauncher.failed_to_get_settings=Não é possível obter as configurações do Tor\n\n %S @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Deve especificar ambos, um endereço de IP torlauncher.error_proxy_type_missing=Deve selecionar o tipo de proxy. torlauncher.error_bridges_missing=Deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Deve selecionar o tipo de transporte para as pontes fornecidas -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Por favor, solicite uma ponte. torlauncher.error_bridge_bad_default_type=Não estão disponíveis as pontes fornecidas que têm o tipo de transporte %S. Por favor, ajuste as suas configurações. torlauncher.bridge_suffix.meek-amazon=(funciona na China) torlauncher.bridge_suffix.meek-azure=(funciona na China) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Solicite uma Ponte... +torlauncher.request_a_new_bridge=Solicite uma Nova Ponte... +torlauncher.contacting_bridgedb=A contactar BridgeDB. Por favor, aguarde. +torlauncher.captcha_prompt=Resolva o CAPTCHA para solicitar uma ponte. +torlauncher.bad_captcha_solution=A solução não está correta. Por favor, tente novamente. +torlauncher.unable_to_get_bridge=Não é possível obter uma ponte de BridgeDB.\n\n%S +torlauncher.no_meek=Este navegador não está configurado para "meek", que é necessário para obter as pontes. +torlauncher.no_bridges_available=De momento, não estão disponíveis pontes. Desculpe. torlauncher.connect=Ligar torlauncher.restart_tor=Reiniciar o Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro torlauncher.bootstrapWarning.ioerror=Erro de leitura/gravação torlauncher.bootstrapWarning.pt_missing=transporte de ligação em falta -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=A ligação para o servidor foi perdida. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Não foi possível ligar ao servidor. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Não foi possível ligar ao proxy. diff --git a/src/install.rdf b/src/install.rdf index 011ab5b..5a31473 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.16</em:version> + <em:version>0.2.16.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 26466: Remove sv-SE from tracking for releases
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 300d8921fe752e3168e7071bf2506762e96f10d7 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 08:44:33 2018 +0000 Bug 26466: Remove sv-SE from tracking for releases sv-SE is essentially not used for Swedish translations. We should fall back to sv. --- src/chrome/locale/sv-SE/network-settings.dtd | 55 -------------------------- src/chrome/locale/sv-SE/torlauncher.properties | 31 --------------- 2 files changed, 86 deletions(-) diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd deleted file mode 100644 index 6ce1473..0000000 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ /dev/null @@ -1,55 +0,0 @@ -<!ENTITY torsettings.dialog.title ""> - - - -<!ENTITY torsettings.prompt ""> - -<!ENTITY torSettings.yes ""> -<!ENTITY torSettings.no ""> - -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> - -<!ENTITY torSettings.proxyQuestion ""> - -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> - - - -<!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> - -<!ENTITY torsettings.optional ""> - -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> -<!ENTITY torsettings.useProxy.address ""> -<!ENTITY torsettings.useProxy.address.placeholder ""> -<!ENTITY torsettings.useProxy.port ""> -<!ENTITY torsettings.useProxy.username ""> -<!ENTITY torsettings.useProxy.password ""> -<!ENTITY torsettings.useProxy.type.socks4 ""> -<!ENTITY torsettings.useProxy.type.socks5 ""> -<!ENTITY torsettings.useProxy.type.http ""> -<!ENTITY torsettings.firewall.checkbox ""> -<!ENTITY torsettings.firewall.allowedPorts ""> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties deleted file mode 100644 index fcd4d83..0000000 --- a/src/chrome/locale/sv-SE/torlauncher.properties +++ /dev/null @@ -1,31 +0,0 @@ -### Copyright (c) 2013, The Tor Project, Inc. -### See LICENSE for licensing information. - -# torlauncher.error_title=Tor Launcher - -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S - -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -# torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. -# torlauncher.datadir_missing=The Tor data directory does not exist. -# torlauncher.password_hash_missing=Failed to get hashed password. - -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -# torlauncher.error_proxy_type_missing=You must select the proxy type. -# torlauncher.error_bridges_missing=You must specify one or more bridges. - -# torlauncher.connect=Connect -# torlauncher.quit=Quit -# torlauncher.quit_win=Exit -# torlauncher.done=Done - -# torlauncher.forAssistance=For assistance, contact %S

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26461'
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit fd92d4d0b055f14763d925305e93f78fa4b3146d Merge: 7dc74d1 45f1b0a Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 06:43:43 2018 +0000 Merge remote-tracking branch 'boklm/bug_26461' tools/update-responses/update_responses | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 26461: fix error when {alpha, release}/signed doesn't exist
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 45f1b0a0c0e6e4ebe5dc330b2c1ac052838b060f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 22 17:34:23 2018 +0200 Bug 26461: fix error when {alpha,release}/signed doesn't exist Use make_path instead of mkdir to create all needed parent directories. --- tools/update-responses/update_responses | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 77b9c96..3295808 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -6,6 +6,7 @@ use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; +use File::Path qw(make_path); use Digest::SHA qw(sha256_hex); use XML::Writer; use Cwd; @@ -547,7 +548,7 @@ sub download_version { "$tmpdir/sha256sums-signed-build.txt")) { exit_error "Error checking gpg signature for version $version"; } - mkdir $destdir; + make_path $destdir; move "$tmpdir/sha256sums-signed-build.txt.asc", "$destdir/sha256sums-signed-build.txt.asc"; move "$tmpdir/sha256sums-signed-build.txt", "$destdir/sha256sums-signed-build.txt"; my %sums = map { chomp; reverse split ' ', $_ }

1 0

[tor-browser-build/maint-7.5] Bug 26461: fix error when {alpha, release}/signed doesn't exist
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit b4ceb77a9a481f3770129959e899f5866f049c7a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 22 17:34:23 2018 +0200 Bug 26461: fix error when {alpha,release}/signed doesn't exist Use make_path instead of mkdir to create all needed parent directories. --- tools/update-responses/update_responses | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1df35b3..f776521 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -6,6 +6,7 @@ use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; +use File::Path qw(make_path); use Digest::SHA qw(sha256_hex); use XML::Writer; use Cwd; @@ -546,7 +547,7 @@ sub download_version { "$tmpdir/sha256sums-signed-build.txt")) { exit_error "Error checking gpg signature for version $version"; } - mkdir $destdir; + make_path $destdir; move "$tmpdir/sha256sums-signed-build.txt.asc", "$destdir/sha256sums-signed-build.txt.asc"; move "$tmpdir/sha256sums-signed-build.txt", "$destdir/sha256sums-signed-build.txt"; my %sums = map { chomp; reverse split ' ', $_ }

1 0