[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

2019-01-17 Thread translation
commit df79783cb8c4cf728177cae6b4d17a1dacb31ad2
Author: Translation commit bot 
Date:   Fri Jan 18 02:20:15 2019 +

Update translations for support-portal_completed
---
 contents+pt-PT.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index cc3fabb9d..fd0a961c8 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -2965,7 +2965,7 @@ msgstr ""
 #: http//localhost/censorship/having-trouble-connecting-to-tor/
 #: (content/censorship/censorship-5/contents+en.lrquestion.seo_slug)
 msgid "having-trouble-connecting-to-tor"
-msgstr "problemas-em-conectar-ao-tor"
+msgstr "problemas-em-ligar-rede-tor"
 
 #: http//localhost/connecting/cannot-reach-x-onion/
 #: (content/connecting/connecting-3/contents+en.lrquestion.title)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/support-portal] Update translations for support-portal

2019-01-17 Thread translation
commit 41558586eb4c43c0a98e52ef0e3b9cf622498487
Author: Translation commit bot 
Date:   Fri Jan 18 02:20:07 2019 +

Update translations for support-portal
---
 contents+pt-PT.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index cc3fabb9d..fd0a961c8 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -2965,7 +2965,7 @@ msgstr ""
 #: http//localhost/censorship/having-trouble-connecting-to-tor/
 #: (content/censorship/censorship-5/contents+en.lrquestion.seo_slug)
 msgid "having-trouble-connecting-to-tor"
-msgstr "problemas-em-conectar-ao-tor"
+msgstr "problemas-em-ligar-rede-tor"
 
 #: http//localhost/connecting/cannot-reach-x-onion/
 #: (content/connecting/connecting-3/contents+en.lrquestion.title)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-17 Thread translation
commit 2c32a50c1009d8ef595f0a9bf44e955ab1e996af
Author: Translation commit bot 
Date:   Fri Jan 18 02:17:38 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 90 +++
 1 file changed, 65 insertions(+), 25 deletions(-)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index 2dbfb770c..8b1693300 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -610,12 +610,12 @@ msgid ""
 "href=\"/troubleshooting\">Troubleshooting page for help solving the "
 "problem."
 msgstr ""
-"Na maior parte dos casos, escolher \"Conectar\" permitir-lhe-á conectar-se à
"
-" rede Tor sem necessidade de configurações adicionais. Após clicar em "
-"\"Conectar\", aparecerá a barra de estado, mostrando a progressão da "
-"conexão. Se tiver uma conexão rápida, mas essa barra parar num certo 
ponto, "
-"consulte a página Como solucionar problemas"
-" para obter ajuda."
+"Na maior parte dos casos, escolher \"Ligar\" permitir-lhe-á conectar-se à "
+"rede Tor sem necessidade de configurações adicionais. Após clicar em "
+"\"Ligar\", aparecerá a barra de estado, mostrando a progressão da 
ligação. "
+"Se tiver uma ligação rápida, mas essa barra parar num certo ponto, 
consulte "
+"a página Resolução de problemas para 
obter "
+"ajuda."
 
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -1228,6 +1228,9 @@ msgid ""
 "entered the onion address correctly: even a small mistake will stop Tor "
 "Browser from being able to reach the site."
 msgstr ""
+"Se você não conseguir conectar-se ao serviço onion que deseja, 
certifique-se"
+" de ter escrito corretamente o endereço onion de 16 caracteres: até mesmo 
um"
+" pequeno erro impedirá que o Tor Browser aceda ao site."
 
 #: https//tb-manual.torproject.org/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.body)
@@ -1236,6 +1239,9 @@ msgid ""
 "later. There may be a temporary connection issue, or the site operators may "
 "have allowed it to go offline without warning."
 msgstr ""
+"Se ainda assim não conseguir conectar-se ao serviço onion, por favor tente "
+"novamente mais tarde. Pode ser que haja um problema temporário de ligação 
ou"
+" os operadores do site podem tê-lo desativado sem aviso."
 
 #: https//tb-manual.torproject.org/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.body)
@@ -1244,21 +1250,24 @@ msgid ""
 "connecting to http://3g2upl4pq6kufc4m.onion/\;>DuckDuckGo's Onion "
 "Service"
 msgstr ""
+"Também pode certificar-se de que consegue aceder a outros serviços onion "
+"acedendo ao http://3g2upl4pq6kufc4m.onion/\;>serviço onion do "
+"DuckDuckGo."
 
 #: https//tb-manual.torproject.org/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.seo_slug)
 msgid "onion-services"
-msgstr ""
+msgstr "servicos-onion"
 
 #: https//tb-manual.torproject.org/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.title)
 msgid "Secure Connections"
-msgstr ""
+msgstr "Ligações seguras"
 
 #: https//tb-manual.torproject.org/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.description)
 msgid "Learn how to protect your data using Tor Browser and HTTPS"
-msgstr ""
+msgstr "Saiba como proteger os seus dados utilizando o Tor Browser e HTTPS"
 
 #: https//tb-manual.torproject.org/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1270,6 +1279,12 @@ msgid ""
 " verify this in the URL bar: if your connection is encrypted, the address "
 "will begin with “https://”, rather than “http://”.;
 msgstr ""
+"Se as informações pessoais, tais como palavras-passe, viajarem pela 
Internet"
+" sem serem criptografadas, elas poderão facilmente ser intercetadas por um "
+"espião. Se estiver a entrar numa conta de utilizador de um site, certifique-"
+"se de que esse site oferece criptografia HTTPS, que protege contra este tipo"
+" de espionagem. Pode verificar isso na barra de endereços: se sua ligação "
+"for criptografada, o endereço começará com “https://” ao invés de 
“http://”.;
 
 #: https//tb-manual.torproject.org/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1282,6 +1297,8 @@ msgid ""
 "The following visualization shows what information is visible to "
 "eavesdroppers with and without Tor Browser and HTTPS encryption:"
 msgstr ""
+"A seguinte visualização mostra que tipos de informações são visíveis 
para "
+"espiões com e sem o Tor Browser e a criptografia HTTPS:"
 
 #: https//tb-manual.torproject.org/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1294,6 +1311,9 @@ msgid ""
 "* Click the “Tor” button to see what data is visible to observers when "
 "you're using Tor. The button will turn green to indicate that Tor is 

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2019-01-17 Thread translation
commit 09fcae94a73ceb86e5d0900ce0755014b9be7bcf
Author: Translation commit bot 
Date:   Fri Jan 18 01:49:11 2019 +

Update translations for tor-launcher-network-settings_completed
---
 pt_PT/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt_PT/network-settings.dtd b/pt_PT/network-settings.dtd
index 3cbf3e670..b3651adc7 100644
--- a/pt_PT/network-settings.dtd
+++ b/pt_PT/network-settings.dtd
@@ -1,6 +1,6 @@
 
-
-
+
+
 
 
 
@@ -52,7 +52,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2019-01-17 Thread translation
commit 7d9aa69d197e578d4e43bff4338a306a25dda51c
Author: Translation commit bot 
Date:   Fri Jan 18 01:49:06 2019 +

Update translations for tor-launcher-network-settings
---
 pt_PT/network-settings.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_PT/network-settings.dtd b/pt_PT/network-settings.dtd
index 3cbf3e670..e87ba8098 100644
--- a/pt_PT/network-settings.dtd
+++ b/pt_PT/network-settings.dtd
@@ -1,6 +1,6 @@
 
-
-
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-17 Thread translation
commit 21c9d5f855b95a2e4df2f2c6701bfdd46272
Author: Translation commit bot 
Date:   Fri Jan 18 01:47:09 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 136 +++---
 1 file changed, 110 insertions(+), 26 deletions(-)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index 912b5c791..2dbfb770c 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -781,6 +781,11 @@ msgid ""
 " of the URL bar, then select 'Tor Network Settings...' to access these "
 "options."
 msgstr ""
+"Se estiver a iniciar o Tor Browser pela primeira vez, clique em "
+"\"Configurar\" para abrir a janela de Configurações da Rede Tor. Caso "
+"contrário, clique no Torbutton, localizado no lado esquerdo da barra de "
+"endereços, e selecione \"Configurações da Rede Tor...\" para aceder a 
estas "
+"opções."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -789,6 +794,9 @@ msgid ""
 "Then, select 'Provide a bridge I know' and enter each bridge address on a "
 "separate line."
 msgstr ""
+"Na janela de Configurações da Rede Tor, selecione \"O Tor é censurado no 
meu"
+" país\". Em seguida, selecione \"Fornecer uma ponte que eu conheça\" e "
+"digite cada um dos endereços das pontes  numa linha separada."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -805,6 +813,8 @@ msgid ""
 "Click “OK” to save your settings. Using bridges may slow down the 
connection"
 " compared to using ordinary Tor relays."
 msgstr ""
+"Clique em \"OK\" para gravar as configurações. A utilização de pontes 
pode "
+"ser mais lenta comparada com a utilização de retransmissores normais do 
Tor."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -812,16 +822,19 @@ msgid ""
 "If the connection fails, the bridges you received may be down. Please use "
 "one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
+"Se a sua conexão falhar, as pontes que recebeu podem estar desligadas. Nesse"
+" caso, por favor, use um dos métodos acima para obter mais endereços de "
+"pontes e tente de novo."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.seo_slug)
 msgid "bridges"
-msgstr ""
+msgstr "pontes"
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.title)
 msgid "Pluggable transports"
-msgstr ""
+msgstr "Transportes ligáveis"
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.description)
@@ -829,6 +842,8 @@ msgid ""
 "Pluggable transports are tools that Tor can use to disguise the traffic it "
 "sends out."
 msgstr ""
+"Os transportes ligáveis são ferramentas que o Tor pode usar para disfarçar 
o"
+" tráfego que envia."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -838,11 +853,15 @@ msgid ""
 "Provider or other authority is actively blocking connections to the Tor "
 "network."
 msgstr ""
+"Os transportadores ligáveis são ferramentas que o Tor utiliza para mascarar 
"
+"o tráfego enviado para fora da rede Tor. Eles são úteis em situações 
onde os"
+" Fornecedores de Acesso à Internet, ou outras autoridades, bloqueiam "
+"conexões à rede Tor."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid "# Types of pluggable transport"
-msgstr ""
+msgstr "# Tipos de transportadores ligáveis"
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -850,36 +869,38 @@ msgid ""
 "Currently there are six pluggable transports available, but more are being "
 "developed."
 msgstr ""
+"Atualmente existem 6 transportadores ligáveis disponíveis, mas estão a ser 
"
+"desenvolvidos outros."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid "obfs3"
-msgstr ""
+msgstr "obfs3"
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: 

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-17 Thread translation
commit e1e8c3185786b6af38babc22c1a14d6dd1f22c14
Author: Translation commit bot 
Date:   Fri Jan 18 01:17:16 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 38 ++
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index 2c59195cf..912b5c791 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -650,6 +650,12 @@ msgid ""
 " You will then be taken to the Circumvention "
 "screen to configure a pluggable transport."
 msgstr ""
+"O primeiro ecrã pergunta se o seu acesso à rede Tor está a ser bloqueado 
ou "
+"censurado. Se acha que não é este o caso, selecione “Não”. Se souber 
que a "
+"sua conexão é censurada ou se tentou mas não conseguiu conectar-se à rede 
"
+"Tor e que nenhuma outra solução funcionou, selecione “Sim”. Irá 
aparecer o "
+"ecrã Contornar para que configure um "
+"transporte ligável."
 
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -660,6 +666,12 @@ msgid ""
 "ask your network administrator for guidance. If your connection does not use"
 " a proxy, click “Continue”."
 msgstr ""
+"O próximo ecrã pergunta se a sua conexão usa um proxy. Na maioria dos 
casos,"
+" isto não é necessário. Normalmente o utilizador saberá se usa um, sendo "
+"então a sua resposta “Sim”, já que os mesmos parâmetros são usados 
também em"
+" outros navegadores de Internet. Se possível, consulte a pessoa responsável 
"
+"pela administração da sua rede. Caso a sua conexão não use um proxy, 
clique "
+"em “Continuar”."
 
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -674,7 +686,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.seo_slug)
 msgid "running-tor-browser"
-msgstr ""
+msgstr "executar-tor-browser"
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.title)
@@ -687,6 +699,8 @@ msgid ""
 "Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
 "“bridge” relays."
 msgstr ""
+"A maioria dos Transportadores Ligáveis, como obfs3 e obfs4, baseiam-se no "
+"uso de retransmissores de \"ponte\"."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -698,6 +712,13 @@ msgid ""
 "combination with pluggable transports helps to disguise the fact that you "
 "are using Tor."
 msgstr ""
+"A maioria dos Transportadores Ligáveis, como "
+"obfs3 e obfs4, baseiam-se no uso de retransmissores de \"ponte\". Assim como"
+" os retransmissores comuns do Tor, as pontes são executadas por 
voluntários."
+" A diferença é que estas não se encontram em listas públicas, por forma a 
"
+"que não seja fácil para um adversário identificá-las. O uso combinado de "
+"pontes e de transportadores ligáveis ajuda a disfarçar o facto de que está 
a"
+" usar o Tor."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -706,11 +727,14 @@ msgid ""
 "techniques that do not rely on bridges. You do not need to obtain bridge "
 "addresses in order to use these transports."
 msgstr ""
+"Outros transportadores ligáveis, como o meek, usam outras técnicas anti-"
+"censura, que não se baseiam em pontes. Não necessita de obter os endereços 
"
+"das pontes para usar estes transportadores."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
 msgid "# Getting bridge addresses"
-msgstr ""
+msgstr "# Como obter endereços de pontes"
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -718,23 +742,27 @@ msgid ""
 "Because bridge addresses are not public, you will need to request them "
 "yourself. You have two options:"
 msgstr ""
+"Como os endereços de pontes não são públicos, tem de os pedir. Tem duas "
+"opções:"
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
 msgid ""
 "* Visit https://bridges.torproject.org/ and follow the instructions, or"
-msgstr ""
+msgstr "* Visitar https://bridges.torproject.org/ e seguir as instruções, ou"
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
 msgid ""
 "* Email brid...@torproject.org from a Gmail, Yahoo, or Riseup email address"
 msgstr ""
+"* Enviar um e-mail para brid...@torproject.org de uma conta de e-mail no "
+"Gmail, Yahoo ou no Riseup"
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
 msgid "# Entering bridge addresses"
-msgstr ""
+msgstr "# Configurar endereços de pontes"
 
 #: 

[tor-commits] [tor/master] Better failure message on stochastic test failure

2019-01-17 Thread nickm
commit 81f1b89efc94723f2c13b0b80d311364a2245d85
Author: Nick Mathewson 
Date:   Thu Jan 17 16:24:08 2019 -0500

Better failure message on stochastic test failure
---
 src/test/test_prob_distr.c | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/test/test_prob_distr.c b/src/test/test_prob_distr.c
index 114057fec..42cc6d70f 100644
--- a/src/test/test_prob_distr.c
+++ b/src/test/test_prob_distr.c
@@ -1137,7 +1137,11 @@ teardown_deterministic_rand(void)
 static void
 dump_seed(void)
 {
-  printf("\nSeed: %s\n",
+  printf("\n"
+ "NOTE: This is a stochastic test, and we expect it to fail from\n"
+ "time to time, with some low probability. If you see it fail more\n"
+ "than one trial in 100, though, please tell us.\n\n"
+ "Seed: %s\n",
  hex_str((const char*)rng_seed, sizeof(rng_seed)));
 }
 
@@ -1190,7 +1194,7 @@ test_stochastic_uniform(void *arg)
 .a = -4e-324,
 .b = 4e-310,
   };
-  bool ok = true;
+  bool ok = true, tests_failed = true;
 
   init_deterministic_rand();
   MOCK(crypto_rand, crypto_rand_deterministic);
@@ -1204,8 +1208,14 @@ test_stochastic_uniform(void *arg)
 
   tt_assert(ok);
 
+  tests_failed = false;
+
  done:
-;
+  if (tests_failed) {
+dump_seed();
+  }
+  teardown_deterministic_rand();
+  UNMOCK(crypto_rand);
 }
 
 static bool

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Speed up the deterministic prng in test_prob_distr, by a lot.

2019-01-17 Thread nickm
commit c08fc2e19e7695c5d3fd111fb8c1a46afc23b5e8
Author: Nick Mathewson 
Date:   Thu Jan 17 16:10:02 2019 -0500

Speed up the deterministic prng in test_prob_distr, by a lot.

Using a single xof object and squeezing it repeatedly should make
everything MUCH faster here.
---
 src/test/test_prob_distr.c | 47 ++
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/test/test_prob_distr.c b/src/test/test_prob_distr.c
index aac9d23e4..114057fec 100644
--- a/src/test/test_prob_distr.c
+++ b/src/test/test_prob_distr.c
@@ -1115,13 +1115,30 @@ test_psi_dist_sample(const struct dist *dist)
 }
 
 /* This is the seed of the deterministic randomness */
-static uint32_t deterministic_rand_counter;
+static uint8_t rng_seed[16];
+static crypto_xof_t *rng_xof = NULL;
 
 /** Initialize the seed of the deterministic randomness. */
 static void
 init_deterministic_rand(void)
 {
-  deterministic_rand_counter = crypto_rand_u32();
+  crypto_rand((char*)rng_seed, sizeof(rng_seed));
+  crypto_xof_free(rng_xof);
+  rng_xof = crypto_xof_new();
+  crypto_xof_add_bytes(rng_xof, rng_seed, sizeof(rng_seed));
+}
+
+static void
+teardown_deterministic_rand(void)
+{
+  crypto_xof_free(rng_xof);
+}
+
+static void
+dump_seed(void)
+{
+  printf("\nSeed: %s\n",
+ hex_str((const char*)rng_seed, sizeof(rng_seed)));
 }
 
 /** Produce deterministic randomness for the stochastic tests using the global
@@ -1134,15 +1151,8 @@ static void
 crypto_rand_deterministic(char *out, size_t n)
 {
   /* Use a XOF to squeeze bytes out of that silly counter */
-  crypto_xof_t *xof = crypto_xof_new();
-  tor_assert(xof);
-  crypto_xof_add_bytes(xof, (uint8_t*)_rand_counter,
-   sizeof(deterministic_rand_counter));
-  crypto_xof_squeeze_bytes(xof, (uint8_t*)out, n);
-  crypto_xof_free(xof);
-
-  /* Increase counter for next run */
-  deterministic_rand_counter++;
+  tor_assert(rng_xof);
+  crypto_xof_squeeze_bytes(rng_xof, (uint8_t*)out, n);
 }
 
 static void
@@ -1287,8 +1297,9 @@ test_stochastic_genpareto(void *arg)
 
  done:
   if (tests_failed) {
-printf("seed: %"PRIu32, deterministic_rand_counter);
+dump_seed();
   }
+  teardown_deterministic_rand();
   UNMOCK(crypto_rand);
 }
 
@@ -1316,8 +1327,9 @@ test_stochastic_geometric(void *arg)
 
  done:
   if (tests_failed) {
-printf("seed: %"PRIu32, deterministic_rand_counter);
+dump_seed();
   }
+  teardown_deterministic_rand();
   UNMOCK(crypto_rand);
 }
 
@@ -1344,8 +1356,9 @@ test_stochastic_logistic(void *arg)
 
  done:
   if (tests_failed) {
-printf("seed: %"PRIu32, deterministic_rand_counter);
+dump_seed();
   }
+  teardown_deterministic_rand();
   UNMOCK(crypto_rand);
 }
 
@@ -1372,8 +1385,9 @@ test_stochastic_log_logistic(void *arg)
 
  done:
   if (tests_failed) {
-printf("seed: %"PRIu32, deterministic_rand_counter);
+dump_seed();
   }
+  teardown_deterministic_rand();
   UNMOCK(crypto_rand);
 }
 
@@ -1402,8 +1416,9 @@ test_stochastic_weibull(void *arg)
 
  done:
   if (tests_failed) {
-printf("seed: %"PRIu32, deterministic_rand_counter);
+dump_seed();
   }
+  teardown_deterministic_rand();
   UNMOCK(crypto_rand);
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2019-01-17 Thread translation
commit 3249f88bf85667fb67e8e903884b060660c71d3a
Author: Translation commit bot 
Date:   Thu Jan 17 20:46:58 2019 +

Update translations for tails-persistence-setup_completed
---
 da/da.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/da/da.po b/da/da.po
index 28e3d19c3..ce582a300 100644
--- a/da/da.po
+++ b/da/da.po
@@ -6,7 +6,7 @@
 # Anders Damsgaard , 2013
 # Christian Villum , 2014
 # David Nielsen , 2015
-# scootergrisen, 2017-2018
+# scootergrisen, 2017-2019
 # 7110bbed2db4fadc642a4cd0e91bb1b9, 2015
 # Tore Bjørnson , 2013
 # Whiz Zurrd , 2014
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-11-01 12:21+0100\n"
-"PO-Revision-Date: 2019-01-15 12:21+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-01-17 20:24+\n"
+"Last-Translator: scootergrisen\n"
 "Language-Team: Danish 
