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

[torspec/master] Add 240, tweak 227
by nickm＠torproject.org 10 Jan '15

10 Jan '15

commit 3c0422acc464a9da74bc35d3027ae966bf59d8d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 15:45:59 2015 -0500 Add 240, tweak 227 --- proposals/000-index.txt | 2 + proposals/227-vote-on-package-fingerprints.txt | 5 +-- proposals/240-auth-cert-revocation.txt | 48 ++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 9af0405..b8d4490 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -160,6 +160,7 @@ Proposals by number: 237 All relays are directory servers [OPEN] 238 Better hidden service stats from Tor relays [DRAFT] 239 Consensus Hash Chaining [DRAFT] +240 Early signing key revocation for directory authorities [DRAFT] Proposals by status: @@ -184,6 +185,7 @@ Proposals by status: 235 Stop assigning (and eventually supporting) the Named flag [for 0.2.5] 238 Better hidden service stats from Tor relays 239 Consensus Hash Chaining + 240 Early signing key revocation for directory authorities NEEDS-REVISION: 131 Help users to verify they are using Tor 190 Bridge Client Authorization Based on a Shared Secret diff --git a/proposals/227-vote-on-package-fingerprints.txt b/proposals/227-vote-on-package-fingerprints.txt index d82f76c..83ac3da 100644 --- a/proposals/227-vote-on-package-fingerprints.txt +++ b/proposals/227-vote-on-package-fingerprints.txt @@ -31,12 +31,11 @@ Status: Open VERSION = NONSPACE URL = NONSPACE DIGESTS = DIGEST | DIGESTS SP DIGEST - DIGEST = DIGESTTYPE "=" BASE64 + DIGEST = DIGESTTYPE "=" DIGESTVAL NONSPACE = one or more non-space printing characters - BASE64 = one or more base-64 characters, with trailing =s - removed. + DIGESTVAL = any number of non-=, non-" " characters. SP = " " NL = a newline diff --git a/proposals/240-auth-cert-revocation.txt b/proposals/240-auth-cert-revocation.txt new file mode 100644 index 0000000..fa426ca --- /dev/null +++ b/proposals/240-auth-cert-revocation.txt @@ -0,0 +1,48 @@ +Filename: 240-auth-cert-revocation.txt +Title: Early signing key revocation for directory authorities. +Author: Nick Mathewson +Created: 09-Jan-2015 +Status: Draft + +1. Overview + + This proposal describes a simple way for directory authorities to + perform signing key revocation. + +2. Specification + + We add the following lines to the authority signing certificate + format: + + revoked-signing-key SP algname SP FINGERPRINT NL + + This line may appear zero or more times. + + It indicates that a particular not-yet-expired signing key should not + be used. + +3. Client and cache operation + + No client or cache should retain, use, or serve any certificate whose + signing key is described in a revoked-signing-key line in a + certificate with the same authority identity key. (If the signing + key fingerprint appears in a cert with a different identity key, it + has no effect: you aren't allowed to revoke other people's keys.) + + No Tor instance should download a certificate whose signing + key,identity key combination is known to be revoked. + +4. Authority operator interface. + + The 'tor-gencert' command will take a number of older certificates to + revoke as optional command-line arguments. It will include their + keys in revoked-signing-key lines only if they are still valid, or + have been expired for no more than a month. + +5. Circular revocation + + My first attempt at writing a proposal here included a lengthy + section about how to handle cases where certificate A revokes the key + of certificate B, and certificate B revokes the key of certificate A. + + Instead, I am inclined to say that this is a MUST NOT.

1 0

[torspec/master] tweak proposal 227 to match my implementation.
by nickm＠torproject.org 10 Jan '15

10 Jan '15