(http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -111,7 +111,7 @@ msgstr "Personlig data"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:58
 msgid "Keep files stored in the `Persistent' directory"
-msgstr "Behold filer i \"vedvarende\"-mappen"
+msgstr "Behold filer i \"Vedvarende\"-mappen"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:71
 msgid "Browser Bookmarks"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2019-01-17 Thread translation
commit 864767313818c3664fbbe0f73edc1bf0e21ab7ef
Author: Translation commit bot 
Date:   Thu Jan 17 20:46:52 2019 +

Update translations for tails-persistence-setup
---
 da/da.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/da/da.po b/da/da.po
index 28e3d19c3..ce582a300 100644
--- a/da/da.po
+++ b/da/da.po
@@ -6,7 +6,7 @@
 # Anders Damsgaard , 2013
 # Christian Villum , 2014
 # David Nielsen , 2015
-# scootergrisen, 2017-2018
+# scootergrisen, 2017-2019
 # 7110bbed2db4fadc642a4cd0e91bb1b9, 2015
 # Tore Bjørnson , 2013
 # Whiz Zurrd , 2014
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-11-01 12:21+0100\n"
-"PO-Revision-Date: 2019-01-15 12:21+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-01-17 20:24+\n"
+"Last-Translator: scootergrisen\n"
 "Language-Team: Danish 
(http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -111,7 +111,7 @@ msgstr "Personlig data"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:58
 msgid "Keep files stored in the `Persistent' directory"
-msgstr "Behold filer i \"vedvarende\"-mappen"
+msgstr "Behold filer i \"Vedvarende\"-mappen"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:71
 msgid "Browser Bookmarks"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-01-17 Thread translation
commit e92d74bfd80b214c7f629a48e38055b76fdd06e0
Author: Translation commit bot 
Date:   Thu Jan 17 20:46:08 2019 +

Update translations for tails-misc_completed
---
 da.po | 44 ++--
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/da.po b/da.po
index 7763a55d8..5ac8b2a1c 100644
--- a/da.po
+++ b/da.po
@@ -13,16 +13,16 @@
 # mort3n , 2016
 # Aesthese, 2013
 # Aesthese, 2016
-# scootergrisen, 2017-2018
+# scootergrisen, 2017-2019
 # 7110bbed2db4fadc642a4cd0e91bb1b9, 2015
 # Whiz Zurrd , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-07 10:24+0100\n"
-"PO-Revision-Date: 2019-01-11 14:12+\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-01-14 21:20+0100\n"
+"PO-Revision-Date: 2019-01-17 20:23+\n"
+"Last-Translator: scootergrisen\n"
 "Language-Team: Danish 
(http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -104,6 +104,30 @@ msgstr "_Start"
 msgid "_Exit"
 msgstr "_Afslut"
 
+#: config/chroot_local-includes/usr/local/bin/keepassx:17
+#, sh-format
+msgid ""
+"Do you want to rename your KeePassX database?\n"
+"\n"
+"You have a KeePassX database in your Persistent folder:\n"
+"\n"
+"${filename}\n"
+"\n"
+"Renaming it to keepassx.kdbx would allow KeePassX to open it 
automatically in the future."
+msgstr "Vil du omdøbe din KeePassX-database?\n\nDu 
har en KeePassX-database i din 
Vedvarende-mappe:\n\n${filename}\n\nHvis den omdøbes til 
keepassx.kdbx, så kan KeePassX automatisk åbnes i fremtiden."
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:25
+msgid "Rename"
+msgstr "Omdøb"
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:26
+msgid "Keep current name"
+msgstr "Behold nuværende navn"
+
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr "su er deaktiveret. Brug venligst sudo i stedet."
+
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "Genstart"
@@ -250,7 +274,7 @@ msgid "Remove"
 msgstr "Fjern"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Annuller"
@@ -394,23 +418,23 @@ msgid ""
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}). 
Fejlretning fejlede også, så al brug af netværk er deaktiveret. \nDu vil 
måske foretrække at genstarte Tails og slå MAC spoofing fra."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
 msgid "Lock Screen"
 msgstr "Lås skærm"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
 msgid "Screen Locker"
 msgstr "Skærmlåser"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
 msgid "Set up a password to unlock the screen."
 msgstr "Opsæt en adgangskode til at låse skærmen op."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
 msgid "Password"
 msgstr "Adgangskode"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
 msgid "Confirm"
 msgstr "Bekræft"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-17 Thread translation
commit 3287dae0b55897805486f5dc701a364521572d00
Author: Translation commit bot 
Date:   Thu Jan 17 20:46:02 2019 +

Update translations for tails-misc
---
 da.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/da.po b/da.po
index 5e9870de1..5ac8b2a1c 100644
--- a/da.po
+++ b/da.po
@@ -13,7 +13,7 @@
 # mort3n , 2016
 # Aesthese, 2013
 # Aesthese, 2016
-# scootergrisen, 2017-2018
+# scootergrisen, 2017-2019
 # 7110bbed2db4fadc642a4cd0e91bb1b9, 2015
 # Whiz Zurrd , 2014
 msgid ""
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-17 20:23+\n"
+"Last-Translator: scootergrisen\n"
 "Language-Team: Danish 
(http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -114,19 +114,19 @@ msgid ""
 "${filename}\n"
 "\n"
 "Renaming it to keepassx.kdbx would allow KeePassX to open it 
automatically in the future."
-msgstr ""
+msgstr "Vil du omdøbe din KeePassX-database?\n\nDu 
har en KeePassX-database i din 
Vedvarende-mappe:\n\n${filename}\n\nHvis den omdøbes til 
keepassx.kdbx, så kan KeePassX automatisk åbnes i fremtiden."
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:25
 msgid "Rename"
-msgstr ""
+msgstr "Omdøb"
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:26
 msgid "Keep current name"
-msgstr ""
+msgstr "Behold nuværende navn"
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."
-msgstr ""
+msgstr "su er deaktiveret. Brug venligst sudo i stedet."
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] UI review - sponsors

2019-01-17 Thread hiro
commit 9a01de79bd112ab542f008abf9b832d76d9f3d4c
Author: Antonela 
Date:   Thu Jan 17 16:58:54 2019 -0300

UI review - sponsors

add sponsor images, review padding, minor ui bugs
---
 assets/scss/_portal.scss |   2 +-
 assets/static/bootstrap.css  |   2 +-
 assets/static/images/sponsors/OTF.png| Bin 0 -> 18657 bytes
 assets/static/images/sponsors/USSD.png   | Bin 499319 -> 90079 bytes
 assets/static/images/sponsors/cymru.png  | Bin 18259 -> 16385 bytes
 assets/static/images/sponsors/darpa.png  | Bin 525926 -> 127422 bytes
 assets/static/images/sponsors/fastly.png | Bin 0 -> 10142 bytes
 assets/static/images/sponsors/handshake.png  | Bin 0 -> 11209 bytes
 assets/static/images/sponsors/imls.png   | Bin 31458 -> 36164 bytes
 assets/static/images/sponsors/mdf.png| Bin 0 -> 29004 bytes
 assets/static/images/sponsors/mozilla.png| Bin 0 -> 16327 bytes
 assets/static/images/sponsors/nsf.png| Bin 1434049 -> 63745 bytes
 assets/static/images/sponsors/rose.png   | Bin 37996 -> 42626 bytes
 assets/static/images/sponsors/sida.png   | Bin 3355 -> 38963 bytes
 content/about/sponsors/fastly/contents.lr|   2 +-
 content/about/sponsors/handshake/contents.lr |   2 +-
 content/about/sponsors/mdf/contents.lr   |   2 +-
 content/about/sponsors/mozilla/contents.lr   |   2 +-
 content/about/sponsors/otf/contents.lr   |   2 +-
 templates/layout.html|   2 +-
 templates/macros/sponsors.html   |   6 +++--
 templates/sponsors.html  |  32 +--
 22 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/assets/scss/_portal.scss b/assets/scss/_portal.scss
index bd6d902..2cd09f3 100644
--- a/assets/scss/_portal.scss
+++ b/assets/scss/_portal.scss
@@ -47,7 +47,7 @@
   text-align: left;
 }
 
-.description-small {
+.description-small, .description-small p {
   font-size: 16px;
   width: 95%;
 }
diff --git a/assets/static/bootstrap.css b/assets/static/bootstrap.css
index a5ad318..73863a4 100644
--- a/assets/static/bootstrap.css
+++ b/assets/static/bootstrap.css
@@ -8652,7 +8652,7 @@ a.text-dark:focus, a.text-dark:hover {
   text-align: left;
 }
 
-.description-small {
+.description-small, .description-small p {
   font-size: 16px;
   width: 95%;
 }
diff --git a/assets/static/images/sponsors/OTF.png 
b/assets/static/images/sponsors/OTF.png
new file mode 100644
index 000..6b5d9bb
Binary files /dev/null and b/assets/static/images/sponsors/OTF.png differ
diff --git a/assets/static/images/sponsors/USSD.png 
b/assets/static/images/sponsors/USSD.png
index de3edeb..a62b096 100644
Binary files a/assets/static/images/sponsors/USSD.png and 
b/assets/static/images/sponsors/USSD.png differ
diff --git a/assets/static/images/sponsors/cymru.png 
b/assets/static/images/sponsors/cymru.png
index f31f95b..8170abb 100644
Binary files a/assets/static/images/sponsors/cymru.png and 
b/assets/static/images/sponsors/cymru.png differ
diff --git a/assets/static/images/sponsors/darpa.png 
b/assets/static/images/sponsors/darpa.png
index be4405f..8a6e79c 100644
Binary files a/assets/static/images/sponsors/darpa.png and 
b/assets/static/images/sponsors/darpa.png differ
diff --git a/assets/static/images/sponsors/fastly.png 
b/assets/static/images/sponsors/fastly.png
new file mode 100644
index 000..ba71a3c
Binary files /dev/null and b/assets/static/images/sponsors/fastly.png differ
diff --git a/assets/static/images/sponsors/handshake.png 
b/assets/static/images/sponsors/handshake.png
new file mode 100644
index 000..82bd860
Binary files /dev/null and b/assets/static/images/sponsors/handshake.png differ
diff --git a/assets/static/images/sponsors/imls.png 
b/assets/static/images/sponsors/imls.png
index 88a3bdf..20fff7a 100644
Binary files a/assets/static/images/sponsors/imls.png and 
b/assets/static/images/sponsors/imls.png differ
diff --git a/assets/static/images/sponsors/mdf.png 
b/assets/static/images/sponsors/mdf.png
new file mode 100644
index 000..2228612
Binary files /dev/null and b/assets/static/images/sponsors/mdf.png differ
diff --git a/assets/static/images/sponsors/mozilla.png 
b/assets/static/images/sponsors/mozilla.png
new file mode 100644
index 000..614b80d
Binary files /dev/null and b/assets/static/images/sponsors/mozilla.png differ
diff --git a/assets/static/images/sponsors/nsf.png 
b/assets/static/images/sponsors/nsf.png
index 7c52c69..8e45952 100644
Binary files a/assets/static/images/sponsors/nsf.png and 
b/assets/static/images/sponsors/nsf.png differ
diff --git a/assets/static/images/sponsors/rose.png 
b/assets/static/images/sponsors/rose.png
index 6efe42f..0fa90d0 100644
Binary files a/assets/static/images/sponsors/rose.png and 
b/assets/static/images/sponsors/rose.png differ
diff --git a/assets/static/images/sponsors/sida.png 
b/assets/static/images/sponsors/sida.png
index bb620ee..f6a6802 100644
Binary files 

[tor-commits] [tpo/staging] Merge pull request #2 from torproject/master

2019-01-17 Thread hiro
commit c023b91439374f8111c12a2d03578869a4f3b81a
Merge: c34d50a 9c31480
Author: Antonela 
Date:   Thu Jan 17 15:31:06 2019 -0300

Merge pull request #2 from torproject/master

rebase

 templates/macros/people.html |  9 +
 templates/sponsors.html  | 47 
 2 files changed, 1 insertion(+), 55 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] UI review - sponsors

2019-01-17 Thread hiro
commit 9a01de79bd112ab542f008abf9b832d76d9f3d4c
Author: Antonela 
Date:   Thu Jan 17 16:58:54 2019 -0300

UI review - sponsors

add sponsor images, review padding, minor ui bugs
---
 assets/scss/_portal.scss |   2 +-
 assets/static/bootstrap.css  |   2 +-
 assets/static/images/sponsors/OTF.png| Bin 0 -> 18657 bytes
 assets/static/images/sponsors/USSD.png   | Bin 499319 -> 90079 bytes
 assets/static/images/sponsors/cymru.png  | Bin 18259 -> 16385 bytes
 assets/static/images/sponsors/darpa.png  | Bin 525926 -> 127422 bytes
 assets/static/images/sponsors/fastly.png | Bin 0 -> 10142 bytes
 assets/static/images/sponsors/handshake.png  | Bin 0 -> 11209 bytes
 assets/static/images/sponsors/imls.png   | Bin 31458 -> 36164 bytes
 assets/static/images/sponsors/mdf.png| Bin 0 -> 29004 bytes
 assets/static/images/sponsors/mozilla.png| Bin 0 -> 16327 bytes
 assets/static/images/sponsors/nsf.png| Bin 1434049 -> 63745 bytes
 assets/static/images/sponsors/rose.png   | Bin 37996 -> 42626 bytes
 assets/static/images/sponsors/sida.png   | Bin 3355 -> 38963 bytes
 content/about/sponsors/fastly/contents.lr|   2 +-
 content/about/sponsors/handshake/contents.lr |   2 +-
 content/about/sponsors/mdf/contents.lr   |   2 +-
 content/about/sponsors/mozilla/contents.lr   |   2 +-
 content/about/sponsors/otf/contents.lr   |   2 +-
 templates/layout.html|   2 +-
 templates/macros/sponsors.html   |   6 +++--
 templates/sponsors.html  |  32 +--
 22 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/assets/scss/_portal.scss b/assets/scss/_portal.scss
index bd6d902..2cd09f3 100644
--- a/assets/scss/_portal.scss
+++ b/assets/scss/_portal.scss
@@ -47,7 +47,7 @@
   text-align: left;
 }
 
-.description-small {
+.description-small, .description-small p {
   font-size: 16px;
   width: 95%;
 }
diff --git a/assets/static/bootstrap.css b/assets/static/bootstrap.css
index a5ad318..73863a4 100644
--- a/assets/static/bootstrap.css
+++ b/assets/static/bootstrap.css
@@ -8652,7 +8652,7 @@ a.text-dark:focus, a.text-dark:hover {
   text-align: left;
 }
 
-.description-small {
+.description-small, .description-small p {
   font-size: 16px;
   width: 95%;
 }
diff --git a/assets/static/images/sponsors/OTF.png 
b/assets/static/images/sponsors/OTF.png
new file mode 100644
index 000..6b5d9bb
Binary files /dev/null and b/assets/static/images/sponsors/OTF.png differ
diff --git a/assets/static/images/sponsors/USSD.png 
b/assets/static/images/sponsors/USSD.png
index de3edeb..a62b096 100644
Binary files a/assets/static/images/sponsors/USSD.png and 
b/assets/static/images/sponsors/USSD.png differ
diff --git a/assets/static/images/sponsors/cymru.png 
b/assets/static/images/sponsors/cymru.png
index f31f95b..8170abb 100644
Binary files a/assets/static/images/sponsors/cymru.png and 
b/assets/static/images/sponsors/cymru.png differ
diff --git a/assets/static/images/sponsors/darpa.png 
b/assets/static/images/sponsors/darpa.png
index be4405f..8a6e79c 100644
Binary files a/assets/static/images/sponsors/darpa.png and 
b/assets/static/images/sponsors/darpa.png differ
diff --git a/assets/static/images/sponsors/fastly.png 
b/assets/static/images/sponsors/fastly.png
new file mode 100644
index 000..ba71a3c
Binary files /dev/null and b/assets/static/images/sponsors/fastly.png differ
diff --git a/assets/static/images/sponsors/handshake.png 
b/assets/static/images/sponsors/handshake.png
new file mode 100644
index 000..82bd860
Binary files /dev/null and b/assets/static/images/sponsors/handshake.png differ
diff --git a/assets/static/images/sponsors/imls.png 
b/assets/static/images/sponsors/imls.png
index 88a3bdf..20fff7a 100644
Binary files a/assets/static/images/sponsors/imls.png and 
b/assets/static/images/sponsors/imls.png differ
diff --git a/assets/static/images/sponsors/mdf.png 
b/assets/static/images/sponsors/mdf.png
new file mode 100644
index 000..2228612
Binary files /dev/null and b/assets/static/images/sponsors/mdf.png differ
diff --git a/assets/static/images/sponsors/mozilla.png 
b/assets/static/images/sponsors/mozilla.png
new file mode 100644
index 000..614b80d
Binary files /dev/null and b/assets/static/images/sponsors/mozilla.png differ
diff --git a/assets/static/images/sponsors/nsf.png 
b/assets/static/images/sponsors/nsf.png
index 7c52c69..8e45952 100644
Binary files a/assets/static/images/sponsors/nsf.png and 
b/assets/static/images/sponsors/nsf.png differ
diff --git a/assets/static/images/sponsors/rose.png 
b/assets/static/images/sponsors/rose.png
index 6efe42f..0fa90d0 100644
Binary files a/assets/static/images/sponsors/rose.png and 
b/assets/static/images/sponsors/rose.png differ
diff --git a/assets/static/images/sponsors/sida.png 
b/assets/static/images/sponsors/sida.png
index bb620ee..f6a6802 100644
Binary files 

[tor-commits] [tpo/staging] Merge branch 'master' into staging

2019-01-17 Thread hiro
commit 761fecc50c13ec5e227a987ac4ebf2bb62ec35c5
Merge: 57ad436 9a01de7
Author: hiro 
Date:   Thu Jan 17 21:13:40 2019 +0100

Merge branch 'master' into staging

 assets/scss/_portal.scss |   2 +-
 assets/static/bootstrap.css  |   2 +-
 assets/static/images/sponsors/OTF.png| Bin 0 -> 18657 bytes
 assets/static/images/sponsors/USSD.png   | Bin 499319 -> 90079 bytes
 assets/static/images/sponsors/cymru.png  | Bin 18259 -> 16385 bytes
 assets/static/images/sponsors/darpa.png  | Bin 525926 -> 127422 bytes
 assets/static/images/sponsors/fastly.png | Bin 0 -> 10142 bytes
 assets/static/images/sponsors/handshake.png  | Bin 0 -> 11209 bytes
 assets/static/images/sponsors/imls.png   | Bin 31458 -> 36164 bytes
 assets/static/images/sponsors/mdf.png| Bin 0 -> 29004 bytes
 assets/static/images/sponsors/mozilla.png| Bin 0 -> 16327 bytes
 assets/static/images/sponsors/nsf.png| Bin 1434049 -> 63745 bytes
 assets/static/images/sponsors/rose.png   | Bin 37996 -> 42626 bytes
 assets/static/images/sponsors/sida.png   | Bin 3355 -> 38963 bytes
 content/about/sponsors/fastly/contents.lr|   2 +-
 content/about/sponsors/handshake/contents.lr |   2 +-
 content/about/sponsors/mdf/contents.lr   |   2 +-
 content/about/sponsors/mozilla/contents.lr   |   2 +-
 content/about/sponsors/otf/contents.lr   |   2 +-
 templates/layout.html|   2 +-
 templates/macros/sponsors.html   |   6 +++--
 templates/sponsors.html  |  32 +--
 22 files changed, 28 insertions(+), 26 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] Merge pull request #2 from torproject/master

2019-01-17 Thread hiro
commit c023b91439374f8111c12a2d03578869a4f3b81a
Merge: c34d50a 9c31480
Author: Antonela 
Date:   Thu Jan 17 15:31:06 2019 -0300

Merge pull request #2 from torproject/master

rebase

 templates/macros/people.html |  9 +
 templates/sponsors.html  | 47 
 2 files changed, 1 insertion(+), 55 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-01-17 Thread translation
commit 464ceee336c8fa90a26d59bd48492df5f9e41a28
Author: Translation commit bot 
Date:   Thu Jan 17 18:49:15 2019 +

Update translations for tpo-web
---
 contents+es.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+es.po b/contents+es.po
index b0776a54d..86a01bddf 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -146,7 +146,7 @@ msgstr ""
 #: https//torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.title)
 msgid "History"
-msgstr "Historial"
+msgstr "Historia"
 
 #: https//torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] Merge pull request #1 from torproject/master

2019-01-17 Thread hiro
commit e7d78c770da01e552f9ed4d92e1d16ace1dc1b7b
Merge: cee4340 70a1687
Author: Antonela 
Date:   Fri Jan 11 10:51:58 2019 -0300

Merge pull request #1 from torproject/master

rebase

 .gitignore|5 +-
 assets/scss/_portal.scss  |   13 +-
 assets/scss/_tor.scss |   16 +
 assets/scss/_tpo.scss |   30 +-
 assets/static/bootstrap.css   |   22 +-
 assets/static/bootstrap.css.map   |2 +-
 assets/static/images/circle-pattern.png   |  Bin 0 -> 556240 bytes
 assets/static/images/circle-pattern.svg   |  106 ++
 assets/static/images/png/Group4.png   |  Bin 0 -> 12525 bytes
 assets/static/images/png/gro...@2x.png|  Bin 0 -> 27750 bytes
 assets/static/images/png/gro...@3x.png|  Bin 0 -> 43617 bytes
 assets/static/images/svg/Group 4.svg  |   80 +
 content/about/contents+en.lr  |   13 -
 content/about/contents+es.lr  |   13 -
 content/about/contents+fr.lr  |   13 -
 content/about/history/contents+en.lr  |   31 -
 content/about/history/contents+es.lr  |   31 -
 content/about/history/contents+fr.lr  |   31 -
 content/about/jobs/contents+en.lr |   13 -
 content/about/jobs/contents+es.lr |   13 -
 content/about/jobs/contents+fr.lr |   13 -
 content/about/people/agrabeli/contents.lr |   16 +
 content/about/people/ahf/contents.lr  |   15 +
 content/about/people/ailanthus/contents.lr|   13 +
 content/about/people/alsmith/contents.lr  |   13 +
 content/about/people/amoghbl1/contents.lr |   13 +
 content/about/people/andreas/contents.lr  |   12 +
 content/about/people/antonela/contents.lr |   13 +
 content/about/people/arlolra/contents.lr  |   13 +
 content/about/people/arma/contents.lr |   14 +
 content/about/people/arthuredelstein/contents.lr  |   11 +
 content/about/people/asn/contents.lr  |   11 +
 content/about/people/atagar/contents.lr   |   13 +
 content/about/people/bdavila/contents.lr  |   13 +
 content/about/people/biella-core/contents.lr  |   13 +
 content/about/people/biella/contents.lr   |   23 +
 content/about/people/boklm/contents.lr|   11 +
 content/about/people/brade/contents.lr|   11 +
 content/about/people/catalyst/contents.lr |   16 +
 content/about/people/cindy-core/contents.lr   |   15 +
 content/about/people/cindy/contents.lr|   23 +
 content/about/people/contents+en.lr   |   13 -
 content/about/people/contents+es.lr   |   13 -
 content/about/people/contents+fr.lr   |   13 -
 content/about/people/contents.lr  |2 +
 content/about/people/dawuud/contents.lr   |   14 +
 content/about/people/dgoulet/contents.lr  |   11 +
 content/about/people/donnchac/contents.lr |   13 +
 content/about/people/egypcio/contents.lr  |   13 +
 content/about/people/emmapeel/contents.lr |   13 +
 content/about/people/ewyatt/contents.lr   |   12 +
 content/about/people/flexlibris/contents.lr   |   17 +
 content/about/people/gaba/contents.lr |   13 +
 content/about/people/geko/contents.lr |   11 +
 content/about/people/ggus/contents.lr |   11 +
 content/about/people/gman999/contents.lr  |   11 +
 content/about/people/gunner/contents.lr   |   15 +
 content/about/people/haxxpop/contents.lr  |   13 +
 content/about/people/hc/contents.lr   |   14 +
 content/about/people/hellais/contents.lr  |   15 +
 content/about/people/hiro/contents.lr |   13 +
 content/about/people/iangoldberg/contents.lr  |   14 +
 content/about/people/igt0/contents.lr |   13 +
 content/about/people/inf0/contents.lr |   14 +
 content/about/people/intrigeri/contents.lr|   13 +
 content/about/people/irl/contents.lr  |   16 +
 content/about/people/isabela/contents.lr  |   13 +
 content/about/people/isra/contents.lr |   11 +
 content/about/people/jselon/contents.lr   |   11 +
 content/about/people/juga/contents.lr |   13 +
 content/about/people/julius-core/contents.lr  |   11 +
 content/about/people/julius/contents.lr   |   19 +
 content/about/people/juris/contents.lr|   11 +
 content/about/people/karsten/contents.lr  |   14 +
 content/about/people/kat/contents.lr  |   13 +
 content/about/people/komlo/contents.lr|   13 +
 content/about/people/kushal/contents.lr   |   17 +
 content/about/people/leif/contents.lr |   11 +
 content/about/people/ln5/contents.lr  |   

[tor-commits] [tpo/staging] this does not work so well, so disabling

2019-01-17 Thread hiro
commit 1142f26526e23798ebb56cc771f05f396650f319
Author: emma peel 
Date:   Wed Jan 16 12:47:34 2019 +0100

this does not work so well, so disabling
---
 configs/i18n.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/i18n.ini b/configs/i18n.ini
index bc54fbb..d65d25e 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -1,5 +1,5 @@
 content = en
 translations = es,fr
 i18npath = i18n
-translate_paragraphwise = True
+translate_paragraphwise = False
 url_prefix = https://torproject.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] Add jobs and modify sponsors

2019-01-17 Thread hiro
commit 9c314805852ffed036ceb07c8e0a2504552cc48e
Author: hiro 
Date:   Thu Jan 17 15:59:07 2019 +0100

Add jobs and modify sponsors
---
 templates/macros/people.html |  9 +
 templates/sponsors.html  | 47 
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/templates/macros/people.html b/templates/macros/people.html
index b6743a7..11109fe 100644
--- a/templates/macros/people.html
+++ b/templates/macros/people.html
@@ -1,9 +1,5 @@
 {% macro render_board(item, alternative) %}
-<<< HEAD
-  
-===
   
->>> 530331a95807603311a9dafe6ecbe5a623fd0d8e
 
   {{ item.name }}
   {{ 
item.title }}
@@ -14,11 +10,8 @@
 {% endmacro %}
 
 {% macro render_core(item, alternative) %}
-<<< HEAD
-  
-===
   
->>> 530331a95807603311a9dafe6ecbe5a623fd0d8e
+  
 
   {{ item.name }}
   {{ 
item.nickname }}{% if item.pronoun %} - {{ item.pronoun }}{% endif %}{% if 
item.twitter_handle %} - https://twitter.com/{{ item.twitter_handle 
}}">@{{ item.twitter_handle }}{% endif %}
diff --git a/templates/sponsors.html b/templates/sponsors.html
index f434a08..8bb08ba 100644
--- a/templates/sponsors.html
+++ b/templates/sponsors.html
@@ -3,35 +3,6 @@
 
 
   
-<<< HEAD
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-===
 
   
 {% set items = this.children %}
@@ -39,7 +10,6 @@
   {{ item.name }} -  {{ 
item.time }}
 {% endfor %}
   
->>> 530331a95807603311a9dafe6ecbe5a623fd0d8e
 
   
 
@@ -48,22 +18,6 @@
 
 
   
-<<< HEAD
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-===
 {% from "macros/sponsors.html" import render_active %}
 {% set items = this.children %}
 {% for item in items.filter(F.active == True) %}
@@ -74,6 +28,5 @@
 
   
 This sponsors page is based upon un-audited and un-reviewed financial 
and in-kind donations, contract, and other data. Further details about our 
audited and reviewed funding can be found on our Financial Reports page.
->>> 530331a95807603311a9dafe6ecbe5a623fd0d8e
   
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] Merge branch 'master' into staging

2019-01-17 Thread hiro
commit 57ad436b36cf842dadcf0850843ad9b9e3825ac2
Merge: 530331a 9c31480
Author: hiro 
Date:   Thu Jan 17 19:32:12 2019 +0100

Merge branch 'master' into staging

 assets/scss/_portal.scss|6 +-
 assets/scss/_tor.scss   |9 +-
 assets/scss/_tpo.scss   |6 +-
 assets/static/bootstrap.css | 8632 ---
 assets/static/bootstrap.css.map |8 +-
 templates/contact.html  |6 +-
 templates/download.html |8 +-
 templates/footer.html   |4 +-
 templates/hero-download.html|3 +-
 templates/press.html|8 +-
 templates/projects.html |2 +-
 11 files changed, 5382 insertions(+), 3310 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] rebase

2019-01-17 Thread hiro
commit c34d50ad7d96a7dd3c13adb5b47f6d8a077a785a
Author: Antonela 
Date:   Thu Jan 17 13:58:48 2019 -0300

rebase
---
 .gitignore |   3 +-
 assets/static/images/sponsors/OTF.jpg  | Bin 0 -> 22698 bytes
 assets/static/images/sponsors/USSD.png | Bin 0 -> 499319 bytes
 assets/static/images/sponsors/artwork.png  | Bin 0 -> 22387 bytes
 assets/static/images/sponsors/artw...@2x.png   | Bin 0 -> 46793 bytes
 assets/static/images/sponsors/cymru.png| Bin 0 -> 18259 bytes
 assets/static/images/sponsors/darpa.png| Bin 0 -> 525926 bytes
 assets/static/images/sponsors/fastly.svg   |   1 +
 assets/static/images/sponsors/handshake.svg|  13 
 assets/static/images/sponsors/imls.png | Bin 0 -> 31458 bytes
 assets/static/images/sponsors/mdf.jpg  | Bin 0 -> 11032 bytes
 assets/static/images/sponsors/mozilla.jpg  | Bin 0 -> 15093 bytes
 assets/static/images/sponsors/nsf.png  | Bin 0 -> 1434049 bytes
 assets/static/images/sponsors/rose.png | Bin 0 -> 37996 bytes
 assets/static/images/sponsors/sida.png | Bin 0 -> 3355 bytes
 configs/i18n.ini   |   3 +-
 content/about/history/contents.lr  |  25 ---
 content/about/jobs/contents.lr |   2 +
 .../jobs/developer-data-architect/contents.lr  |  79 +
 .../jobs/senior-system-administrator/contents.lr   |  59 +++
 content/about/people/agrabeli/contents.lr  |   3 +-
 content/about/people/biella/contents.lr|  13 ++--
 content/about/people/catalyst/contents.lr  |   4 +-
 content/about/people/cindy/contents.lr |  13 +---
 content/about/people/ewyatt/contents.lr|   3 +-
 content/about/people/flexlibris/contents.lr|   5 +-
 content/about/people/gunner/contents.lr|   5 +-
 content/about/people/julius/contents.lr|  13 ++--
 content/about/people/ln5/contents.lr   |   4 +-
 content/about/people/matt-core/contents.lr |   3 +-
 content/about/people/matt/contents.lr  |   6 +-
 content/about/people/meejah/contents.lr|   4 +-
 content/about/people/megan/contents.lr |  15 ++--
 content/about/people/micahflee/contents.lr |   5 +-
 content/about/people/moritz/contents.lr|   3 +-
 content/about/people/mtigas/contents.lr|   4 +-
 content/about/people/n8fr8/contents.lr |   5 +-
 content/about/people/nickm/contents.lr |   3 +-
 content/about/people/nighat/contents.lr|  16 ++---
 content/about/people/nyinz/contents.lr |   3 +-
 content/about/people/pari/contents.lr  |   3 +-
 content/about/people/phoul/contents.lr |   4 +-
 content/about/people/phw/contents.lr   |   5 +-
 content/about/people/ramy/contents.lr  |  24 ++-
 content/about/people/redshiftzero/contents.lr  |   3 +-
 content/about/people/sjmurdoch/contents.lr |   5 +-
 content/about/people/syverson/contents.lr  |   4 +-
 content/about/people/teor/contents.lr  |   3 +-
 content/about/people/tjr/contents.lr   |   3 +-
 content/about/people/wseltzer/contents.lr  |   4 +-
 content/about/sponsors/DARPA-nrl/contents.lr   |  21 ++
 content/about/sponsors/DARPA-penn/contents.lr  |  21 ++
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |  18 +
 content/about/sponsors/USSD-DHRL/contents.lr   |  18 +
 content/about/sponsors/access-now/contents.lr  |   9 +++
 content/about/sponsors/anonymous-ngo/contents.lr   |   9 +++
 content/about/sponsors/bbg/contents.lr |   9 +++
 content/about/sponsors/bell-security/contents.lr   |   9 +++
 content/about/sponsors/contents.lr |   2 +
 content/about/sponsors/cyber-ta/contents.lr|   9 +++
 content/about/sponsors/cymru/contents.lr   |  15 
 content/about/sponsors/disconnect/contents.lr  |   9 +++
 content/about/sponsors/eff/contents.lr |   9 +++
 content/about/sponsors/fastly/contents.lr  |  13 
 content/about/sponsors/ffo-germany/contents.lr |   9 +++
 content/about/sponsors/ford-foundation/contents.lr |   9 +++
 content/about/sponsors/freedom-press/contents.lr   |   9 +++
 content/about/sponsors/google-soc/contents.lr  |   9 +++
 content/about/sponsors/google/contents.lr  |   9 +++
 content/about/sponsors/handshake/contents.lr   |  15 
 content/about/sponsors/hivos/contents.lr   |   9 +++
 content/about/sponsors/hrw/contents.lr |   9 +++
 content/about/sponsors/imls-ny/contents.lr |  15 
 content/about/sponsors/individuals/contents.lr |  15 
 content/about/sponsors/internews-eu/contents.lr|   9 +++
 content/about/sponsors/mdf/contents.lr  

[tor-commits] [tpo/staging] this gives a practical link to translators when searching for the string

2019-01-17 Thread hiro
commit d0e95343bbf6971ae6576a5986cd89bf2d9cf68c
Author: emma peel 
Date:   Thu Jan 10 13:52:20 2019 +0100

this gives a practical link to translators when searching for the string
---
 configs/i18n.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/i18n.ini b/configs/i18n.ini
index d65d25e..bc54fbb 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -1,5 +1,5 @@
 content = en
 translations = es,fr
 i18npath = i18n
-translate_paragraphwise = False
+translate_paragraphwise = True
 url_prefix = https://torproject.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] Add jobs and modify sponsors

2019-01-17 Thread hiro
commit 9c314805852ffed036ceb07c8e0a2504552cc48e
Author: hiro 
Date:   Thu Jan 17 15:59:07 2019 +0100

Add jobs and modify sponsors
---
 templates/macros/people.html |  9 +
 templates/sponsors.html  | 47 
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/templates/macros/people.html b/templates/macros/people.html
index b6743a7..11109fe 100644
--- a/templates/macros/people.html
+++ b/templates/macros/people.html
@@ -1,9 +1,5 @@
 {% macro render_board(item, alternative) %}
-<<< HEAD
-  
-===
   
->>> 530331a95807603311a9dafe6ecbe5a623fd0d8e
 
   {{ item.name }}
   {{ 
item.title }}
@@ -14,11 +10,8 @@
 {% endmacro %}
 
 {% macro render_core(item, alternative) %}
-<<< HEAD
-  
-===
   
->>> 530331a95807603311a9dafe6ecbe5a623fd0d8e
+  
 
   {{ item.name }}
   {{ 
item.nickname }}{% if item.pronoun %} - {{ item.pronoun }}{% endif %}{% if 
item.twitter_handle %} - https://twitter.com/{{ item.twitter_handle 
}}">@{{ item.twitter_handle }}{% endif %}
diff --git a/templates/sponsors.html b/templates/sponsors.html
index f434a08..8bb08ba 100644
--- a/templates/sponsors.html
+++ b/templates/sponsors.html
@@ -3,35 +3,6 @@
 
 
   
-<<< HEAD
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-===
 
   
 {% set items = this.children %}
@@ -39,7 +10,6 @@
   {{ item.name }} -  {{ 
item.time }}
 {% endfor %}
   
->>> 530331a95807603311a9dafe6ecbe5a623fd0d8e
 
   
 
@@ -48,22 +18,6 @@
 
 
   
-<<< HEAD
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-
-  
-  
-Sponsor 
Name
-Some quick 
paragraph about the projects we are working with this sponsor and a link to the 
trac.
-  
-
-===
 {% from "macros/sponsors.html" import render_active %}
 {% set items = this.children %}
 {% for item in items.filter(F.active == True) %}
@@ -74,6 +28,5 @@
 
   
 This sponsors page is based upon un-audited and un-reviewed financial 
and in-kind donations, contract, and other data. Further details about our 
audited and reviewed funding can be found on our Financial Reports page.
->>> 530331a95807603311a9dafe6ecbe5a623fd0d8e
   
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] this does not work so well, so disabling

2019-01-17 Thread hiro
commit 1142f26526e23798ebb56cc771f05f396650f319
Author: emma peel 
Date:   Wed Jan 16 12:47:34 2019 +0100

this does not work so well, so disabling
---
 configs/i18n.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/i18n.ini b/configs/i18n.ini
index bc54fbb..d65d25e 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -1,5 +1,5 @@
 content = en
 translations = es,fr
 i18npath = i18n
-translate_paragraphwise = True
+translate_paragraphwise = False
 url_prefix = https://torproject.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] this gives a practical link to translators when searching for the string

2019-01-17 Thread hiro
commit d0e95343bbf6971ae6576a5986cd89bf2d9cf68c
Author: emma peel 
Date:   Thu Jan 10 13:52:20 2019 +0100

this gives a practical link to translators when searching for the string
---
 configs/i18n.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/i18n.ini b/configs/i18n.ini
index d65d25e..bc54fbb 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -1,5 +1,5 @@
 content = en
 translations = es,fr
 i18npath = i18n
-translate_paragraphwise = False
+translate_paragraphwise = True
 url_prefix = https://torproject.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] Merge pull request #1 from torproject/master

2019-01-17 Thread hiro
commit e7d78c770da01e552f9ed4d92e1d16ace1dc1b7b
Merge: cee4340 70a1687
Author: Antonela 
Date:   Fri Jan 11 10:51:58 2019 -0300

Merge pull request #1 from torproject/master

rebase

 .gitignore|5 +-
 assets/scss/_portal.scss  |   13 +-
 assets/scss/_tor.scss |   16 +
 assets/scss/_tpo.scss |   30 +-
 assets/static/bootstrap.css   |   22 +-
 assets/static/bootstrap.css.map   |2 +-
 assets/static/images/circle-pattern.png   |  Bin 0 -> 556240 bytes
 assets/static/images/circle-pattern.svg   |  106 ++
 assets/static/images/png/Group4.png   |  Bin 0 -> 12525 bytes
 assets/static/images/png/gro...@2x.png|  Bin 0 -> 27750 bytes
 assets/static/images/png/gro...@3x.png|  Bin 0 -> 43617 bytes
 assets/static/images/svg/Group 4.svg  |   80 +
 content/about/contents+en.lr  |   13 -
 content/about/contents+es.lr  |   13 -
 content/about/contents+fr.lr  |   13 -
 content/about/history/contents+en.lr  |   31 -
 content/about/history/contents+es.lr  |   31 -
 content/about/history/contents+fr.lr  |   31 -
 content/about/jobs/contents+en.lr |   13 -
 content/about/jobs/contents+es.lr |   13 -
 content/about/jobs/contents+fr.lr |   13 -
 content/about/people/agrabeli/contents.lr |   16 +
 content/about/people/ahf/contents.lr  |   15 +
 content/about/people/ailanthus/contents.lr|   13 +
 content/about/people/alsmith/contents.lr  |   13 +
 content/about/people/amoghbl1/contents.lr |   13 +
 content/about/people/andreas/contents.lr  |   12 +
 content/about/people/antonela/contents.lr |   13 +
 content/about/people/arlolra/contents.lr  |   13 +
 content/about/people/arma/contents.lr |   14 +
 content/about/people/arthuredelstein/contents.lr  |   11 +
 content/about/people/asn/contents.lr  |   11 +
 content/about/people/atagar/contents.lr   |   13 +
 content/about/people/bdavila/contents.lr  |   13 +
 content/about/people/biella-core/contents.lr  |   13 +
 content/about/people/biella/contents.lr   |   23 +
 content/about/people/boklm/contents.lr|   11 +
 content/about/people/brade/contents.lr|   11 +
 content/about/people/catalyst/contents.lr |   16 +
 content/about/people/cindy-core/contents.lr   |   15 +
 content/about/people/cindy/contents.lr|   23 +
 content/about/people/contents+en.lr   |   13 -
 content/about/people/contents+es.lr   |   13 -
 content/about/people/contents+fr.lr   |   13 -
 content/about/people/contents.lr  |2 +
 content/about/people/dawuud/contents.lr   |   14 +
 content/about/people/dgoulet/contents.lr  |   11 +
 content/about/people/donnchac/contents.lr |   13 +
 content/about/people/egypcio/contents.lr  |   13 +
 content/about/people/emmapeel/contents.lr |   13 +
 content/about/people/ewyatt/contents.lr   |   12 +
 content/about/people/flexlibris/contents.lr   |   17 +
 content/about/people/gaba/contents.lr |   13 +
 content/about/people/geko/contents.lr |   11 +
 content/about/people/ggus/contents.lr |   11 +
 content/about/people/gman999/contents.lr  |   11 +
 content/about/people/gunner/contents.lr   |   15 +
 content/about/people/haxxpop/contents.lr  |   13 +
 content/about/people/hc/contents.lr   |   14 +
 content/about/people/hellais/contents.lr  |   15 +
 content/about/people/hiro/contents.lr |   13 +
 content/about/people/iangoldberg/contents.lr  |   14 +
 content/about/people/igt0/contents.lr |   13 +
 content/about/people/inf0/contents.lr |   14 +
 content/about/people/intrigeri/contents.lr|   13 +
 content/about/people/irl/contents.lr  |   16 +
 content/about/people/isabela/contents.lr  |   13 +
 content/about/people/isra/contents.lr |   11 +
 content/about/people/jselon/contents.lr   |   11 +
 content/about/people/juga/contents.lr |   13 +
 content/about/people/julius-core/contents.lr  |   11 +
 content/about/people/julius/contents.lr   |   19 +
 content/about/people/juris/contents.lr|   11 +
 content/about/people/karsten/contents.lr  |   14 +
 content/about/people/kat/contents.lr  |   13 +
 content/about/people/komlo/contents.lr|   13 +
 content/about/people/kushal/contents.lr   |   17 +
 content/about/people/leif/contents.lr |   11 +
 content/about/people/ln5/contents.lr  |   

[tor-commits] [tpo/master] rebase

2019-01-17 Thread hiro
commit c34d50ad7d96a7dd3c13adb5b47f6d8a077a785a
Author: Antonela 
Date:   Thu Jan 17 13:58:48 2019 -0300

rebase
---
 .gitignore |   3 +-
 assets/static/images/sponsors/OTF.jpg  | Bin 0 -> 22698 bytes
 assets/static/images/sponsors/USSD.png | Bin 0 -> 499319 bytes
 assets/static/images/sponsors/artwork.png  | Bin 0 -> 22387 bytes
 assets/static/images/sponsors/artw...@2x.png   | Bin 0 -> 46793 bytes
 assets/static/images/sponsors/cymru.png| Bin 0 -> 18259 bytes
 assets/static/images/sponsors/darpa.png| Bin 0 -> 525926 bytes
 assets/static/images/sponsors/fastly.svg   |   1 +
 assets/static/images/sponsors/handshake.svg|  13 
 assets/static/images/sponsors/imls.png | Bin 0 -> 31458 bytes
 assets/static/images/sponsors/mdf.jpg  | Bin 0 -> 11032 bytes
 assets/static/images/sponsors/mozilla.jpg  | Bin 0 -> 15093 bytes
 assets/static/images/sponsors/nsf.png  | Bin 0 -> 1434049 bytes
 assets/static/images/sponsors/rose.png | Bin 0 -> 37996 bytes
 assets/static/images/sponsors/sida.png | Bin 0 -> 3355 bytes
 configs/i18n.ini   |   3 +-
 content/about/history/contents.lr  |  25 ---
 content/about/jobs/contents.lr |   2 +
 .../jobs/developer-data-architect/contents.lr  |  79 +
 .../jobs/senior-system-administrator/contents.lr   |  59 +++
 content/about/people/agrabeli/contents.lr  |   3 +-
 content/about/people/biella/contents.lr|  13 ++--
 content/about/people/catalyst/contents.lr  |   4 +-
 content/about/people/cindy/contents.lr |  13 +---
 content/about/people/ewyatt/contents.lr|   3 +-
 content/about/people/flexlibris/contents.lr|   5 +-
 content/about/people/gunner/contents.lr|   5 +-
 content/about/people/julius/contents.lr|  13 ++--
 content/about/people/ln5/contents.lr   |   4 +-
 content/about/people/matt-core/contents.lr |   3 +-
 content/about/people/matt/contents.lr  |   6 +-
 content/about/people/meejah/contents.lr|   4 +-
 content/about/people/megan/contents.lr |  15 ++--
 content/about/people/micahflee/contents.lr |   5 +-
 content/about/people/moritz/contents.lr|   3 +-
 content/about/people/mtigas/contents.lr|   4 +-
 content/about/people/n8fr8/contents.lr |   5 +-
 content/about/people/nickm/contents.lr |   3 +-
 content/about/people/nighat/contents.lr|  16 ++---
 content/about/people/nyinz/contents.lr |   3 +-
 content/about/people/pari/contents.lr  |   3 +-
 content/about/people/phoul/contents.lr |   4 +-
 content/about/people/phw/contents.lr   |   5 +-
 content/about/people/ramy/contents.lr  |  24 ++-
 content/about/people/redshiftzero/contents.lr  |   3 +-
 content/about/people/sjmurdoch/contents.lr |   5 +-
 content/about/people/syverson/contents.lr  |   4 +-
 content/about/people/teor/contents.lr  |   3 +-
 content/about/people/tjr/contents.lr   |   3 +-
 content/about/people/wseltzer/contents.lr  |   4 +-
 content/about/sponsors/DARPA-nrl/contents.lr   |  21 ++
 content/about/sponsors/DARPA-penn/contents.lr  |  21 ++
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |  18 +
 content/about/sponsors/USSD-DHRL/contents.lr   |  18 +
 content/about/sponsors/access-now/contents.lr  |   9 +++
 content/about/sponsors/anonymous-ngo/contents.lr   |   9 +++
 content/about/sponsors/bbg/contents.lr |   9 +++
 content/about/sponsors/bell-security/contents.lr   |   9 +++
 content/about/sponsors/contents.lr |   2 +
 content/about/sponsors/cyber-ta/contents.lr|   9 +++
 content/about/sponsors/cymru/contents.lr   |  15 
 content/about/sponsors/disconnect/contents.lr  |   9 +++
 content/about/sponsors/eff/contents.lr |   9 +++
 content/about/sponsors/fastly/contents.lr  |  13 
 content/about/sponsors/ffo-germany/contents.lr |   9 +++
 content/about/sponsors/ford-foundation/contents.lr |   9 +++
 content/about/sponsors/freedom-press/contents.lr   |   9 +++
 content/about/sponsors/google-soc/contents.lr  |   9 +++
 content/about/sponsors/google/contents.lr  |   9 +++
 content/about/sponsors/handshake/contents.lr   |  15 
 content/about/sponsors/hivos/contents.lr   |   9 +++
 content/about/sponsors/hrw/contents.lr |   9 +++
 content/about/sponsors/imls-ny/contents.lr |  15 
 content/about/sponsors/individuals/contents.lr |  15 
 content/about/sponsors/internews-eu/contents.lr|   9 +++
 content/about/sponsors/mdf/contents.lr  

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-01-17 Thread translation
commit 9723197efffb290b0a9dcf31a2888fd69af6233c
Author: Translation commit bot 
Date:   Thu Jan 17 17:19:56 2019 +

Update translations for tpo-web_completed
---
 contents.pot | 332 ++-
 1 file changed, 125 insertions(+), 207 deletions(-)

diff --git a/contents.pot b/contents.pot
index d293bda4f..5dfb509a5 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-16 17:27+CET\n"
+"POT-Creation-Date: 2019-01-17 17:59+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -86,10 +86,12 @@ msgstr "press"
 msgid "Email inquiries to pr...@torproject.org."
 msgstr "Email inquiries to pr...@torproject.org."
 
+#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title)
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.title)
 msgid "history"
 msgstr "history"
 
+#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section)
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
@@ -104,6 +106,30 @@ msgstr "history"
 msgid "about"
 msgstr "about"
 
+#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "About"
+msgstr "About"
+
+#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Documentation"
+msgstr "Documentation"
+
+#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Press"
+msgstr "Press"
+
+#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Blog"
+msgstr "Blog"
+
+#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Newsletter"
+msgstr "Newsletter"
+
+#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Contact"
+msgstr "Contact"
+
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.body)
 msgid ""
 "The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of "
@@ -360,16 +386,26 @@ msgstr "Jobs"
 
 #: https//torproject.org/about/jobs/
 #: (content/about/jobs/contents+en.lrpage.body)
+msgid "We’re always looking for more great people to join our team."
+msgstr "We’re always looking for more great people to join our team."
+
+#: https//torproject.org/about/jobs/
+#: (content/about/jobs/contents+en.lrpage.body)
 msgid ""
-"We’re always looking for more great people to join our team. Join us in our 
"
-"Seattle office or work remotely from wherever you are in the world. You’ll "
-"work with a diverse group of bright and passionate folks committed to "
-"fostering internet freedom worldwide."
+"Join us in our Seattle office or work remotely from wherever you are in the "
+"world."
 msgstr ""
-"We’re always looking for more great people to join our team. Join us in our 
"
-"Seattle office or work remotely from wherever you are in the world. You’ll "
-"work with a diverse group of bright and passionate folks committed to "
-"fostering internet freedom worldwide."
+"Join us in our Seattle office or work remotely from wherever you are in the "
+"world."
+
+#: https//torproject.org/about/jobs/
+#: (content/about/jobs/contents+en.lrpage.body)
+msgid ""
+"You’ll work with a diverse group of bright and passionate folks committed 
to"
+" fostering internet freedom worldwide."
+msgstr ""
+"You’ll work with a diverse group of bright and passionate folks committed 
to"
+" fostering internet freedom worldwide."
 
 #: https//torproject.org/about/people/hc/
 #: (content/about/people/hc/contents+en.lrperson.role)
@@ -562,15 +598,10 @@ msgstr "core"
 #: (content/about/people/hc/contents+en.lrperson.description)
 msgid ""
 "Works on Orbot, NetCipher, and integrating Tor everywhere possible, "
-"especially"
+"especiall in Debian and Android. Also deeply mixed into Guardian Project."
 msgstr ""
 "Works on Orbot, NetCipher, and integrating Tor everywhere possible, "
-"especially"
-
-#: https//torproject.org/about/people/hc/
-#: (content/about/people/hc/contents+en.lrperson.description)
-msgid "in Debian and Android. Also deeply mixed into Guardian Project."
-msgstr "in Debian and Android. Also deeply mixed into Guardian Project."
+"especiall in Debian and Android. Also deeply mixed into Guardian Project."
 
 #: https//torproject.org/about/people/agrabeli/
 #: (content/about/people/agrabeli/contents+en.lrperson.description)