commit eee061542a7d4e9b62e64bbedc4dd583fe02e583 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 14:56:45 2015 -0500 tweak proposal 227 to match my implementation. --- proposals/227-vote-on-package-fingerprints.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/proposals/227-vote-on-package-fingerprints.txt b/proposals/227-vote-on-package-fingerprints.txt index 9c8652e..d82f76c 100644 --- a/proposals/227-vote-on-package-fingerprints.txt +++ b/proposals/227-vote-on-package-fingerprints.txt @@ -44,9 +44,12 @@ Status: Open Votes and consensuses may include any number of "package" lines, but no vote or consensus may include more than one "package" line with the same PACKAGENAME and VERSION values. All "package" - lines must be sorted by PACKAGENAME, and then by VERSION, in + lines must be sorted by "PACKAGENAME VERSION", in lexical (strcmp) order. + (If a vote contains multiple entries with the same PACKAGENAME and + VERSION, then only the last one is considered.) + If the consensus-method is at least (TBD), then when computing the consensus, package lines for a given PACKAGENAME/VERSION pair should be included if at least three authorities list such a @@ -141,3 +144,4 @@ Status: Open This proposal is not a substitute for a proper software update tool. +

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 10 Jan '15

10 Jan '15

commit 9a21b07044a88b8ac911dea51db6757aa237678d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 10 14:45:45 2015 +0000 Update translations for tor-launcher-network-settings_completed --- pt/network-settings.dtd | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pt/network-settings.dtd b/pt/network-settings.dtd index 6a469ec..617692f 100644 --- a/pt/network-settings.dtd +++ b/pt/network-settings.dtd @@ -1,62 +1,62 @@ -<!ENTITY torsettings.dialog.title "Definições da rede Tor"> +<!ENTITY torsettings.dialog.title "Configurações da Rede Tor">  -<!ENTITY torsettings.prompt "Antes de se ligar à rede Tor precisa de fornecer informações sobre a ligação deste computador à Internet."> +<!ENTITY torsettings.prompt "Antes de se ligar à rede Tor, precisa de fornecer informação sobre a ligação deste computador à Internet."> <!ENTITY torSettings.yes "Sim"> <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "Esta ligação à Internet está censurada ou é através de um proxy."> -<!ENTITY torSettings.configurePrompt2 "Preciso de configurar a ponte ou as definições de proxy."> +<!ENTITY torSettings.configurePrompt1 "Esta ligação à Internet deste computador está censurada ou é efetuada via proxy."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar as definiçõs da ponte e do proxy."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente à rede Tor."> +<!ENTITY torSettings.connectPrompt2 "Eu gostaria de me ligar diretamente à rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isto funciona na maior parte das situações."> <!ENTITY torSettings.connect "Ligar"> -<!ENTITY torSettings.proxyQuestion "Este computador precisa de usar uma proxy para aceder a Internet?"> +<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet?">  <!ENTITY torSettings.proxyHelp "Se não tem a certeza de como responder esta questão, olhe para as definições de Internet noutro navegador para ver se está configurado para usar um proxy."> -<!ENTITY torSettings.enterProxy "Introduza as definições de proxy."> +<!ENTITY torSettings.enterProxy "Insira as definições do proxy."> <!ENTITY torSettings.bridgeQuestion "O seu fornecedor de serviços de internet bloqueia ou censura ligações à rede Tor ?"> <!ENTITY torSettings.bridgeHelp "Se não tem a certeza de como responder a esta questão, escolha o Nº.  Se escolher Sim, vai-lhe ser pedido para configurar as Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear ligações à rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de bridges personalizadas.">  -<!ENTITY torsettings.startingTor "À espera que o Tor inicie..."> +<!ENTITY torsettings.startingTor "A aguardar que o Tor inicie..."> <!ENTITY torsettings.restartTor "Reiniciar o Tor"> <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de usar uma proxy para aceder à Internet."> +<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de utilizar um proxy para aceder à Internet."> <!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> <!ENTITY torsettings.useProxy.address "Endereço:"> -<!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou nome de anfitrião"> -<!ENTITY torsettings.useProxy.port "Porto:"> +<!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do anfitrião"> +<!ENTITY torsettings.useProxy.port "Porta:"> <!ENTITY torsettings.useProxy.username "Nome do utilizador:"> -<!ENTITY torsettings.useProxy.password "Palavra-Chave:"> +<!ENTITY torsettings.useProxy.password "Palavra-chave:"> <!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 "Este computador está protegido por um firewall que permite apenas algumas ligações a alguns portos."> -<!ENTITY torsettings.firewall.allowedPorts "Portos permitidos:"> +<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "O meu Internet Service Provider (ISP) bloqueia ligações à rede Tor"> <!ENTITY torsettings.useBridges.default "Ligar com as bridges fornecidas"> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> -<!ENTITY torsettings.useBridges.custom "Introduza bridges personalizadas"> -<!ENTITY torsettings.useBridges.label "Introduza um ou mais relays bridge (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder "escreva endereço:porto"> +<!ENTITY torsettings.useBridges.custom "Insira as pontes personalizadas"> +<!ENTITY torsettings.useBridges.label "Insira um ou mais relays de ponte (um por linha)."> +<!ENTITY torsettings.useBridges.placeholder "digite endereço:porta"> -<!ENTITY torsettings.copyLog "Copiar o log Tor para a Área de Transferência"> -<!ENTITY torsettings.bridgeHelpTitle "Ajuda Bridge Relay"> +<!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> +<!ENTITY torsettings.bridgeHelpTitle "Ajuda da Relay da Ponte"> <!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu provedor de internet (ISP) ou outro intermediário está a bloquear o Tor.  Normalmente, pode contornar este problema usando Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear."> <!ENTITY torsettings.bridgeHelp1B "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de endereços personalizados usando um dos três métodos:"> -<!ENTITY torsettings.bridgeHelp2Heading "Pela rede"> -<!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Pelo respondedor de email automático"> +<!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> +<!ENTITY torsettings.bridgeHelp2 "Utilize um navegador da Web para visitar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor de Correio Eletrónico Automático"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Enviar mensagem para bridges(a)torproject.org com a linha 'get bridges' sozinha no corpo da mensagem.  Contudo, para tornar mais difícil para os atacantes aprenderem sobre os endereços de pontes, tem de enviar a mensagem de um dos seguintes fornecedores de serviços de correio eletrónico (por esta ordem de preferência):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Pelo Helpdesk"> +<!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte"> <!ENTITY torsettings.bridgeHelp4 "Em último caso, pode pedir endereços bridge enviando um email cordial para help(a)rt.torproject.org.  Por favor tenha em conta que cada pedido será respondido por uma pessoa.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 10 Jan '15

10 Jan '15

commit c5a51186ec74b296326eb19c05ff4bb622d42337 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 10 14:45:41 2015 +0000 Update translations for tor-launcher-network-settings --- pt/network-settings.dtd | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pt/network-settings.dtd b/pt/network-settings.dtd index 6a469ec..617692f 100644 --- a/pt/network-settings.dtd +++ b/pt/network-settings.dtd @@ -1,62 +1,62 @@ -<!ENTITY torsettings.dialog.title "Definições da rede Tor"> +<!ENTITY torsettings.dialog.title "Configurações da Rede Tor">  -<!ENTITY torsettings.prompt "Antes de se ligar à rede Tor precisa de fornecer informações sobre a ligação deste computador à Internet."> +<!ENTITY torsettings.prompt "Antes de se ligar à rede Tor, precisa de fornecer informação sobre a ligação deste computador à Internet."> <!ENTITY torSettings.yes "Sim"> <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "Esta ligação à Internet está censurada ou é através de um proxy."> -<!ENTITY torSettings.configurePrompt2 "Preciso de configurar a ponte ou as definições de proxy."> +<!ENTITY torSettings.configurePrompt1 "Esta ligação à Internet deste computador está censurada ou é efetuada via proxy."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar as definiçõs da ponte e do proxy."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente à rede Tor."> +<!ENTITY torSettings.connectPrompt2 "Eu gostaria de me ligar diretamente à rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isto funciona na maior parte das situações."> <!ENTITY torSettings.connect "Ligar"> -<!ENTITY torSettings.proxyQuestion "Este computador precisa de usar uma proxy para aceder a Internet?"> +<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet?">  <!ENTITY torSettings.proxyHelp "Se não tem a certeza de como responder esta questão, olhe para as definições de Internet noutro navegador para ver se está configurado para usar um proxy."> -<!ENTITY torSettings.enterProxy "Introduza as definições de proxy."> +<!ENTITY torSettings.enterProxy "Insira as definições do proxy."> <!ENTITY torSettings.bridgeQuestion "O seu fornecedor de serviços de internet bloqueia ou censura ligações à rede Tor ?"> <!ENTITY torSettings.bridgeHelp "Se não tem a certeza de como responder a esta questão, escolha o Nº.  Se escolher Sim, vai-lhe ser pedido para configurar as Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear ligações à rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de bridges personalizadas.">  -<!ENTITY torsettings.startingTor "À espera que o Tor inicie..."> +<!ENTITY torsettings.startingTor "A aguardar que o Tor inicie..."> <!ENTITY torsettings.restartTor "Reiniciar o Tor"> <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de usar uma proxy para aceder à Internet."> +<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de utilizar um proxy para aceder à Internet."> <!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> <!ENTITY torsettings.useProxy.address "Endereço:"> -<!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou nome de anfitrião"> -<!ENTITY torsettings.useProxy.port "Porto:"> +<!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do anfitrião"> +<!ENTITY torsettings.useProxy.port "Porta:"> <!ENTITY torsettings.useProxy.username "Nome do utilizador:"> -<!ENTITY torsettings.useProxy.password "Palavra-Chave:"> +<!ENTITY torsettings.useProxy.password "Palavra-chave:"> <!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 "Este computador está protegido por um firewall que permite apenas algumas ligações a alguns portos."> -<!ENTITY torsettings.firewall.allowedPorts "Portos permitidos:"> +<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "O meu Internet Service Provider (ISP) bloqueia ligações à rede Tor"> <!ENTITY torsettings.useBridges.default "Ligar com as bridges fornecidas"> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> -<!ENTITY torsettings.useBridges.custom "Introduza bridges personalizadas"> -<!ENTITY torsettings.useBridges.label "Introduza um ou mais relays bridge (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder "escreva endereço:porto"> +<!ENTITY torsettings.useBridges.custom "Insira as pontes personalizadas"> +<!ENTITY torsettings.useBridges.label "Insira um ou mais relays de ponte (um por linha)."> +<!ENTITY torsettings.useBridges.placeholder "digite endereço:porta"> -<!ENTITY torsettings.copyLog "Copiar o log Tor para a Área de Transferência"> -<!ENTITY torsettings.bridgeHelpTitle "Ajuda Bridge Relay"> +<!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> +<!ENTITY torsettings.bridgeHelpTitle "Ajuda da Relay da Ponte"> <!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu provedor de internet (ISP) ou outro intermediário está a bloquear o Tor.  Normalmente, pode contornar este problema usando Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear."> <!ENTITY torsettings.bridgeHelp1B "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de endereços personalizados usando um dos três métodos:"> -<!ENTITY torsettings.bridgeHelp2Heading "Pela rede"> -<!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Pelo respondedor de email automático"> +<!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> +<!ENTITY torsettings.bridgeHelp2 "Utilize um navegador da Web para visitar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor de Correio Eletrónico Automático"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Enviar mensagem para bridges(a)torproject.org com a linha 'get bridges' sozinha no corpo da mensagem.  Contudo, para tornar mais difícil para os atacantes aprenderem sobre os endereços de pontes, tem de enviar a mensagem de um dos seguintes fornecedores de serviços de correio eletrónico (por esta ordem de preferência):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Pelo Helpdesk"> +<!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte"> <!ENTITY torsettings.bridgeHelp4 "Em último caso, pode pedir endereços bridge enviando um email cordial para help(a)rt.torproject.org.  Por favor tenha em conta que cada pedido será respondido por uma pessoa.">

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 10 Jan '15

10 Jan '15

commit db664d996b67833a661761dcd76613206e9c45a4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 10 14:45:28 2015 +0000 Update translations for tails-greeter_completed --- pt/pt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 1f35838..5450bb8 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-07 19:21+0200\n" -"PO-Revision-Date: 2014-07-09 16:31+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2015-01-10 14:41+0000\n" "Last-Translator: testsubject67 <deborinha97(a)hotmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 10 Jan '15

10 Jan '15

commit 41313a5656d61ded88349e03290fd1f742d68fa8 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 10 14:45:21 2015 +0000 Update translations for tails-greeter --- pt/pt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 1f35838..5450bb8 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-07 19:21+0200\n" -"PO-Revision-Date: 2014-07-09 16:31+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2015-01-10 14:41+0000\n" "Last-Translator: testsubject67 <deborinha97(a)hotmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 10 Jan '15

10 Jan '15

commit 136f7763105349a06f006fc721a60adc7473b5e6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 10 12:45:45 2015 +0000 Update translations for torbutton-torbuttondtd --- cs/torbutton.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cs/torbutton.dtd b/cs/torbutton.dtd index 89f84d6..9beff59 100644 --- a/cs/torbutton.dtd +++ b/cs/torbutton.dtd @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_caption "Úroveň zabezpečení"> +<!ENTITY torbutton.prefs.sec_low "Nízká (výchozí)"> <!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> <!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_high "Vysoká"> +<!ENTITY torbutton.prefs.sec_custom "Vlastní hodnoty">

1 0

[tor-browser-bundle/maint-4.0] Preparing 4.0.3.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 9c67ead33843115e7f4dcd2f7ce96c6008b19d0d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:35:17 2015 +0000 Preparing 4.0.3. Update Changelog; bump version of Tor Launcher, Firefox and NoScript. --- Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ gitian/versions | 14 +++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 50f7974..12f5180 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 4.0.3 -- Jan 13 2014 + * All Platforms + * Update Firefox to 31.4.0esr + * Update NoScript to 2.6.9.10 + * Update meek to 0.15 + * Update Tor Launcher to 0.2.7.0.2 + * Translation updates only + Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms * Update Firefox to 31.3.0esr diff --git a/gitian/versions b/gitian/versions index a8c9475..ee4435c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,16 +1,16 @@ -TORBROWSER_VERSION=4.0.2 +TORBROWSER_VERSION=4.0.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.3.0esr +FIREFOX_VERSION=31.4.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 TOR_TAG=tor-0.2.5.10 -TORLAUNCHER_TAG=0.2.7.0.1 +TORLAUNCHER_TAG=0.2.7.0.2 TORBUTTON_TAG=1.7.0.2 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 @@ -33,7 +33,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a +NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 HTTPSE_HASH=c83f9bc10f3da6e33e2242c7944fd2bb534708821685bef7b9d16850550cc858 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-4.0] Separate MAR file/htdocs generation.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit dca3ac0e09d1feda5d4f370960f824c0124f6492 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 21:44:36 2015 +0000 Separate MAR file/htdocs generation. This is part of d852329ac0979d8005e9e8bdd9b3f8a049fc2db4 which we need in order to be able to backport #13857 cleanly. The related part of the commit message is: Change update_responses to select the action to be done based on the program name, thereby separating the incremental MAR file generation (done via a new 'gen_incrementals' symlink) from the htdocs generation. Also added an 'update_responses' make target. Thanks to boklm for help with this. --- gitian/Makefile | 3 +++ tools/update-responses/gen_incrementals | 1 + tools/update-responses/update_responses | 34 ++++++++++++++++++++++++------- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 2c17656..b2e3224 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,6 +33,9 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: + ../tools/update-responses/gen_incrementals + +update_responses: ../tools/update-responses/update_responses hash: diff --git a/tools/update-responses/gen_incrementals b/tools/update-responses/gen_incrementals new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/gen_incrementals @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b28b575..5b85037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; @@ -13,6 +14,7 @@ use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +use File::Basename; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -158,7 +160,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars { +sub create_missing_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -178,6 +180,14 @@ sub create_missing_incremental_mars { $pm->wait_all_children; } +sub create_all_missing_incremental_mars { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } +} + sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -224,7 +234,6 @@ sub write_responses { my ($config) = @_; foreach my $version (values %{$config->{channels}}) { get_version_files($config, $version); - create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) { @@ -309,8 +318,19 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } -extract_martools; -check_deps; -write_responses($config); -write_htaccess($config); -clean_htdocs; +my %actions = ( + update_responses => sub { + write_responses(@_); + write_htaccess(@_); + clean_htdocs; + }, + gen_incrementals => sub { + extract_martools; + check_deps; + create_all_missing_incremental_mars(@_); + }, +); + +my $action = fileparse($PROGRAM_NAME); +exit_error "Unknown action $action" unless $actions{$action}; +$actions{$action}->($config);

1 0

[tor-browser-bundle/maint-4.0] Add a command to check an update_responses deployement
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 8286124e36d9dd366b0e13b4a5a10ba80c3bd16c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 22 14:55:20 2014 +0100 Add a command to check an update_responses deployement usage: check_update_responses_deployement <base_url> [channels...] example: $ ./check_update_responses_deployement \ https://dist.torproject.org/torbrowser/update_2 release This command will read the config.yml file, then try to load different URLs to check that it returns correct xml with the expected version, incremental update files for the versions that should have them, or no update when already using the current version. It does not currently check that the checksum of the files is correct. --- tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/update_responses | 106 ++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 206bd7a..5fe69a2 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,7 +13,8 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager + IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML + LWP On Debian / Ubuntu you can install them with: @@ -21,7 +22,8 @@ On Debian / Ubuntu you can install them with: # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl + libparallel-forkmanager-perl libxml-libxml-perl \ + libwww-perl ``` On Red Hat / Fedora you can install them with: @@ -29,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager + Parallel::ForkManager XML::LibXML LWP do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/check_update_responses_deployement b/tools/update-responses/check_update_responses_deployement new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/check_update_responses_deployement @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 0c487e3..f982637 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use feature "state"; use English; use FindBin; use YAML qw(LoadFile); @@ -15,6 +16,8 @@ use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; use File::Basename; +use XML::LibXML '1.70'; +use LWP::Simple; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -26,6 +29,7 @@ my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; +my @check_errors; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -327,6 +331,107 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } +sub log_step { + my ($url, $step, $status, $details) = @_; + state $u; + if (!defined $u || $url ne $u) { + print "\n" if $u; + print "$url\n"; + $u = $url; + } + print ' ', $step, $status ? ': OK' : ': ERROR', + $details ? " - $details\n" : "\n"; + return if $status; + push @check_errors, { url => $url, step => $step, details => $details }; +} + +sub get_remote_xml { + my ($url) = @_; + my $content = get $url; + log_step($url, 'get', defined $content); + return undef unless defined $content; + my $dom = eval { XML::LibXML->load_xml(string => $content) }; + log_step($url, 'parse_xml', defined $dom, $@); + return $dom; +} + +sub check_get_version { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + return $updates[0]->getAttribute('appVersion'); +} + +sub check_no_update { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return @updates == 0; +} + +sub check_has_incremental { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + my @patches = $updates[0]->getChildrenByLocalName('patch'); + foreach my $patch (@patches) { + return 1 if $patch->getAttribute('type') eq 'partial'; + } + return undef; +} + +sub check_update_responses_channel { + my ($config, $base_url, $channel) = @_; + my $channel_version = $config->{channels}{$channel}; + foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $lang (qw(en-US de)) { + my $url = "$base_url/$channel/$build_target/1.0/$lang"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; + $dom = get_remote_xml($url); + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); + } + } + } +} + +sub check_update_responses { + my ($config) = @_; + exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; + my ($base_url, @channels) = @ARGV; + foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { + check_update_responses_channel($config, $base_url, $channel); + } + if (!@check_errors) { + print "\n\nNo errors\n"; + return; + } + print "\n\nErrors list:\n"; + my $url = ''; + foreach my $error (@check_errors) { + if ($url ne $error->{url}) { + $url = $error->{url}; + print "$url\n"; + } + print " $error->{step}", + $error->{details} ? " - $error->{details}\n" : "\n"; + } +} + my %actions = ( update_responses => sub { my ($config) = @_; @@ -349,6 +454,7 @@ my %actions = ( create_missing_incremental_mars_for_version($config, $version); } }, + check_update_responses_deployement => \&check_update_responses, ); my $action = fileparse($PROGRAM_NAME);

1 0