@@ -702,15 +733,10 @@ msgstr "Developer for Snowflake, Tor Messenger, and 
Check."
 #: (content/about/people/arma/contents+en.lrperson.description)
 msgid ""
 "Original developer of Tor along with Nick and Paul. Leading privacy "
-"researcher,"
+"researcher, coordinating developers and researchers."
 msgstr ""
 "Original developer of Tor along with Nick and Paul. Leading privacy "
-"researcher,"
-
-#: 

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/645'

2019-01-17 Thread nickm
commit 77712a5fa29f135e0a79ed9122f28c5dcb902e77
Merge: 16430fdaf 59a88b3c3
Author: Nick Mathewson 
Date:   Thu Jan 17 12:04:50 2019 -0500

Merge remote-tracking branch 'tor-github/pr/645'

 src/feature/client/transports.c | 12 ++--
 src/test/test_pt.c  | 12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Rename TYPE to TRANSPORT in PT STATUS messages.

2019-01-17 Thread nickm
commit 59a88b3c3a31d2fc195d199f6c7aa62a8764e6dc
Author: Alexander Færøy 
Date:   Mon Jan 14 17:59:59 2019 +0100

Rename TYPE to TRANSPORT in PT STATUS messages.

See: https://bugs.torproject.org/28181
---
 src/feature/client/transports.c | 12 ++--
 src/test/test_pt.c  | 12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c
index 8a8bcd9f7..a961b2189 100644
--- a/src/feature/client/transports.c
+++ b/src/feature/client/transports.c
@@ -1236,13 +1236,13 @@ parse_status_line(const char *line, managed_proxy_t *mp)
 goto done;
   }
 
-  /* We check if we received the TYPE parameter, which is the only *required*
-   * value. */
-  const config_line_t *type = config_line_find(values, "TYPE");
+  /* We check if we received the TRANSPORT parameter, which is the only
+   * *required* value. */
+  const config_line_t *type = config_line_find(values, "TRANSPORT");
 
   if (! type) {
 log_warn(LD_PT, "Managed proxy \"%s\" wrote a STATUS line without "
-"TYPE: %s", mp->argv[0], escaped(data));
+"TRANSPORT: %s", mp->argv[0], escaped(data));
 goto done;
   }
 
@@ -1250,8 +1250,8 @@ parse_status_line(const char *line, managed_proxy_t *mp)
   config_line_prepend(, "PT", mp->argv[0]);
   status_message = kvline_encode(values, KV_QUOTED);
 
-  /* We have checked that TYPE is there, we can now emit the STATUS event via
-   * the control port. */
+  /* We have checked that TRANSPORT is there, we can now emit the STATUS event
+   * via the control port. */
   control_event_pt_status(status_message);
 
  done:
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index 60a044aec..5edf85815 100644
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -311,9 +311,9 @@ process_read_stdout_replacement(process_t *process, buf_t 
*buffer)
 buf_add_string(buffer, "LOG SEVERITY=info MESSAGE=\"info msg\"\n");
 buf_add_string(buffer, "LOG SEVERITY=debug MESSAGE=\"debug msg\"\n");
   } else if (times_called <= 8) {
-buf_add_string(buffer, "STATUS TYPE=a K_1=a K_2=b K_3=\"foo bar\"\n");
-buf_add_string(buffer, "STATUS TYPE=b K_1=a K_2=b K_3=\"foo bar\"\n");
-buf_add_string(buffer, "STATUS TYPE=c K_1=a K_2=b K_3=\"foo bar\"\n");
+buf_add_string(buffer, "STATUS TRANSPORT=a K_1=a K_2=b K_3=\"foo bar\"\n");
+buf_add_string(buffer, "STATUS TRANSPORT=b K_1=a K_2=b K_3=\"foo bar\"\n");
+buf_add_string(buffer, "STATUS TRANSPORT=c K_1=a K_2=b K_3=\"foo bar\"\n");
   }
 
   return (int)buf_datalen(buffer);
@@ -445,13 +445,13 @@ test_pt_configure_proxy(void *arg)
 
   tt_str_op(smartlist_get(controlevent_msgs, 10), OP_EQ,
 "650 PT_STATUS "
-"PT= TYPE=a K_1=a K_2=b K_3=\"foo bar\"\r\n");
+"PT= TRANSPORT=a K_1=a K_2=b K_3=\"foo bar\"\r\n");
   tt_str_op(smartlist_get(controlevent_msgs, 11), OP_EQ,
 "650 PT_STATUS "
-"PT= TYPE=b K_1=a K_2=b K_3=\"foo bar\"\r\n");
+"PT= TRANSPORT=b K_1=a K_2=b K_3=\"foo bar\"\r\n");
   tt_str_op(smartlist_get(controlevent_msgs, 12), OP_EQ,
 "650 PT_STATUS "
-"PT= TYPE=c K_1=a K_2=b K_3=\"foo bar\"\r\n");
+"PT= TRANSPORT=c K_1=a K_2=b K_3=\"foo bar\"\r\n");
 
   { /* check that the transport info were saved properly in the tor state */
 config_line_t *transport_in_state = NULL;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [torspec/master] control-spec: Add the PT_LOG event

2019-01-17 Thread nickm
commit 3028cf166067cd688683bdf674d462869f7565ec
Author: David Goulet 
Date:   Thu Oct 25 12:08:41 2018 -0400

control-spec: Add the PT_LOG event

Once we add the LOG message on the PT side, Tor will relay it to the control
port through this event named PT_LOG.

This is to address #25502. Implemented in #28179.

Closes #28182

Signed-off-by: David Goulet 
---
 control-spec.txt | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/control-spec.txt b/control-spec.txt
index fb4cb3e..4135add 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -3260,6 +3260,29 @@
 
   [NETWORK_LIVENESS was added in Tor 0.2.7.2-alpha]
 
+4.1.28. Pluggable Transport Logs
+
+   Syntax:
+  "650" SP "PT_LOG" SP PT=Program SP Message
+
+  Program = The program path as defined in the *TransportPlugin
+configuration option. Tor accepts relative and full path.
+  Message = The log message that the PT sends back to the tor parent
+process minus the "LOG" string prefix. Formatted as
+specified in pt-spec.txt section 3.3.4.
+
+   This event is triggered when tor receives a log message from the PT.
+
+   Example:
+
+  PT (obfs4): LOG SEVERITY=debug MESSAGE="Connected to bridge A"
+
+the resulting control port event would be:
+
+  Tor: 650 PT_LOG PT=/usr/bin/obfs4proxy SEVERITY=debug MESSAGE="Connected 
to bridge A"
+
+   [PT_LOG was added in Tor 0.4.0.1-alpha]
+
 5. Implementation notes
 
 5.1. Authentication



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [torspec/master] control-spec: Add the PT_STATUS event

2019-01-17 Thread nickm
commit b38257efad09be1678f92a7184464fd3b5b9f560
Author: David Goulet 
Date:   Mon Jan 7 11:53:39 2019 -0500

control-spec: Add the PT_STATUS event

Once we add the STATUS message on the PT side, Tor will relay it to the
control port through this event named PT_STATUS.

This is to address #25502. Implemented in #28179.

Closes #28182

Signed-off-by: David Goulet 
---
 control-spec.txt | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/control-spec.txt b/control-spec.txt
index 4135add..c9c7d41 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -3283,6 +3283,29 @@
 
[PT_LOG was added in Tor 0.4.0.1-alpha]
 
+4.1.29. Pluggable Transport Status
+
+   Syntax:
+  "650" SP "PT_STATUS" SP PT=Program SP Message
+
+  Program = The program path as defined in the *TransportPlugin
+configuration option. Tor accepts relative and full path.
+  Message = The status message that the PT sends back to the tor parent
+process minus the "STATUS" string prefix. Formatted as
+specified in pt-spec.txt section 3.3.5.
+
+   This event is triggered when tor receives a log message from the PT.
+
+   Example:
+
+  PT (obfs4): STATUS TYPE=obfs4 CONNECT=Success
+
+   the resulting control port event would be:
+
+  Tor: 650 PT_STATUS PT=/usr/bin/obfs4proxy TYPE=obfs4 CONNECT=Success
+
+   [PT_STATUS was added in Tor 0.4.0.1-alpha]
+
 5. Implementation notes
 
 5.1. Authentication



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [torspec/master] control-spec: Use TRANSPORT in PT_STATUS

2019-01-17 Thread nickm
commit a5e2dca209f4520261880d0baea689d3026c089f
Author: David Goulet 
Date:   Thu Jan 17 11:08:30 2019 -0500

control-spec: Use TRANSPORT in PT_STATUS

Signed-off-by: David Goulet 
---
 control-spec.txt | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index c9c7d41..1259c60 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -3279,17 +3279,19 @@
 
 the resulting control port event would be:
 
-  Tor: 650 PT_LOG PT=/usr/bin/obfs4proxy SEVERITY=debug MESSAGE="Connected 
to bridge A"
+  Tor: 650 PT_LOG SEVERITY=debug MESSAGE="Connected to bridge A"
 
[PT_LOG was added in Tor 0.4.0.1-alpha]
 
 4.1.29. Pluggable Transport Status
 
Syntax:
-  "650" SP "PT_STATUS" SP PT=Program SP Message
+  "650" SP "PT_STATUS" SP PT=Program SP TRANSPORT=Transport SP Message
 
   Program = The program path as defined in the *TransportPlugin
 configuration option. Tor accepts relative and full path.
+  Transport = This value indicate a hint on what the PT is such has the
+  name or the protocol used for instance.
   Message = The status message that the PT sends back to the tor parent
 process minus the "STATUS" string prefix. Formatted as
 specified in pt-spec.txt section 3.3.5.
@@ -3298,11 +3300,11 @@
 
Example:
 
-  PT (obfs4): STATUS TYPE=obfs4 CONNECT=Success
+  PT (obfs4): STATUS TRANSPORT=obfs4 CONNECT=Success
 
the resulting control port event would be:
 
-  Tor: 650 PT_STATUS PT=/usr/bin/obfs4proxy TYPE=obfs4 CONNECT=Success
+  Tor: 650 PT_STATUS TRANSPORT=obfs4 CONNECT=Success
 
[PT_STATUS was added in Tor 0.4.0.1-alpha]
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [torspec/master] fixup! control-spec: Use TRANSPORT in PT_STATUS

2019-01-17 Thread nickm
commit 01f475a1ca0d8ece5550b35124b014b91fca3193
Author: David Goulet 
Date:   Thu Jan 17 11:10:41 2019 -0500

fixup! control-spec: Use TRANSPORT in PT_STATUS
---
 control-spec.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index 1259c60..85bad3c 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -3279,7 +3279,7 @@
 
 the resulting control port event would be:
 
-  Tor: 650 PT_LOG SEVERITY=debug MESSAGE="Connected to bridge A"
+  Tor: 650 PT_LOG PT=/usr/bin/obs4proxy SEVERITY=debug MESSAGE="Connected 
to bridge A"
 
[PT_LOG was added in Tor 0.4.0.1-alpha]
 
@@ -3304,7 +3304,7 @@
 
the resulting control port event would be:
 
-  Tor: 650 PT_STATUS TRANSPORT=obfs4 CONNECT=Success
+  Tor: 650 PT_STATUS PT=/usr/bin/obs4proxy TRANSPORT=obfs4 CONNECT=Success
 
[PT_STATUS was added in Tor 0.4.0.1-alpha]
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket28182_04'

2019-01-17 Thread nickm
commit 795420240305a6d67c0f4322993a65da4c7b6f2f
Merge: e1cb634 01f475a
Author: Nick Mathewson 
Date:   Thu Jan 17 12:03:39 2019 -0500

Merge remote-tracking branch 'dgoulet/ticket28182_04'

 control-spec.txt | 48 
 1 file changed, 48 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] Merge branch 'staging'

2019-01-17 Thread hiro
commit 530331a95807603311a9dafe6ecbe5a623fd0d8e
Merge: 5b6be9a d4e4a5a
Author: hiro 
Date:   Thu Jan 17 16:13:46 2019 +0100

Merge branch 'staging'

 configs/i18n.ini  |  3 ++-
 content/about/history/contents.lr | 25 +
 content/about/people/agrabeli/contents.lr |  3 +--
 content/about/people/biella/contents.lr   | 13 -
 content/about/people/catalyst/contents.lr |  4 ++--
 content/about/people/cindy/contents.lr| 13 +++--
 content/about/people/ewyatt/contents.lr   |  3 +--
 content/about/people/flexlibris/contents.lr   |  5 ++---
 content/about/people/gunner/contents.lr   |  5 ++---
 content/about/people/julius/contents.lr   | 13 +
 content/about/people/ln5/contents.lr  |  4 ++--
 content/about/people/matt-core/contents.lr|  3 +--
 content/about/people/matt/contents.lr |  6 ++
 content/about/people/meejah/contents.lr   |  4 +---
 content/about/people/megan/contents.lr| 15 ---
 content/about/people/micahflee/contents.lr|  5 +
 content/about/people/moritz/contents.lr   |  3 +--
 content/about/people/mtigas/contents.lr   |  4 +---
 content/about/people/n8fr8/contents.lr|  5 +++--
 content/about/people/nickm/contents.lr|  3 +--
 content/about/people/nighat/contents.lr   | 16 ++--
 content/about/people/nyinz/contents.lr|  3 +--
 content/about/people/pari/contents.lr |  3 +--
 content/about/people/phoul/contents.lr|  4 ++--
 content/about/people/phw/contents.lr  |  5 +
 content/about/people/ramy/contents.lr | 24 +++-
 content/about/people/redshiftzero/contents.lr |  3 +--
 content/about/people/sjmurdoch/contents.lr|  5 ++---
 content/about/people/syverson/contents.lr |  4 ++--
 content/about/people/teor/contents.lr |  3 +--
 content/about/people/tjr/contents.lr  |  3 +--
 content/about/people/wseltzer/contents.lr |  4 ++--
 content/download/contents.lr  |  1 +
 models/page.ini   |  3 +++
 models/people.ini |  3 +++
 models/person.ini |  4 
 templates/hero-home.html  |  6 +++---
 templates/jobs.html   |  6 +++---
 38 files changed, 100 insertions(+), 139 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] better strings to translate

2019-01-17 Thread hiro
commit d4e4a5a2c2b7e2d9618215c281addc0a0386ff2d
Author: emma peel 
Date:   Wed Jan 16 17:38:32 2019 +0100

better strings to translate
---
 content/about/people/ln5/contents.lr   | 4 ++--
 content/about/people/matt-core/contents.lr | 3 +--
 content/about/people/matt/contents.lr  | 6 ++
 content/about/people/moritz/contents.lr| 3 +--
 content/about/people/nickm/contents.lr | 3 +--
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/content/about/people/ln5/contents.lr 
b/content/about/people/ln5/contents.lr
index 440a0be..d70bd6f 100644
--- a/content/about/people/ln5/contents.lr
+++ b/content/about/people/ln5/contents.lr
@@ -10,5 +10,5 @@ pronoun: he
 ---
 description:
 
-Software developer, sysadmin and co-founder of the Swedish Torservers.net 
partner
-:DFRI. Member of the sysadmin team. Runs one of the directory authorities.
+Software developer, sysadmin and co-founder of the Swedish Torservers.net 
partner :DFRI.
+Member of the sysadmin team. Runs one of the directory authorities.
diff --git a/content/about/people/matt-core/contents.lr 
b/content/about/people/matt-core/contents.lr
index aa4ff86..aae37e6 100644
--- a/content/about/people/matt-core/contents.lr
+++ b/content/about/people/matt-core/contents.lr
@@ -10,5 +10,4 @@ nickname: matt
 ---
 description:
 
-Chairs the Tor Board of Directors. Professor at the University of Pennsylvania
-where he researches security, privacy, and anonymity.
+Chairs the Tor Board of Directors. Professor at the University of Pennsylvania 
where he researches security, privacy, and anonymity.
diff --git a/content/about/people/matt/contents.lr 
b/content/about/people/matt/contents.lr
index 5c1aed8..057f962 100644
--- a/content/about/people/matt/contents.lr
+++ b/content/about/people/matt/contents.lr
@@ -12,7 +12,5 @@ nickname: matt
 ---
 description:
 
-Matt is a professor in the computer and information science department at the
-University of Pennsylvania, where he directs the Distributed Systems 
Laboratory.
-He has been doing research on surveillance technology for over 20 years, as 
well
-as cryptography, secure systems, and public policy.
+Matt is a professor in the computer and information science department at the 
University of Pennsylvania, where he directs the Distributed Systems Laboratory.
+He has been doing research on surveillance technology for over 20 years, as 
well as cryptography, secure systems, and public policy.
diff --git a/content/about/people/moritz/contents.lr 
b/content/about/people/moritz/contents.lr
index 23b69ba..aa18146 100644
--- a/content/about/people/moritz/contents.lr
+++ b/content/about/people/moritz/contents.lr
@@ -10,5 +10,4 @@ nickname: moritz
 ---
 description:
 
-Co-founder of [torservers.net](https://www.torservers.net/), a network of
-non-profit organizations that run Tor exit relays.
+Co-founder of [torservers.net](https://www.torservers.net/), a network of 
non-profit organizations that run Tor exit relays.
diff --git a/content/about/people/nickm/contents.lr 
b/content/about/people/nickm/contents.lr
index c4874d7..1858d23 100644
--- a/content/about/people/nickm/contents.lr
+++ b/content/about/people/nickm/contents.lr
@@ -12,5 +12,4 @@ twitter_handle: nickm_tor
 ---
 description:
 
-One of the three original designers of Tor - does a lot of the ongoing design 
work,
-and coordinates and leads ongoing development.
+One of the three original designers of Tor - does a lot of the ongoing design 
work, and coordinates and leads ongoing development.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] better strings to translate

2019-01-17 Thread hiro
commit ddee6034eaf26a109bec9679b07a39481bd5714a
Author: emma peel 
Date:   Wed Jan 16 16:41:52 2019 +0100

better strings to translate
---
 content/about/people/meejah/contents.lr| 4 +---
 content/about/people/micahflee/contents.lr | 5 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/content/about/people/meejah/contents.lr 
b/content/about/people/meejah/contents.lr
index 2cf5c16..25ed2a2 100644
--- a/content/about/people/meejah/contents.lr
+++ b/content/about/people/meejah/contents.lr
@@ -10,6 +10,4 @@ twitter: meejah
 ---
 description:
 
-[Author](https://meejah.ca/) of [txtorcon](https://github.com/meejah/txtorcon),
-[carml](https://github.com/meejah/carml) and other Tor Python tools including
-some for bad-relay hunting.
+[Author](https://meejah.ca/) of 
[txtorcon](https://github.com/meejah/txtorcon), 
[carml](https://github.com/meejah/carml) and other Tor Python tools including 
some for bad-relay hunting.
diff --git a/content/about/people/micahflee/contents.lr 
b/content/about/people/micahflee/contents.lr
index 7a2e128..02dbbd4 100644
--- a/content/about/people/micahflee/contents.lr
+++ b/content/about/people/micahflee/contents.lr
@@ -10,7 +10,4 @@ twitter: micahflee
 ---
 description:
 
-Developer of [OnionShare](https://github.com/micahflee/onionshare) and
-[Tor Browser Launcher](https://github.com/micahflee/torbrowser-launcher) 
journalist
-and security engineer at [The 
Intercept](https://theintercept.com/staff/micah-lee/)
-and advocate for [freedom of the press](https://freedom.press/).
+Developer of [OnionShare](https://github.com/micahflee/onionshare) and [Tor 
Browser Launcher](https://github.com/micahflee/torbrowser-launcher) journalist 
and security engineer at [The 
Intercept](https://theintercept.com/staff/micah-lee/) and advocate for [freedom 
of the press](https://freedom.press/).



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] better strings to translate

2019-01-17 Thread hiro
commit 7e3d86bb4b11ed21abe521c089b7dabeff18bf36
Author: emma peel 
Date:   Wed Jan 16 16:21:35 2019 +0100

better strings to translate
---
 content/about/people/sjmurdoch/contents.lr | 5 ++---
 content/about/people/syverson/contents.lr  | 4 ++--
 content/about/people/teor/contents.lr  | 3 +--
 content/about/people/tjr/contents.lr   | 3 +--
 content/about/people/wseltzer/contents.lr  | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/content/about/people/sjmurdoch/contents.lr 
b/content/about/people/sjmurdoch/contents.lr
index aca1915..90d2a18 100644
--- a/content/about/people/sjmurdoch/contents.lr
+++ b/content/about/people/sjmurdoch/contents.lr
@@ -12,6 +12,5 @@ twitter_handle: sjmurdoch
 ---
 description:
 
-[Principal Research 
Fellow](https://www.torproject.org/about/corepeople.html.en)
-at University College London. He is the original creator of the
-[Tor Browser](https://www.torproject.org/about/corepeople.html.en).
+[Principal Research 
Fellow](https://www.torproject.org/about/corepeople.html.en) at University 
College London.
+He is the original creator of the [Tor 
Browser](https://www.torproject.org/about/corepeople.html.en).
diff --git a/content/about/people/syverson/contents.lr 
b/content/about/people/syverson/contents.lr
index 1bc7042..db68c2d 100644
--- a/content/about/people/syverson/contents.lr
+++ b/content/about/people/syverson/contents.lr
@@ -8,5 +8,5 @@ nickname: syverson
 ---
 description:
 
-[NRL](https://www.nrl.navy.mil/) researcher on most things Tor. Inventor of
-[onion routing](https://www.onion-router.net/), and one of the three original 
designers of Tor.
+[NRL](https://www.nrl.navy.mil/) researcher on most things Tor.
+Inventor of [onion routing](https://www.onion-router.net/), and one of the 
three original designers of Tor.
diff --git a/content/about/people/teor/contents.lr 
b/content/about/people/teor/contents.lr
index d68c9c3..0777da5 100644
--- a/content/about/people/teor/contents.lr
+++ b/content/about/people/teor/contents.lr
@@ -10,5 +10,4 @@ pronoun: they
 ---
 description:
 
-Tor developer and chutney maintainer. Currently working on onion services,
-directory documents, and statistics.
+Tor developer and chutney maintainer. Currently working on onion services, 
directory documents, and statistics.
diff --git a/content/about/people/tjr/contents.lr 
b/content/about/people/tjr/contents.lr
index 43a69b3..ac22f3b 100644
--- a/content/about/people/tjr/contents.lr
+++ b/content/about/people/tjr/contents.lr
@@ -12,5 +12,4 @@ twitter_handle: tomrittervg
 ---
 description:
 
-Maintains [Consensus Health](https://consensus-health.torproject.org/),
-runs one of the bandwidth authorities, and contributes to Tor Browser.
+Maintains [Consensus Health](https://consensus-health.torproject.org/), runs 
one of the bandwidth authorities, and contributes to Tor Browser.
diff --git a/content/about/people/wseltzer/contents.lr 
b/content/about/people/wseltzer/contents.lr
index 77af34b..0035b5b 100644
--- a/content/about/people/wseltzer/contents.lr
+++ b/content/about/people/wseltzer/contents.lr
@@ -10,5 +10,5 @@ pronoun: she
 ---
 description:
 
-[Techie lawyer](https://wendy.seltzer.org/) and former Tor board member. She
-works on legal and policy support for private and secure communications.
+[Techie lawyer](https://wendy.seltzer.org/) and former Tor board member.
+She works on legal and policy support for private and secure communications.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] i18n templates

2019-01-17 Thread hiro
commit 7a2208ecdbc429188478895fb48fe72d9e540216
Author: emma peel 
Date:   Wed Jan 16 15:17:49 2019 +0100

i18n templates
---
 templates/jobs.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/jobs.html b/templates/jobs.html
index fece3cd..d1b98be 100644
--- a/templates/jobs.html
+++ b/templates/jobs.html
@@ -1,5 +1,5 @@
 
-  Current Openings
+  {{ _('Current Openings') }}
 
 
   
@@ -34,7 +34,7 @@
   
 
 
-  Previous Openings
+  {{ _('Previous Openings') }}
 
 
   
@@ -62,6 +62,6 @@
 
   
   
-Think you could help us in a position that’s not listed? We also rely 
on a vast community of volunteer contributors and many have become paid staff. 
We invite you to join us on IRC to find how you can get 
involved.
+{{ _("Think you could help us in a position that’s not listed? We 
also rely on a vast community of volunteer contributors and many have become 
paid staff.") }} {{ _("We invite you to join us on IRC to find how 
you can get involved.") }}
   
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] i18n templates

2019-01-17 Thread hiro
commit 0e63f3fc637fabbc4bde62772f01a9d659c70d0c
Author: emma peel 
Date:   Wed Jan 16 15:04:20 2019 +0100

i18n templates
---
 templates/hero-home.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/hero-home.html b/templates/hero-home.html
index 666433d..a614779 100644
--- a/templates/hero-home.html
+++ b/templates/hero-home.html
@@ -1,11 +1,11 @@
 
-  Browse Privately.
+  {{ _('Browse Privately.') }}
 
 
-  Explore Freely.
+  {{ _('Explore Freely.') }}
 
 
-  Defend yourself against tracking and 
surveillance. Circumnvent censorship.
+  {{ _('Defend yourself against tracking 
and surveillance. Circumvent censorship.') }}
 
 
   {% set download = site.get('/download') %}



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] better strings to translate

2019-01-17 Thread hiro
commit 27793e087719ba4a40b46af7f5995fe10036167c
Author: emma peel 
Date:   Wed Jan 16 16:06:27 2019 +0100

better strings to translate
---
 content/about/history/contents.lr | 25 +
 content/about/people/agrabeli/contents.lr |  3 +--
 content/about/people/biella/contents.lr   | 13 -
 content/about/people/catalyst/contents.lr |  4 ++--
 content/about/people/cindy/contents.lr| 13 +++--
 content/about/people/ewyatt/contents.lr   |  3 +--
 content/about/people/flexlibris/contents.lr   |  5 ++---
 content/about/people/gunner/contents.lr   |  5 ++---
 content/about/people/julius/contents.lr   | 13 +
 content/about/people/megan/contents.lr| 15 ---
 content/about/people/phoul/contents.lr|  4 ++--
 content/about/people/phw/contents.lr  |  5 +
 content/about/people/ramy/contents.lr | 24 +++-
 content/about/people/redshiftzero/contents.lr |  3 +--
 14 files changed, 52 insertions(+), 83 deletions(-)

diff --git a/content/about/history/contents.lr 
b/content/about/history/contents.lr
index 147dbb2..ee2aa85 100644
--- a/content/about/history/contents.lr
+++ b/content/about/history/contents.lr
@@ -10,22 +10,31 @@ title: History
 ---
 body:
 
-In the 1990s, the lack of security on the internet and its ability to be used 
for tracking and surveillance was becoming clear, and in 1994, the Navy 
Research Lab (NRL), funded by the office of Naval Research (ONR) started 
researching a way to communicate privately and securely online. They created 
the first research design and prototype of onion routing.
+In the 1990s, the lack of security on the internet and its ability to be used 
for tracking and surveillance was becoming clear, and in 1994, the Navy 
Research Lab (NRL), funded by the office of Naval Research (ONR) started 
researching a way to communicate privately and securely online.
+They created the first research design and prototype of onion routing.
 
-The goal of onion routing was to have a way to use the internet with as much 
privacy as possible, and the idea was to route traffic through multiple servers 
and encrypt it each step of the way. This is still a simple explanation for how 
Tor works today.
+The goal of onion routing was to have a way to use the internet with as much 
privacy as possible, and the idea was to route traffic through multiple servers 
and encrypt it each step of the way.
+This is still a simple explanation for how Tor works today.
 
-In 2001, Roger Dingledine, then a student at MIT, adapted code from an 
undergraduate Cambridge student’s thesis and began referring to the project 
as Tor, which stood for The Onion Router. Nick Mathewson, also a student at 
MIT, became involved in Tor’s development around this time, too.
+In 2001, Roger Dingledine, then a student at MIT, adapted code from an 
undergraduate Cambridge student’s thesis and began referring to the project 
as Tor, which stood for The Onion Router.
+Nick Mathewson, also a student at MIT, became involved in Tor’s development 
around this time, too.
 
-In October 2003, Tor network was deployed, and Tor code was released under a 
free and open MIT license. In order for Tor to work optimally, everyone 
involved realized that not only does the Tor network need to be decentralized, 
it should also be maintained by a transparently operating entity with clear 
separation from its then stakeholders, and it needed to be free and open 
licensed. By the end of 2003, the network has about a dozen volunteer nodes, 
mostly in the US, plus one in Germany.
+In October 2003, Tor network was deployed, and Tor code was released under a 
free and open MIT license.
+In order for Tor to work optimally, everyone involved realized that not only 
does the Tor network need to be decentralized, it should also be maintained by 
a transparently operating entity with clear separation from its then 
stakeholders, and it needed to be free and open licensed.
+By the end of 2003, the network has about a dozen volunteer nodes, mostly in 
the US, plus one in Germany.
 
-Recognizing the benefit of Tor to digital rights, EFF became a fiscal sponsor 
of Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit 
organization, was founded to maintain Tor’s development.
+Recognizing the benefit of Tor to digital rights, EFF became a fiscal sponsor 
of Tor in 2004.
+In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded 
to maintain Tor’s development.
 
 In 2007, the organization began developing bridges to the Tor network to 
address censorship, such as the need to get around government firewalls, in 
order for its users to access the open web.
 
 Tor began gaining popularity among activists and tech-savvy users interested 
in privacy, but it was still difficult for less-technically savvy people to 
use, so in 2009-2010, development of tools beyond just the Tor 

[tor-commits] [tpo/master] better strings to translate

2019-01-17 Thread hiro
commit 99e894b885647843f0cdc8b7f23dfb24dae7db2f
Author: emma peel 
Date:   Wed Jan 16 16:26:13 2019 +0100

better strings to translate
---
 content/about/people/mtigas/contents.lr |  4 +---
 content/about/people/n8fr8/contents.lr  |  5 +++--
 content/about/people/nighat/contents.lr | 16 ++--
 content/about/people/nyinz/contents.lr  |  3 +--
 content/about/people/pari/contents.lr   |  3 +--
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/content/about/people/mtigas/contents.lr 
b/content/about/people/mtigas/contents.lr
index 7407d91..5eacbc3 100644
--- a/content/about/people/mtigas/contents.lr
+++ b/content/about/people/mtigas/contents.lr
@@ -10,6 +10,4 @@ twitter: mtigas
 ---
 description:
 
-Works on [Onion Browser](https://mike.tig.as/onionbrowser/), iOS, and
-hacker-journalist at [ProPublica](https://www.propublica.org/) running their
-[onion service](https://www.propub3r6espa33w.onion/).
+Works on [Onion Browser](https://mike.tig.as/onionbrowser/), iOS, and 
hacker-journalist at [ProPublica](https://www.propublica.org/) running their 
[onion service](https://www.propub3r6espa33w.onion/).
diff --git a/content/about/people/n8fr8/contents.lr 
b/content/about/people/n8fr8/contents.lr
index 8e5ec37..b47e712 100644
--- a/content/about/people/n8fr8/contents.lr
+++ b/content/about/people/n8fr8/contents.lr
@@ -10,5 +10,6 @@ nickname: n8fr8
 ---
 description:
 
-Founder of the [Guardian Project](https://guardianproject.info/). Orbot lead 
developer and contributor to Orfox,
-Onion Browser and NetCipher SDK. Director of Technology at Tibet Action 
Institute.
+Founder of the [Guardian Project](https://guardianproject.info/).
+Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK.
+Director of Technology at Tibet Action Institute.
diff --git a/content/about/people/nighat/contents.lr 
b/content/about/people/nighat/contents.lr
index c051f03..865a29d 100644
--- a/content/about/people/nighat/contents.lr
+++ b/content/about/people/nighat/contents.lr
@@ -10,13 +10,9 @@ nickname: nighat
 ---
 description:
 
-Nighat is the founder and Executive Director of the Digital Rights Foundation,
-Pakistan. She is an accomplished lawyer and human rights activist. Nighat is a
-pioneer for access to a safe and open Internet in Pakistan and globally. She 
was
-a TED Global Fellow for 2017, was listed as one of TIME magazine's Next
-Generation Leaders in 2015, and was the recipient of the Atlantic Council
-Freedom Award and Human Rights Tulip Award. Nighat was also the only Pakistani
-selected as a Young Global Leader by the World Economic Forum in 2018. Recently
-her organization, the Digital Rights Foundation, was named among the 10 best
-social entrepreneurs at the United Nations General Assembly 2018 meeting by
-Forbes magazine. 
+Nighat is the founder and Executive Director of the Digital Rights Foundation, 
Pakistan.
+She is an accomplished lawyer and human rights activist.
+Nighat is a pioneer for access to a safe and open Internet in Pakistan and 
globally.
+She was a TED Global Fellow for 2017, was listed as one of TIME magazine's 
Next Generation Leaders in 2015, and was the recipient of the Atlantic Council 
Freedom Award and Human Rights Tulip Award.
+Nighat was also the only Pakistani selected as a Young Global Leader by the 
World Economic Forum in 2018.
+Recently her organization, the Digital Rights Foundation, was named among the 
10 best social entrepreneurs at the United Nations General Assembly 2018 
meeting by Forbes magazine.
diff --git a/content/about/people/nyinz/contents.lr 
b/content/about/people/nyinz/contents.lr
index 7dddf7f..19b89b6 100644
--- a/content/about/people/nyinz/contents.lr
+++ b/content/about/people/nyinz/contents.lr
@@ -8,5 +8,4 @@ nickname: nyinz
 ---
 description:
 
-I am very excited and honored to contribute to the Tor project on its mission 
to
-provide usable technologies to the global south.
+I am very excited and honored to contribute to the Tor project on its mission 
to provide usable technologies to the global south.
diff --git a/content/about/people/pari/contents.lr 
b/content/about/people/pari/contents.lr
index 9aa..3b68d6e 100644
--- a/content/about/people/pari/contents.lr
+++ b/content/about/people/pari/contents.lr
@@ -10,5 +10,4 @@ twitter_handle: ParinishthaY
 ---
 description:
 
-Works with UX and Community teams, and on Tor India initiatives. Started as an
-Outreachy intern.
+Works with UX and Community teams, and on Tor India initiatives. Started as an 
Outreachy intern.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] Merge remote-tracking branch 'origin/staging' into staging

2019-01-17 Thread hiro
commit ec7b83c8f0f726111d8875595c8e4f2c77cccecc
Merge: 93d402e 70a1687
Author: emma peel 
Date:   Fri Jan 11 15:01:47 2019 +0100

Merge remote-tracking branch 'origin/staging' into staging

 content/about/contents+en.lr  |   13 -
 content/about/contents+es.lr  |   13 -
 content/about/contents+fr.lr  |   13 -
 content/about/history/contents+en.lr  |   31 -
 content/about/history/contents+es.lr  |   31 -
 content/about/history/contents+fr.lr  |   31 -
 content/about/jobs/contents+en.lr |   13 -
 content/about/jobs/contents+es.lr |   13 -
 content/about/jobs/contents+fr.lr |   13 -
 content/about/people/contents+en.lr   |   15 -
 content/about/people/contents+es.lr   |   15 -
 content/about/people/contents+fr.lr   |   15 -
 content/about/reports/contents+en.lr  |   13 -
 content/about/reports/contents+es.lr  |   13 -
 content/about/reports/contents+fr.lr  |   13 -
 content/about/sponsors/contents+en.lr |   13 -
 content/about/sponsors/contents+es.lr |   13 -
 content/about/sponsors/contents+fr.lr |   13 -
 content/contact/contents+en.lr|   15 -
 content/contact/contents+es.lr|   15 -
 content/contact/contents+fr.lr|   15 -
 content/contents+en.lr|   16 -
 content/contents+es.lr|   16 -
 content/contents+fr.lr|   16 -
 content/download/contents+en.lr   |   11 -
 content/download/contents+es.lr   |   11 -
 content/download/contents+fr.lr   |   11 -
 content/press/contents+en.lr  |   13 -
 content/press/contents+es.lr  |   13 -
 content/press/contents+fr.lr  |   13 -
 i18n/contents+en.po   |   79 --
 i18n/contents+es.po   | 1895 -
 i18n/contents+fr.po   |  426 
 33 files changed, 2859 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] empty body generates .pot error

2019-01-17 Thread hiro
commit 6e361c1e03699ccb67097e7284429b6f5e695053
Author: emma peel 
Date:   Tue Jan 15 07:14:14 2019 +0100

empty body generates .pot error
---
 content/download/contents.lr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/download/contents.lr b/content/download/contents.lr
index ed2a069..d2963fd 100644
--- a/content/download/contents.lr
+++ b/content/download/contents.lr
@@ -9,3 +9,4 @@ color: dark
 title: download
 ---
 body:
+Download Tor Browser



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] this does not work so well, so disabling

2019-01-17 Thread hiro
commit 0ca325f038814ed4718f61c41cfdaf48a8b19e65
Author: emma peel 
Date:   Wed Jan 16 12:47:34 2019 +0100

this does not work so well, so disabling
---
 configs/i18n.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/i18n.ini b/configs/i18n.ini
index bc54fbb..d65d25e 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -1,5 +1,5 @@
 content = en
 translations = es,fr
 i18npath = i18n
-translate_paragraphwise = True
+translate_paragraphwise = False
 url_prefix = https://torproject.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] this gives a practical link to translators when searching for the string

2019-01-17 Thread hiro
commit 0bc712ea5e48495f74ff2a23121f912cfed9304e
Author: emma peel 
Date:   Thu Jan 10 13:52:20 2019 +0100

this gives a practical link to translators when searching for the string
---
 configs/i18n.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/i18n.ini b/configs/i18n.ini
index 2fec8b5..bc54fbb 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -2,3 +2,4 @@ content = en
 translations = es,fr
 i18npath = i18n
 translate_paragraphwise = True
+url_prefix = https://torproject.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] make fields translatable

2019-01-17 Thread hiro
commit 93d402e1d1df1845f90844fc59a5b8b331c5f7e5
Author: emma peel 
Date:   Fri Jan 11 15:00:13 2019 +0100

make fields translatable
---
 models/page.ini   | 3 +++
 models/people.ini | 3 +++
 models/person.ini | 4 
 3 files changed, 10 insertions(+)

diff --git a/models/page.ini b/models/page.ini
index f913c43..ab36981 100644
--- a/models/page.ini
+++ b/models/page.ini
@@ -5,14 +5,17 @@ label = {{ this.title }}
 [fields.title]
 label = Title
 type = string
+translate = True
 
 [fields.section]
 label = Section
 type = string
+translate = True
 
 [fields.body]
 label = Body
 type = markdown
+translate = True
 
 [fields.color]
 label = Color
diff --git a/models/people.ini b/models/people.ini
index d7f8a86..2f860be 100644
--- a/models/people.ini
+++ b/models/people.ini
@@ -6,14 +6,17 @@ hidden = yes
 [fields.title]
 label = Title
 type = string
+translate = True
 
 [fields.section]
 label = Section
 type = string
+translate = True
 
 [fields.body]
 label = Body
 type = markdown
+translate = True
 
 [fields.color]
 label = Color
diff --git a/models/person.ini b/models/person.ini
index 39b6fca..462333a 100644
--- a/models/person.ini
+++ b/models/person.ini
@@ -15,10 +15,12 @@ addon_label = @
 [fields.title]
 label = Title
 type = string
+translate = True
 
 [fields.role]
 label = Role
 type = string
+translate = True
 
 [fields.name]
 label = Name
@@ -27,6 +29,7 @@ type = string
 [fields.description]
 label = Description
 type = markdown
+translate = True
 
 [fields.image]
 label = Image
@@ -35,3 +38,4 @@ type = string
 [fields.pronoun]
 label = Pronoun
 type = string
+translate = True



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] Remove temp files

2019-01-17 Thread hiro
commit 5b6be9a8fc2ae6e039d8474a89f7cf8b15393cf3
Author: hiro 
Date:   Thu Jan 17 16:06:49 2019 +0100

Remove temp files
---
 i18n/_compiled/en/LC_MESSAGES/contents.mo | Bin 1581 -> 0 bytes
 i18n/_compiled/es/LC_MESSAGES/contents.mo | Bin 363 -> 0 bytes
 i18n/_compiled/fr/LC_MESSAGES/contents.mo | Bin 362 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/i18n/_compiled/en/LC_MESSAGES/contents.mo 
b/i18n/_compiled/en/LC_MESSAGES/contents.mo
deleted file mode 100644
index eee9bbd..000
Binary files a/i18n/_compiled/en/LC_MESSAGES/contents.mo and /dev/null differ
diff --git a/i18n/_compiled/es/LC_MESSAGES/contents.mo 
b/i18n/_compiled/es/LC_MESSAGES/contents.mo
deleted file mode 100644
index 6e84656..000
Binary files a/i18n/_compiled/es/LC_MESSAGES/contents.mo and /dev/null differ
diff --git a/i18n/_compiled/fr/LC_MESSAGES/contents.mo 
b/i18n/_compiled/fr/LC_MESSAGES/contents.mo
deleted file mode 100644
index e660b2d..000
Binary files a/i18n/_compiled/fr/LC_MESSAGES/contents.mo and /dev/null differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] Merge branch 'staging'

2019-01-17 Thread hiro
commit 530331a95807603311a9dafe6ecbe5a623fd0d8e
Merge: 5b6be9a d4e4a5a
Author: hiro 
Date:   Thu Jan 17 16:13:46 2019 +0100

Merge branch 'staging'

 configs/i18n.ini  |  3 ++-
 content/about/history/contents.lr | 25 +
 content/about/people/agrabeli/contents.lr |  3 +--
 content/about/people/biella/contents.lr   | 13 -
 content/about/people/catalyst/contents.lr |  4 ++--
 content/about/people/cindy/contents.lr| 13 +++--
 content/about/people/ewyatt/contents.lr   |  3 +--
 content/about/people/flexlibris/contents.lr   |  5 ++---
 content/about/people/gunner/contents.lr   |  5 ++---
 content/about/people/julius/contents.lr   | 13 +
 content/about/people/ln5/contents.lr  |  4 ++--
 content/about/people/matt-core/contents.lr|  3 +--
 content/about/people/matt/contents.lr |  6 ++
 content/about/people/meejah/contents.lr   |  4 +---
 content/about/people/megan/contents.lr| 15 ---
 content/about/people/micahflee/contents.lr|  5 +
 content/about/people/moritz/contents.lr   |  3 +--
 content/about/people/mtigas/contents.lr   |  4 +---
 content/about/people/n8fr8/contents.lr|  5 +++--
 content/about/people/nickm/contents.lr|  3 +--
 content/about/people/nighat/contents.lr   | 16 ++--
 content/about/people/nyinz/contents.lr|  3 +--
 content/about/people/pari/contents.lr |  3 +--
 content/about/people/phoul/contents.lr|  4 ++--
 content/about/people/phw/contents.lr  |  5 +
 content/about/people/ramy/contents.lr | 24 +++-
 content/about/people/redshiftzero/contents.lr |  3 +--
 content/about/people/sjmurdoch/contents.lr|  5 ++---
 content/about/people/syverson/contents.lr |  4 ++--
 content/about/people/teor/contents.lr |  3 +--
 content/about/people/tjr/contents.lr  |  3 +--
 content/about/people/wseltzer/contents.lr |  4 ++--
 content/download/contents.lr  |  1 +
 models/page.ini   |  3 +++
 models/people.ini |  3 +++
 models/person.ini |  4 
 templates/hero-home.html  |  6 +++---
 templates/jobs.html   |  6 +++---
 38 files changed, 100 insertions(+), 139 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] Modify gitignore

2019-01-17 Thread hiro
commit 52aa6b3a81dc1ee2641daa32cace9a303c8798a5
Author: hiro 
Date:   Thu Jan 17 16:00:01 2019 +0100

Modify gitignore
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2baf5c4..e978b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@ node_modules
 .DS_Store
 
 public
-
+*.mo
+*.po
 contents+*.lr
 
 *.egg-info



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/staging] Add jobs and modify sponsors

2019-01-17 Thread hiro
commit dde07218cecbdd1264457b3a00c411c613bf48d8
Author: hiro 
Date:   Thu Jan 17 15:59:07 2019 +0100

Add jobs and modify sponsors
---
 assets/static/images/sponsors/OTF.jpg  | Bin 0 -> 22698 bytes
 assets/static/images/sponsors/USSD.png | Bin 0 -> 499319 bytes
 assets/static/images/sponsors/artwork.png  | Bin 0 -> 22387 bytes
 assets/static/images/sponsors/artw...@2x.png   | Bin 0 -> 46793 bytes
 assets/static/images/sponsors/cymru.png| Bin 0 -> 18259 bytes
 assets/static/images/sponsors/darpa.png| Bin 0 -> 525926 bytes
 assets/static/images/sponsors/fastly.svg   |   1 +
 assets/static/images/sponsors/handshake.svg|  13 ++
 assets/static/images/sponsors/imls.png | Bin 0 -> 31458 bytes
 assets/static/images/sponsors/mdf.jpg  | Bin 0 -> 11032 bytes
 assets/static/images/sponsors/mozilla.jpg  | Bin 0 -> 15093 bytes
 assets/static/images/sponsors/nsf.png  | Bin 0 -> 1434049 bytes
 assets/static/images/sponsors/rose.png | Bin 0 -> 37996 bytes
 assets/static/images/sponsors/sida.png | Bin 0 -> 3355 bytes
 content/about/jobs/contents.lr |   2 +
 .../jobs/developer-data-architect/contents.lr  |  79 
 .../jobs/senior-system-administrator/contents.lr   |  59 +
 content/about/sponsors/DARPA-nrl/contents.lr   |  21 
 content/about/sponsors/DARPA-penn/contents.lr  |  21 
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |  18 +++
 content/about/sponsors/USSD-DHRL/contents.lr   |  18 +++
 content/about/sponsors/access-now/contents.lr  |   9 ++
 content/about/sponsors/anonymous-ngo/contents.lr   |   9 ++
 content/about/sponsors/bbg/contents.lr |   9 ++
 content/about/sponsors/bell-security/contents.lr   |   9 ++
 content/about/sponsors/contents.lr |   2 +
 content/about/sponsors/cyber-ta/contents.lr|   9 ++
 content/about/sponsors/cymru/contents.lr   |  15 +++
 content/about/sponsors/disconnect/contents.lr  |   9 ++
 content/about/sponsors/eff/contents.lr |   9 ++
 content/about/sponsors/fastly/contents.lr  |  13 ++
 content/about/sponsors/ffo-germany/contents.lr |   9 ++
 content/about/sponsors/ford-foundation/contents.lr |   9 ++
 content/about/sponsors/freedom-press/contents.lr   |   9 ++
 content/about/sponsors/google-soc/contents.lr  |   9 ++
 content/about/sponsors/google/contents.lr  |   9 ++
 content/about/sponsors/handshake/contents.lr   |  15 +++
 content/about/sponsors/hivos/contents.lr   |   9 ++
 content/about/sponsors/hrw/contents.lr |   9 ++
 content/about/sponsors/imls-ny/contents.lr |  15 +++
 content/about/sponsors/individuals/contents.lr |  15 +++
 content/about/sponsors/internews-eu/contents.lr|   9 ++
 content/about/sponsors/mdf/contents.lr |  15 +++
 content/about/sponsors/mozilla/contents.lr |  15 +++
 content/about/sponsors/ncf/contents.lr |   9 ++
 content/about/sponsors/nlnet/contents.lr   |   9 ++
 content/about/sponsors/nrl/contents.lr |   9 ++
 content/about/sponsors/nsf-drexel/contents.lr  |  15 +++
 content/about/sponsors/nsf-georgetown/contents.lr  |  15 +++
 .../sponsors/nsf-illinois-chicago/contents.lr  |  15 +++
 content/about/sponsors/nsf-minnesota/contents.lr   |  15 +++
 content/about/sponsors/nsf-princeton/contents.lr   |  15 +++
 content/about/sponsors/nsf-rice/contents.lr|  15 +++
 content/about/sponsors/nsf-rochester/contents.lr   |  15 +++
 content/about/sponsors/omidyar/contents.lr |   9 ++
 content/about/sponsors/otf/contents.lr |  15 +++
 content/about/sponsors/reddit/contents.lr  |   9 ++
 content/about/sponsors/rose/contents.lr|  15 +++
 content/about/sponsors/shinjiru/contents.lr|   9 ++
 content/about/sponsors/sida/contents.lr|  15 +++
 content/about/sponsors/sri/contents.lr |   9 ++
 content/about/sponsors/torfox/contents.lr  |   9 ++
 i18n/_compiled/en/LC_MESSAGES/contents.mo  | Bin 1439 -> 1581 bytes
 i18n/_compiled/es/LC_MESSAGES/contents.mo  | Bin 1586 -> 363 bytes
 i18n/_compiled/fr/LC_MESSAGES/contents.mo  | Bin 1429 -> 362 bytes
 i18n/contents.pot  |   2 +-
 models/job.ini |  23 
 models/jobs.ini|  27 +
 models/sponsor.ini |  28 +
 models/sponsors.ini|  28 +
 templates/about.html   |   7 ++
 templates/job.html |   1 +
 templates/jobs.html|  57 ++---
 templates/macros/jobs.html |  16 +++
 templates/macros/people.html   |   4 +-
 

[tor-commits] [tpo/master] Remove temp files

2019-01-17 Thread hiro
commit 5b6be9a8fc2ae6e039d8474a89f7cf8b15393cf3
Author: hiro 
Date:   Thu Jan 17 16:06:49 2019 +0100

Remove temp files
---
 i18n/_compiled/en/LC_MESSAGES/contents.mo | Bin 1581 -> 0 bytes
 i18n/_compiled/es/LC_MESSAGES/contents.mo | Bin 363 -> 0 bytes
 i18n/_compiled/fr/LC_MESSAGES/contents.mo | Bin 362 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/i18n/_compiled/en/LC_MESSAGES/contents.mo 
b/i18n/_compiled/en/LC_MESSAGES/contents.mo
deleted file mode 100644
index eee9bbd..000
Binary files a/i18n/_compiled/en/LC_MESSAGES/contents.mo and /dev/null differ
diff --git a/i18n/_compiled/es/LC_MESSAGES/contents.mo 
b/i18n/_compiled/es/LC_MESSAGES/contents.mo
deleted file mode 100644
index 6e84656..000
Binary files a/i18n/_compiled/es/LC_MESSAGES/contents.mo and /dev/null differ
diff --git a/i18n/_compiled/fr/LC_MESSAGES/contents.mo 
b/i18n/_compiled/fr/LC_MESSAGES/contents.mo
deleted file mode 100644
index e660b2d..000
Binary files a/i18n/_compiled/fr/LC_MESSAGES/contents.mo and /dev/null differ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] Modify gitignore

2019-01-17 Thread hiro
commit 52aa6b3a81dc1ee2641daa32cace9a303c8798a5
Author: hiro 
Date:   Thu Jan 17 16:00:01 2019 +0100

Modify gitignore
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2baf5c4..e978b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@ node_modules
 .DS_Store
 
 public
-
+*.mo
+*.po
 contents+*.lr
 
 *.egg-info

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tpo/master] Add jobs and modify sponsors

2019-01-17 Thread hiro
commit dde07218cecbdd1264457b3a00c411c613bf48d8
Author: hiro 
Date:   Thu Jan 17 15:59:07 2019 +0100

Add jobs and modify sponsors
---
 assets/static/images/sponsors/OTF.jpg  | Bin 0 -> 22698 bytes
 assets/static/images/sponsors/USSD.png | Bin 0 -> 499319 bytes
 assets/static/images/sponsors/artwork.png  | Bin 0 -> 22387 bytes
 assets/static/images/sponsors/artw...@2x.png   | Bin 0 -> 46793 bytes
 assets/static/images/sponsors/cymru.png| Bin 0 -> 18259 bytes
 assets/static/images/sponsors/darpa.png| Bin 0 -> 525926 bytes
 assets/static/images/sponsors/fastly.svg   |   1 +
 assets/static/images/sponsors/handshake.svg|  13 ++
 assets/static/images/sponsors/imls.png | Bin 0 -> 31458 bytes
 assets/static/images/sponsors/mdf.jpg  | Bin 0 -> 11032 bytes
 assets/static/images/sponsors/mozilla.jpg  | Bin 0 -> 15093 bytes
 assets/static/images/sponsors/nsf.png  | Bin 0 -> 1434049 bytes
 assets/static/images/sponsors/rose.png | Bin 0 -> 37996 bytes
 assets/static/images/sponsors/sida.png | Bin 0 -> 3355 bytes
 content/about/jobs/contents.lr |   2 +
 .../jobs/developer-data-architect/contents.lr  |  79 
 .../jobs/senior-system-administrator/contents.lr   |  59 +
 content/about/sponsors/DARPA-nrl/contents.lr   |  21 
 content/about/sponsors/DARPA-penn/contents.lr  |  21 
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |  18 +++
 content/about/sponsors/USSD-DHRL/contents.lr   |  18 +++
 content/about/sponsors/access-now/contents.lr  |   9 ++
 content/about/sponsors/anonymous-ngo/contents.lr   |   9 ++
 content/about/sponsors/bbg/contents.lr |   9 ++
 content/about/sponsors/bell-security/contents.lr   |   9 ++
 content/about/sponsors/contents.lr |   2 +
 content/about/sponsors/cyber-ta/contents.lr|   9 ++
 content/about/sponsors/cymru/contents.lr   |  15 +++
 content/about/sponsors/disconnect/contents.lr  |   9 ++
 content/about/sponsors/eff/contents.lr |   9 ++
 content/about/sponsors/fastly/contents.lr  |  13 ++
 content/about/sponsors/ffo-germany/contents.lr |   9 ++
 content/about/sponsors/ford-foundation/contents.lr |   9 ++
 content/about/sponsors/freedom-press/contents.lr   |   9 ++
 content/about/sponsors/google-soc/contents.lr  |   9 ++
 content/about/sponsors/google/contents.lr  |   9 ++
 content/about/sponsors/handshake/contents.lr   |  15 +++
 content/about/sponsors/hivos/contents.lr   |   9 ++
 content/about/sponsors/hrw/contents.lr |   9 ++
 content/about/sponsors/imls-ny/contents.lr |  15 +++
 content/about/sponsors/individuals/contents.lr |  15 +++
 content/about/sponsors/internews-eu/contents.lr|   9 ++
 content/about/sponsors/mdf/contents.lr |  15 +++
 content/about/sponsors/mozilla/contents.lr |  15 +++
 content/about/sponsors/ncf/contents.lr |   9 ++
 content/about/sponsors/nlnet/contents.lr   |   9 ++
 content/about/sponsors/nrl/contents.lr |   9 ++
 content/about/sponsors/nsf-drexel/contents.lr  |  15 +++
 content/about/sponsors/nsf-georgetown/contents.lr  |  15 +++
 .../sponsors/nsf-illinois-chicago/contents.lr  |  15 +++
 content/about/sponsors/nsf-minnesota/contents.lr   |  15 +++
 content/about/sponsors/nsf-princeton/contents.lr   |  15 +++
 content/about/sponsors/nsf-rice/contents.lr|  15 +++
 content/about/sponsors/nsf-rochester/contents.lr   |  15 +++
 content/about/sponsors/omidyar/contents.lr |   9 ++
 content/about/sponsors/otf/contents.lr |  15 +++
 content/about/sponsors/reddit/contents.lr  |   9 ++
 content/about/sponsors/rose/contents.lr|  15 +++
 content/about/sponsors/shinjiru/contents.lr|   9 ++
 content/about/sponsors/sida/contents.lr|  15 +++
 content/about/sponsors/sri/contents.lr |   9 ++
 content/about/sponsors/torfox/contents.lr  |   9 ++
 i18n/_compiled/en/LC_MESSAGES/contents.mo  | Bin 1439 -> 1581 bytes
 i18n/_compiled/es/LC_MESSAGES/contents.mo  | Bin 1586 -> 363 bytes
 i18n/_compiled/fr/LC_MESSAGES/contents.mo  | Bin 1429 -> 362 bytes
 i18n/contents.pot  |   2 +-
 models/job.ini |  23 
 models/jobs.ini|  27 +
 models/sponsor.ini |  28 +
 models/sponsors.ini|  28 +
 templates/about.html   |   7 ++
 templates/job.html |   1 +
 templates/jobs.html|  57 ++---
 templates/macros/jobs.html |  16 +++
 templates/macros/people.html   |   4 +-
 

[tor-commits] [translation/support-portal] Update translations for support-portal

2019-01-17 Thread translation
commit a347df4f507e0f08a6e0c1a40fe644951215ca7b
Author: Translation commit bot 
Date:   Thu Jan 17 14:50:22 2019 +

Update translations for support-portal
---
 contents+pl.po | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/contents+pl.po b/contents+pl.po
index 6c1cfa44a..4d705df6c 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -1,7 +1,8 @@
 # Translators:
-# hoek , 2018
+# Dawid Job , 2018
 # erinm, 2018
 # Filip , 2018
+# Emma Peel, 2019
 # Dominik Adrian Grzywak, 2019
 # 
 msgid ""
@@ -56,11 +57,11 @@ msgstr "FAQ"
 
 #: http//localhost/tbb/ (content/tbb/contents+en.lrtopic.title)
 msgid "Tor Browser"
-msgstr "Przeglądarka Tor"
+msgstr "Tor Browser"
 
 #: http//localhost/tbb/ (content/tbb/contents+en.lrtopic.seo_slug)
 msgid "tor-browser"
-msgstr "przeglądarka-tor"
+msgstr "tor-browser"
 
 #: http//localhost/tormessenger/
 #: (content/tormessenger/contents+en.lrtopic.title)
@@ -152,8 +153,7 @@ msgstr ""
 #: http//localhost/tbb/tell-which-website-are-visited-while-using-tor-browser/
 #: (content/tbb/tbb-3/contents+en.lrquestion.description)
 msgid "Tor Browser prevents people from knowing the websites you visit."
-msgstr ""
-"Przeglądarka Tor uniemożliwia ludziom zobaczenie jakie odwiedzasz strony."
+msgstr "Tor Browser uniemożliwia ludziom zobaczenie jakie odwiedzasz strony."
 
 #: http//localhost/faq/will-anyone-be-able-to-tell-which-website-i-visit/
 #: (content/faq/faq-1/contents+en.lrquestion.description)
@@ -183,8 +183,8 @@ msgid ""
 "Our website is blocked by a censor. Can Tor Browser help users access our "
 "website?"
 msgstr ""
-"Nasza strona jest zablokowana przez cenzurę. Czy przeglądarka Tor może 
pomóc"
-" użytkownikom mieć dostęp do naszej strony?"
+"Nasza strona jest zablokowana przez cenzurę. Czy Tor Browser może pomóc "
+"użytkownikom mieć dostęp do naszej strony?"
 
 #: http//localhost/faq/can-tor-help-users-access-website/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -196,8 +196,8 @@ msgid ""
 "Tor Browser can certainly help people access your website in places where it"
 " is blocked."
 msgstr ""
-"Przeglądarka Tor na pewno może umożliwić ludziom łatwiejszy dostęp do 
Twojej"
-" strony, gdzie jest ona zablokowana."
+"Tor Browser na pewno może umożliwić ludziom łatwiejszy dostęp do Twojej "
+"strony, gdzie jest ona zablokowana."
 
 #: http//localhost/faq/can-tor-help-users-access-website/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -287,7 +287,7 @@ msgid ""
 "and https://noscript.net/\;>NoScript — and 
adding"
 " anything else could deanonymize you."
 msgstr ""
-"Przeglądarka Tor podstawowo zawiera zainstalowane 2 add-ony — https://www.eff.org/https-everywhere\;>HTTPS Everywhere i "
 "https://noscript.net/\;>NoScript — dodawanie "
 "czegokolwiek więcej może Cię deanonimizować."
@@ -302,7 +302,7 @@ msgstr "instalowanie-add-onow-rozszerzen-przegladarka-tor"
 #: http//localhost/tbb/which-platform-tor-browser-available/
 #: (content/tbb/tbb-31/contents+en.lrquestion.title)
 msgid "Which platforms is Tor Browser available for?"
-msgstr "Na jakie platformy dostępna jest Przeglądarka Tor?"
+msgstr "Na jakie platformy dostępna jest Tor Browser?"
 
 #: http//localhost/faq/temp-faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -315,7 +315,7 @@ msgid ""
 "href=\"https://www.torproject.org/download/download-easy.html.en#mac\;>macOS"
 " (OS X)."
 msgstr ""
-"Przeglądarka Tor jest na ten moment dostępna na https://www.torproject.org/download/download-;
 "easy.html.en#windows\">Windows, https://www.torproject.org/download/download-;
@@ -669,7 +669,7 @@ msgstr ""
 #: http//localhost/tbb/tor-browser-protecting-other-apps/
 #: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug)
 msgid "tor-browser-protecting-other-apps"
-msgstr "przeglądarka-tor-ochrona-innych-aplikacji"
+msgstr "tor-browser-ochrona-innych-aplikacji"
 
 #: http//localhost/tbb/installing-add-on-extensions-tor-browser/
 #: (content/tbb/tbb-14/contents+en.lrquestion.seo_slug)
@@ -782,7 +782,7 @@ msgid ""
 "Browser is not officially supported."
 msgstr ""
 "Jest coś takiego jak https://www.torbsd.org/\;>projekt "
-"TorBSD, ale ich Przeglądarka Tor nie jest oficjalnie wspierana."
+"TorBSD, ale ich Tor Browser nie jest oficjalnie wspierana."
 
 #: http//localhost/tbb/is-there-support-for-bsd/
 #: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug)
@@ -1777,7 +1777,7 @@ msgstr ""
 #: (content/tbb/tbb-42/contents+en.lrquestion.title)
 msgid "Why does my Tor Browser say something about Firefox not working?"
 msgstr ""
-"Dlaczego Przeglądarka Tor wyświetla komunikat o tym, że nie działa 
Firefox?"
+"Dlaczego Tor Browser wyświetla komunikat o tym, że nie działa Firefox?"
 
 #: http//localhost/tbb/tor-browser-firefox-not-working-error/
 #: (content/tbb/tbb-42/contents+en.lrquestion.description)
@@ -1794,9 +1794,9 @@ msgid ""
 " you have extracted Tor Browser in a 

[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2019-01-17 Thread translation
commit ec956ca1fdc198a84ab9da19a77f40a50780aa40
Author: Translation commit bot 
Date:   Thu Jan 17 14:49:23 2019 +

Update translations for torbutton-browseronboardingproperties
---
 pl/browserOnboarding.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pl/browserOnboarding.properties b/pl/browserOnboarding.properties
index 396dcee20..6b63e5cf9 100644
--- a/pl/browserOnboarding.properties
+++ b/pl/browserOnboarding.properties
@@ -4,17 +4,17 @@
 
 onboarding.tour-tor-welcome=Witamy
 onboarding.tour-tor-welcome.title=Jesteś gotowy.
-onboarding.tour-tor-welcome.description=Przeglądarka Tor oferuje najwyższy 
standard prywatości oraz bezpieczeństwa przy przęglądaniu sieci. Jesteś 
teraz chroniony przed śledzeniem, inwigilacją i cenzurą. To szybkie 
wdrożenie pokaże Ci jak.
+onboarding.tour-tor-welcome.description=Tor Browser oferuje najwyższy 
standard prywatości oraz bezpieczeństwa przy przęglądaniu sieci. Jesteś 
teraz chroniony przed śledzeniem, inwigilacją i cenzurą. To szybkie 
wdrożenie pokaże Ci jak.
 onboarding.tour-tor-welcome.button=Zacznij teraz
 
 onboarding.tour-tor-privacy=Prywatność
 onboarding.tour-tor-privacy.title=Zlekcewarz trackery i snoopery.
-onboarding.tour-tor-privacy.description=Przeglądarka Tor izoluje ciasteczka i 
usuwa twoją historię przeglądania po każdej sesji. Te modyfikacje 
zapewniają że Twoja prywatność oraz bezpieczeństwo są chronione przez 
przeglądarkę. Kliknij 'Sieć Tor' aby dowiedzieć się jak chronimy Cię na 
poziomie sieciowym.
+onboarding.tour-tor-privacy.description=Tor Browser izoluje ciasteczka i usuwa 
twoją historię przeglądania po każdej sesji. Te modyfikacje zapewniają że 
Twoja prywatność oraz bezpieczeństwo są chronione przez przeglądarkę. 
Kliknij 'Sieć Tor' aby dowiedzieć się jak chronimy Cię na poziomie 
sieciowym.
 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=Przeglądarka Tor łą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=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.button=Przejdź do wyświetlacza obwodu
 
 onboarding.tour-tor-circuit-display=Wyświetlacz Obwodu

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2019-01-17 Thread translation
commit 7beb078a5e312561c2b7744f5366dd99ef446423
Author: Translation commit bot 
Date:   Thu Jan 17 14:49:15 2019 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 pl/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pl/abouttbupdate.dtd b/pl/abouttbupdate.dtd
index c227f7d1c..b4d701584 100644
--- a/pl/abouttbupdate.dtd
+++ b/pl/abouttbupdate.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2019-01-17 Thread translation
commit ca2ef07ac5588878b95bd6f47c6fee6393dbc826
Author: Translation commit bot 
Date:   Thu Jan 17 14:49:09 2019 +

Update translations for torbutton-abouttbupdatedtd
---
 pl/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pl/abouttbupdate.dtd b/pl/abouttbupdate.dtd
index c227f7d1c..b4d701584 100644
--- a/pl/abouttbupdate.dtd
+++ b/pl/abouttbupdate.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2019-01-17 Thread translation
commit 4e00169562b9f3241f3a6be3843870c4d4609989
Author: Translation commit bot 
Date:   Thu Jan 17 14:49:42 2019 +

Update translations for tor-launcher-properties
---
 pl/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pl/torlauncher.properties b/pl/torlauncher.properties
index 32b912ab2..2d2d94c1d 100644
--- a/pl/torlauncher.properties
+++ b/pl/torlauncher.properties
@@ -3,7 +3,7 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited_during_startup=Tor wyłączył się podczas 
uruchamiania. Może to być spowodowane błędem programu Tor, lub innego 
programu zainstalowanego w Twoim systemie, lub może to być wina wadliwego 
sprzętu. Do czasu naprawienia problemu lub restartu programu, przeglądarka 
Tor się nie uruchomi.
+torlauncher.tor_exited_during_startup=Tor wyłączył się podczas 
uruchamiania. Może to być spowodowane błędem programu Tor, lub innego 
programu zainstalowanego w Twoim systemie, lub może to być wina wadliwego 
sprzętu. Do czasu naprawienia problemu lub restartu programu, Tor Browser się 
nie uruchomi.
 torlauncher.tor_exited=Tor niespodziewanie wyłączył się. Może to być 
spowodowane błędem programu Tor, lub innego programu zainstalowanym w Twoim 
systemie, lub może być to wina wadliwego sprzętu. Do czasu ponownego 
uruchomienia Tora, Tor Browser nie będzie w stanie dotrzeć do wszystkich 
stron. Jeśli problem nadal występuje, należy wysłać kopię logów Tora do 
zespołu pomocy technicznej.
 torlauncher.tor_exited2=Zrestartowanie Tora nie spowoduje zamknięcia Twoich 
zakładek.
 torlauncher.tor_controlconn_failed=Nie można połączyć się z portem 
kontrolnym Tora.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed

2019-01-17 Thread translation
commit 7627b7ed42368467b8c3303a5985a268df87694d
Author: Translation commit bot 
Date:   Thu Jan 17 14:49:29 2019 +

Update translations for torbutton-browseronboardingproperties_completed
---
 pl/browserOnboarding.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pl/browserOnboarding.properties b/pl/browserOnboarding.properties
index 396dcee20..6b63e5cf9 100644
--- a/pl/browserOnboarding.properties
+++ b/pl/browserOnboarding.properties
@@ -4,17 +4,17 @@
 
 onboarding.tour-tor-welcome=Witamy
 onboarding.tour-tor-welcome.title=Jesteś gotowy.
-onboarding.tour-tor-welcome.description=Przeglądarka Tor oferuje najwyższy 
standard prywatości oraz bezpieczeństwa przy przęglądaniu sieci. Jesteś 
teraz chroniony przed śledzeniem, inwigilacją i cenzurą. To szybkie 
wdrożenie pokaże Ci jak.
+onboarding.tour-tor-welcome.description=Tor Browser oferuje najwyższy 
standard prywatości oraz bezpieczeństwa przy przęglądaniu sieci. Jesteś 
teraz chroniony przed śledzeniem, inwigilacją i cenzurą. To szybkie 
wdrożenie pokaże Ci jak.
 onboarding.tour-tor-welcome.button=Zacznij teraz
 
 onboarding.tour-tor-privacy=Prywatność
 onboarding.tour-tor-privacy.title=Zlekcewarz trackery i snoopery.
-onboarding.tour-tor-privacy.description=Przeglądarka Tor izoluje ciasteczka i 
usuwa twoją historię przeglądania po każdej sesji. Te modyfikacje 
zapewniają że Twoja prywatność oraz bezpieczeństwo są chronione przez 
przeglądarkę. Kliknij 'Sieć Tor' aby dowiedzieć się jak chronimy Cię na 
poziomie sieciowym.
+onboarding.tour-tor-privacy.description=Tor Browser izoluje ciasteczka i usuwa 
twoją historię przeglądania po każdej sesji. Te modyfikacje zapewniają że 
Twoja prywatność oraz bezpieczeństwo są chronione przez przeglądarkę. 
Kliknij 'Sieć Tor' aby dowiedzieć się jak chronimy Cię na poziomie 
sieciowym.
 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=Przeglądarka Tor łą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=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.button=Przejdź do wyświetlacza obwodu
 
 onboarding.tour-tor-circuit-display=Wyświetlacz Obwodu

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2019-01-17 Thread translation
commit 2d3cefd37270aed2054a6b6d67496457ca46904e
Author: Translation commit bot 
Date:   Thu Jan 17 14:49:47 2019 +

Update translations for tor-launcher-properties_completed
---
 pl/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pl/torlauncher.properties b/pl/torlauncher.properties
index 32b912ab2..2d2d94c1d 100644
--- a/pl/torlauncher.properties
+++ b/pl/torlauncher.properties
@@ -3,7 +3,7 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited_during_startup=Tor wyłączył się podczas 
uruchamiania. Może to być spowodowane błędem programu Tor, lub innego 
programu zainstalowanego w Twoim systemie, lub może to być wina wadliwego 
sprzętu. Do czasu naprawienia problemu lub restartu programu, przeglądarka 
Tor się nie uruchomi.
+torlauncher.tor_exited_during_startup=Tor wyłączył się podczas 
uruchamiania. Może to być spowodowane błędem programu Tor, lub innego 
programu zainstalowanego w Twoim systemie, lub może to być wina wadliwego 
sprzętu. Do czasu naprawienia problemu lub restartu programu, Tor Browser się 
nie uruchomi.
 torlauncher.tor_exited=Tor niespodziewanie wyłączył się. Może to być 
spowodowane błędem programu Tor, lub innego programu zainstalowanym w Twoim 
systemie, lub może być to wina wadliwego sprzętu. Do czasu ponownego 
uruchomienia Tora, Tor Browser nie będzie w stanie dotrzeć do wszystkich 
stron. Jeśli problem nadal występuje, należy wysłać kopię logów Tora do 
zespołu pomocy technicznej.
 torlauncher.tor_exited2=Zrestartowanie Tora nie spowoduje zamknięcia Twoich 
zakładek.
 torlauncher.tor_controlconn_failed=Nie można połączyć się z portem 
kontrolnym Tora.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed

2019-01-17 Thread translation
commit 81f97cf339abbfbe2362052022cd1dcf6722f03a
Author: Translation commit bot 
Date:   Thu Jan 17 14:48:39 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 pl/torbutton.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/torbutton.properties b/pl/torbutton.properties
index c39834120..12ebacb50 100644
--- a/pl/torbutton.properties
+++ b/pl/torbutton.properties
@@ -8,7 +8,7 @@ torbutton.circuit_display.unknown_country = Nieznane państwo
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Twój węzeł [Guard] może się nie 
zmienić.
 torbutton.circuit_display.learn_more = Dowiedz się więcej
-torbutton.content_sizer.margin_tooltip = Przeglądarka Tor dodaje ten margines 
po to, aby szerokość i wysokość okna Twojej przeglądarki była mniej 
charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online.
+torbutton.content_sizer.margin_tooltip = Tor Browser dodaje ten margines po 
to, aby szerokość i wysokość okna Twojej przeglądarki była mniej 
charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online.
 torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora
 torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tora
 torbutton.panel.label.disabled = Tor wyłączony
@@ -31,7 +31,7 @@ torbutton.popup.confirm_plugins = Wtyczki takie jak Flash 
mogą szkodzić Twojej
 torbutton.popup.never_ask_again = Nie pytaj mnie więcej
 torbutton.popup.confirm_newnym = Tor Browser zamknie wszystkie otwarte okna i 
karty. Wszystkie sesje zostaną utracone.\n\nCzy chcesz zrestartować Tor 
Browser teraz, aby zmienić tożsamość?\n\n
 
-torbutton.maximize_warning = Zwiększenie przeglądarki Tor pozwala stronom 
internetowym ustalić rozmiar ekranu i przez to śledzić użytkownika. 
Polecamy zostawiać przeglądarka Tor w domyślnym rozmiarze.
+torbutton.maximize_warning = Zwiększenie przeglądarki Tor pozwala stronom 
internetowym ustalić rozmiar ekranu i przez to śledzić użytkownika. 
Polecamy zostawiać Tor Browser w domyślnym rozmiarze.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Ta strona internetowa (%S) próbowała wydobyć HTML5 canvas 
danych obrazu, które mogą być wykorzystane w celu identyfikacji Twojego 
komputera.\n\nCzy chcesz, aby Tor Browser pozwolił tej stronie na wydobycie 
danych obrazu HTML5 canvas?

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2019-01-17 Thread translation
commit dd23d56aec41c50228fef866b05b75e432689840
Author: Translation commit bot 
Date:   Thu Jan 17 14:48:33 2019 +

Update translations for torbutton-torbuttonproperties
---
 pl/torbutton.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/torbutton.properties b/pl/torbutton.properties
index c39834120..12ebacb50 100644
--- a/pl/torbutton.properties
+++ b/pl/torbutton.properties
@@ -8,7 +8,7 @@ torbutton.circuit_display.unknown_country = Nieznane państwo
 torbutton.circuit_display.guard = Guard
 torbutton.circuit_display.guard_note = Twój węzeł [Guard] może się nie 
zmienić.
 torbutton.circuit_display.learn_more = Dowiedz się więcej
-torbutton.content_sizer.margin_tooltip = Przeglądarka Tor dodaje ten margines 
po to, aby szerokość i wysokość okna Twojej przeglądarki była mniej 
charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online.
+torbutton.content_sizer.margin_tooltip = Tor Browser dodaje ten margines po 
to, aby szerokość i wysokość okna Twojej przeglądarki była mniej 
charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online.
 torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora
 torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tora
 torbutton.panel.label.disabled = Tor wyłączony
@@ -31,7 +31,7 @@ torbutton.popup.confirm_plugins = Wtyczki takie jak Flash 
mogą szkodzić Twojej
 torbutton.popup.never_ask_again = Nie pytaj mnie więcej
 torbutton.popup.confirm_newnym = Tor Browser zamknie wszystkie otwarte okna i 
karty. Wszystkie sesje zostaną utracone.\n\nCzy chcesz zrestartować Tor 
Browser teraz, aby zmienić tożsamość?\n\n
 
-torbutton.maximize_warning = Zwiększenie przeglądarki Tor pozwala stronom 
internetowym ustalić rozmiar ekranu i przez to śledzić użytkownika. 
Polecamy zostawiać przeglądarka Tor w domyślnym rozmiarze.
+torbutton.maximize_warning = Zwiększenie przeglądarki Tor pozwala stronom 
internetowym ustalić rozmiar ekranu i przez to śledzić użytkownika. 
Polecamy zostawiać Tor Browser w domyślnym rozmiarze.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Ta strona internetowa (%S) próbowała wydobyć HTML5 canvas 
danych obrazu, które mogą być wykorzystane w celu identyfikacji Twojego 
komputera.\n\nCzy chcesz, aby Tor Browser pozwolił tej stronie na wydobycie 
danych obrazu HTML5 canvas?

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed

2019-01-17 Thread translation
commit 82c712f920e9d6dd6d9a79a47c9c4319dc25b510
Author: Translation commit bot 
Date:   Thu Jan 17 14:48:14 2019 +

Update translations for torbutton-brandproperties_completed
---
 pl/brand.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pl/brand.properties b/pl/brand.properties
index 0381babb4..f80706737 100644
--- a/pl/brand.properties
+++ b/pl/brand.properties
@@ -2,9 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Przeglądarka Tor
-brandShortName=Przeglądarka Tor
-brandFullName=Przeglądarka Tor
+brandShorterName=Tor Browser
+brandShortName=Tor Browser
+brandFullName=Tor Browser
 vendorShortName=Project Tor
 
 homePageSingleStartMain=Firefox Start, szybka strona domowa z wbudowana 
wyszukiwarką

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties

2019-01-17 Thread translation
commit 457f62bd110fe8716f160647e91d12049c9dac62
Author: Translation commit bot 
Date:   Thu Jan 17 14:48:07 2019 +

Update translations for torbutton-brandproperties
---
 pl/brand.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pl/brand.properties b/pl/brand.properties
index 0381babb4..f80706737 100644
--- a/pl/brand.properties
+++ b/pl/brand.properties
@@ -2,9 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Przeglądarka Tor
-brandShortName=Przeglądarka Tor
-brandFullName=Przeglądarka Tor
+brandShorterName=Tor Browser
+brandShortName=Tor Browser
+brandFullName=Tor Browser
 vendorShortName=Project Tor
 
 homePageSingleStartMain=Firefox Start, szybka strona domowa z wbudowana 
wyszukiwarką

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed

2019-01-17 Thread translation
commit 4fe41c52edd4bfca3485082d5b44366801eea06d
Author: Translation commit bot 
Date:   Thu Jan 17 14:48:26 2019 +

Update translations for torbutton-branddtd_completed
---
 pl/brand.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/brand.dtd b/pl/brand.dtd
index 608dab0a4..a777445ed 100644
--- a/pl/brand.dtd
+++ b/pl/brand.dtd
@@ -3,8 +3,8 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
-
-
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-branddtd] Update translations for torbutton-branddtd

2019-01-17 Thread translation
commit 0681564674603ea8e3ceace1ea8b6b00059c464e
Author: Translation commit bot 
Date:   Thu Jan 17 14:48:20 2019 +

Update translations for torbutton-branddtd
---
 pl/brand.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/brand.dtd b/pl/brand.dtd
index 608dab0a4..a777445ed 100644
--- a/pl/brand.dtd
+++ b/pl/brand.dtd
@@ -3,8 +3,8 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
-
-
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-17 Thread translation
commit b38f3233adf92d1e6e5b22efee6a4640f0f0fdc4
Author: Translation commit bot 
Date:   Thu Jan 17 14:47:27 2019 +

Update translations for tbmanual-contentspot
---
 contents+pl.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+pl.po b/contents+pl.po
index b5a5196f2..54c2a78d9 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -1,7 +1,7 @@
 # Translators:
 # Steve Dougherty, 2018
 # Emma Peel, 2018
-# hoek , 2018
+# Dawid Job , 2018
 # erinm, 2018
 # Filip , 2018
 # 
@@ -1556,7 +1556,7 @@ msgstr "Rozwiązywanie problemów"
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.description)
 msgid "What to do if Tor Browser doesn’t work"
-msgstr "Co robić, gdy Przeglądarka Tora nie pracuje"
+msgstr "Co robić, gdy Tor Browsera nie pracuje"
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd

2019-01-17 Thread translation
commit f6574c9a111f0c67bcca2d9a9766e226f4f61fed
Author: Translation commit bot 
Date:   Thu Jan 17 14:47:12 2019 +

Update translations for tba-torbrowserstringsdtd
---
 pl/android_strings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pl/android_strings.dtd b/pl/android_strings.dtd
index a386b4b4d..3fed5b109 100644
--- a/pl/android_strings.dtd
+++ b/pl/android_strings.dtd
@@ -1,15 +1,15 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
-
+
 
 
 
@@ -21,5 +21,5 @@
 
 
 
-
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed

2019-01-17 Thread translation
commit a47bdc710047d7917d3f5a32fcb59746541c7649
Author: Translation commit bot 
Date:   Thu Jan 17 14:47:18 2019 +

Update translations for tba-torbrowserstringsdtd_completed
---
 pl/android_strings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pl/android_strings.dtd b/pl/android_strings.dtd
index a386b4b4d..3fed5b109 100644
--- a/pl/android_strings.dtd
+++ b/pl/android_strings.dtd
@@ -1,15 +1,15 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
-
+
 
 
 
@@ -21,5 +21,5 @@
 
 
 
-
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-17 Thread translation
commit aebc9b09793f7d5cde7ae25fce18d78f3115f473
Author: Translation commit bot 
Date:   Thu Jan 17 14:46:15 2019 +

Update translations for tails-misc
---
 pl.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pl.po b/pl.po
index 4f527955e..dd0e0c241 100644
--- a/pl.po
+++ b/pl.po
@@ -7,6 +7,7 @@
 # Aron , 2014
 # Dawid Job , 2016-2017
 # Dawid Job , 2014
+# Emma Peel, 2019
 # Filip , 2018
 # Dawid Job , 2018
 # Dawid Job , 2014
@@ -21,8 +22,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-17 14:29+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -717,7 +718,7 @@ msgstr "Dowiedz się więcej o Tails"
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
 msgid "Tor Browser"
-msgstr "Przeglądarka Tor"
+msgstr "Tor Browser"
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
 msgid "Anonymous Web Browser"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-17 Thread translation
commit fee33f9b5691d59bd10ea37f5d51583300045260
Author: Translation commit bot 
Date:   Thu Jan 17 14:16:20 2019 +

Update translations for tails-misc
---
 fr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fr.po b/fr.po
index 7df99dc61..3d7b03791 100644
--- a/fr.po
+++ b/fr.po
@@ -30,8 +30,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-17 13:58+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -135,7 +135,7 @@ msgstr "Conserver le nom actuel"
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."
-msgstr ""
+msgstr "su est désactivée. Veuillez plutôt utiliser sudo."
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-01-17 Thread translation
commit 2c16f80766ee07ca19328dfcff4d7809fa62a4c4
Author: Translation commit bot 
Date:   Thu Jan 17 14:16:25 2019 +

Update translations for tails-misc_completed
---
 fr.po | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/fr.po b/fr.po
index 16523848e..3d7b03791 100644
--- a/fr.po
+++ b/fr.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-14 20:19+0100\n"
-"PO-Revision-Date: 2019-01-15 13:57+\n"
+"POT-Creation-Date: 2019-01-14 21:20+0100\n"
+"PO-Revision-Date: 2019-01-17 13:58+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -133,6 +133,10 @@ msgstr "Renommer"
 msgid "Keep current name"
 msgstr "Conserver le nom actuel"
 
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr "su est désactivée. Veuillez plutôt utiliser sudo."
+
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "Redémarrer"
@@ -279,7 +283,7 @@ msgid "Remove"
 msgstr "Supprimer"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Annuler"
@@ -423,23 +427,23 @@ msgid ""
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "Le déguisement MAC a échoué pour la carte réseau ${nic_name} 
(${nic}). La récupération en cas d’erreur a aussi échoué et toute la mise 
en réseau est désactivée.\nVous pourriez préférer redémarrer Tails et 
désactiver le déguisement MAC."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
 msgid "Lock Screen"
 msgstr "Verrouiller l’écran"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
 msgid "Screen Locker"
 msgstr "Verrou d’écran"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
 msgid "Set up a password to unlock the screen."
 msgstr "Définir un mot de passe pour déverrouiller l’écran"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
 msgid "Password"
 msgstr "Mot de passe"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
 msgid "Confirm"
 msgstr "Confirmer"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-browser-build/master] Bug 28874: Bump mingw-w64 commit to fix WebGL crash

2019-01-17 Thread boklm
commit 87f892495a13e878922147429e4c2b7a423f0d8e
Author: Georg Koppen 
Date:   Fri Jan 11 08:19:14 2019 +

Bug 28874: Bump mingw-w64 commit to fix WebGL crash
---
 projects/mingw-w64/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 19a7a82..d0268cb 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64
-git_hash: ee9fc3d0b8c8868280e38384edd968067b8e71fc
+git_hash: 2d4e517ad0c7a9f0bd7001c42e6c131b977c15d9
 version: '[% c("abbrev") %]'
 var:
   container:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd

2019-01-17 Thread translation
commit c742f7c281087f3bb2b36f0ff0a8e2ec4c902fb2
Author: Translation commit bot 
Date:   Thu Jan 17 12:47:10 2019 +

Update translations for tba-torbrowserstringsdtd
---
 ru/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/android_strings.dtd b/ru/android_strings.dtd
index 377571c1c..5e6866ddb 100644
--- a/ru/android_strings.dtd
+++ b/ru/android_strings.dtd
@@ -19,7 +19,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed

2019-01-17 Thread translation
commit 2c6931d6feed472ab7811baee6b23f6d979fd1b4
Author: Translation commit bot 
Date:   Thu Jan 17 12:47:15 2019 +

Update translations for tba-torbrowserstringsdtd_completed
---
 ru/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/android_strings.dtd b/ru/android_strings.dtd
index 377571c1c..5e6866ddb 100644
--- a/ru/android_strings.dtd
+++ b/ru/android_strings.dtd
@@ -19,7 +19,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-17 Thread translation
commit 75eb3d5dfa92d546627fe55301e1a99821abea1b
Author: Translation commit bot 
Date:   Thu Jan 17 12:46:10 2019 +

Update translations for tails-misc
---
 ru.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ru.po b/ru.po
index 0dd1c828d..2a3d7ed3b 100644
--- a/ru.po
+++ b/ru.po
@@ -15,6 +15,7 @@
 # joshua ridney, 2015
 # jujjer , 2013
 # Julia Liberman , 2015
+# JZDLin, 2019
 # Legenden Rifk , 2018
 # mendov, 2013
 # Misha Dyachuk , 2016
@@ -33,8 +34,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-17 12:32+\n"
+"Last-Translator: JZDLin\n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,7 +127,7 @@ msgid ""
 "${filename}\n"
 "\n"
 "Renaming it to keepassx.kdbx would allow KeePassX to open it 
automatically in the future."
-msgstr ""
+msgstr "Хотите переименовать вашу базу 
данных KeePassX?\n\nУ вас имеется база 
данных KeePassX в Постоянной 
папке:\n\n${filename}\n\nПереименование БД в 
keepassx.kdbx позволит KeePassX открывать ее 
в дальнейшем автоматически."
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:25
 msgid "Rename"
@@ -134,11 +135,11 @@ msgstr "Переименовать"
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:26
 msgid "Keep current name"
-msgstr ""
+msgstr "Оставить без изменений"
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."
-msgstr ""
+msgstr "Использование su отключено. 
Используйте sudo."
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-01-17 Thread translation
commit 3471e06664144dc6b59b77f07ad0fa36d372d0e6
Author: Translation commit bot 
Date:   Thu Jan 17 12:46:15 2019 +

Update translations for tails-misc_completed
---
 ru.po | 43 ++-
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/ru.po b/ru.po
index bc0659700..2a3d7ed3b 100644
--- a/ru.po
+++ b/ru.po
@@ -15,6 +15,7 @@
 # joshua ridney, 2015
 # jujjer , 2013
 # Julia Liberman , 2015
+# JZDLin, 2019
 # Legenden Rifk , 2018
 # mendov, 2013
 # Misha Dyachuk , 2016
@@ -32,9 +33,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-07 10:24+0100\n"
-"PO-Revision-Date: 2019-01-11 14:12+\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-01-14 21:20+0100\n"
+"PO-Revision-Date: 2019-01-17 12:32+\n"
+"Last-Translator: JZDLin\n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -116,6 +117,30 @@ msgstr "_Launch"
 msgid "_Exit"
 msgstr "_Exit"
 
+#: config/chroot_local-includes/usr/local/bin/keepassx:17
+#, sh-format
+msgid ""
+"Do you want to rename your KeePassX database?\n"
+"\n"
+"You have a KeePassX database in your Persistent folder:\n"
+"\n"
+"${filename}\n"
+"\n"
+"Renaming it to keepassx.kdbx would allow KeePassX to open it 
automatically in the future."
+msgstr "Хотите переименовать вашу базу 
данных KeePassX?\n\nУ вас имеется база 
данных KeePassX в Постоянной 
папке:\n\n${filename}\n\nПереименование БД в 
keepassx.kdbx позволит KeePassX открывать ее 
в дальнейшем автоматически."
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:25
+msgid "Rename"
+msgstr "Переименовать"
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:26
+msgid "Keep current name"
+msgstr "Оставить без изменений"
+
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr "Использование su отключено. 
Используйте sudo."
+
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "Перезапуск"
@@ -262,7 +287,7 @@ msgid "Remove"
 msgstr "Убрать"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Отмена"
@@ -406,23 +431,23 @@ msgid ""
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "MAC-адрес сетевой карты ${nic_name} (${nic}) 
подменить не удалось. Не сработало и 
восстановление после ошибки, и поэтому 
весь сетевой сервис полностью 
отключен.\nВозможно, вам придется 
перезагрузить Tails и отключить режим 
подмены MAC-адреса. "
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
 msgid "Lock Screen"
 msgstr "Экран блокировки"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
 msgid "Screen Locker"
 msgstr "Экранный блокировщик"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
 msgid "Set up a password to unlock the screen."
 msgstr "Настройте пароль для разблокировки 
экрана."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
 msgid "Password"
 msgstr "Пароль"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
 msgid "Confirm"
 msgstr "Подтвердить"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2019-01-17 Thread translation
commit 2057f27a6380035af3386582732902500304761a
Author: Translation commit bot 
Date:   Thu Jan 17 12:45:10 2019 +

Update translations for abouttor-homepage_completed
---
 ru/aboutTor.dtd | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd
index 879d708e8..3deb6305e 100644
--- a/ru/aboutTor.dtd
+++ b/ru/aboutTor.dtd
@@ -11,7 +11,7 @@
 
 
 
-
+
 https://duckduckgo.com;>
 
 
@@ -35,8 +35,13 @@
 
 
 
+
+
+
+
 
 
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-01-17 Thread translation
commit 56ca22f3bb70f965376b234e8678c78a3a21c04f
Author: Translation commit bot 
Date:   Thu Jan 17 12:45:04 2019 +

Update translations for abouttor-homepage
---
 ru/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd
index ebe17a578..3deb6305e 100644
--- a/ru/aboutTor.dtd
+++ b/ru/aboutTor.dtd
@@ -38,10 +38,10 @@
 
 
 
-
+
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-17 Thread translation
commit 8bbb32dc200510c371c61655da3eb78ef0e3cb7e
Author: Translation commit bot 
Date:   Thu Jan 17 12:16:15 2019 +

Update translations for tails-misc
---
 lt.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lt.po b/lt.po
index 35b054fff..d0358bfc8 100644
--- a/lt.po
+++ b/lt.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 11:46+\n"
+"PO-Revision-Date: 2019-01-17 11:47+\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian 
(http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -674,7 +674,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
 msgid "Failed to add container"
-msgstr ""
+msgstr "Nepavyko pridėti konteinerio"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
 #, python-format
@@ -722,7 +722,7 @@ msgstr "Nesaugi saityno naršyklė"
 
 #: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
 msgid "Unlock VeraCrypt Volumes"
-msgstr ""
+msgstr "Atrakinti VeraCrypt tomus"
 
 #: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
 msgid "Mount VeraCrypt encrypted file containers and devices"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2019-01-17 Thread translation
commit edd737129c94049e688cbac9aaf208659846bf71
Author: Translation commit bot 
Date:   Thu Jan 17 12:15:51 2019 +

Update translations for https_everywhere_completed
---
 ru/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index 36391fcb1..13f6b4741 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2019-01-17 Thread translation
commit 37888c5473937a6f91856712d68eca417a6087c0
Author: Translation commit bot 
Date:   Thu Jan 17 12:15:42 2019 +

Update translations for https_everywhere
---
 ru/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index 6c148d111..13f6b4741 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

2019-01-17 Thread translation
commit 96500e55f908abd495ff398fb496c77dad470c36
Author: Translation commit bot 
Date:   Thu Jan 17 11:50:13 2019 +

Update translations for support-portal_completed
---
 contents+pt-PT.po | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index f1ed7d8e0..cc3fabb9d 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -166,9 +166,8 @@ msgid ""
 "see that you're using Tor, but they won't know where you're going when you "
 "do."
 msgstr ""
-"Algumas entidades, tais como o seu Fornecedor de Acesso à Internet (em "
-"inglês, ISP = Internet Service Provider), podem ver que você está usando o 
"
-"Tor, mas não sabem aonde você vai quando o faz."
+"Algumas entidades, tais como o seu Fornecedor de Acesso à Internet (ISP), "
+"podem ver que está a utilizar o Tor, mas não sabem o que está a aceder."
 
 #: http//localhost/faq/will-anyone-be-able-to-tell-which-website-i-visit/
 #: (content/faq/faq-1/contents+en.lrquestion.seo_slug)
@@ -666,9 +665,9 @@ msgid ""
 "a USB stick or a DVD."
 msgstr ""
 "Caso seja necessário assegurar que todo o tráfego seja transmitido pela 
rede"
-" Tor, confira o https://tails.boum.org/\;>sistema "
-"operacional \"live\" Tails que você pode usar para dar boot em "
-"qualquer computador usando um pendrive USB ou um DVD."
+" Tor, veja o https://tails.boum.org/\;>sistema operativo "
+"\"live\" Tails que pode usar em qualquer computador através de "
+"uma pen USB ou um DVD."
 
 #: http//localhost/tbb/tor-browser-protecting-other-apps/
 #: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/support-portal] Update translations for support-portal

2019-01-17 Thread translation
commit 732a100c4c5a71a8e05e59e4ca68d149c01f1cdc
Author: Translation commit bot 
Date:   Thu Jan 17 11:50:07 2019 +

Update translations for support-portal
---
 contents+pt-PT.po | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index f1ed7d8e0..cc3fabb9d 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -166,9 +166,8 @@ msgid ""
 "see that you're using Tor, but they won't know where you're going when you "
 "do."
 msgstr ""
-"Algumas entidades, tais como o seu Fornecedor de Acesso à Internet (em "
-"inglês, ISP = Internet Service Provider), podem ver que você está usando o 
"
-"Tor, mas não sabem aonde você vai quando o faz."
+"Algumas entidades, tais como o seu Fornecedor de Acesso à Internet (ISP), "
+"podem ver que está a utilizar o Tor, mas não sabem o que está a aceder."
 
 #: http//localhost/faq/will-anyone-be-able-to-tell-which-website-i-visit/
 #: (content/faq/faq-1/contents+en.lrquestion.seo_slug)
@@ -666,9 +665,9 @@ msgid ""
 "a USB stick or a DVD."
 msgstr ""
 "Caso seja necessário assegurar que todo o tráfego seja transmitido pela 
rede"
-" Tor, confira o https://tails.boum.org/\;>sistema "
-"operacional \"live\" Tails que você pode usar para dar boot em "
-"qualquer computador usando um pendrive USB ou um DVD."
+" Tor, veja o https://tails.boum.org/\;>sistema operativo "
+"\"live\" Tails que pode usar em qualquer computador através de "
+"uma pen USB ou um DVD."
 
 #: http//localhost/tbb/tor-browser-protecting-other-apps/
 #: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-17 Thread translation
commit 052f6d5f5f17c4f58c79986e451e3d4d37b6a44c
Author: Translation commit bot 
Date:   Thu Jan 17 11:47:31 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 131 ++
 1 file changed, 103 insertions(+), 28 deletions(-)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index c1f5c69b6..2c59195cf 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -271,16 +271,18 @@ msgid ""
 "You can also access this option in the new circuit display, in the site "
 "information menu, in the URL bar."
 msgstr ""
+"Também pode aceder a esta opção na nova visualização de circuitos, no 
menu "
+"de informações do site, na barra de endereços."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.seo_slug)
 msgid "managing-identities"
-msgstr ""
+msgstr "gerir-identidades"
 
 #: https//tb-manual.torproject.org/en-US/
 #: (content/contents+en-US.lrshowcase.title)
 msgid "Tor Browser User Manual"
-msgstr ""
+msgstr "Manual de Utilização do Tor Browser"
 
 #: https//tb-manual.torproject.org/en-US/menu/
 #: (content/menu/contents+en-US.lrtopic.body)
@@ -321,6 +323,8 @@ msgstr "Sobre Tor Browser"
 #: (content/about/contents+en-US.lrtopic.description)
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
+"Saiba o que o Tor Browser pode fazer para proteger a sua privacidade e "
+"anonimato"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -328,6 +332,8 @@ msgid ""
 "Tor Browser uses the Tor network to protect your privacy and anonymity. "
 "Using the Tor network has two main properties:"
 msgstr ""
+"O Tor Browser utiliza a rede Tor para proteger a sua privacidade e "
+"anonimato. A utilização da rede Tor tem duas características principais:"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -336,6 +342,9 @@ msgid ""
 "locally, will not be able to track your internet activity, including the "
 "names and addresses of the websites you visit."
 msgstr ""
+"*  O seu fornecedor de acesso à Internet e qualquer pessoa que esteja a ver "
+"a sua conexão localmente, não poderão rastrear a sua atividade na 
Internet, "
+"incluindo os nomes e endereços dos sites que visita."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -345,6 +354,10 @@ msgid ""
 "your real Internet (IP) address, and will not know who you are unless you "
 "explicitly identify yourself."
 msgstr ""
+"* Os operadores dos sites e serviços que utiliza, e qualquer um que os "
+"vigie, verão uma conexão proveniente da rede Tor em vez do seu endereço 
real"
+" de Internet (IP) e não saberão quem é, a não ser que se identifique "
+"explicitamente."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -352,6 +365,9 @@ msgid ""
 "In addition, Tor Browser is designed to prevent websites from "
 "“fingerprinting” or identifying you based on your browser configuration."
 msgstr ""
+"Além disso, o Tor Browser é concebido para impedir que os sites recolham as 
"
+"suas \"impressões digitais\" identificando-a/o a partir das configurações 
do"
+" seu navegador."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -360,11 +376,15 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Por padrão, o Tor Browser não mantém registos de histórico de 
navegação. Os "
+"cookies são válidos apenas por uma sessão (isto é, até que o utilizador "
+"feche o Tor Browser ou requisite uma Nova Identidade)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
 msgid "# How Tor works"
-msgstr ""
+msgstr "# Como é que o Tor funciona"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -375,6 +395,11 @@ msgid ""
 "relay in the circuit (the “exit relay”) then sends the traffic out onto 
the "
 "public Internet."
 msgstr ""
+"O Tor é uma rede de túneis virtuais que permite melhorar a sua privacidade 
e"
+" segurança na Internet. O Tor envia o seu tráfego através de três 
servidores"
+" aleatórios (também conhecidos como *retransmissores*) na rede Tor. O 
último"
+" retransmissor do circuito (o \"retransmissor de saída\") envia então o "
+"tráfego para fora, para a Internet pública."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -382,6 +407,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -391,6 +418,10 @@ msgid ""
 "three keys represent the layers of encryption between the user and each "
 "relay."
 

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-17 Thread translation
commit 14f4fd21d89887e72f60f4d553bd695661ada7e2
Author: Translation commit bot 
Date:   Thu Jan 17 11:46:14 2019 +

Update translations for tails-misc
---
 lt.po | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lt.po b/lt.po
index 41cc16329..35b054fff 100644
--- a/lt.po
+++ b/lt.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Gediminas Golcevas <>, 2014
-# Moo, 2015-2018
+# Moo, 2015-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-17 11:46+\n"
+"Last-Translator: Moo\n"
 "Language-Team: Lithuanian 
(http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -107,7 +107,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:25
 msgid "Rename"
-msgstr ""
+msgstr "Pervadinti"
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:26
 msgid "Keep current name"
@@ -115,7 +115,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."
-msgstr ""
+msgstr "su yra išjungta. Vietoj to, naudokite sudo."
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
@@ -204,18 +204,18 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293
 msgid "Install Every Time"
-msgstr ""
+msgstr "Įdiegti kiekvieną kartą"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325
 msgid "Install Only Once"
-msgstr ""
+msgstr "Įdiegti tik vieną kartą"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371
 msgid "The configuration of your additional software failed."
-msgstr ""
+msgstr "Jūsų papildomos programinės įrangos konfigūracija patyrė 
nesėkmę."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321
 msgid ""
@@ -249,7 +249,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359
 #, python-brace-format
 msgid "Remove {packages} from your additional software?"
-msgstr ""
+msgstr "Šalinti {packages} iš jūsų papildomos programinės įrangos?"
 
 #. Translators: Don't translate {packages}, it's a placeholder
 #. and will be replaced.
@@ -278,11 +278,11 @@ msgstr "Tai gali užimti kelias minutes."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559
 msgid "The installation of your additional software failed"
-msgstr ""
+msgstr "Jūsų papildomos programinės įrangos diegimas patyrė nesėkmę."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574
 msgid "Additional software installed successfully"
-msgstr ""
+msgstr "Papildoma programinė įranga sėkmingai įdiegta"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594
 msgid "The check for upgrades of your additional software failed"
@@ -614,7 +614,7 @@ msgstr "{volume_name} – {drive_name}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
 msgid "Wrong passphrase or parameters"
-msgstr ""
+msgstr "Neteisinga slaptafrazė arba parametrai"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
 msgid "Error unlocking volume"
@@ -627,7 +627,7 @@ msgstr ""
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
-msgstr ""
+msgstr "Nepavyko atrakinti tomo {volume_name}:\n{error_message}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
@@ -639,7 +639,7 @@ msgstr "Neaptikta jokių VeraCrypt įrenginių"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
 msgid "Container already added"
-msgstr ""
+msgstr "Konteineris jau pridėtas"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115
 #, python-format
@@ -648,7 +648,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131
 msgid "Container opened read-only"
-msgstr ""
+msgstr "Konteineris atvertas tik skaitymui"
 
 #. Translators: Don't translate {path}, it's a placeholder  and will be
 #. replaced.
@@ -665,7 +665,7 @@ msgstr "Klaida atveriant failą"
 
 #: 

[tor-commits] [tor-browser-build/master] Bug 29105: Unbreak obfs4 nightly builds

2019-01-17 Thread boklm
commit aabf423be17388db2c980be9f04239479bdb6bb4
Author: Georg Koppen 
Date:   Thu Jan 17 10:00:07 2019 +

Bug 29105: Unbreak obfs4 nightly builds
---
 projects/obfs4/build | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/projects/obfs4/build b/projects/obfs4/build
index 2c3f933..4e42b23 100644
--- a/projects/obfs4/build
+++ b/projects/obfs4/build
@@ -21,9 +21,15 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
   # versioning (see bug 28325).
   rm -f go.mod go.sum
 [% END -%]
-
-mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports"
-ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git"
+# Commit 70d0e90c861be34ce3c5425ef1366a0b2ceb3026 changed the canonical obfs4
+# upstream repo to gitlab.com/yawning/obfs4.git.
+[% IF c("var/nightly") %]
+  mkdir -p "$GOPATH/src/gitlab.com/yawning"
+  ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git"
+[% ELSE %]
+  mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports"
+  ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git"
+[% END %]
 cd obfs4proxy
 go build -ldflags '-s'
 cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-17 Thread translation
commit 5fd17fdf3d52244b1b41f2dbc1ffd5cb732b5a33
Author: Translation commit bot 
Date:   Thu Jan 17 11:17:27 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index 6147b1fa5..c1f5c69b6 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -258,6 +258,12 @@ msgid ""
 " reloaded. This option does not clear any private information or unlink your"
 " activity, nor does it affect your current connections to other websites."
 msgstr ""
+"Esta opção é útil se o retransmissor de 
"
+"saída que está a utilizar não for capaz de aceder ao site que deseja 
ou "
+"não estiver a carregar adequadamente. Ao selecioná-la, o separador ou a "
+"janela atualmente ativa será recarregada através de um novo circuito Tor. "
+"Esta opção não elimina nenhuma informação privada, não desvincula a sua 
"
+"atividade na rede nem afeta as suas conexões atuais a outros sites."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-17 Thread translation
commit c9fab81888fe61123f0c92f573b1113da5c37ffa
Author: Translation commit bot 
Date:   Thu Jan 17 11:16:11 2019 +

Update translations for tails-misc
---
 pt_PT.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt_PT.po b/pt_PT.po
index 82ae25073..a49771c35 100644
--- a/pt_PT.po
+++ b/pt_PT.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-17 11:15+\n"
+"Last-Translator: Rui \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -115,7 +115,7 @@ msgstr "Manter nome atual"
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."
-msgstr ""
+msgstr "O su está desativado. Em vez disso utilize o sudo."
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-01-17 Thread translation
commit 8dbf0b7286af5501575e7fdf459649f6cd34320b
Author: Translation commit bot 
Date:   Thu Jan 17 11:16:18 2019 +

Update translations for tails-misc_completed
---
 pt_PT.po | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pt_PT.po b/pt_PT.po
index 583be0704..a49771c35 100644
--- a/pt_PT.po
+++ b/pt_PT.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-14 20:19+0100\n"
-"PO-Revision-Date: 2019-01-15 13:09+\n"
+"POT-Creation-Date: 2019-01-14 21:20+0100\n"
+"PO-Revision-Date: 2019-01-17 11:15+\n"
 "Last-Translator: Rui \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -113,6 +113,10 @@ msgstr "Renomear"
 msgid "Keep current name"
 msgstr "Manter nome atual"
 
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr "O su está desativado. Em vez disso utilize o sudo."
+
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "Reiniciar"
@@ -259,7 +263,7 @@ msgid "Remove"
 msgstr "Remover"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Cancelar"
@@ -403,23 +407,23 @@ msgid ""
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "Mascarar endereço MAC para o cartão da rede ${nic_name} (${nic}) 
falhou. A recuperação de erro também falhou, por isso toda a rede está 
desativada.\nPode preferir reiniciar o Tails e desativar a máscara do 
endereço MAC."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
 msgid "Lock Screen"
 msgstr "Ecrã de Bloqueio"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
 msgid "Screen Locker"
 msgstr "Bloqueador de Ecrã"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
 msgid "Set up a password to unlock the screen."
 msgstr "Configure uma palavra-passe para desbloquear o ecrã."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
 msgid "Confirm"
 msgstr "Confirmar"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-01-17 Thread translation
commit d7adceedc9d45b0ebd85fadceeb25a6bcd0b4fe5
Author: Translation commit bot 
Date:   Thu Jan 17 10:16:33 2019 +

Update translations for tails-misc_completed
---
 es.po | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/es.po b/es.po
index 1ed1baeb9..0f6e759e0 100644
--- a/es.po
+++ b/es.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-14 20:19+0100\n"
-"PO-Revision-Date: 2019-01-15 12:25+\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-01-14 21:20+0100\n"
+"PO-Revision-Date: 2019-01-17 10:09+\n"
+"Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,6 +121,10 @@ msgstr "Renombrar"
 msgid "Keep current name"
 msgstr "Mantener el nombre actual"
 
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr "su está desactivado. En su lugar usa sudo."
+
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "Reiniciar"
@@ -267,7 +271,7 @@ msgid "Remove"
 msgstr "Eliminar"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Cancelar"
@@ -411,23 +415,23 @@ msgid ""
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "Falló el MAC spoofing para la tarjeta de red ${nic_name} (${nic}). La 
recuperación de errores también falló porque toda la red está 
deshabilitada.\nQuizás prefieras reiniciar Tails y deshabilitar el MAC 
spoofing."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
 msgid "Lock Screen"
 msgstr "Bloquear pantalla"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
 msgid "Screen Locker"
 msgstr "Bloqueo de pantalla"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
 msgid "Set up a password to unlock the screen."
 msgstr "Establece una contraseña para desbloquear la pantalla"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
 msgid "Password"
 msgstr "Contraseña"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
 msgid "Confirm"
 msgstr "Confirmar"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-17 Thread translation
commit d040fe9627d3c5bbde5c05adfe5b6ae1fe5a3291
Author: Translation commit bot 
Date:   Thu Jan 17 10:16:28 2019 +

Update translations for tails-misc
---
 es.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es.po b/es.po
index 91265d7e9..0f6e759e0 100644
--- a/es.po
+++ b/es.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-17 10:09+\n"
+"Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,7 @@ msgstr "Mantener el nombre actual"
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."
-msgstr ""
+msgstr "su está desactivado. En su lugar usa sudo."
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [meek/master] Make RoundTripper a field of RequestInfo.

2019-01-17 Thread dcf
commit 05491c83be510e81b704bd86bc1a5e380e6f1d14
Author: David Fifield 
Date:   Wed Jan 16 22:30:06 2019 -0700

Make RoundTripper a field of RequestInfo.
---
 meek-client/meek-client.go | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index 9c715a3..1b13f11 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -117,6 +117,9 @@ type RequestInfo struct {
// The Host header to put in the HTTP request (optional and may be
// different from the host name in URL).
Host string
+   // The RoundTripper to use to send requests. This may vary depending on
+   // the value of global options like --helper.
+   RoundTripper http.RoundTripper
 }
 
 // Make an http.Request from the payload data in buf and the request metadata 
in
@@ -177,15 +180,11 @@ again:
 // Send the data in buf to the remote URL, wait for a reply, and feed the reply
 // body back into conn.
 func sendRecv(buf []byte, conn net.Conn, info *RequestInfo) (int64, error) {
-   var rt http.RoundTripper = httpRoundTripper
-   if options.UseHelper {
-   rt = helperRoundTripper
-   }
req, err := makeRequest(buf, info)
if err != nil {
return 0, err
}
-   resp, err := roundTripRetries(rt, req, maxTries)
+   resp, err := roundTripRetries(info.RoundTripper, req, maxTries)
if err != nil {
return 0, err
}
@@ -319,6 +318,11 @@ func handler(conn *pt.SocksConn) error {
info.URL.Host = front
}
 
+   info.RoundTripper = httpRoundTripper
+   if options.UseHelper {
+   info.RoundTripper = helperRoundTripper
+   }
+
return copyLoop(conn, )
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/support-portal] Update translations for support-portal

2019-01-17 Thread translation
commit 53290ad330d9ed034a97daebe685287cf71be9b1
Author: Translation commit bot 
Date:   Thu Jan 17 01:19:20 2019 +

Update translations for support-portal
---
 contents+pt-PT.po | 117 --
 1 file changed, 97 insertions(+), 20 deletions(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index 8b821fc70..17a9053da 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -701,7 +701,7 @@ msgstr "transferir-tor-browser-chromeos"
 #: http//localhost/tbb/pick-which-country-i-am-exiting/
 #: (content/tbb/tbb-16/contents+en.lrquestion.title)
 msgid "Can I pick which country I'm exiting from?"
-msgstr "Eu posso escolher o país do meu nodo de saída?"
+msgstr "Eu posso escolher o país do nó de saída que estou a utilizar?"
 
 #: http//localhost/tbb/pick-which-country-i-am-exiting/
 #: (content/tbb/tbb-16/contents+en.lrquestion.description)
@@ -719,8 +719,8 @@ msgid ""
 "anonymity."
 msgstr ""
 "Obtém a melhor segurança que o Tor pode oferecer quando permite que o este "
-"efetue a seleção da rota; substituindo os nodos de entrada / saída que 
podem"
-" comprometer o seu anonimato."
+"efetue a seleção da rota; substituindo os nós de entrada / saída que 
podem "
+"comprometer o seu anonimato."
 
 #: http//localhost/tbb/pick-which-country-i-am-exiting/
 #: (content/tbb/tbb-16/contents+en.lrquestion.description)
@@ -746,7 +746,7 @@ msgstr ""
 #: http//localhost/tbb/pick-which-country-i-am-exiting/
 #: (content/tbb/tbb-16/contents+en.lrquestion.seo_slug)
 msgid "pick-which-country-i-am-exiting"
-msgstr "escolher-pais-nodo-saida"
+msgstr "escolher-o-pais-do-retransmissor-de-saida"
 
 #: http//localhost/tbb/run-tor-browser-and-different-browser/
 #: (content/tbb/tbb-17/contents+en.lrquestion.title)
@@ -2893,7 +2893,7 @@ msgstr "Se utilizar pontes poderá resolver este 
problema."
 #: http//localhost/censorship/having-trouble-connecting-to-tor/
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid "# Common log error #4: Clock skew"
-msgstr ""
+msgstr "# Erro comum no registo: #4 Diferença horária"
 
 #: http//localhost/connecting/having-trouble-connecting-to-tor/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -4156,11 +4156,13 @@ msgid ""
 "The same protections that keep bad people from breaking Tor's anonymity also"
 " prevent us from tracking users."
 msgstr ""
+"As mesmas proteções que impedem que as pessoas más quebrem o anonimato do "
+"Tor também impedem que nós rastreemos os utilizadores."
 
 #: http//localhost/misc/tracing-tor-user/
 #: (content/misc/misc-1/contents+en.lrquestion.seo_slug)
 msgid "tracing-tor-user"
-msgstr ""
+msgstr "rastrear-utilizador-tor"
 
 #: http//localhost/misc/does-tor-project-offer-hosting/
 #: (content/misc/misc-10/contents+en.lrquestion.title)
@@ -4175,7 +4177,7 @@ msgstr "Não, o Projeto Tor não oferece serviços de 
hospedagem."
 #: http//localhost/misc/does-tor-project-offer-hosting/
 #: (content/misc/misc-10/contents+en.lrquestion.seo_slug)
 msgid "does-tor-project-offer-hosting"
-msgstr ""
+msgstr "projeto-tor-fornece-alojamento-de-sites"
 
 #: http//localhost/misc/change-the-number-of-hops-tor-uses/
 #: (content/misc/misc-11/contents+en.lrquestion.title)
@@ -4188,6 +4190,8 @@ msgid ""
 "Right now the path length is hard-coded at 3 plus the number of nodes in "
 "your path that are sensitive."
 msgstr ""
+"Neste momento, o comprimento do caminho é codificado com 3 mais o número de 
"
+"nós no seu caminho que sejam sensíveis."
 
 #: http//localhost/misc/change-the-number-of-hops-tor-uses/
 #: (content/misc/misc-11/contents+en.lrquestion.description)
@@ -4195,6 +4199,9 @@ msgid ""
 "That is, in normal cases it's 3, but for example if you're accessing an "
 "onion service or a \".exit\" address it could be more."
 msgstr ""
+"Isto é, em situações normais, esse número é 3 mas, por exemplo, caso 
esteja "
+"acedendo a um serviço onion ou um endereço de \"saída\", este poderá ser "
+"maior."
 
 #: http//localhost/misc/change-the-number-of-hops-tor-uses/
 #: (content/misc/misc-11/contents+en.lrquestion.description)
@@ -4203,6 +4210,9 @@ msgid ""
 "increases load on the network without (as far as we can tell) providing any "
 "more security."
 msgstr ""
+"Nós não queremos encorajar as pessoas a utilizarem caminhos mais longos do "
+"que este, pois isto aumentaria a carga na rede (até onde sabemos) sem "
+"fornecer qualquer melhoria na segurança."
 
 #: http//localhost/misc/change-the-number-of-hops-tor-uses/
 #: (content/misc/misc-11/contents+en.lrquestion.description)
@@ -4213,11 +4223,17 @@ msgid ""
 " identifier if only a small number of users have the same path length as "
 "you."
 msgstr ""
+"Além disso, a utilização de caminhos mais longos do que 3 poderá 
prejudicar "
+"o seu anonimato; em primeiro lugar, porque torna mais fácil os ataques de "
+"https://www.freehaven.net/anonbib/#ccs07-doa\;>negação de "

[tor-commits] [meek/master] Don't wait for handlers to finish after SIGTERM.

2019-01-17 Thread dcf
commit c7541223c704f76cb45a4e20bd20d963ea8d1fc7
Author: David Fifield 
Date:   Wed Jan 16 22:52:51 2019 -0700

Don't wait for handlers to finish after SIGTERM.

The requirement to wait until handlers are finished, as well as the
complicated signal counting logic, was removed from pt-spec.txt in 2014.

https://bugs.torproject.org/26389

Compare

https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=15f83653abbcced9003c96cc14edc5b2f82e0e0e
---
 meek-client/meek-client.go | 27 +++
 meek-server/meek-server.go | 25 ++---
 2 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index 1b13f11..6059947 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -102,10 +102,6 @@ var options struct {
UseHelper bool
 }
 
-// When a connection handler starts, +1 is written to this channel; when it
-// ends, -1 is written.
-var handlerChan = make(chan int)
-
 // RequestInfo encapsulates all the configuration used for a request–response
 // roundtrip, including variables that may come from SOCKS args or from the
 // command line.
@@ -279,11 +275,6 @@ func genSessionID() string {
 
 // Callback for new SOCKS requests.
 func handler(conn *pt.SocksConn) error {
-   handlerChan <- 1
-   defer func() {
-   handlerChan <- -1
-   }()
-
defer conn.Close()
err := conn.Grant({IP: net.IPv4zero, Port: 0})
if err != nil {
@@ -473,8 +464,6 @@ func main() {
}
pt.CmethodsDone()
 
-   var numHandlers int = 0
-   var sig os.Signal
sigChan := make(chan os.Signal, 1)
signal.Notify(sigChan, syscall.SIGTERM)
 
@@ -488,23 +477,13 @@ func main() {
}()
}
 
-   // Keep track of handlers and wait for a signal.
-   sig = nil
-   for sig == nil {
-   select {
-   case n := <-handlerChan:
-   numHandlers += n
-   case sig = <-sigChan:
-   log.Printf("got signal %s", sig)
-   }
-   }
+   // Wait for a signal.
+   sig := <-sigChan
+   log.Printf("got signal %s", sig)
 
for _, ln := range listeners {
ln.Close()
}
-   for numHandlers > 0 {
-   numHandlers += <-handlerChan
-   }
 
log.Printf("done")
 }
diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go
index 4676b47..42aab0a 100644
--- a/meek-server/meek-server.go
+++ b/meek-server/meek-server.go
@@ -70,10 +70,6 @@ const (
 
 var ptInfo pt.ServerInfo
 
-// When a connection handler starts, +1 is written to this channel; when it
-// ends, -1 is written.
-var handlerChan = make(chan int)
-
 func httpBadRequest(w http.ResponseWriter) {
http.Error(w, "Bad request.", http.StatusBadRequest)
 }
@@ -115,11 +111,6 @@ func NewState() *State {
 }
 
 func (state *State) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-   handlerChan <- 1
-   defer func() {
-   handlerChan <- -1
-   }()
-
switch req.Method {
case "GET":
state.Get(w, req)
@@ -494,8 +485,6 @@ func main() {
}
pt.SmethodsDone()
 
-   var numHandlers int = 0
-   var sig os.Signal
sigChan := make(chan os.Signal, 1)
signal.Notify(sigChan, syscall.SIGTERM)
 
@@ -510,15 +499,8 @@ func main() {
}
 
// Keep track of handlers and wait for a signal.
-   sig = nil
-   for sig == nil {
-   select {
-   case n := <-handlerChan:
-   numHandlers += n
-   case sig = <-sigChan:
-   log.Printf("got signal %s", sig)
-   }
-   }
+   sig := <-sigChan
+   log.Printf("got signal %s", sig)
 
/*
// Not supported until go1.8.
@@ -526,9 +508,6 @@ func main() {
server.Close()
}
*/
-   for numHandlers > 0 {
-   numHandlers += <-handlerChan
-   }
 
log.Printf("done")
 }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


  1   2   >