date:20190123

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

2019-01-23 Thread translation

commit 4dc673491e8e6e362746b1d4e8ce6772147d60c0
Author: Translation commit bot 
Date:   Thu Jan 24 05:18:37 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 da/torbutton.properties | 5 +
 1 file changed, 5 insertions(+)

diff --git a/da/torbutton.properties b/da/torbutton.properties
index 573e4e1f9..383044d30 100644
--- a/da/torbutton.properties
+++ b/da/torbutton.properties
@@ -50,6 +50,11 @@ profileReadOnlyMac=Du kan ikke kÃ¸re %S fra et 
skrivebeskyttet filsystem. KopiÃ©
 profileAccessDenied= %S har ikke rettigheder til at bruge profilen. Skift 
venligst rettigheder og prÃ¸v igen.
 profileMigrationFailed=OverfÃ¸rsel af din eksisterende %S profil fejlede.\nNye 
indstillinger vil blive brugt.
 
+# "Downloading update" string for the hamburger menu (see #28885).
+# This string is kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+updateDownloadingPanelUILabel=Downloader %S opdatering
+
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelse krypteret 
(lÃ¸g-tjeneste, %1$S, %2$S-bit nÃ¸gler, %3$S)
 pageInfo_OnionEncryption=Forbindelse krypteret (lÃ¸g-tjeneste)

___
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-23 Thread translation

commit 1d1bba60edf97debdea60c80468f96743c10dfb4
Author: Translation commit bot 
Date:   Thu Jan 24 05:18:28 2019 +

Update translations for torbutton-torbuttonproperties
---
 da/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/da/torbutton.properties b/da/torbutton.properties
index 8f8d71617..383044d30 100644
--- a/da/torbutton.properties
+++ b/da/torbutton.properties
@@ -53,7 +53,7 @@ profileMigrationFailed=OverfÃ¸rsel af din eksisterende %S 
profil fejlede.\nNye i
 # "Downloading update" string for the hamburger menu (see #28885).
 # This string is kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Downloading %S update
+updateDownloadingPanelUILabel=Downloader %S opdatering
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelse krypteret 
(lÃ¸g-tjeneste, %1$S, %2$S-bit nÃ¸gler, %3$S)

___
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-23 Thread translation

commit 77a7142830fb799ecb07af99cf85372969230d01
Author: Translation commit bot 
Date:   Wed Jan 23 23:48:07 2019 +

Update translations for torbutton-torbuttonproperties
---
 pt_BR/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties
index e1ac07b12..df17228b1 100644
--- a/pt_BR/torbutton.properties
+++ b/pt_BR/torbutton.properties
@@ -53,7 +53,7 @@ profileMigrationFailed=MigraÃ§Ã£o de seu perfil  %S existente 
falhou.\nNovas con
 # "Downloading update" string for the hamburger menu (see #28885).
 # This string is kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Downloading %S update
+updateDownloadingPanelUILabel=Baixando a atualizaÃ§Ã£o %S
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=ConexÃ£o criptografada (ServiÃ§o 
Onion, %1$S, %2$S bit keys, %3$S)

___
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-23 Thread translation

commit 7fee5f98fb8e87c566d7803cc8187c7f93504807
Author: Translation commit bot 
Date:   Wed Jan 23 23:48:13 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 pt_BR/torbutton.properties | 5 +
 1 file changed, 5 insertions(+)

diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties
index 69885807b..df17228b1 100644
--- a/pt_BR/torbutton.properties
+++ b/pt_BR/torbutton.properties
@@ -50,6 +50,11 @@ profileReadOnlyMac=NÃ£o Ã© possÃvel executar %S a partir de 
um sistema de arqui
 profileAccessDenied=%S nÃ£o possui permissÃ£o para acessar o perfil. Por 
favor, ajuste as suas permissÃµes de arquivo de sistema e tente novamente. 
 profileMigrationFailed=MigraÃ§Ã£o de seu perfil  %S existente falhou.\nNovas 
configuraÃ§Ãµes serÃ£o usadas.
 
+# "Downloading update" string for the hamburger menu (see #28885).
+# This string is kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+updateDownloadingPanelUILabel=Baixando a atualizaÃ§Ã£o %S
+
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=ConexÃ£o criptografada (ServiÃ§o 
Onion, %1$S, %2$S bit keys, %3$S)
 pageInfo_OnionEncryption=ConexÃ£o criptografada (ServiÃ§o Onion)

___
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-23 Thread translation

commit ac9bc5a0266e79780c1c63446866ba363ce775a5
Author: Translation commit bot 
Date:   Wed Jan 23 23:47:10 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt-BR.po | 38 --
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index a053c570f..ef8dd8f98 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -5,7 +5,7 @@
 # Eduardo Addad de Oliveira , 2018
 # erinm, 2018
 # Emma Peel, 2018
-# Chacal Exodius, 2018
+# Chacal Exodius, 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-23 12:08+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Chacal Exodius, 2018\n"
+"Last-Translator: Chacal Exodius, 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -691,6 +691,11 @@ msgid ""
 "Web Services; meek-azure makes it look like you are using a Microsoft web "
 "site; and meek-google makes it look like you are using Google search."
 msgstr ""
+"Todos os transportes mansos fazem parecer que vocÃª estÃ¡ navegando em um "
+"grande site, em vez de usar o Tor. meek-amazon faz parecer que vocÃª estÃ¡ "
+"usando o Amazon Web Services; meek-azure faz parecer que vocÃª estÃ¡ usando 
um"
+" site da Microsoft; e meek-google faz parecer que vocÃª estÃ¡ usando a "
+"pesquisa do Google."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -719,7 +724,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid "# How to use pluggable transports"
-msgstr ""
+msgstr "# Como usar transportes plugÃ¡veis"
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -727,11 +732,14 @@ msgid ""
 "To use a pluggable transport, first click the onion icon to the left of the "
 "URL bar, or click 'Configure' when starting Tor Browser for the first time."
 msgstr ""
+"Para usar um transporte conectÃ¡vel, primeiro clique no Ãcone de cebola Ã  "
+"esquerda da barra de URL ou clique em 'Configurar' ao iniciar o Navegador "
+"Tor pela primeira vez."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid "Next, select 'Tor Network Settings' from the drop-down menu."
-msgstr ""
+msgstr "Em seguida, selecione 'Tor Network Settings' no menu suspenso."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -739,13 +747,15 @@ msgid ""
 "In the window that appears, check 'Tor is censored in my country,' then "
 "click 'Select a built-in bridge.'"
 msgstr ""
+"Na janela que aparece, marque 'Tor Ã© censurado em meu paÃs' e clique em "
+"'Selecionar uma ponte incorporada'."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid ""
 "From the drop-down menu, select whichever pluggable transport you'd like to "
 "use."
-msgstr ""
+msgstr "No menu suspenso, selecione o transporte que vocÃª deseja usar."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -753,6 +763,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -760,6 +772,8 @@ msgid ""
 "Once you've selected the pluggable transport you'd like to use, click 'OK' "
 "to save your settings."
 msgstr ""
+"Depois de selecionar o transporte conectÃ¡vel que vocÃª deseja usar, clique 
em"
+" \"OK\" para salvar suas configuraÃ§Ãµes."
 
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.title)
@@ -793,6 +807,8 @@ msgstr ""
 msgid ""
 "Tor Browser currently has four pluggable transport options to choose from."
 msgstr ""
+"O Navegador Tor tem atualmente quatro opÃ§Ãµes de transporte conectÃ¡veis 
para "
+"escolher."
 
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
@@ -805,6 +821,8 @@ msgid ""
 "To use pluggable transports, click 'Configure' in the Tor Launcher window "
 "that appears when you first run Tor Browser."
 msgstr ""
+"Para usar transportes conectÃ¡veis, clique em 'Configurar' na janela do Tor "
+"Launcher que aparece quando vocÃª executa o Navegador Tor pela primeira vez."
 
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
@@ -813,6 +831,9 @@ msgid ""
 "clicking on the onion icon to the left of the address bar, then selecting "
 "'Tor Network Settings'."
 msgstr ""
+"VocÃª tambÃ©m pode configurar transportes conectÃ¡veis enquanto o Navegador 
Tor"
+" estiver em execuÃ§Ã£o clicando no Ãcone de

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

2019-01-23 Thread translation

commit d99dc3527cca7bde2caff57b5a057f2ef844adde
Author: Translation commit bot 
Date:   Wed Jan 23 23:47:16 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+pt-BR.po | 38 --
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index a053c570f..ef8dd8f98 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -5,7 +5,7 @@
 # Eduardo Addad de Oliveira , 2018
 # erinm, 2018
 # Emma Peel, 2018
-# Chacal Exodius, 2018
+# Chacal Exodius, 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-23 12:08+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Chacal Exodius, 2018\n"
+"Last-Translator: Chacal Exodius, 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -691,6 +691,11 @@ msgid ""
 "Web Services; meek-azure makes it look like you are using a Microsoft web "
 "site; and meek-google makes it look like you are using Google search."
 msgstr ""
+"Todos os transportes mansos fazem parecer que vocÃª estÃ¡ navegando em um "
+"grande site, em vez de usar o Tor. meek-amazon faz parecer que vocÃª estÃ¡ "
+"usando o Amazon Web Services; meek-azure faz parecer que vocÃª estÃ¡ usando 
um"
+" site da Microsoft; e meek-google faz parecer que vocÃª estÃ¡ usando a "
+"pesquisa do Google."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -719,7 +724,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid "# How to use pluggable transports"
-msgstr ""
+msgstr "# Como usar transportes plugÃ¡veis"
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -727,11 +732,14 @@ msgid ""
 "To use a pluggable transport, first click the onion icon to the left of the "
 "URL bar, or click 'Configure' when starting Tor Browser for the first time."
 msgstr ""
+"Para usar um transporte conectÃ¡vel, primeiro clique no Ãcone de cebola Ã  "
+"esquerda da barra de URL ou clique em 'Configurar' ao iniciar o Navegador "
+"Tor pela primeira vez."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid "Next, select 'Tor Network Settings' from the drop-down menu."
-msgstr ""
+msgstr "Em seguida, selecione 'Tor Network Settings' no menu suspenso."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -739,13 +747,15 @@ msgid ""
 "In the window that appears, check 'Tor is censored in my country,' then "
 "click 'Select a built-in bridge.'"
 msgstr ""
+"Na janela que aparece, marque 'Tor Ã© censurado em meu paÃs' e clique em "
+"'Selecionar uma ponte incorporada'."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
 msgid ""
 "From the drop-down menu, select whichever pluggable transport you'd like to "
 "use."
-msgstr ""
+msgstr "No menu suspenso, selecione o transporte que vocÃª deseja usar."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -753,6 +763,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.body)
@@ -760,6 +772,8 @@ msgid ""
 "Once you've selected the pluggable transport you'd like to use, click 'OK' "
 "to save your settings."
 msgstr ""
+"Depois de selecionar o transporte conectÃ¡vel que vocÃª deseja usar, clique 
em"
+" \"OK\" para salvar suas configuraÃ§Ãµes."
 
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.title)
@@ -793,6 +807,8 @@ msgstr ""
 msgid ""
 "Tor Browser currently has four pluggable transport options to choose from."
 msgstr ""
+"O Navegador Tor tem atualmente quatro opÃ§Ãµes de transporte conectÃ¡veis 
para "
+"escolher."
 
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
@@ -805,6 +821,8 @@ msgid ""
 "To use pluggable transports, click 'Configure' in the Tor Launcher window "
 "that appears when you first run Tor Browser."
 msgstr ""
+"Para usar transportes conectÃ¡veis, clique em 'Configurar' na janela do Tor "
+"Launcher que aparece quando vocÃª executa o Navegador Tor pela primeira vez."
 
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
@@ -813,6 +831,9 @@ msgid ""
 "clicking on the onion icon to the left of the address bar, then selecting "
 "'Tor Network Settings'."
 msgstr ""
+"VocÃª tambÃ©m pode configurar transportes conectÃ¡veis enquanto o Navegador 
Tor"
+" estiver em execuÃ§Ã£o clicando no

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

2019-01-23 Thread translation

commit f87eb9c0bf71cf3f968a8dcf877a8c859c84fa6e
Author: Translation commit bot 
Date:   Wed Jan 23 22:49:40 2019 +

Update translations for whisperback
---
 ru/ru.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/ru.po b/ru/ru.po
index 5d0017952..32d4ebd3e 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2019-01-23 19:03+\n"
+"PO-Revision-Date: 2019-01-23 22:39+\n"
 "Last-Translator: Sergey Smirnov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"

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

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

2019-01-23 Thread translation

commit 133fa171f6a11973fffeb63f8aa52625e63490ba
Author: Translation commit bot 
Date:   Wed Jan 23 22:49:46 2019 +

Update translations for whisperback_completed
---
 ru/ru.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/ru.po b/ru/ru.po
index 5d0017952..32d4ebd3e 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2019-01-23 19:03+\n"
+"PO-Revision-Date: 2019-01-23 22:39+\n"
 "Last-Translator: Sergey Smirnov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [stem/master] Catch ORPort socket timeouts

2019-01-23 Thread atagar

commit 2e86567b0cbcae03ddf1bec335808cd51329c961
Author: Damian Johnson 
Date:   Wed Jan 23 11:50:49 2019 -0800

Catch ORPort socket timeouts

Oops. I added a timeout attribute but completely forgot to catch the 
resulting
exceptions. Caught thanks to starlight...

  https://trac.torproject.org/projects/tor/ticket/28961

  Traceback (most recent call last):
File "../download_descriptor.py", line 133, in 
  main()
File "../download_descriptor.py", line 115, in main
  endpoints = [args.download_from],
File 
"/usr/local/lib/python3.7/site-packages/stem/descriptor/remote.py", line 485, 
in run
  return list(self._run(suppress))
File 
"/usr/local/lib/python3.7/site-packages/stem/descriptor/remote.py", line 496, 
in _run
  raise self.error
File 
"/usr/local/lib/python3.7/site-packages/stem/descriptor/remote.py", line 561, 
in _download_descriptors
  self.content, self.reply_headers = _download_from_orport(endpoint, 
self.compression, self.resource)
File 
"/usr/local/lib/python3.7/site-packages/stem/descriptor/remote.py", line 962, 
in _download_from_orport
  with relay.create_circuit() as circ:
File "/usr/local/lib/python3.7/site-packages/stem/client/__init__.py", 
line 207, in create_circuit
  for cell in self._msg(create_fast_cell):
File "/usr/local/lib/python3.7/site-packages/stem/client/__init__.py", 
line 160, in _msg
  response = self._orport.recv(timeout = 1)
File "/usr/local/lib/python3.7/site-packages/stem/socket.py", line 416, 
in recv
  return self._recv(wrapped_recv)
File "/usr/local/lib/python3.7/site-packages/stem/socket.py", line 274, 
in _recv
  return handler(my_socket, my_socket_file)
File "/usr/local/lib/python3.7/site-packages/stem/socket.py", line 410, 
in wrapped_recv
  return s.recv()
File "/usr/local/lib/python3.7/ssl.py", line 1037, in recv
  return self.read(buflen)
File "/usr/local/lib/python3.7/ssl.py", line 913, in read
  return self._sslobj.read(len)
  socket.timeout: The read operation timed out

Through experimentation I also managed to get the following too...

  Traceback (most recent call last):
File "download_descriptor.py", line 131, in 
  main()
File "download_descriptor.py", line 113, in main
  endpoints = [args.download_from],
File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 485, 
in run
  return list(self._run(suppress))
File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 496, 
in _run
  raise self.error
  ssl.SSLError: ('The read operation timed out',)

Unfortunately since this is an SSL socket (rather than a standard one) 
receive
calls are liable to raise exceptions from both modules making this a bit of 
a
whack-a-mole game (socket's docs are particularly bad about describing the
array of exceptions that might get raised).
---
 stem/socket.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stem/socket.py b/stem/socket.py
index 9290d6c6..80d29b83 100644
--- a/stem/socket.py
+++ b/stem/socket.py
@@ -408,7 +408,7 @@ class RelaySocket(BaseSocket):
 
 try:
   return s.recv()
-except ssl.SSLWantReadError:
+except (socket.timeout, ssl.SSLError, ssl.SSLWantReadError):
   return None
 finally:
   s.setblocking(1)

___
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-23 Thread translation

commit 4cfb2db2c33407d1d541b848fa2546a51b2c0ffc
Author: Translation commit bot 
Date:   Wed Jan 23 20:18:50 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 es_AR/torbutton.properties | 5 +
 1 file changed, 5 insertions(+)

diff --git a/es_AR/torbutton.properties b/es_AR/torbutton.properties
index 181160ffe..0b1364bbb 100644
--- a/es_AR/torbutton.properties
+++ b/es_AR/torbutton.properties
@@ -50,6 +50,11 @@ profileReadOnlyMac=No podÃ©s correr %S desde un sistema de 
archivos de sÃ³lo lec
 profileAccessDenied=%S no tiene permiso para acceder al perfil. Por favor 
ajustÃ¡ los permisos de tu sistema de archivos y tratÃ¡ de nuevo.
 profileMigrationFailed=La migraciÃ³n de tu perfil existente de %S 
fallÃ³.\nSerÃ¡n usados nuevos ajustes.
 
+# "Downloading update" string for the hamburger menu (see #28885).
+# This string is kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+updateDownloadingPanelUILabel=Descargando %S actualizaciÃ³n
+
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=ConexiÃ³n encriptada (Servicio 
Onion, %1$S, claves de %2$S bits, %3$S)
 pageInfo_OnionEncryption=ConexiÃ³n encriptada (Servicio Onion)

___
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-23 Thread translation

commit c96d28cf40e738dce1df89c104e7e12cc6ebcbde
Author: Translation commit bot 
Date:   Wed Jan 23 20:18:43 2019 +

Update translations for torbutton-torbuttonproperties
---
 es_AR/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es_AR/torbutton.properties b/es_AR/torbutton.properties
index 397aa7dd1..0b1364bbb 100644
--- a/es_AR/torbutton.properties
+++ b/es_AR/torbutton.properties
@@ -53,7 +53,7 @@ profileMigrationFailed=La migraciÃ³n de tu perfil existente 
de %S fallÃ³.\nSerÃ¡
 # "Downloading update" string for the hamburger menu (see #28885).
 # This string is kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Downloading %S update
+updateDownloadingPanelUILabel=Descargando %S actualizaciÃ³n
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=ConexiÃ³n encriptada (Servicio 
Onion, %1$S, claves de %2$S bits, %3$S)

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

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

2019-01-23 Thread translation

commit 45dd0cfed20892aff094e4394a35557ed8865efd
Author: Translation commit bot 
Date:   Wed Jan 23 20:17:48 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+es-AR.po | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 0daa7857f..5d975c8ba 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -2,7 +2,7 @@
 # sbosio , 2018
 # Emma Peel, 2018
 # erinm, 2018
-# Zuhualime Akoochimoya, 2018
+# Zuhualime Akoochimoya, 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-23 12:08+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Zuhualime Akoochimoya, 2018\n"
+"Last-Translator: Zuhualime Akoochimoya, 2019\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -687,6 +687,11 @@ msgid ""
 "Web Services; meek-azure makes it look like you are using a Microsoft web "
 "site; and meek-google makes it look like you are using Google search."
 msgstr ""
+"Todos los transportes meek hacen que parezca que estÃ¡s usando un sitio web "
+"de envergadura en vez de Tor. meek-amazon hace parecer que estÃ¡s usando "
+"Servicios Web Amazon; meek-azure hace parecer que estÃ¡s usando un sitio web "
+"de Microsoft y meek-google hace parecer que estÃ¡s usando la bÃºsqueda de "
+"Google."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/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/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-23 Thread translation

commit 477375292aea3db7a6a1d8ab6751d0dc060aa46c
Author: Translation commit bot 
Date:   Wed Jan 23 20:17:41 2019 +

Update translations for tbmanual-contentspot
---
 contents+es-AR.po | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 0daa7857f..5d975c8ba 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -2,7 +2,7 @@
 # sbosio , 2018
 # Emma Peel, 2018
 # erinm, 2018
-# Zuhualime Akoochimoya, 2018
+# Zuhualime Akoochimoya, 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-23 12:08+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Zuhualime Akoochimoya, 2018\n"
+"Last-Translator: Zuhualime Akoochimoya, 2019\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -687,6 +687,11 @@ msgid ""
 "Web Services; meek-azure makes it look like you are using a Microsoft web "
 "site; and meek-google makes it look like you are using Google search."
 msgstr ""
+"Todos los transportes meek hacen que parezca que estÃ¡s usando un sitio web "
+"de envergadura en vez de Tor. meek-amazon hace parecer que estÃ¡s usando "
+"Servicios Web Amazon; meek-azure hace parecer que estÃ¡s usando un sitio web "
+"de Microsoft y meek-google hace parecer que estÃ¡s usando la bÃºsqueda de "
+"Google."
 
 #: https//tb-manual.torproject.org/en-US/transports/
 #: (content/transports/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-23 Thread translation

commit dff751a9db0811c7d02c834355442a17f014cb0f
Author: Translation commit bot 
Date:   Wed Jan 23 20:16:17 2019 +

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

diff --git a/es_AR.po b/es_AR.po
index 64eb6a875..9b232c479 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -14,8 +14,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-23 19:52+\n"
+"Last-Translator: Zuhualime Akoochimoya\n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -119,7 +119,7 @@ msgstr "Mantener 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Ã¡ deshabilitado. Por favor use sudo en vez."
 
 #: 
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-23 Thread translation

commit 03189c9bb9ee1f52ebe47237b3ac0e933ae1e6ac
Author: Translation commit bot 
Date:   Wed Jan 23 20:16:23 2019 +

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

diff --git a/es_AR.po b/es_AR.po
index 74c7a4400..9b232c479 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -13,8 +13,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-16 22:21+\n"
+"POT-Creation-Date: 2019-01-14 21:20+0100\n"
+"PO-Revision-Date: 2019-01-23 19:52+\n"
 "Last-Translator: Zuhualime Akoochimoya\n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -117,6 +117,10 @@ msgstr "Renombrar"
 msgid "Keep current name"
 msgstr "Mantener 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Ã¡ deshabilitado. Por favor use sudo en vez."
+
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "Reiniciar"
@@ -263,7 +267,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"
@@ -407,23 +411,23 @@ msgid ""
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "FalsificaciÃ³n de MAC para placa de red ${nic_name} (${nic}) fallÃ³. 
La recuperaciÃ³n de error tambiÃ©n fallÃ³, por lo que las funciones de red 
estÃ¡n deshabilitadas.\nQuizÃ¡s prefieras reiniciar Tails y deshabilitar esta 
funciÃ³n."
 
-#: 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 "Bloqueador 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 "DefinÃ 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/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2019-01-23 Thread translation

commit 48096b010a436f5b504c83287ce177693da457a3
Author: Translation commit bot 
Date:   Wed Jan 23 19:48:16 2019 +

Update translations for torbutton-torbuttonproperties
---
 lt/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lt/torbutton.properties b/lt/torbutton.properties
index 1be1a6127..f59adf372 100644
--- a/lt/torbutton.properties
+++ b/lt/torbutton.properties
@@ -45,7 +45,7 @@ canvas.neverAccessKey=e
 # Profile/startup error messages. Strings are kept here for ease of 
translation.
 # LOCALIZATION NOTE: %S is the application name.
 profileProblemTitle=%S profilio problema
-profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
+profileReadOnly=Negalite paleisti %S iÅ¡ tik skaitymui skirtos failÅ³ 
sistemos.  PrieÅ¡ norÄdami ja naudotis, nukopijuokite %S Ä¯ kitÄ vietÄ.
 profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
 profileAccessDenied=%S neturi leidimo prieigai prie profilio. PraÅ¡ome 
suderinti savo failÅ³ sistemos leidimus ir bandyti dar kartÄ.
 profileMigrationFailed=JÅ«sÅ³ esamo %S profilio perkÄlimas nepavyko.\nBus 
naudojami nauji nustatymai.

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

[tor-commits] [stem/master] Reject duplicate bandwidth file entries

2019-01-23 Thread atagar

commit a26c7c4d871e184cc9988b7b86d41d7c15b4e3d9
Author: Damian Johnson 
Date:   Wed Jan 23 11:40:17 2019 -0800

Reject duplicate bandwidth file entries

Teor adjusted the bandwidth file spec so it is now at the discretion of 
parsers
for how we behave when bandwidth files list a relay multiple times. My other
descriptor parsers bias toward strictness so doing so here too. Doing so 
will
hopefully help uncover if we ever get sbws regressions, and we can always
adjust this back to something looser later.
---
 stem/descriptor/bandwidth_file.py | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/stem/descriptor/bandwidth_file.py 
b/stem/descriptor/bandwidth_file.py
index dfe8377b..4601ad18 100644
--- a/stem/descriptor/bandwidth_file.py
+++ b/stem/descriptor/bandwidth_file.py
@@ -154,17 +154,13 @@ def _parse_body(descriptor, entries):
   for line in content.readlines():
 line = stem.util.str_tools._to_unicode(line.strip())
 attr = dict(_mappings_for('measurement', line))
+fingerprint = attr.get('node_id', '').lstrip('$')  # bwauths prefix 
fingerprints with '$'
 
-if 'node_id' not in attr:
+if not fingerprint:
   raise ValueError("Every meaurement must include 'node_id': %s" % line)
-elif attr['node_id'] in measurements:
-  # Relay is listed multiple times. This is a bug for the bandwidth
-  # authority that made this descriptor, but according to the spec
-  # should be ignored by parsers.
+elif fingerprint in measurements:
+  raise ValueError('Relay %s is listed multiple times. It should only be 
present once.' % fingerprint)
 
-  continue
-
-fingerprint = attr['node_id'].lstrip('$')  # bwauths prefix fingerprints 
with '$'
 measurements[fingerprint] = attr
 
   descriptor.measurements = measurements

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

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

2019-01-23 Thread translation

commit 61132d0ae234c3fd6c5375281b0aeeda112ab546
Author: Translation commit bot 
Date:   Wed Jan 23 19:19:42 2019 +

Update translations for whisperback_completed
---
 ru/ru.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/ru.po b/ru/ru.po
index 386a1f0c8..5d0017952 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2019-01-23 18:23+\n"
+"PO-Revision-Date: 2019-01-23 19:03+\n"
 "Last-Translator: Sergey Smirnov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"

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

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

2019-01-23 Thread translation

commit 65e1b848ea930669585c093be0a1933245c128af
Author: Translation commit bot 
Date:   Wed Jan 23 19:19:37 2019 +

Update translations for whisperback
---
 ru/ru.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/ru.po b/ru/ru.po
index 386a1f0c8..5d0017952 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2019-01-23 18:23+\n"
+"PO-Revision-Date: 2019-01-23 19:03+\n"
 "Last-Translator: Sergey Smirnov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2019-01-23 Thread translation

commit 79fe42d371288c265609ea1057e637e4345409da
Author: Translation commit bot 
Date:   Wed Jan 23 19:16:43 2019 +

Update translations for tails-openpgp-applet
---
 ar/openpgp-applet.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/openpgp-applet.pot b/ar/openpgp-applet.pot
index 77d94e25f..958906663 100644
--- a/ar/openpgp-applet.pot
+++ b/ar/openpgp-applet.pot
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2019-01-15 12:27+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-01-23 18:52+\n"
+"Last-Translator: ButterflyOfFire ButterflyOfFire\n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2019-01-23 Thread translation

commit c28287b9a771c4e9f16e3bf73080307ab4e26f7b
Author: Translation commit bot 
Date:   Wed Jan 23 19:16:48 2019 +

Update translations for tails-openpgp-applet_completed
---
 ar/openpgp-applet.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/openpgp-applet.pot b/ar/openpgp-applet.pot
index 77d94e25f..958906663 100644
--- a/ar/openpgp-applet.pot
+++ b/ar/openpgp-applet.pot
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2019-01-15 12:27+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-01-23 18:52+\n"
+"Last-Translator: ButterflyOfFire ButterflyOfFire\n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-01-23 Thread translation

commit ff2ca812c71215c87464c498c83a89e6b8e818fc
Author: Translation commit bot 
Date:   Wed Jan 23 18:50:27 2019 +

Update translations for whisperback_completed
---
 ru/ru.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/ru.po b/ru/ru.po
index b7983a251..386a1f0c8 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2019-01-22 21:42+\n"
+"PO-Revision-Date: 2019-01-23 18:23+\n"
 "Last-Translator: Sergey Smirnov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"

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

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

2019-01-23 Thread translation

commit cb4a732f5c540f6c251407d7f127472abff53a0c
Author: Translation commit bot 
Date:   Wed Jan 23 18:50:20 2019 +

Update translations for whisperback
---
 ru/ru.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/ru.po b/ru/ru.po
index b7983a251..386a1f0c8 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2019-01-22 21:42+\n"
+"PO-Revision-Date: 2019-01-23 18:23+\n"
 "Last-Translator: Sergey Smirnov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-23 Thread translation

commit 460a64e4150029c09ea7e5465bea4ded48c92f0e
Author: Translation commit bot 
Date:   Wed Jan 23 18:15:28 2019 +

Update translations for donatepages-messagespot
---
 locale/nb/LC_MESSAGES/messages.po | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/locale/nb/LC_MESSAGES/messages.po 
b/locale/nb/LC_MESSAGES/messages.po
index c1167c7d5..a5464bdae 100644
--- a/locale/nb/LC_MESSAGES/messages.po
+++ b/locale/nb/LC_MESSAGES/messages.po
@@ -793,7 +793,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:121
 msgid "What kinds of people support Tor?"
-msgstr ""
+msgstr "Hvilke typer mennesker stÃ¸tter Tor?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:125
 msgid "All kinds of people."
@@ -881,6 +881,8 @@ msgid ""
 "We know that both the Russian government and the NSA have tried in the past "
 "to crack Tor, and failed."
 msgstr ""
+"Vi vet at bÃ¥de den russiske regjeringen og NSA har forsÃ¸kt tidligere Ã¥ "
+"knekke Tor, og mislyktes."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:172
 msgid ""
@@ -1034,11 +1036,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:264
 msgid "If I am not in the United States, can I still donate?"
-msgstr ""
+msgstr "Hvis jeg ikke er i USA, kan jeg fortsatt donere?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:268
 msgid "Yes, definitely."
-msgstr ""
+msgstr "Ja, definitivt."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:270
 msgid ""

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

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

2019-01-23 Thread translation

commit 990b976caba34cc77a6dd48cba031aa54757c24a
Author: Translation commit bot 
Date:   Wed Jan 23 17:50:01 2019 +

Update translations for torbutton-browseronboardingproperties
---
 nb/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/browserOnboarding.properties b/nb/browserOnboarding.properties
index 3e923fdfd..f37c87b0d 100644
--- a/nb/browserOnboarding.properties
+++ b/nb/browserOnboarding.properties
@@ -9,7 +9,7 @@ onboarding.tour-tor-welcome.button=Start nÃ¥
 
 onboarding.tour-tor-privacy=Personvern
 onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and 
deletes your browser history after your session. These modifications ensure 
your privacy and security are protected in the browser. Click âTor Networkâ 
to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.description=Tor Browser isolerer 
informasjonskapsler og sletter nettleserens historie etter Ã¸kten. Disse 
endringene sikrer at personvernet ditt og sikkerheten er beskyttet i 
nettleseren. Klikk "Tor Nettverk" for Ã¥ lÃ¦re hvordan vi beskytter deg pÃ¥ 
nettverksnivÃ¥.
 onboarding.tour-tor-privacy.button=GÃ¥ til Tor Nettverk
 
 onboarding.tour-tor-network=Tor Nettverk

___
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-23 Thread translation

commit 93c5c121c6d3674dcd74e9f5aeba8d94cc1a6bcb
Author: Translation commit bot 
Date:   Wed Jan 23 17:48:08 2019 +

Update translations for tba-torbrowserstringsdtd_completed
---
 nb/android_strings.dtd | 25 +
 1 file changed, 25 insertions(+)

diff --git a/nb/android_strings.dtd b/nb/android_strings.dtd
new file mode 100644
index 0..50ff65af5
--- /dev/null
+++ b/nb/android_strings.dtd
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2019-01-23 Thread translation

commit d0388c9aae2ed0ba8e31e1dc5939e8e16577f5a1
Author: Translation commit bot 
Date:   Wed Jan 23 17:47:14 2019 +

Update translations for tails-greeter-2
---
 pt_PT/pt_PT.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po
index b786bab54..657ffeb08 100644
--- a/pt_PT/pt_PT.po
+++ b/pt_PT/pt_PT.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-04 09:46+0200\n"
+"POT-Creation-Date: 2019-01-16 11:27+0100\n"
 "PO-Revision-Date: 2016-11-18 21:29+\n"
 "Last-Translator: Rui , 2019\n"
 "Language-Team: Portuguese (Portugal) 
(https://www.transifex.com/otf/teams/1519/pt_PT/)\n"

___
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-23 Thread translation

commit 4bee6e4d5af15811f15d0a2ca6efa54999770b11
Author: Translation commit bot 
Date:   Wed Jan 23 17:48:03 2019 +

Update translations for tba-torbrowserstringsdtd
---
 nb/android_strings.dtd | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nb/android_strings.dtd b/nb/android_strings.dtd
index 2e09b3174..50ff65af5 100644
--- a/nb/android_strings.dtd
+++ b/nb/android_strings.dtd
@@ -1,25 +1,25 @@
 
 
-
-
-
+
+
+
 
 
-
+
 
 
 
-
+
 
 
 
-
+
 
 
-
-
+
+
 
-
-
-
-
+
+
+
+

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2019-01-23 Thread translation

commit bafcb0a7966837d51c15f02be2d1af9f308936fb
Author: Translation commit bot 
Date:   Wed Jan 23 17:47:28 2019 +

Update translations for tails-openpgp-applet
---
 pt_PT/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_PT/openpgp-applet.pot b/pt_PT/openpgp-applet.pot
index b2af63b2a..df4fb1811 100644
--- a/pt_PT/openpgp-applet.pot
+++ b/pt_PT/openpgp-applet.pot
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2019-01-14 15:14+\n"
+"PO-Revision-Date: 2019-01-23 17:22+\n"
 "Last-Translator: Rui \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed

2019-01-23 Thread translation

commit 24aa918e674cc43160d524132fd90947e5d7b29b
Author: Translation commit bot 
Date:   Wed Jan 23 17:47:21 2019 +

Update translations for tails-greeter-2_completed
---
 pt_PT/pt_PT.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po
index b786bab54..657ffeb08 100644
--- a/pt_PT/pt_PT.po
+++ b/pt_PT/pt_PT.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-04 09:46+0200\n"
+"POT-Creation-Date: 2019-01-16 11:27+0100\n"
 "PO-Revision-Date: 2016-11-18 21:29+\n"
 "Last-Translator: Rui , 2019\n"
 "Language-Team: Portuguese (Portugal) 
(https://www.transifex.com/otf/teams/1519/pt_PT/)\n"

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

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2019-01-23 Thread translation

commit 63643f3bfd3230cc508564c53342615b6af668a3
Author: Translation commit bot 
Date:   Wed Jan 23 17:47:35 2019 +

Update translations for tails-openpgp-applet_completed
---
 pt_PT/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_PT/openpgp-applet.pot b/pt_PT/openpgp-applet.pot
index b2af63b2a..df4fb1811 100644
--- a/pt_PT/openpgp-applet.pot
+++ b/pt_PT/openpgp-applet.pot
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2019-01-14 15:14+\n"
+"PO-Revision-Date: 2019-01-23 17:22+\n"
 "Last-Translator: Rui \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-23 Thread translation

commit aa236f367ef268b8d8322fb4fece778d39371953
Author: Translation commit bot 
Date:   Wed Jan 23 17:45:29 2019 +

Update translations for donatepages-messagespot
---
 locale/nb/LC_MESSAGES/messages.po | 50 ---
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/locale/nb/LC_MESSAGES/messages.po 
b/locale/nb/LC_MESSAGES/messages.po
index 31a73b710..c1167c7d5 100644
--- a/locale/nb/LC_MESSAGES/messages.po
+++ b/locale/nb/LC_MESSAGES/messages.po
@@ -1,10 +1,11 @@
 # Translators:
 # Allan NordhÃ¸y , 2018
 # erinm, 2018
+# Tom Larsen , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: erinm, 2018\n"
+"Last-Translator: Tom Larsen , 2019\n"
 "Language-Team: Norwegian BokmÃ¥l 
(https://www.transifex.com/otf/teams/1519/nb/)\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -170,7 +171,7 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:67
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:67
 msgid "@torproject"
-msgstr ""
+msgstr "@torproject"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:102
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:102
@@ -195,7 +196,7 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:143
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:143
 msgid "Total Donated"
-msgstr ""
+msgstr "Totalt Donert"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:159
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:159
@@ -212,12 +213,12 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:172
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:172
 msgid "once"
-msgstr ""
+msgstr "en gang"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:178
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:178
 msgid "monthly"
-msgstr ""
+msgstr "mÃ¥nedlig"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:185
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:345
@@ -229,12 +230,12 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:201
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:201
 msgid "invalid amount"
-msgstr ""
+msgstr "ugyldig belÃ¸p"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:205
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:205
 msgid "$2 minimum donation"
-msgstr ""
+msgstr "$2 minimum donasjon"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:209
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:209
@@ -276,7 +277,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:259
 msgid "$15"
-msgstr ""
+msgstr "$15"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:261
 msgid "OFF"
@@ -333,27 +334,27 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:336
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:330
 msgid "Credit Card"
-msgstr ""
+msgstr "Kredittkort"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:352
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:346
 msgid "Your Info"
-msgstr ""
+msgstr "Din info"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:356
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:350
 msgid "* required fields"
-msgstr ""
+msgstr "* Obligatoriske felt"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:361
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:355
 msgid "First Name"
-msgstr ""
+msgstr "Fornavn"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:365
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:359
 msgid "Last Name"
-msgstr ""
+msgstr "Etternavn"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:371
 #:

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2019-01-23 Thread translation

commit e3baa3a869c0ba66e2c1af3ff7a0ee6957a1e3ef
Author: Translation commit bot 
Date:   Wed Jan 23 17:16:05 2019 +

Update translations for liveusb-creator
---
 nb/nb.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nb/nb.po b/nb/nb.po
index 5f7fa1efa..13f16cdf2 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -6,16 +6,17 @@
 # Allan NordhÃ¸y , 2014
 # Allan NordhÃ¸y , 2015-2018
 # John Henningsen , 2015
-# lateralus, 2013-2014
+# 81149148127a5edca7d06dcbfba79969, 2013-2014
 # trash , 2013
+# Tom Larsen , 2019
 # 9d7045af8ca83a89b1b4bf48a2c67786, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-02 09:26+0100\n"
-"PO-Revision-Date: 2019-01-02 13:32+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-23 17:03+\n"
+"Last-Translator: Tom Larsen \n"
 "Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -313,13 +314,13 @@ msgstr "Tails-installasjonskandidat"
 
 #: ../tails_installer/gui.py:441
 msgid "Tails Installer is deprecated"
-msgstr ""
+msgstr "Tails Installer er foreldet"
 
 #: ../tails_installer/gui.py:443
 msgid ""
 "To install a new Tails, see the installation documentation.\n"
 "To upgrade an existing Tails, see the upgrade documentation."
-msgstr ""
+msgstr "For Ã¥ installere en ny Tails, se installasjonsdokumentasjonen.\nFor 
Ã¥ oppgradere eksisterende Tails, se oppgraderingsdokumentasjonen."
 
 #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2
 msgid "Clone the current Tails"

___
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-23 Thread translation

commit 506beb6a88e1c9c50e31a7520e441d2041ba6997
Author: Translation commit bot 
Date:   Wed Jan 23 17:19:00 2019 +

Update translations for torbutton-torbuttonproperties
---
 nb/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/torbutton.properties b/nb/torbutton.properties
index 58b7f0752..83defa32d 100644
--- a/nb/torbutton.properties
+++ b/nb/torbutton.properties
@@ -53,7 +53,7 @@ profileMigrationFailed=Migrering av din eksisterende 
%S-profil mislykkes.\nNye i
 # "Downloading update" string for the hamburger menu (see #28885).
 # This string is kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Downloading %S update
+updateDownloadingPanelUILabel=Laster ned %S oppdatering
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=Tilkobling kryptert (LÃ¸k 
Tjeneste, %1$S, %2$S bits nÃ¸kler, %3$S)

___
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-23 Thread translation

commit ed450c7482061adbe21484e288d21fb35a9fadf3
Author: Translation commit bot 
Date:   Wed Jan 23 17:17:27 2019 +

Update translations for tails-persistence-setup
---
 pt_PT/pt_PT.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po
index 9752ef55e..b2da938d5 100644
--- a/pt_PT/pt_PT.po
+++ b/pt_PT/pt_PT.po
@@ -10,7 +10,7 @@ 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 13:13+\n"
+"PO-Revision-Date: 2019-01-23 17:12+\n"
 "Last-Translator: Rui \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"

___
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-23 Thread translation

commit 49e8fc7dea32e065e614a336cc0768454fd2deb6
Author: Translation commit bot 
Date:   Wed Jan 23 17:17:34 2019 +

Update translations for tails-persistence-setup_completed
---
 pt_PT/pt_PT.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po
index 9752ef55e..b2da938d5 100644
--- a/pt_PT/pt_PT.po
+++ b/pt_PT/pt_PT.po
@@ -10,7 +10,7 @@ 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 13:13+\n"
+"PO-Revision-Date: 2019-01-23 17:12+\n"
 "Last-Translator: Rui \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"

___
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-23 Thread translation

commit a6e74134b130b7b70e974f75f202cb9daa5934db
Author: Translation commit bot 
Date:   Wed Jan 23 17:15:50 2019 +

Update translations for https_everywhere
---
 nb/https-everywhere.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd
index f74764af9..087ad78d9 100644
--- a/nb/https-everywhere.dtd
+++ b/nb/https-everywhere.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -18,8 +18,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -40,8 +40,8 @@
 
 
 
-
-
+
+
 
 
 

___
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-23 Thread translation

commit f1fb225cf20c6e7975782269a50f96d4b87ae1dc
Author: Translation commit bot 
Date:   Wed Jan 23 17:17:41 2019 +

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

diff --git a/nb/android_strings.dtd b/nb/android_strings.dtd
index e9ec9d2d3..2e09b3174 100644
--- a/nb/android_strings.dtd
+++ b/nb/android_strings.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_completed] Update translations for https_everywhere_completed

2019-01-23 Thread translation

commit 38466f30e37ca22585ddf12f5e5690016e2516ea
Author: Translation commit bot 
Date:   Wed Jan 23 17:15:57 2019 +

Update translations for https_everywhere_completed
---
 nb/https-everywhere.dtd | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd
index 25c088abd..087ad78d9 100644
--- a/nb/https-everywhere.dtd
+++ b/nb/https-everywhere.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -18,6 +18,8 @@
 
 
 
+
+
 
 
 
@@ -38,6 +40,8 @@
 
 
 
+
+
 
 
 

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

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2019-01-23 Thread translation

commit 4598f1b4969bce5256d5e39e3bce6d621f9f4e96
Author: Translation commit bot 
Date:   Wed Jan 23 17:16:13 2019 +

Update translations for liveusb-creator_completed
---
 nb/nb.po | 171 +--
 1 file changed, 91 insertions(+), 80 deletions(-)

diff --git a/nb/nb.po b/nb/nb.po
index 41a985b4d..13f16cdf2 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -6,16 +6,17 @@
 # Allan NordhÃ¸y , 2014
 # Allan NordhÃ¸y , 2015-2018
 # John Henningsen , 2015
-# lateralus, 2013-2014
+# 81149148127a5edca7d06dcbfba79969, 2013-2014
 # trash , 2013
+# Tom Larsen , 2019
 # 9d7045af8ca83a89b1b4bf48a2c67786, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-17 14:51+\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-01-02 09:26+0100\n"
+"PO-Revision-Date: 2019-01-23 17:03+\n"
+"Last-Translator: Tom Larsen \n"
 "Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,194 +83,194 @@ msgstr "Klarer ikke kopiere %(infile)s til %(outfile)s: 
%(message)s"
 msgid "Removing existing Live OS"
 msgstr "Fjerner eksisterende Live OS"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "Klarer ikke chmod %(file)s: %(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "Klarer ikke slette fil fra tidligere LiveOS: %(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "Klarer ikke Ã¥ fjerne katalog fra tidligere LiveOS: %(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "Kan ikke finne enhet %s"
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Klarer ikke Ã¥ skrive til %(device)s, hopper over."
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Noen partisjoner pÃ¥ mÃ¥lenheten %(device)s er montert. De vil 
avmontert fÃ¸r installasjonsprosessen starter."
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Ukjent filsystem. Din enhet mÃ¥ kanskje omformateres."
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Ikke stÃ¸ttet filsystem: %s"
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Ukjent GLib-unntak under montering av enhet: %(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Klarer ikke Ã¥ laste enhet: %(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "Ingen lastepunkter funnet"
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Angir unmount_device for '%(device)s'"
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Avmonterer monterte filsystem pÃ¥  '%(device)s'"
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Avmonterer '%(udi)s' pÃ¥ '%(device)s'"
 
-#: ../tails_installer/creator.py:851
+#: ../tails_installer/creator.py:853
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "%s eksisterer fortsatt etter frakoblingsforsÃ¸k"
 
-#: ../tails_installer/creator.py:864
+#: ../tails_installer/creator.py:866
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partisjonerer enheten %(device)s"
 
-#: ../tails_installer/creator.py:993
+#: ../tails_installer/creator.py:995
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."

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

2019-01-23 Thread translation

commit cc634cbd504e617b2694bdf387d77fe3868d89f7
Author: Translation commit bot 
Date:   Wed Jan 23 17:16:36 2019 +

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

diff --git a/nb.po b/nb.po
index 23444ae8e..c85619587 100644
--- a/nb.po
+++ b/nb.po
@@ -5,15 +5,16 @@
 # Translators:
 # Aleksandr Bakken , 2014
 # Allan NordhÃ¸y , 2016-2017
-# lateralus, 2014
+# 81149148127a5edca7d06dcbfba79969, 2014
+# Tom Larsen , 2019
 # tyler moss , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-12-09 13:56+0100\n"
-"PO-Revision-Date: 2018-12-09 14:14+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-23 17:06+\n"
+"Last-Translator: Tom Larsen \n"
 "Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -199,11 +200,11 @@ msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:612
 msgid "Upgrade successfully downloaded"
-msgstr ""
+msgstr "Oppgradering ble lastet ned"
 
 #: ../lib/Tails/IUK/Frontend.pm:614
 msgid "Apply upgrade"
-msgstr ""
+msgstr "Bruk oppgradering"
 
 #: ../lib/Tails/IUK/Frontend.pm:621
 msgid ""

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

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

2019-01-23 Thread translation

commit 660a95fa853893af06aba5559a19f2479b0c4b41
Author: Translation commit bot 
Date:   Wed Jan 23 17:19:45 2019 +

Update translations for torbutton-browseronboardingproperties
---
 nb/browserOnboarding.properties | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nb/browserOnboarding.properties b/nb/browserOnboarding.properties
index 09b36334a..3e923fdfd 100644
--- a/nb/browserOnboarding.properties
+++ b/nb/browserOnboarding.properties
@@ -13,21 +13,21 @@ onboarding.tour-tor-privacy.description=Tor Browser 
isolates cookies and deletes
 onboarding.tour-tor-privacy.button=GÃ¥ til Tor Nettverk
 
 onboarding.tour-tor-network=Tor Nettverk
-onboarding.tour-tor-network.title=Travel a decentralized network.
-onboarding.tour-tor-network.description=Tor Browser connects you to the Tor 
network run by thousands of volunteers around the world. Unlike a VPN, 
thereâs no one point of failure or centralized entity you need to trust in 
order to enjoy the internet privately.
-onboarding.tour-tor-network.button=Go to Circuit Display
+onboarding.tour-tor-network.title=Reis et decentralisert nettverk.
+onboarding.tour-tor-network.description=Tor Browser forbinder deg med 
Tor-nettet som drives av tusenvis av frivillige rundt om i verden. I motsetning 
til en VPN er det ingen feilpunkt eller sentralisert enhet du mÃ¥ stole pÃ¥ for 
Ã¥ kunne nyte Internettet privat.
+onboarding.tour-tor-network.button=GÃ¥ til Kretsvisning
 
-onboarding.tour-tor-circuit-display=Circuit Display
-onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit, 
your traffic is relayed and encrypted in a circuit across three Tor relays 
around the world. No website knows where you are connecting from. You can 
request a new circuit by clicking âNew Circuit for this Siteâ on our 
Circuit Display.
+onboarding.tour-tor-circuit-display=Kretsvisning
+onboarding.tour-tor-circuit-display.title=Se din vei.
+onboarding.tour-tor-circuit-display.description=For hvert domene du besÃ¸ker, 
blir trafikken din omdirigert og kryptert i en krets over tre Tor-relÃ©er rundt 
om i verden. Ingen nettside vet hvor du kobler fra. Du kan be om en ny krets 
ved Ã¥ klikke "Ny krets for dette nettstedet" pÃ¥ vÃ¥r kretsvisning.
 onboarding.tour-tor-circuit-display.button=Se Min Vei
 
 onboarding.tour-tor-security=Sikkerhet
 onboarding.tour-tor-security.title=Velg din opplevelse.
-onboarding.tour-tor-security.description=We also provide you with additional 
settings for bumping up your browser security. Our Security Settings allow you 
to block elements that could be used to attack your computer. Click below to 
see what the different options do.
-onboarding.tour-tor-security.button=Review Settings
+onboarding.tour-tor-security.description=Vi gir deg ogsÃ¥ 
tilleggsinnstillinger for Ã¥ stÃ¸te pÃ¥ nettleserens sikkerhet. VÃ¥re 
sikkerhetsinnstillinger lar deg blokkere elementer som kan brukes til Ã¥ 
angripe datamaskinen din. Klikk nedenfor for Ã¥ se hva de forskjellige 
alternativene gjÃ¸r.
+onboarding.tour-tor-security.button=GjennomgÃ¥ Innstillinger
 
-onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences=Opplevelsestips
 onboarding.tour-tor-expect-differences.title=Forvent noen forskjeller.
 onboarding.tour-tor-expect-differences.description=Med alle de sikkerhets og 
personvernfunksjonene som Tor leverer, kan din erfaring mens du surfer pÃ¥ 
Internett, vÃ¦re litt annerledes. Det kan vÃ¦re litt tregere, og avhengig av 
sikkerhetsnivÃ¥et, kan noen elementer ikke fungere eller lastes. Du kan ogsÃ¥ 
bli bedt om Ã¥ bevise at du er et menneske og ikke en robot.
 onboarding.tour-tor-expect-differences.button=se FAQs
@@ -45,10 +45,10 @@ onboarding.tor-circuit-display.two-of-three=2 av 3
 onboarding.tor-circuit-display.three-of-three=3 av 3
 
 onboarding.tor-circuit-display.intro.title=Hvordan fungerer kretser?
-onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly 
assigned relays, which are computers around the world configured to forward Tor 
traffic. Circuits allow you to browse privately and to connect to onion 
services.
+onboarding.tor-circuit-display.intro.msg=Kretsene bestÃ¥r av tilfeldig 
tilordnede relÃ©er, som er datamaskiner rundt om i verden, konfigurert til Ã¥ 
sende Tor-trafikk. Kretser lar deg bla gjennom privat og koble til 
lÃ¸ktjenester.
 
-onboarding.tor-circuit-display.diagram.title=Circuit Display
-onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that 
make up the circuit for this website. To prevent linking of activity across 
different sites, each website gets a different circuit.
+onboarding.tor-circuit-display.diagram.title=Kretsvisning
+onboarding.tor-circuit-display.diagram.msg=Dette diagrammet viser relÃ©ene som 
utgjÃ¸r kretsen for denne nettsiden. For Ã¥ forhindre kobling av aktivitet pÃ¥ 
forskjellige nettsteder, fÃ¥r hver nettside en

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

2019-01-23 Thread translation

commit 4b7691ac1e6d5c08733c937a39de8135e8ef57c3
Author: Translation commit bot 
Date:   Wed Jan 23 17:19:06 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 nb/torbutton.properties | 5 +
 1 file changed, 5 insertions(+)

diff --git a/nb/torbutton.properties b/nb/torbutton.properties
index 873756e43..83defa32d 100644
--- a/nb/torbutton.properties
+++ b/nb/torbutton.properties
@@ -50,6 +50,11 @@ profileReadOnlyMac=Du kan ikke kjÃ¸re %S fra et filsystem 
som bare er lesbart. K
 profileAccessDenied=%S har ikke tilgang til endring av profilen. Juster 
filrettighetene og prÃ¸v igjen.
 profileMigrationFailed=Migrering av din eksisterende %S-profil mislykkes.\nNye 
innstillinger vil bli benyttet.
 
+# "Downloading update" string for the hamburger menu (see #28885).
+# This string is kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+updateDownloadingPanelUILabel=Laster ned %S oppdatering
+
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=Tilkobling kryptert (LÃ¸k 
Tjeneste, %1$S, %2$S bits nÃ¸kler, %3$S)
 pageInfo_OnionEncryption=Tilkobling kryptert (LÃ¸k Tjeneste)

___
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-23 Thread translation

commit c5ee4a54d83f497d1eddf54f81064e2a53f3c317
Author: Translation commit bot 
Date:   Wed Jan 23 17:15:12 2019 +

Update translations for abouttor-homepage_completed
---
 nb/aboutTor.dtd | 45 ++---
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd
index 038d29385..708d57dc6 100644
--- a/nb/aboutTor.dtd
+++ b/nb/aboutTor.dtd
@@ -1,45 +1,28 @@
 
 
 
 
-
-
-
-
-
-
-
-
-
+
+
 
 
 
-
+
 https://duckduckgo.com;>
 
-
-
-
-
-
-
-
-https://www.torproject.org/download/download.html.en#warning;>
+
+
+
 
-
-
-
-
-https://www.torproject.org/docs/tor-doc-relay.html.en;>
-
-https://www.torproject.org/getinvolved/volunteer.html.en;>
-
-https://www.torproject.org/donate/donate.html.en;>
+
+
+
+
+https://www.torproject.org/getinvolved/volunteer.html.en;>
 
-
-
-https://www.torproject.org/about/overview.html.en;>
+
+

___
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-23 Thread translation

commit 26f24127e44956905222bdd82aa6c728febe3005
Author: Translation commit bot 
Date:   Wed Jan 23 17:15:05 2019 +

Update translations for abouttor-homepage
---
 nb/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd
index 89bd5a7f3..708d57dc6 100644
--- a/nb/aboutTor.dtd
+++ b/nb/aboutTor.dtd
@@ -15,7 +15,7 @@
 https://duckduckgo.com;>
 
 
-
+
 
 
 

___
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-23 Thread translation

commit 0471829e879853d67deba454d032ba0a397a3a21
Author: Translation commit bot 
Date:   Wed Jan 23 16:48:28 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 de/torbutton.properties| 5 +
 es/torbutton.properties| 5 +
 pt_PT/torbutton.properties | 5 +
 3 files changed, 15 insertions(+)

diff --git a/de/torbutton.properties b/de/torbutton.properties
index cff5f13be..d280a29e2 100644
--- a/de/torbutton.properties
+++ b/de/torbutton.properties
@@ -50,6 +50,11 @@ profileReadOnlyMac=Es ist nicht mÃ¶glich %S auf einem nur 
lesbaren Dateisystem z
 profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. 
Bitte die Berechtigungen deines Dateisystems einstellen und es noch einmal 
probieren.
 profileMigrationFailed=Ãbernahme des bestehenden %S Profils ist 
fehlgeschlagen.\nEs werden neue Einstellungen verwendet.
 
+# "Downloading update" string for the hamburger menu (see #28885).
+# This string is kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+updateDownloadingPanelUILabel=%S Aktualisierung wird heruntergeladen
+
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=Verbindung verschlÃ¼sselt 
(Onion-Dienst, %1$S, %2$S bit SchlÃ¼ssel, %3$S)
 pageInfo_OnionEncryption=Verbindung verschlÃ¼sselt (Onion-Dienst)
diff --git a/es/torbutton.properties b/es/torbutton.properties
index 55f505269..70c25d967 100644
--- a/es/torbutton.properties
+++ b/es/torbutton.properties
@@ -50,6 +50,11 @@ profileReadOnlyMac=No puede ejecutar %S desde un sistema de 
ficheros de solo-lec
 profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los 
permisos de su sistema de ficheros e intÃ©ntelo de nuevo.
 profileMigrationFailed=Ha ocurrido un error en la migraciÃ³n de tu perfil %S. 
\nSe usarÃ¡n los nuevos ajustes.
 
+# "Downloading update" string for the hamburger menu (see #28885).
+# This string is kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+updateDownloadingPanelUILabel=Descargando %S de la actualizaciÃ³n 
+
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=ConexiÃ³n cifrada (Servicio 
cebolla, %1$S, %2$S bit keys, %3$S)
 pageInfo_OnionEncryption=ConexiÃ³n cifrada (Servicio cebolla)
diff --git a/pt_PT/torbutton.properties b/pt_PT/torbutton.properties
index f4f80c519..a42365063 100644
--- a/pt_PT/torbutton.properties
+++ b/pt_PT/torbutton.properties
@@ -50,6 +50,11 @@ profileReadOnlyMac=NÃ£o pode executar %S a partir de um 
ficheiro do sistema sÃ³
 profileAccessDenied=%S nÃ£o tem permissÃ£o para aceder ao perfil. Por favor, 
ajuste as suas permissÃµes de ficheiro do sistema e tente de novo.
 profileMigrationFailed=A migraÃ§Ã£o do seu perfil %S existente falhou. 
\nSerÃ£o utilizadas novas configuraÃ§Ãµes.
 
+# "Downloading update" string for the hamburger menu (see #28885).
+# This string is kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+updateDownloadingPanelUILabel=A descarregar %S atualizaÃ§Ã£o
+
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=LigaÃ§Ã£o Encriptada (ServiÃ§o 
Onion, %1$S, %2$S bit chaves, %3$S)
 pageInfo_OnionEncryption=LigaÃ§Ã£o Encriptada (ServiÃ§o Onion)

___
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-23 Thread translation

commit 9bf3d5ce4360e1198ce3fa5cce948a47531d9fd2
Author: Translation commit bot 
Date:   Wed Jan 23 16:48:21 2019 +

Update translations for torbutton-torbuttonproperties
---
 de/torbutton.properties| 2 +-
 es/torbutton.properties| 2 +-
 pt_PT/torbutton.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/de/torbutton.properties b/de/torbutton.properties
index 491b46d66..d280a29e2 100644
--- a/de/torbutton.properties
+++ b/de/torbutton.properties
@@ -53,7 +53,7 @@ profileMigrationFailed=Ãbernahme des bestehenden %S Profils 
ist fehlgeschlagen.
 # "Downloading update" string for the hamburger menu (see #28885).
 # This string is kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Downloading %S update
+updateDownloadingPanelUILabel=%S Aktualisierung wird heruntergeladen
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=Verbindung verschlÃ¼sselt 
(Onion-Dienst, %1$S, %2$S bit SchlÃ¼ssel, %3$S)
diff --git a/es/torbutton.properties b/es/torbutton.properties
index c9065f68f..70c25d967 100644
--- a/es/torbutton.properties
+++ b/es/torbutton.properties
@@ -53,7 +53,7 @@ profileMigrationFailed=Ha ocurrido un error en la migraciÃ³n 
de tu perfil %S. \n
 # "Downloading update" string for the hamburger menu (see #28885).
 # This string is kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Downloading %S update
+updateDownloadingPanelUILabel=Descargando %S de la actualizaciÃ³n 
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=ConexiÃ³n cifrada (Servicio 
cebolla, %1$S, %2$S bit keys, %3$S)
diff --git a/pt_PT/torbutton.properties b/pt_PT/torbutton.properties
index e30dc51c5..a42365063 100644
--- a/pt_PT/torbutton.properties
+++ b/pt_PT/torbutton.properties
@@ -53,7 +53,7 @@ profileMigrationFailed=A migraÃ§Ã£o do seu perfil %S 
existente falhou. \nSerÃ£o
 # "Downloading update" string for the hamburger menu (see #28885).
 # This string is kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Downloading %S update
+updateDownloadingPanelUILabel=A descarregar %S atualizaÃ§Ã£o
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=LigaÃ§Ã£o Encriptada (ServiÃ§o 
Onion, %1$S, %2$S bit chaves, %3$S)

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

[tor-commits] [tor/master] Log an HSDesc we failed to parse at Debug loglevel

2019-01-23 Thread nickm

commit 712a622fcecd43a7a50c7b35a9811f1210aeadb8
Author: rl1987 
Date:   Mon Jan 21 12:06:46 2019 +0200

Log an HSDesc we failed to parse at Debug loglevel
---
 changes/bug29135  | 5 +
 src/feature/hs/hs_cache.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug29135 b/changes/bug29135
new file mode 100644
index 0..fd7b1ae80
--- /dev/null
+++ b/changes/bug29135
@@ -0,0 +1,5 @@
+  o Minor bugfixes (onion services, logging):
+- In hs_cache_store_as_client() log an HSDesc we failed to parse at Debug
+  loglevel. Tor used to log it at Warning loglevel, which caused
+  very long log lines to appear for some users. Fixes bug 29135; bugfix on
+  0.3.2.1-alpha.
diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c
index 82ce68642..05f9940ae 100644
--- a/src/feature/hs/hs_cache.c
+++ b/src/feature/hs/hs_cache.c
@@ -778,8 +778,8 @@ hs_cache_store_as_client(const char *desc_str,
   /* Create client cache descriptor object */
   client_desc = cache_client_desc_new(desc_str, identity_pk);
   if (!client_desc) {
-log_warn(LD_GENERAL, "Failed to parse received descriptor %s.",
- escaped(desc_str));
+log_warn(LD_GENERAL, "HSDesc parsing failed!");
+log_debug(LD_GENERAL, "Failed to parse HSDesc: %s.", escaped(desc_str));
 goto err;
   }
 



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2019-01-23 Thread nickm

commit adeeb8841e0cb7c6b896b2d7a5bebf7d131af3ed
Merge: 5ec566edd 712a622fc
Author: Nick Mathewson 
Date:   Wed Jan 23 11:18:14 2019 -0500

Merge branch 'maint-0.3.5'

 changes/bug29135  | 5 +
 src/feature/hs/hs_cache.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2019-01-23 Thread nickm

commit 589b60d9e071cbf27e8a45daccf926c4ea55bac8
Merge: 95b214d8e 712a622fc
Author: Nick Mathewson 
Date:   Wed Jan 23 11:18:14 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug29135  | 5 +
 src/feature/hs/hs_cache.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/release-0.3.5] Log an HSDesc we failed to parse at Debug loglevel

2019-01-23 Thread nickm

commit 712a622fcecd43a7a50c7b35a9811f1210aeadb8
Author: rl1987 
Date:   Mon Jan 21 12:06:46 2019 +0200

Log an HSDesc we failed to parse at Debug loglevel
---
 changes/bug29135  | 5 +
 src/feature/hs/hs_cache.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug29135 b/changes/bug29135
new file mode 100644
index 0..fd7b1ae80
--- /dev/null
+++ b/changes/bug29135
@@ -0,0 +1,5 @@
+  o Minor bugfixes (onion services, logging):
+- In hs_cache_store_as_client() log an HSDesc we failed to parse at Debug
+  loglevel. Tor used to log it at Warning loglevel, which caused
+  very long log lines to appear for some users. Fixes bug 29135; bugfix on
+  0.3.2.1-alpha.
diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c
index 82ce68642..05f9940ae 100644
--- a/src/feature/hs/hs_cache.c
+++ b/src/feature/hs/hs_cache.c
@@ -778,8 +778,8 @@ hs_cache_store_as_client(const char *desc_str,
   /* Create client cache descriptor object */
   client_desc = cache_client_desc_new(desc_str, identity_pk);
   if (!client_desc) {
-log_warn(LD_GENERAL, "Failed to parse received descriptor %s.",
- escaped(desc_str));
+log_warn(LD_GENERAL, "HSDesc parsing failed!");
+log_debug(LD_GENERAL, "Failed to parse HSDesc: %s.", escaped(desc_str));
 goto err;
   }
 



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

[tor-commits] [tor/maint-0.3.5] Log an HSDesc we failed to parse at Debug loglevel

2019-01-23 Thread nickm

commit 712a622fcecd43a7a50c7b35a9811f1210aeadb8
Author: rl1987 
Date:   Mon Jan 21 12:06:46 2019 +0200

Log an HSDesc we failed to parse at Debug loglevel
---
 changes/bug29135  | 5 +
 src/feature/hs/hs_cache.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug29135 b/changes/bug29135
new file mode 100644
index 0..fd7b1ae80
--- /dev/null
+++ b/changes/bug29135
@@ -0,0 +1,5 @@
+  o Minor bugfixes (onion services, logging):
+- In hs_cache_store_as_client() log an HSDesc we failed to parse at Debug
+  loglevel. Tor used to log it at Warning loglevel, which caused
+  very long log lines to appear for some users. Fixes bug 29135; bugfix on
+  0.3.2.1-alpha.
diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c
index 82ce68642..05f9940ae 100644
--- a/src/feature/hs/hs_cache.c
+++ b/src/feature/hs/hs_cache.c
@@ -778,8 +778,8 @@ hs_cache_store_as_client(const char *desc_str,
   /* Create client cache descriptor object */
   client_desc = cache_client_desc_new(desc_str, identity_pk);
   if (!client_desc) {
-log_warn(LD_GENERAL, "Failed to parse received descriptor %s.",
- escaped(desc_str));
+log_warn(LD_GENERAL, "HSDesc parsing failed!");
+log_debug(LD_GENERAL, "Failed to parse HSDesc: %s.", escaped(desc_str));
 goto err;
   }
 

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

[tor-commits] [torspec/master] Spacing

2019-01-23 Thread nickm

commit 9a3f014c826a15c4cf25dbcff198b1657c33946e
Author: teor 
Date:   Tue Jan 22 10:17:30 2019 +1000

Spacing
---
 bandwidth-file-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index a940904..385bdb6 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -100,7 +100,7 @@
 Timestamp ::= Int
 Bandwidth ::= Int
 MasterKey ::= a base64-encoded Ed25519 public key, with
-padding characters omitted.
+  padding characters omitted.
 DateTime ::= "-MM-DDTHH:MM:SS", as in ISO 8601
 
   Note that key_value and value are defined in Tor directory protocol



___
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 'tor-github/pr/51'

2019-01-23 Thread nickm

commit 6e9a14b030bc1a7b9d2919bda637d01ea34fc021
Merge: 7954202 63676e7
Author: Nick Mathewson 
Date:   Wed Jan 23 11:15:26 2019 -0500

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

 bandwidth-file-spec.txt | 756 
 1 file changed, 384 insertions(+), 372 deletions(-)

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

[tor-commits] [torspec/master] bandwidth: typos and spacing

2019-01-23 Thread nickm

commit 63676e7c2f0b12ea3e3454d1e6431dd924e4d83d
Author: teor 
Date:   Wed Jan 23 08:23:13 2019 +1000

bandwidth: typos and spacing
---
 bandwidth-file-spec.txt | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index fe9d056..96b5d03 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -44,20 +44,21 @@
 
 1.4. Format Versions
 
-   1.0.0 - The legacy fallback Bandwidth List format
+  1.0.0 - The legacy fallback Bandwidth List format
 
-   1.1.0 - Add a header containing information about the bandwidth
-   file. Document the sbws and Torflow relay line keys.
+  1.1.0 - Add a header containing information about the bandwidth
+  file. Document the sbws and Torflow relay line keys.
 
-   1.2.0 - If there are not enough eligible relays, the bandwidth file
-   SHOULD contain a header, but no relays. (To match Torflow's
-   existing behaviour.)
-   Adds new KeyValue Lines to the Header List section with
-   statistics about the number of relays included in the file.
-   Add new KeyValue Lines to the Relays' Bandwidth List section
-   with different bandwidth values.
+  1.2.0 - If there are not enough eligible relays, the bandwidth file
+  SHOULD contain a header, but no relays. (To match Torflow's
+  existing behaviour.)
+  Adds new KeyValue Lines to the Header List section with
+  statistics about the number of relays included in the file.
+  Add new KeyValue Lines to the Relays' Bandwidth List section
+  with different bandwidth values.
 
   All Tor versions can consume format version 1.0.0.
+  
   All Tor versions can consume format version 1.1.0 and later,
   but Tor versions earlier than 0.3.5.1-alpha warn if the header
   contains any KeyValue lines after the Timestamp.
@@ -96,7 +97,7 @@
 Value ::= ArgumentCharValue+
 ArgumentCharValue ::= any printing ASCII character except NL and SP.
 Terminator ::= "=" or ""
-   Generators SHOULD use a 5-charatcer terminator.
+   Generators SHOULD use a 5-character terminator.
 Timestamp ::= Int
 Bandwidth ::= Int
 MasterKey ::= a base64-encoded Ed25519 public key, with



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

[tor-commits] [torspec/master] bandwidth: Prefer a 5-character header terminator

2019-01-23 Thread nickm

commit 7f573b3c5968c3e59a15dfc05c0a21b194373c97
Author: teor 
Date:   Wed Jan 23 08:17:20 2019 +1000

bandwidth: Prefer a 5-character header terminator
---
 bandwidth-file-spec.txt | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 385bdb6..fe9d056 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -96,7 +96,7 @@
 Value ::= ArgumentCharValue+
 ArgumentCharValue ::= any printing ASCII character except NL and SP.
 Terminator ::= "=" or ""
-  Note: sbws versions 0.1.0 to 1.0.2 used a 4-character terminator.
+   Generators SHOULD use a 5-charatcer terminator.
 Timestamp ::= Int
 Bandwidth ::= Int
 MasterKey ::= a base64-encoded Ed25519 public key, with
@@ -305,11 +305,17 @@
 
   [Zero or one time.]
 
-  The Header List section ends with this Terminator.
+  The Header List section ends with a Terminator.
 
   In version 1.0.0, Header List ends when the first relay bandwidth
   is found conforming to the next section.
-  Implementations of version 1.1.0 and later SHOULD include this Line.
+  
+  Implementations of version 1.1.0 and later SHOULD use a 5-character
+  terminator.
+  
+  Tor 0.4.0.1-alpha and later look for a 5-character terminator,
+  or the first relay bandwidth line. sbws versions 0.1.0 to 1.0.2
+  used a 4-character terminator, this bug was fixed in 1.0.3.
 
 2.3. Relay Line format
 



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

[tor-commits] [torspec/master] Remove sbws version from relay line key value list

2019-01-23 Thread nickm

commit 49a0f5cfb6cbc1ae953975d3a0ac1c10e55a6c4a
Author: teor 
Date:   Tue Jan 22 10:12:01 2019 +1000

Remove sbws version from relay line key value list

The version was out of date, and we're not tracking the versions when keys 
were added.
---
 bandwidth-file-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 3fc7582..714c456 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -447,7 +447,7 @@
 
 2.4.2.1. Simple Bandwidth Scanner
 
-  Every RelayLine in sbws version 0.1.0 consists of:
+  sbws RelayLines may contain these keys:
 
 "node_id=" hexdigest SP
 



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

[tor-commits] [torspec/master] Allow parsers to fail files with duplicate relay lines

2019-01-23 Thread nickm

commit b03483635d7e3c9371054643fc5140f650706ae0
Author: teor 
Date:   Tue Jan 22 10:15:34 2019 +1000

Allow parsers to fail files with duplicate relay lines
---
 bandwidth-file-spec.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 714c456..a940904 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -319,9 +319,10 @@
   There MUST NOT be multiple KeyValue pairs with the same key in the same
   RelayLine. If there are, the parser SHOULD choose an arbitrary Value.
 
-  There MUST NOT be multiple RelayLine per relay identity (node_id or
+  There MUST NOT be multiple RelayLines per relay identity (node_id or
   master_key_ed25519). If there are, parsers SHOULD issue a warning.
-  Parers MAY choose an arbitrary value, or ignore both values.
+  Parers MAY reject the file, choose an arbitrary RelayLine, or ignore
+  both RelayLines.
 
   If a parser does not recognize any extra material in a RelayLine,
   the extra material MUST be ignored.



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

[tor-commits] [torspec/master] bandwidth: Add sbws and Tor versions where required

2019-01-23 Thread nickm

commit aa8807d3064a88b6b489373bd65ad9310a59beea
Author: teor 
Date:   Mon Jan 14 11:27:38 2019 +1000

bandwidth: Add sbws and Tor versions where required
---
 bandwidth-file-spec.txt | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 05d1f40..e3a744f 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -59,9 +59,8 @@
 
   All Tor versions can consume format version 1.0.0.
   All Tor versions can consume format version 1.1.0 and later,
-  but they warn on additional header Lines.
-  [TODO: this might be fixed, and if it is fixed should be said which
-  version of Tor]
+  but Tor versions earlier than 0.3.5.1-alpha warn if the header
+  contains any KeyValue lines after the Timestamp.
 
 2. Format details
 
@@ -95,7 +94,8 @@
 KeyValue ::= Keyword "=" Value
 Value ::= ArgumentCharValue+
 ArgumentCharValue ::= any printing ASCII character except NL and SP.
-Terminator ::= "="
+Terminator ::= "=" or ""
+  Note: sbws versions 0.1.0 to 1.0.2 used a 4-character terminator.
 Timestamp ::= Int
 Bandwidth ::= Int
 MasterKey ::= a base64-encoded Ed25519 public key, with
@@ -105,12 +105,13 @@
   Note that key_value and value are defined in Tor directory protocol
   with different formats to KeyValue and Value here.
 
-  All Lines in the file MUST be 510 characters or less, to allow for the
-  trailing newline and NULL characters.
-  The previous limit was 254 characters in Tor 0.2.6.2-alpha and
-  earlier.
-  The parser MAY ignore longer Lines.
-  [TODO: Change this restriction in 1.1.0 or later]
+  Tor versions earlier than 0.3.5.1-alpha require all lines in the file
+  to be 510 characters or less. The previous limit was 254 characters in
+  Tor 0.2.6.2-alpha and earlier. Parsers MAY ignore longer Lines.
+
+  Note that directory authorities are only supported on the two most
+  recent stable Tor versions, so we expect that line limits will be
+  removed after Tor 0.4.0 is released in 2019.
 
 2.2. Header List format
 
@@ -305,7 +306,7 @@ It consists of:
 
 In version 1.0.0, Header List ends when the first relay bandwidth
 is found conforming to the next section.
-Implementations of version 1.1.0 SHOULD include this Line.
+Implementations of version 1.1.0 and later SHOULD include this Line.
 
 2.3. Relays' Bandwidth List format
 
@@ -325,9 +326,6 @@ If a parser does not recognize any extra material in a 
RelayLine,
 the extra material MUST be ignored.
 
 Each RelayLine MUST include the following KeyValue pairs:
-In version 1.0.0, node_id MUST NOT be at the end of the Line.
-In version 1.1.0, the KeyValue can be in any arbitrary order.
-[TODO: list of Tor version that support it, when it's done]
 
   "node_id=" hexdigest
 
@@ -335,6 +333,10 @@ In version 1.1.0, the KeyValue can be in any arbitrary 
order.
 
 The fingerprint for the relay's RSA identity key.
 
+Note: In bandwidth files read by Tor versions earlier than
+  0.3.4.1-alpha, node_id MUST NOT be at the end of the Line.
+  These authority versions are no longer supported.
+
   "master_key_ed25519=" MasterKey
 
 [Zero or one time.]
@@ -568,8 +570,8 @@ earliest_bandwidth=2018-04-16T15:13:26
 bw=380 error_circ=0 error_misc=0 error_stream=1 
master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ nick=Test 
node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 rtt=380 success=1 
time=2018-05-08T16:13:26
 bw=189 error_circ=0 error_misc=0 error_stream=0 
master_key_ed25519=a6a+dZadrQBtfSbmQkP7j2ardCmLnm5NJ4ZzkvDxbo0I nick=Test2 
node_id=$96C15995F30895689291F455587BD94CA427B6FC rtt=378 success=1 
time=2018-05-08T16:13:36
 
-A.3. Generated by sbws version 1.X.X
-[TODO: change the version of sbws that generates this when it is implemented]
+A.3. Generated by sbws version 1.0.3
+
 1523911758
 version=1.2.0
 latest_bandwidth=2018-04-16T20:49:18
@@ -582,8 +584,7 @@ number_consensus_relays=6436
 number_eligible_relays=6000
 percent_eligible_relays=93
 software=sbws
-software_version=1.X.X
-[TODO: change the version of sbws that generates this when it is implemented]
+software_version=1.0.3
 =
 bw=38000 bw_mean=1127824 bw_median=1180062 desc_avg_bw=1073741824 
desc_obs_bw_last=17230879 desc_obs_bw_mean=14732306 error_circ=0 error_misc=0 
error_stream=1 master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ 
nick=Test node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 rtt=380 success=1 
time=2018-05-08T16:13:26
 bw=1 bw_mean=199162 bw_median=185675 desc_avg_bw=409600 
desc_obs_bw_last=836165 desc_obs_bw_mean=858030 error_circ=0 error_misc=0 
error_stream=0 master_key_ed25519=a6a+dZadrQBtfSbmQkP7j2ardCmLnm5NJ4ZzkvDxbo0I 
nick=Test2 node_id=$96C15995F30895689291F455587BD94CA427B6FC rtt=378 success=1 
time=2018-05-08T16:13:36
@@ -602,8 +603,7 @@ number_consensus_relays=6436
 number_eligible_relays=2960
 percent_eligible_relays=46

[tor-commits] [torspec/master] bandwidth: rewrite the intro

2019-01-23 Thread nickm

commit 469698c3ec53b25bde59c5296cf9b2d914a07bea
Author: teor 
Date:   Mon Jan 14 11:21:14 2019 +1000

bandwidth: rewrite the intro

Part of 27079.
---
 bandwidth-file-spec.txt | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 7e859b7..05d1f40 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -4,16 +4,17 @@
 
 1. Scope and preliminaries
 
-  This document describes the format of Tor's Bandwidth List,
-  version 1.0.0, 1.1.0 and later.
-  It is new specification for the existing format 1.0.0.
-  Describes a new format 1.1.0, which is backwards compatible with
-  1.0.0 parsers.
+  This document describes the format of Tor's Bandwidth List, version
+  1.0.0 and later.
 
-  Since Tor version 0.2.4.12-alpha the directory authorities use
+  It is a new specification for the existing bandwidth file format,
+  which we call version 1.0.0. It also specifies new format versions
+  1.1.0 and later, which are backwards compatible with 1.0.0 parsers.
+
+  Since Tor version 0.2.4.12-alpha, the directory authorities use
   the Bandwidth List file called "V3BandwidthsFile" generated by
-  Torflow [1]. The format is described in Torflow's README.spec.txt and
-  is considered to be version 1.0.0.
+  Torflow [1]. The details of this format are described in Torflow's
+  README.spec.txt. We also summarise the format in this specification.
 
 The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
 NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and
@@ -36,6 +37,7 @@
   The Tor directory protocol (dir-spec.txt [3]) sections 3.4.1
   and 3.4.2, use the term bandwidth measurements, to refer to what
   here is called Bandwidth List.
+
   A Bandwidth List file contains information on relays' bandwidth
   capacities and is produced by bandwidth generators, previously known
   as bandwidth scanners.



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

[tor-commits] [torspec/master] bandwidth: reword Header/Header Lines/Relay Lines descriptions

2019-01-23 Thread nickm

commit 5ddeda35aeab8bc185b0914b138c144ba126a48b
Author: teor 
Date:   Mon Jan 14 11:28:45 2019 +1000

bandwidth: reword Header/Header Lines/Relay Lines descriptions
---
 bandwidth-file-spec.txt | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index e3a744f..bb017c2 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -65,8 +65,9 @@
 2. Format details
 
   The Bandwidth List MUST contain the following sections:
-  - Header List (exactly once)
-  - Relays' Bandwidth List (zero or more times)
+  - Header List (exactly once), which is an ordered list of
+- Header Lines (one or more times), then
+  - Relay Lines (zero or more times), which is an unordered list.
   If it does not contain these sections, parsers SHOULD ignore the file.
 
 2.1. Definitions
@@ -308,7 +309,7 @@ It consists of:
 is found conforming to the next section.
 Implementations of version 1.1.0 and later SHOULD include this Line.
 
-2.3. Relays' Bandwidth List format
+2.3. Relay Line format
 
 It consists of zero or more RelayLines with the relays' bandwidth
 in arbitrary order.



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

[tor-commits] [torspec/master] Clarify header and relay line order

2019-01-23 Thread nickm

commit 9b206eda055fd9bc288526ad1dd094677528cdad
Author: teor 
Date:   Tue Jan 22 09:55:00 2019 +1000

Clarify header and relay line order
---
 bandwidth-file-spec.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 965191d..bef87b8 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -65,9 +65,9 @@
 2. Format details
 
   The Bandwidth List MUST contain the following sections:
-  - Header List (exactly once), which is an ordered list of
+  - Header List (exactly once), which is a partially ordered list of
 - Header Lines (one or more times), then
-  - Relay Lines (zero or more times), which is an unordered list.
+  - Relay Lines (zero or more times), in an arbitrary order.
   If it does not contain these sections, parsers SHOULD ignore the file.
 
 2.1. Definitions



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

[tor-commits] [torspec/master] Clarify relay line and key value orders

2019-01-23 Thread nickm

commit 733cfbdb5ae804010555959145e9fdd22dbc8c4e
Author: teor 
Date:   Tue Jan 22 10:03:08 2019 +1000

Clarify relay line and key value orders
---
 bandwidth-file-spec.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index bef87b8..3fc7582 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -313,8 +313,8 @@
 
 2.3. Relay Line format
 
-  It consists of zero or more RelayLines with the relays' bandwidth
-  in arbitrary order.
+  It consists of zero or more RelayLines containing relay ids and
+  bandwidths. The relays and their KeyValues are in arbitrary order.
 
   There MUST NOT be multiple KeyValue pairs with the same key in the same
   RelayLine. If there are, the parser SHOULD choose an arbitrary Value.



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

[tor-commits] [torspec/master] bandwidth: use consistent 2 space indents, and reflow long lines

2019-01-23 Thread nickm

commit cbb2c760b3cd34d3c421658baddaccdfc6ea5c38
Author: teor 
Date:   Mon Jan 14 11:38:47 2019 +1000

bandwidth: use consistent 2 space indents, and reflow long lines
---
 bandwidth-file-spec.txt | 664 
 1 file changed, 333 insertions(+), 331 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 48de171..965191d 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -116,425 +116,427 @@
 
 2.2. Header List format
 
-Some header Lines MUST appear in specific positions, as documented
-below. All other Lines can appear in any order.
+  Some header Lines MUST appear in specific positions, as documented
+  below. All other Lines can appear in any order.
 
-If a parser does not recognize any extra material in a header Line,
-the Line MUST be ignored.
+  If a parser does not recognize any extra material in a header Line,
+  the Line MUST be ignored.
 
-If a header Line does not conform to this format, the Line SHOULD be
-ignored by parsers.
+  If a header Line does not conform to this format, the Line SHOULD be
+  ignored by parsers.
 
-It consists of:
+  It consists of:
 
-  Timestamp NL
+Timestamp NL
 
-[At start, exactly once.]
+  [At start, exactly once.]
 
-The Unix Epoch time in seconds of the most recent generator bandwidth
-result.
+  The Unix Epoch time in seconds of the most recent generator bandwidth
+  result.
 
-If the generator implementation has multiple threads or
-subprocesses which can fail independently, it SHOULD take the most
-recent timestamp from each thread and use the oldest value. This
-ensures all the threads continue running.
+  If the generator implementation has multiple threads or
+  subprocesses which can fail independently, it SHOULD take the most
+  recent timestamp from each thread and use the oldest value. This
+  ensures all the threads continue running.
 
-If there are threads that do not run continuously, they SHOULD be
-excluded from the timestamp calculation.
+  If there are threads that do not run continuously, they SHOULD be
+  excluded from the timestamp calculation.
 
-If there are no recent results, the generator MUST NOT generate a new file.
+  If there are no recent results, the generator MUST NOT generate a new
+  file.
 
-It does not follow the KeyValue format for backwards compatibility
-with version 1.0.0.
+  It does not follow the KeyValue format for backwards compatibility
+  with version 1.0.0.
 
-  "version=" version_number NL
+"version=" version_number NL
 
-[In second position, zero or one time.]
+  [In second position, zero or one time.]
 
-The specification document format version.
-It uses semantic versioning [5].
+  The specification document format version.
+  It uses semantic versioning [5].
 
-This Line was added in version 1.1.0 of this specification.
+  This Line was added in version 1.1.0 of this specification.
 
-Version 1.0.0 documents do not contain this Line, and the
-version_number is considered to be "1.0.0".
+  Version 1.0.0 documents do not contain this Line, and the
+  version_number is considered to be "1.0.0".
 
-  "software=" Value NL
+"software=" Value NL
 
-[Zero or one time.]
+  [Zero or one time.]
 
-The name of the software that created the document.
+  The name of the software that created the document.
 
-This Line was added in version 1.1.0 of this specification.
+  This Line was added in version 1.1.0 of this specification.
 
-Version 1.0.0 documents do not contain this Line, and the software
-is considered to be "torflow".
+  Version 1.0.0 documents do not contain this Line, and the software
+  is considered to be "torflow".
 
-  "software_version=" Value NL
+"software_version=" Value NL
 
-[Zero or one time.]
+  [Zero or one time.]
 
-The version of the software that created the document.
-The version may be a version_number, a git commit, or some other
-version scheme.
+  The version of the software that created the document.
+  The version may be a version_number, a git commit, or some other
+  version scheme.
 
-This Line was added in version 1.1.0 of this specification.
+  This Line was added in version 1.1.0 of this specification.
 
-  "file_created=" DateTime NL
+"file_created=" DateTime NL
 
-[Zero or one time.]
+  [Zero or one time.]
 
-The date and time timestamp in ISO 8601 format and UTC time zone
-when the file was created.
+  The date and time timestamp in ISO 8601 format and UTC time zone
+  when the file was created.
 
-This Line was added in version 1.1.0 of this specification.
+  This Line was added in version 1.1.0 of this specification.
 
-  "generator_started=" DateTime NL
+"generator_started=" DateTime NL
 
-[Zero or one

[tor-commits] [torspec/master] bandwidth: minor rewording and spacing

2019-01-23 Thread nickm

commit d3407318786a07dc7bd19f0c9d2118ac87d6b911
Author: teor 
Date:   Mon Jan 14 11:29:31 2019 +1000

bandwidth: minor rewording and spacing
---
 bandwidth-file-spec.txt | 37 ++---
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index bb017c2..48de171 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -117,10 +117,11 @@
 2.2. Header List format
 
 Some header Lines MUST appear in specific positions, as documented
-below.
-All other Lines can appear in any order.
+below. All other Lines can appear in any order.
+
 If a parser does not recognize any extra material in a header Line,
 the Line MUST be ignored.
+
 If a header Line does not conform to this format, the Line SHOULD be
 ignored by parsers.
 
@@ -153,7 +154,7 @@ It consists of:
 The specification document format version.
 It uses semantic versioning [5].
 
-This Line has been added in version 1.1.0 of this specification.
+This Line was added in version 1.1.0 of this specification.
 
 Version 1.0.0 documents do not contain this Line, and the
 version_number is considered to be "1.0.0".
@@ -164,7 +165,7 @@ It consists of:
 
 The name of the software that created the document.
 
-This Line has been added in version 1.1.0 of this specification.
+This Line was added in version 1.1.0 of this specification.
 
 Version 1.0.0 documents do not contain this Line, and the software
 is considered to be "torflow".
@@ -177,7 +178,7 @@ It consists of:
 The version may be a version_number, a git commit, or some other
 version scheme.
 
-This Line has been added in version 1.1.0 of this specification.
+This Line was added in version 1.1.0 of this specification.
 
   "file_created=" DateTime NL
 
@@ -186,7 +187,7 @@ It consists of:
 The date and time timestamp in ISO 8601 format and UTC time zone
 when the file was created.
 
-This Line has been added in version 1.1.0 of this specification.
+This Line was added in version 1.1.0 of this specification.
 
   "generator_started=" DateTime NL
 
@@ -195,7 +196,7 @@ It consists of:
 The date and time timestamp in ISO 8601 format and UTC time zone
 when the generator started.
 
-This Line has been added in version 1.1.0 of this specification.
+This Line was added in version 1.1.0 of this specification.
 
   "earliest_bandwidth=" DateTime NL
 
@@ -204,7 +205,7 @@ It consists of:
 The date and time timestamp in ISO 8601 format and UTC time zone
 when the first relay bandwidth was obtained.
 
-This Line has been added in version 1.1.0 of this specification.
+This Line was added in version 1.1.0 of this specification.
 
   "latest_bandwidth=" DateTime NL
 
@@ -218,7 +219,7 @@ It consists of:
 This duplicate value is included to make the format easier for people
 to read.
 
-This Line has been added in version 1.1.0 of this specification.
+This Line was added in version 1.1.0 of this specification.
 
   "number_eligible_relays=" Int NL
 
@@ -227,7 +228,7 @@ It consists of:
 The number of relays that have enough measurements to be
 included in the bandwidth file.
 
-This Line has been added in version 1.2.0 of this specification.
+This Line was added in version 1.2.0 of this specification.
 
   "minimum_percent_eligible_relays=" Int NL
 
@@ -241,7 +242,7 @@ It consists of:
 The minimum percentage is 60% in Torflow, so sbws uses
 60% as the default.
 
-This Line has been added in version 1.2.0 of this specification.
+This Line was added in version 1.2.0 of this specification.
 
   "number_consensus_relays=" Int NL
 
@@ -249,7 +250,7 @@ It consists of:
 
 The number of relays in the consensus.
 
-This Line has been added in version 1.2.0 of this specification.
+This Line was added in version 1.2.0 of this specification.
 
   "percent_eligible_relays=" Int NL
 
@@ -262,7 +263,7 @@ It consists of:
 (number_eligible_relays * 100.0) / number_consensus_relays
 to the number of relays in the consensus to include in this file.
 
-This Line has been added in version 1.2.0 of this specification.
+This Line was added in version 1.2.0 of this specification.
 
   "minimum_number_eligible_relays=" Int NL
 
@@ -273,7 +274,7 @@ It consists of:
 This line SHOULD be equal to:
 number_consensus_relays * (minimum_percent_eligible_relays / 100.0)
 
-This Line has been added in version 1.2.0 of this specification.
+This Line was added in version 1.2.0 of this specification.
 
   KeyValue NL
 
@@ -315,13 +316,11 @@ It consists of zero or more RelayLines with the relays' 
bandwidth
 in arbitrary order.
 
 There MUST NOT be multiple KeyValue pairs with the same key in the same
-RelayLine.
-If there are, the parser SHOULD choose an arbitrary Value.
+RelayLine. If there are, the parser SHOULD choose an arbitrary Value.
 
 There MUST

[tor-commits] [torsocks/master] Add getdents / getdents64 support re ticket 28861

2019-01-23 Thread dgoulet

commit 4c00ec8773fd63fa48ef49e1ccf2adac598427be
Author: Alejandro Alvarado <44826516+seisve...@users.noreply.github.com>
Date:   Mon Dec 17 19:25:18 2018 -0600

Add getdents / getdents64 support re ticket 28861
---
 src/common/compat.h |  8 
 src/lib/syscall.c   | 37 +
 2 files changed, 45 insertions(+)

diff --git a/src/common/compat.h b/src/common/compat.h
index a9b73c2..d79301f 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -129,6 +129,12 @@ void tsocks_once(tsocks_once_t *o, void 
(*init_routine)(void));
 #ifndef __NR_memfd_create
 #define __NR_memfd_create -19
 #endif
+#ifndef __NR_getdents
+#define __NR_getdents -20
+#endif
+#ifndef __NR_getdents64
+#define __NR_getdents64 -21
+#endif
 
 #define TSOCKS_NR_SOCKET__NR_socket
 #define TSOCKS_NR_CONNECT   __NR_connect
@@ -149,6 +155,8 @@ void tsocks_once(tsocks_once_t *o, void 
(*init_routine)(void));
 #define TSOCKS_NR_CLOCK_GETTIME __NR_clock_gettime
 #define TSOCKS_NR_FORK  __NR_fork
 #define TSOCKS_NR_MEMFD_CREATE __NR_memfd_create
+#define TSOCKS_NR_GETDENTS __NR_getdents
+#define TSOCKS_NR_GETDENTS64 __NR_getdents64
 
 /*
  * Despite glibc providing wrappers for these calls for a long time
diff --git a/src/lib/syscall.c b/src/lib/syscall.c
index 7fba580..f793da7 100644
--- a/src/lib/syscall.c
+++ b/src/lib/syscall.c
@@ -437,6 +437,37 @@ static LIBC_SYSCALL_RET_TYPE handle_memfd_create(va_list 
args)
 
return tsocks_libc_syscall(TSOCKS_NR_MEMFD_CREATE, name, flags);
 }
+/*
+ * Handle getdents(2) syscall.
+ */
+static LIBC_SYSCALL_RET_TYPE handle_getdents(va_list args)
+{
+   unsigned int fd;
+   struct linux_dirent *dirp;
+   unsigned int count;
+
+   fd = va_arg(args, __typeof__(fd));
+   dirp = va_arg(args, __typeof__(dirp));
+   count = va_arg(args, __typeof__(count));
+
+   return tsocks_libc_syscall(TSOCKS_NR_GETDENTS, fd, dirp, count);
+}
+/*
+ * Handle getdents64(2) syscall.
+ */
+static LIBC_SYSCALL_RET_TYPE handle_getdents64(va_list args)
+{
+   unsigned int fd;
+   struct linux_dirent64 *dirp;
+   unsigned int count;
+
+   fd = va_arg(args, __typeof__(fd));
+   dirp = va_arg(args, __typeof__(dirp));
+   count = va_arg(args, __typeof__(count));
+
+   return tsocks_libc_syscall(TSOCKS_NR_GETDENTS64, fd, dirp, count);
+}
+
 #endif /* __linux__ */
 
 /*
@@ -558,6 +589,12 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, 
va_list args)
case TSOCKS_NR_MEMFD_CREATE:
ret = handle_memfd_create(args);
break;
+   case TSOCKS_NR_GETDENTS:
+   ret = handle_getdents(args);
+   break;
+   case TSOCKS_NR_GETDENTS64:
+   ret = handle_getdents64(args);
+   break;
 #endif /* __linux__ */
default:
/*

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

[tor-commits] [sbws/master] Merge branch 'bug28590_rebased_master'

2019-01-23 Thread juga

commit c523619e20a91a1c6ec95b2230eec7060323cf15
Merge: 19fa738 df0a34f
Author: juga0 
Date:   Wed Jan 23 15:23:27 2019 +

Merge branch 'bug28590_rebased_master'

 tests/integration/net.tar  | Bin 215040 -> 0 bytes
 tests/integration/net/auth1/fingerprint|   1 +
 .../net/auth1/keys/authority_certificate   |  46 +++
 .../net/auth1/keys/authority_identity_key  |  41 +++
 .../net/auth1/keys/authority_signing_key   |  27 
 .../net/auth1/keys/ed25519_master_id_public_key| Bin 0 -> 64 bytes
 .../net/auth1/keys/ed25519_master_id_secret_key| Bin 0 -> 96 bytes
 .../net/auth1/keys/ed25519_signing_cert| Bin 0 -> 172 bytes
 .../net/auth1/keys/ed25519_signing_secret_key  | Bin 0 -> 96 bytes
 tests/integration/net/auth1/keys/secret_id_key |  15 +++
 tests/integration/net/auth1/keys/secret_onion_key  |  15 +++
 .../net/auth1/keys/secret_onion_key_ntor   | Bin 0 -> 96 bytes
 tests/integration/net/auth1/torrc  |  34 ++
 tests/integration/net/auth2/fingerprint|   1 +
 .../net/auth2/keys/authority_certificate   |  46 +++
 .../net/auth2/keys/authority_identity_key  |  41 +++
 .../net/auth2/keys/authority_signing_key   |  27 
 .../net/auth2/keys/ed25519_master_id_public_key| Bin 0 -> 64 bytes
 .../net/auth2/keys/ed25519_master_id_secret_key| Bin 0 -> 96 bytes
 .../net/auth2/keys/ed25519_signing_cert| Bin 0 -> 172 bytes
 .../net/auth2/keys/ed25519_signing_secret_key  | Bin 0 -> 96 bytes
 tests/integration/net/auth2/keys/secret_id_key |  15 +++
 tests/integration/net/auth2/keys/secret_onion_key  |  15 +++
 .../net/auth2/keys/secret_onion_key_ntor   | Bin 0 -> 96 bytes
 tests/integration/net/auth2/torrc  |  34 ++
 tests/integration/net/auth3/fingerprint|   1 +
 .../net/auth3/keys/authority_certificate   |  46 +++
 .../net/auth3/keys/authority_identity_key  |  41 +++
 .../net/auth3/keys/authority_signing_key   |  27 
 .../net/auth3/keys/ed25519_master_id_public_key| Bin 0 -> 64 bytes
 .../net/auth3/keys/ed25519_master_id_secret_key| Bin 0 -> 96 bytes
 .../net/auth3/keys/ed25519_signing_cert| Bin 0 -> 172 bytes
 .../net/auth3/keys/ed25519_signing_secret_key  | Bin 0 -> 96 bytes
 tests/integration/net/auth3/keys/secret_id_key |  15 +++
 tests/integration/net/auth3/keys/secret_onion_key  |  15 +++
 .../net/auth3/keys/secret_onion_key_ntor   | Bin 0 -> 96 bytes
 tests/integration/net/auth3/torrc  |  34 ++
 tests/integration/net/exit1/fingerprint|   1 +
 .../net/exit1/keys/ed25519_master_id_public_key| Bin 0 -> 64 bytes
 .../net/exit1/keys/ed25519_master_id_secret_key| Bin 0 -> 96 bytes
 .../net/exit1/keys/ed25519_signing_cert| Bin 0 -> 172 bytes
 .../net/exit1/keys/ed25519_signing_secret_key  | Bin 0 -> 96 bytes
 tests/integration/net/exit1/keys/secret_id_key |  15 +++
 tests/integration/net/exit1/keys/secret_onion_key  |  15 +++
 .../net/exit1/keys/secret_onion_key_ntor   | Bin 0 -> 96 bytes
 tests/integration/net/exit1/torrc  |  27 
 tests/integration/net/exit2/fingerprint|   1 +
 .../net/exit2/keys/ed25519_master_id_public_key| Bin 0 -> 64 bytes
 .../net/exit2/keys/ed25519_master_id_secret_key| Bin 0 -> 96 bytes
 .../net/exit2/keys/ed25519_signing_cert| Bin 0 -> 172 bytes
 .../net/exit2/keys/ed25519_signing_secret_key  | Bin 0 -> 96 bytes
 tests/integration/net/exit2/keys/secret_id_key |  15 +++
 tests/integration/net/exit2/keys/secret_onion_key  |  15 +++
 .../net/exit2/keys/secret_onion_key_ntor   | Bin 0 -> 96 bytes
 tests/integration/net/exit2/torrc  |  27 
 tests/integration/net/exit3/fingerprint|   1 +
 .../net/exit3/keys/ed25519_master_id_public_key| Bin 0 -> 64 bytes
 .../net/exit3/keys/ed25519_master_id_secret_key| Bin 0 -> 96 bytes
 .../net/exit3/keys/ed25519_signing_cert| Bin 0 -> 172 bytes
 .../net/exit3/keys/ed25519_signing_secret_key  | Bin 0 -> 96 bytes
 tests/integration/net/exit3/keys/secret_id_key |  15 +++
 tests/integration/net/exit3/keys/secret_onion_key  |  15 +++
 .../net/exit3/keys/secret_onion_key_ntor   | Bin 0 -> 96 bytes
 tests/integration/net/exit3/torrc  |  27 
 tests/integration/net/relay1/fingerprint   |   1 +
 .../net/relay1/keys/ed25519_master_id_public_key   | Bin 0 -> 64 bytes
 .../net/relay1/keys/ed25519_master_id_secret_key   | Bin 0 -> 96 bytes
 .../net/relay1/keys/ed25519_signing_cert   | Bin 0 -> 172 bytes
 .../net/relay1/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes
 tests/integration/net/relay1/keys/secret_id_key|  15 +++
 tests/integration/net/relay1/keys/secret_onion_key |  15 +++

[tor-commits] [sbws/master] Merge branch 'bug28741'

2019-01-23 Thread juga

commit 19fa738e2ffe7c0f3cd27122003c31f5baa80e24
Merge: 8dbe890 225d880
Author: juga0 
Date:   Wed Jan 23 15:20:22 2019 +

Merge branch 'bug28741'

There was merge conflict in the imports, solved adding all of them

 sbws/__init__.py| 17 +
 sbws/core/scanner.py| 34 ++
 sbws/globals.py | 33 +
 sbws/lib/destination.py |  2 +-
 sbws/util/requests.py   | 15 +--
 5 files changed, 82 insertions(+), 19 deletions(-)

diff --cc sbws/core/scanner.py
index edf5227,a6e46a4..8fe8a5b
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@@ -1,7 -1,6 +1,8 @@@
  ''' Measure the relays. '''
  
 +import sys
 +import threading
+ import uuid
  
  from ..lib.circuitbuilder import GapsCircuitBuilder as CB
  from ..lib.resultdump import ResultDump
@@@ -12,7 -11,7 +13,7 @@@ from ..lib.relayprioritizer import Rela
  from ..lib.destination import DestinationList
  from ..util.timestamp import now_isodt_str
  from ..util.state import State
- from sbws.globals import fail_hard, TIMEOUT_MEASUREMENTS
 -from sbws.globals import fail_hard, HTTP_GET_HEADERS
++from sbws.globals import fail_hard, TIMEOUT_MEASUREMENTS, HTTP_GET_HEADERS
  import sbws.util.stem as stem_utils
  import sbws.util.requests as requests_utils
  from argparse import ArgumentDefaultsHelpFormatter

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

[tor-commits] [sbws/master] scanner: refactor, remove unneded line

2019-01-23 Thread juga

commit c2d3bb98eb76eb15c1a7618993244225cbd03b9b
Author: juga0 
Date:   Wed Dec 12 15:27:48 2018 +

scanner: refactor, remove unneded line
---
 sbws/core/scanner.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index f6e226a..caf2aaa 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -40,9 +40,8 @@ def timed_recv_from_server(session, dest, byte_range):
 try:
 # headers are merged with the session ones, not overwritten.
 session.get(dest.url, headers=HTTP_GET_HEADERS, verify=dest.verify)
-except requests.exceptions.ConnectionError as e:
-return False, e
-except requests.exceptions.ReadTimeout as e:
+except (requests.exceptions.ConnectionError,
+requests.exceptions.ReadTimeout) as e:
 return False, e
 end_time = time.time()
 return True, end_time - start_time



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

[tor-commits] [sbws/master] scanner: change comment

2019-01-23 Thread juga

commit 550093645979d4611310e9b34f450802303ddb15
Author: juga0 
Date:   Wed Dec 12 15:40:38 2018 +

scanner: change comment
---
 sbws/core/scanner.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index caf2aaa..f461824 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -36,7 +36,11 @@ def timed_recv_from_server(session, dest, byte_range):
 HTTP_GET_HEADERS['Range'] = byte_range
 # TODO:
 # - What other exceptions can this throw?
-# - Do we have to read the content, or did requests already do so?
+# - response.elapsed "measures the time taken between sending the first
+#   byte of the request and finishing parsing the headers.
+#   It is therefore unaffected by consuming the response content"
+#   If this mean that the content has arrived, elapsed could be used to
+#   know the time it took.
 try:
 # headers are merged with the session ones, not overwritten.
 session.get(dest.url, headers=HTTP_GET_HEADERS, verify=dest.verify)



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

[tor-commits] [sbws/master] scanner: refactor, move HTTP headers to constants

2019-01-23 Thread juga

commit 7022ff30fc657e53be8ca1726ae73259174a322b
Author: juga0 
Date:   Wed Dec 12 15:21:47 2018 +

scanner: refactor, move HTTP headers to constants
---
 sbws/core/scanner.py | 7 ---
 sbws/globals.py  | 5 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 51e7076..f6e226a 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -9,7 +9,7 @@ from ..lib.relayprioritizer import RelayPrioritizer
 from ..lib.destination import DestinationList
 from ..util.timestamp import now_isodt_str
 from ..util.state import State
-from sbws.globals import fail_hard
+from sbws.globals import fail_hard, HTTP_GET_HEADERS
 import sbws.util.stem as stem_utils
 import sbws.util.requests as requests_utils
 from argparse import ArgumentDefaultsHelpFormatter
@@ -31,14 +31,15 @@ def timed_recv_from_server(session, dest, byte_range):
 ''' Request the **byte_range** from the URL at **dest**. If successful,
 return True and the time it took to download. Otherwise return False and an
 exception. '''
-headers = {'Range': byte_range, 'Accept-Encoding': 'identity'}
+
 start_time = time.time()
+HTTP_GET_HEADERS['Range'] = byte_range
 # TODO:
 # - What other exceptions can this throw?
 # - Do we have to read the content, or did requests already do so?
 try:
 # headers are merged with the session ones, not overwritten.
-session.get(dest.url, headers=headers, verify=dest.verify)
+session.get(dest.url, headers=HTTP_GET_HEADERS, verify=dest.verify)
 except requests.exceptions.ConnectionError as e:
 return False, e
 except requests.exceptions.ReadTimeout as e:
diff --git a/sbws/globals.py b/sbws/globals.py
index 2277850..7196736 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -53,6 +53,11 @@ MAX_BW_DIFF_PERC = 50
 
 BW_LINE_SIZE = 510
 
+HTTP_GET_HEADERS = {
+'Range': '{}',
+'Accept-Encoding': 'identity',
+}
+
 
 def fail_hard(*a, **kw):
 ''' Log something ... and then exit as fast as possible '''



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

[tor-commits] [sbws/master] Add HTTP headers to send in every request

2019-01-23 Thread juga

commit 225d880b24a5cf4860a406169ae803a7ae866fba
Author: juga0 
Date:   Wed Dec 12 14:39:26 2018 +

Add HTTP headers to send in every request

create a constant, set the headers in the session.
---
 sbws/__init__.py  | 17 +
 sbws/core/scanner.py  | 15 +++
 sbws/globals.py   | 28 
 sbws/util/requests.py |  3 +++
 4 files changed, 63 insertions(+)

diff --git a/sbws/__init__.py b/sbws/__init__.py
index 4256404..eea7006 100644
--- a/sbws/__init__.py
+++ b/sbws/__init__.py
@@ -1 +1,18 @@
 __version__ = '1.0.3-dev0'
+
+from . import globals  # noqa
+
+
+class Settings:
+def __init__(self):
+# update this dict from globals (but only for ALL_CAPS settings)
+for setting in dir(globals):
+if setting.isupper():
+setattr(self, setting, getattr(globals, setting))
+
+def init_http_headers(self, nickname, uuid, tor_version):
+self.HTTP_HEADERS['Tor-Bandwidth-Scanner-Nickname'] = nickname
+self.HTTP_HEADERS['Tor-Bandwidth-Scanner-UUID'] = uuid
+self.HTTP_HEADERS['User-Agent'] += tor_version
+
+settings = Settings()  # noqa
diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index f461824..a6e46a4 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -1,5 +1,7 @@
 ''' Measure the relays. '''
 
+import uuid
+
 from ..lib.circuitbuilder import GapsCircuitBuilder as CB
 from ..lib.resultdump import ResultDump
 from ..lib.resultdump import ResultSuccess, ResultErrorCircuit
@@ -21,6 +23,8 @@ import logging
 import requests
 import random
 
+from sbws import settings
+
 
 rng = random.SystemRandom()
 end_event = Event()
@@ -335,6 +339,14 @@ def run_speedtest(args, conf):
 'even lead to messed up results.',
 conf.getpath('tor', 'control_socket'))
 time.sleep(15)
+
+# When there will be a refactor where conf is global, this can be removed
+# from here.
+state = State(conf.getpath('paths', 'state_fname'))
+# Call only once to initialize http_headers
+settings.init_http_headers(conf.get('scanner', 'nickname'), state['uuid'],
+   str(controller.get_version()))
+
 rl = RelayList(args, conf, controller)
 cb = CB(args, conf, controller, rl)
 rd = ResultDump(args, conf, end_event)
@@ -394,6 +406,9 @@ def main(args, conf):
 
 state = State(conf.getpath('paths', 'state_fname'))
 state['scanner_started'] = now_isodt_str()
+# Generate an unique identifier for each scanner
+if 'uuid' not in state:
+state['uuid'] = str(uuid.uuid4())
 
 try:
 run_speedtest(args, conf)
diff --git a/sbws/globals.py b/sbws/globals.py
index 7196736..cda6a54 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -1,5 +1,12 @@
 import os
 import logging
+import platform
+
+from requests import __version__ as requests_version
+from stem import __version__ as stem_version
+
+from sbws import __version__
+
 
 log = logging.getLogger(__name__)
 
@@ -53,6 +60,27 @@ MAX_BW_DIFF_PERC = 50
 
 BW_LINE_SIZE = 510
 
+# Metadata to send in every requests, so that data servers can know which
+# scanners are using them.
+# In Requests these keys are case insensitive.
+HTTP_HEADERS = {
+# This would be ignored if changing to HTTP/2
+'Connection': 'keep-alive',
+# Needs to get Tor version from the controller
+'User-Agent': 'sbws/{} ({}) Python/{} Requests/{} Stem/{} Tor/'.format(
+__version__, platform.platform(),
+platform.python_version(),
+requests_version, stem_version),
+# Organization defined names (:rfc:`7239`)
+# Needs to get the nickname from the user config file.
+'Tor-Bandwidth-Scanner-Nickname': '{}',
+'Tor-Bandwidth-Scanner-UUID': '{}',
+# In case of including IP address.
+# 'Forwarded': 'for={}'  # IPv6 part, if there's
+}
+# In the case of having ipv6 it's concatenated to forwarder.
+IPV6_FORWARDED = ', for="[{}]"'
+
 HTTP_GET_HEADERS = {
 'Range': '{}',
 'Accept-Encoding': 'identity',
diff --git a/sbws/util/requests.py b/sbws/util/requests.py
index 103182a..0b1ece2 100644
--- a/sbws/util/requests.py
+++ b/sbws/util/requests.py
@@ -1,4 +1,6 @@
 import requests
+
+from sbws import settings
 import sbws.util.stem as stem_utils
 
 
@@ -10,4 +12,5 @@ def make_session(controller, timeout):
 'https': 'socks5h://{}:{}'.format(*socks_info),
 }
 s.timeout = timeout
+s.headers = settings.HTTP_HEADERS
 return s



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

[tor-commits] [sbws/master] requests: refactor, set session attributes

2019-01-23 Thread juga

commit 106e8a97d0dbfa0ebfaeabc476e5f3a85833ca3e
Author: juga0 
Date:   Wed Dec 12 15:01:03 2018 +

requests: refactor, set session attributes

to their values instead of have to extra functions to call
in every request.
This also makes the code more clear.
---
 sbws/core/scanner.py|  4 ++--
 sbws/lib/destination.py |  2 +-
 sbws/util/requests.py   | 12 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 80251ec..51e7076 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -37,8 +37,8 @@ def timed_recv_from_server(session, dest, byte_range):
 # - What other exceptions can this throw?
 # - Do we have to read the content, or did requests already do so?
 try:
-requests_utils.get(
-session, dest.url, headers=headers, verify=dest.verify)
+# headers are merged with the session ones, not overwritten.
+session.get(dest.url, headers=headers, verify=dest.verify)
 except requests.exceptions.ConnectionError as e:
 return False, e
 except requests.exceptions.ReadTimeout as e:
diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py
index 1b4c192..a9233c3 100644
--- a/sbws/lib/destination.py
+++ b/sbws/lib/destination.py
@@ -73,7 +73,7 @@ def connect_to_destination_over_circuit(dest, circ_id, 
session, cont, max_dl):
 try:
 # TODO:
 # - What other exceptions can this throw?
-head = requests_utils.head(session, dest.url, verify=dest.verify)
+head = session.head(dest.url, verify=dest.verify)
 except (requests.exceptions.ConnectionError,
 requests.exceptions.ReadTimeout) as e:
 return False, 'Could not connect to {} over circ {} {}: {}'.format(
diff --git a/sbws/util/requests.py b/sbws/util/requests.py
index 449ced7..103182a 100644
--- a/sbws/util/requests.py
+++ b/sbws/util/requests.py
@@ -5,17 +5,9 @@ import sbws.util.stem as stem_utils
 def make_session(controller, timeout):
 s = requests.Session()
 socks_info = stem_utils.get_socks_info(controller)
-s.sbws_proxies = {
+s.proxies = {
 'http': 'socks5h://{}:{}'.format(*socks_info),
 'https': 'socks5h://{}:{}'.format(*socks_info),
 }
-s.sbws_timeout = timeout
+s.timeout = timeout
 return s
-
-
-def get(s, url, **kw):
-return s.get(url, timeout=s.sbws_timeout, proxies=s.sbws_proxies, **kw)
-
-
-def head(s, url, **kw):
-return s.head(url, timeout=s.sbws_timeout, proxies=s.sbws_proxies, **kw)



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

[tor-commits] [sbws/master] Merge branch 'bug28932'

2019-01-23 Thread juga

commit 8dbe89057d7eebd7f470fa28aed5d419a76df8cb
Merge: 12ad99d 5dae9b9
Author: juga0 
Date:   Wed Jan 23 15:17:08 2019 +

Merge branch 'bug28932'

 sbws/core/scanner.py | 35 +--
 sbws/globals.py  |  1 +
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --cc sbws/core/scanner.py
index 1ba0e8e,67fa30b..edf5227
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@@ -377,12 -383,19 +401,19 @@@ def run_speedtest(args, conf)
  while len(pending_results) >= max_pending_results:
  time.sleep(5)
  pending_results = [r for r in pending_results if not 
r.ready()]
- while len(pending_results) > 0:
+ time_waiting = 0
+ while (len(pending_results) > 0
+and time_waiting <= TIMEOUT_MEASUREMENTS):
+ log.debug("Number of pending measurement threads %s after "
+   "a prioritization loop.", len(pending_results))
  time.sleep(5)
+ time_waiting += 5
  pending_results = [r for r in pending_results if not r.ready()]
+ if time_waiting > TIMEOUT_MEASUREMENTS:
+ dumpstacks()
  loop_tstop = time.time()
  loop_tdelta = (loop_tstop - loop_tstart) / 60
 -log.debug("Measured %s relays in %s minutes", num_relays, loop_tdelta)
 +log.info("Measured %s relays in %s minutes", num_relays, loop_tdelta)
  
  
  def gen_parser(sub):

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

[tor-commits] [sbws/master] scanner: log backtrace when not progressing

2019-01-23 Thread juga

commit a550d73178d6fc8158bb5ae518e719c0f81b8ae7
Author: juga0 
Date:   Fri Dec 21 05:19:54 2018 +

scanner: log backtrace when not progressing

When sbws stalls after the prioritization loop waiting for thread
results, give it some minutes and otherwise log the backtrace.
This way if there's any bug or deadlock, operators can help to
debug it.
---
 sbws/core/scanner.py | 26 +-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 80251ec..9c7dff5 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -1,5 +1,8 @@
 ''' Measure the relays. '''
 
+import sys
+import threading
+
 from ..lib.circuitbuilder import GapsCircuitBuilder as CB
 from ..lib.resultdump import ResultDump
 from ..lib.resultdump import ResultSuccess, ResultErrorCircuit
@@ -27,6 +30,20 @@ end_event = Event()
 log = logging.getLogger(__name__)
 
 
+def dumpstacks():
+import pdb
+import traceback
+log.warning("sbws stop measuring relays, probably because of a bug."
+"Please, open a ticket in trac.torproject.org with this"
+"backtrace.")
+thread_id2name = dict([(t.ident, t.name) for t in threading.enumerate()])
+for thread_id, stack in sys._current_frames().items():
+log.critical("Thread: %s(%d)",
+ thread_id2name.get(thread_id, ""), thread_id)
+log.critical(traceback.print_stack(stack))
+pdb.set_trace()
+
+
 def timed_recv_from_server(session, dest, byte_range):
 ''' Request the **byte_range** from the URL at **dest**. If successful,
 return True and the time it took to download. Otherwise return False and an
@@ -359,9 +376,16 @@ def run_speedtest(args, conf):
 while len(pending_results) >= max_pending_results:
 time.sleep(5)
 pending_results = [r for r in pending_results if not r.ready()]
-while len(pending_results) > 0:
+counter = 0
+# give it 3min, otherwise there's a bug or deadlock
+while len(pending_results) > 0 and counter <= 36:
+counter += 1
+log.debug("Number of pending measurement threads %s after "
+  "a prioritization loop.", len(pending_results))
 time.sleep(5)
 pending_results = [r for r in pending_results if not r.ready()]
+if counter > 36:
+dumpstacks()
 loop_tstop = time.time()
 loop_tdelta = (loop_tstop - loop_tstart) / 60
 log.debug("Measured %s relays in %s minutes", num_relays, loop_tdelta)



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

[tor-commits] [sbws/master] fixup! scanner: log backtrace when not progressing

2019-01-23 Thread juga

commit 5dae9b99d2cda373b5f05139faf1b7a8710fc5d8
Author: juga0 
Date:   Wed Jan 23 10:22:17 2019 +

fixup! scanner: log backtrace when not progressing
---
 sbws/core/scanner.py | 29 ++---
 sbws/globals.py  |  1 +
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 9c7dff5..67fa30b 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -12,7 +12,7 @@ from ..lib.relayprioritizer import RelayPrioritizer
 from ..lib.destination import DestinationList
 from ..util.timestamp import now_isodt_str
 from ..util.state import State
-from sbws.globals import fail_hard
+from sbws.globals import fail_hard, TIMEOUT_MEASUREMENTS
 import sbws.util.stem as stem_utils
 import sbws.util.requests as requests_utils
 from argparse import ArgumentDefaultsHelpFormatter
@@ -31,17 +31,24 @@ log = logging.getLogger(__name__)
 
 
 def dumpstacks():
-import pdb
 import traceback
-log.warning("sbws stop measuring relays, probably because of a bug."
-"Please, open a ticket in trac.torproject.org with this"
-"backtrace.")
+log.critical("sbws stop measuring relays, probably because of a bug."
+ "Please, open a ticket in trac.torproject.org with this"
+ "backtrace.")
 thread_id2name = dict([(t.ident, t.name) for t in threading.enumerate()])
 for thread_id, stack in sys._current_frames().items():
 log.critical("Thread: %s(%d)",
  thread_id2name.get(thread_id, ""), thread_id)
 log.critical(traceback.print_stack(stack))
-pdb.set_trace()
+# If logging level is less than DEBUG (more verbose), start pdb so that
+# developers can debug the issue.
+if log.getEffectiveLevel() < logging.DEBUG:
+import pdb
+pdb.set_trace()
+# Otherwise exit.
+else:
+# Change to stop threads when #28869 is merged
+sys.exit(1)
 
 
 def timed_recv_from_server(session, dest, byte_range):
@@ -376,15 +383,15 @@ def run_speedtest(args, conf):
 while len(pending_results) >= max_pending_results:
 time.sleep(5)
 pending_results = [r for r in pending_results if not r.ready()]
-counter = 0
-# give it 3min, otherwise there's a bug or deadlock
-while len(pending_results) > 0 and counter <= 36:
-counter += 1
+time_waiting = 0
+while (len(pending_results) > 0
+   and time_waiting <= TIMEOUT_MEASUREMENTS):
 log.debug("Number of pending measurement threads %s after "
   "a prioritization loop.", len(pending_results))
 time.sleep(5)
+time_waiting += 5
 pending_results = [r for r in pending_results if not r.ready()]
-if counter > 36:
+if time_waiting > TIMEOUT_MEASUREMENTS:
 dumpstacks()
 loop_tstop = time.time()
 loop_tdelta = (loop_tstop - loop_tstart) / 60
diff --git a/sbws/globals.py b/sbws/globals.py
index 2277850..50caaf7 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -34,6 +34,7 @@ SUPERVISED_USER_CONFIG_PATH = "/etc/sbws/sbws.ini"
 SUPERVISED_RUN_DPATH = "/run/sbws/tor"
 
 SOCKET_TIMEOUT = 60  # seconds
+TIMEOUT_MEASUREMENTS = 60 * 3  # 3 minutes
 
 SBWS_SCALE_CONSTANT = 7500
 TORFLOW_SCALING = 1



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

[tor-commits] [tor/release-0.3.5] maint-0.2.9: remove changes files that are merged in 0.2.9 releases

2019-01-23 Thread nickm

commit dd6c2b0ad77b5bfbf7f06b1d73f8ab85d81154bf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:48:28 2019 -0500

maint-0.2.9: remove changes files that are merged in 0.2.9 releases

Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
---
 changes/19974|  5 -
 changes/20460|  4 
 changes/20492|  4 
 changes/21359|  8 
 changes/bastet_v6|  4 
 changes/bug15582 |  4 
 changes/bug18100 |  5 -
 changes/bug18329-minimal |  6 --
 changes/bug19025 |  4 
 changes/bug19869 |  4 
 changes/bug19926_029_info|  3 ---
 changes/bug19960 |  4 
 changes/bug19968 | 11 ---
 changes/bug19969 | 10 --
 changes/bug20059 |  3 ---
 changes/bug20085 |  4 
 changes/bug20235 |  4 
 changes/bug20247 |  4 
 changes/bug20306_029 |  4 
 changes/bug20307 |  7 ---
 changes/bug20401 |  4 
 changes/bug20423 |  6 --
 changes/bug20424_029_minimal |  4 
 changes/bug20472 |  5 -
 changes/bug20484 |  5 -
 changes/bug20487 |  4 
 changes/bug20509 |  5 -
 changes/bug20529 |  4 
 changes/bug20533 |  7 ---
 changes/bug20534 |  8 
 changes/bug20536 |  6 --
 changes/bug20551 |  3 ---
 changes/bug20553 |  3 ---
 changes/bug20560 |  4 
 changes/bug20587 |  5 -
 changes/bug20588 |  3 ---
 changes/bug20591 |  3 ---
 changes/bug20593 |  6 --
 changes/bug20597 |  5 -
 changes/bug20613 |  6 --
 changes/bug20634 |  3 ---
 changes/bug20638 |  5 -
 changes/bug20710_025 |  4 
 changes/bug20715 |  4 
 changes/bug20716 |  3 ---
 changes/bug20810 |  4 
 changes/bug20864 |  4 
 changes/bug20875 |  4 
 changes/bug20935 |  3 ---
 changes/bug21018 | 11 ---
 changes/bug21035 |  6 --
 changes/bug21051 |  3 ---
 changes/bug21074_downgrade   |  4 
 changes/bug21108_029 |  6 --
 changes/bug21278_extras  |  3 ---
 changes/bug21278_prevention  |  4 
 changes/bug21280 |  5 -
 changes/bug21357 |  7 ---
 changes/bug21394 |  9 -
 changes/bug21450 |  4 
 changes/bug21507 |  5 -
 changes/bug21576 |  4 
 changes/bug21943 |  6 --
 changes/bug22034 |  4 
 changes/bug22245 |  5 -
 changes/bug22349 |  9 -
 changes/bug22370 |  4 
 changes/bug22446 |  4 
 changes/bug22460_case2   |  8 
 changes/bug22490 |  3 ---
 changes/bug22516 |  5 -
 changes/bug22636 |  8 
 changes/bug22644 |  5 -
 changes/bug22737 | 12 
 changes/bug22789 |  7 ---
 changes/bug22797 |  4 
 changes/bug22801 |  5 -
 changes/bug22838_028 |  5 -
 changes/bug22915 |  3 ---
 changes/bug22916_027 |  3 ---
 changes/bug23030_029 |  7 ---
 changes/bug23081 |  8 
 changes/bug23291 |  3 ---
 changes/bug23318 | 11 ---
 changes/bug23470 |  6 --
 changes/bug23690 |  5 -
 changes/bug23693 |  6 --
 changes/bug23874 |  3 ---
 changes/bug23985 |  9 -
 changes/bug24167 |  7 ---
 changes/bug24170 |  3 ---
 changes/bug24198 |  4 
 changes/bug24313 |  5 -
 changes/bug24480 |  3 ---
 changes/bug24633 |  5 -
 changes/bug24666 |  7 ---
 changes/bug24736 |  6 --
 changes/bug24854 |  3 ---
 changes/bug24895 |  8 
 changes/bug24898-029 |  6 --
 changes/bug24952 |  5 -
 changes/bug24969 |  3 ---
 changes/bug24978 |  7 ---
 changes/bug25223 |  4 
 changes/bug25249 |  3 ---
 changes/bug25249.2   |  3 ---
 changes/bug25440 |  5 -
 changes/bug25629 |  3 ---
 changes/bug26007 |  5 -
 changes/bug26072 |  5 -
 changes/bug26116 |  7 ---
 changes/bug26196 |  4 
 changes/bug26269 |  5 -
 changes/bug26485 |  4

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2019-01-23 Thread nickm

commit 95b214d8eb0de211a43cbee1deb2e173855306c6
Merge: e65d645a7 f9050681c
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-01-23 Thread nickm

commit 1c5f03fba7e0ccf3381cfeb609b5229f7911e359
Merge: 761f1bf71 d1c0dbabf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4




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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-01-23 Thread nickm

commit 1c5f03fba7e0ccf3381cfeb609b5229f7911e359
Merge: 761f1bf71 d1c0dbabf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4




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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2019-01-23 Thread nickm

commit 6f22a0c157fb6af1d05c7146d6d9539daf95b2c5
Merge: 001367eb1 1c5f03fba
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-23 Thread nickm

commit f9050681c032bd339bdf6314c9ee8e577d37cedc
Merge: d9fde8760 1c5f03fba
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5




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

[tor-commits] [tor/release-0.3.4] maint-0.2.9: remove changes files that are merged in 0.2.9 releases

2019-01-23 Thread nickm

commit dd6c2b0ad77b5bfbf7f06b1d73f8ab85d81154bf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:48:28 2019 -0500

maint-0.2.9: remove changes files that are merged in 0.2.9 releases

Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
---
 changes/19974|  5 -
 changes/20460|  4 
 changes/20492|  4 
 changes/21359|  8 
 changes/bastet_v6|  4 
 changes/bug15582 |  4 
 changes/bug18100 |  5 -
 changes/bug18329-minimal |  6 --
 changes/bug19025 |  4 
 changes/bug19869 |  4 
 changes/bug19926_029_info|  3 ---
 changes/bug19960 |  4 
 changes/bug19968 | 11 ---
 changes/bug19969 | 10 --
 changes/bug20059 |  3 ---
 changes/bug20085 |  4 
 changes/bug20235 |  4 
 changes/bug20247 |  4 
 changes/bug20306_029 |  4 
 changes/bug20307 |  7 ---
 changes/bug20401 |  4 
 changes/bug20423 |  6 --
 changes/bug20424_029_minimal |  4 
 changes/bug20472 |  5 -
 changes/bug20484 |  5 -
 changes/bug20487 |  4 
 changes/bug20509 |  5 -
 changes/bug20529 |  4 
 changes/bug20533 |  7 ---
 changes/bug20534 |  8 
 changes/bug20536 |  6 --
 changes/bug20551 |  3 ---
 changes/bug20553 |  3 ---
 changes/bug20560 |  4 
 changes/bug20587 |  5 -
 changes/bug20588 |  3 ---
 changes/bug20591 |  3 ---
 changes/bug20593 |  6 --
 changes/bug20597 |  5 -
 changes/bug20613 |  6 --
 changes/bug20634 |  3 ---
 changes/bug20638 |  5 -
 changes/bug20710_025 |  4 
 changes/bug20715 |  4 
 changes/bug20716 |  3 ---
 changes/bug20810 |  4 
 changes/bug20864 |  4 
 changes/bug20875 |  4 
 changes/bug20935 |  3 ---
 changes/bug21018 | 11 ---
 changes/bug21035 |  6 --
 changes/bug21051 |  3 ---
 changes/bug21074_downgrade   |  4 
 changes/bug21108_029 |  6 --
 changes/bug21278_extras  |  3 ---
 changes/bug21278_prevention  |  4 
 changes/bug21280 |  5 -
 changes/bug21357 |  7 ---
 changes/bug21394 |  9 -
 changes/bug21450 |  4 
 changes/bug21507 |  5 -
 changes/bug21576 |  4 
 changes/bug21943 |  6 --
 changes/bug22034 |  4 
 changes/bug22245 |  5 -
 changes/bug22349 |  9 -
 changes/bug22370 |  4 
 changes/bug22446 |  4 
 changes/bug22460_case2   |  8 
 changes/bug22490 |  3 ---
 changes/bug22516 |  5 -
 changes/bug22636 |  8 
 changes/bug22644 |  5 -
 changes/bug22737 | 12 
 changes/bug22789 |  7 ---
 changes/bug22797 |  4 
 changes/bug22801 |  5 -
 changes/bug22838_028 |  5 -
 changes/bug22915 |  3 ---
 changes/bug22916_027 |  3 ---
 changes/bug23030_029 |  7 ---
 changes/bug23081 |  8 
 changes/bug23291 |  3 ---
 changes/bug23318 | 11 ---
 changes/bug23470 |  6 --
 changes/bug23690 |  5 -
 changes/bug23693 |  6 --
 changes/bug23874 |  3 ---
 changes/bug23985 |  9 -
 changes/bug24167 |  7 ---
 changes/bug24170 |  3 ---
 changes/bug24198 |  4 
 changes/bug24313 |  5 -
 changes/bug24480 |  3 ---
 changes/bug24633 |  5 -
 changes/bug24666 |  7 ---
 changes/bug24736 |  6 --
 changes/bug24854 |  3 ---
 changes/bug24895 |  8 
 changes/bug24898-029 |  6 --
 changes/bug24952 |  5 -
 changes/bug24969 |  3 ---
 changes/bug24978 |  7 ---
 changes/bug25223 |  4 
 changes/bug25249 |  3 ---
 changes/bug25249.2   |  3 ---
 changes/bug25440 |  5 -
 changes/bug25629 |  3 ---
 changes/bug26007 |  5 -
 changes/bug26072 |  5 -
 changes/bug26116 |  7 ---
 changes/bug26196 |  4 
 changes/bug26269 |  5 -
 changes/bug26485 |  4

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-23 Thread nickm

commit d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:50:38 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.




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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-23 Thread nickm

commit d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:50:38 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.




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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-23 Thread nickm

commit d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:50:38 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.




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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2019-01-23 Thread nickm

commit d213fbda2f2aaaf54c0d609f8afe5fd74ad944a9
Merge: b655e77ec d1c0dbabf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

[tor-commits] [tor/release-0.3.3] maint-0.2.9: remove changes files that are merged in 0.2.9 releases

2019-01-23 Thread nickm

commit dd6c2b0ad77b5bfbf7f06b1d73f8ab85d81154bf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:48:28 2019 -0500

maint-0.2.9: remove changes files that are merged in 0.2.9 releases

Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
---
 changes/19974|  5 -
 changes/20460|  4 
 changes/20492|  4 
 changes/21359|  8 
 changes/bastet_v6|  4 
 changes/bug15582 |  4 
 changes/bug18100 |  5 -
 changes/bug18329-minimal |  6 --
 changes/bug19025 |  4 
 changes/bug19869 |  4 
 changes/bug19926_029_info|  3 ---
 changes/bug19960 |  4 
 changes/bug19968 | 11 ---
 changes/bug19969 | 10 --
 changes/bug20059 |  3 ---
 changes/bug20085 |  4 
 changes/bug20235 |  4 
 changes/bug20247 |  4 
 changes/bug20306_029 |  4 
 changes/bug20307 |  7 ---
 changes/bug20401 |  4 
 changes/bug20423 |  6 --
 changes/bug20424_029_minimal |  4 
 changes/bug20472 |  5 -
 changes/bug20484 |  5 -
 changes/bug20487 |  4 
 changes/bug20509 |  5 -
 changes/bug20529 |  4 
 changes/bug20533 |  7 ---
 changes/bug20534 |  8 
 changes/bug20536 |  6 --
 changes/bug20551 |  3 ---
 changes/bug20553 |  3 ---
 changes/bug20560 |  4 
 changes/bug20587 |  5 -
 changes/bug20588 |  3 ---
 changes/bug20591 |  3 ---
 changes/bug20593 |  6 --
 changes/bug20597 |  5 -
 changes/bug20613 |  6 --
 changes/bug20634 |  3 ---
 changes/bug20638 |  5 -
 changes/bug20710_025 |  4 
 changes/bug20715 |  4 
 changes/bug20716 |  3 ---
 changes/bug20810 |  4 
 changes/bug20864 |  4 
 changes/bug20875 |  4 
 changes/bug20935 |  3 ---
 changes/bug21018 | 11 ---
 changes/bug21035 |  6 --
 changes/bug21051 |  3 ---
 changes/bug21074_downgrade   |  4 
 changes/bug21108_029 |  6 --
 changes/bug21278_extras  |  3 ---
 changes/bug21278_prevention  |  4 
 changes/bug21280 |  5 -
 changes/bug21357 |  7 ---
 changes/bug21394 |  9 -
 changes/bug21450 |  4 
 changes/bug21507 |  5 -
 changes/bug21576 |  4 
 changes/bug21943 |  6 --
 changes/bug22034 |  4 
 changes/bug22245 |  5 -
 changes/bug22349 |  9 -
 changes/bug22370 |  4 
 changes/bug22446 |  4 
 changes/bug22460_case2   |  8 
 changes/bug22490 |  3 ---
 changes/bug22516 |  5 -
 changes/bug22636 |  8 
 changes/bug22644 |  5 -
 changes/bug22737 | 12 
 changes/bug22789 |  7 ---
 changes/bug22797 |  4 
 changes/bug22801 |  5 -
 changes/bug22838_028 |  5 -
 changes/bug22915 |  3 ---
 changes/bug22916_027 |  3 ---
 changes/bug23030_029 |  7 ---
 changes/bug23081 |  8 
 changes/bug23291 |  3 ---
 changes/bug23318 | 11 ---
 changes/bug23470 |  6 --
 changes/bug23690 |  5 -
 changes/bug23693 |  6 --
 changes/bug23874 |  3 ---
 changes/bug23985 |  9 -
 changes/bug24167 |  7 ---
 changes/bug24170 |  3 ---
 changes/bug24198 |  4 
 changes/bug24313 |  5 -
 changes/bug24480 |  3 ---
 changes/bug24633 |  5 -
 changes/bug24666 |  7 ---
 changes/bug24736 |  6 --
 changes/bug24854 |  3 ---
 changes/bug24895 |  8 
 changes/bug24898-029 |  6 --
 changes/bug24952 |  5 -
 changes/bug24969 |  3 ---
 changes/bug24978 |  7 ---
 changes/bug25223 |  4 
 changes/bug25249 |  3 ---
 changes/bug25249.2   |  3 ---
 changes/bug25440 |  5 -
 changes/bug25629 |  3 ---
 changes/bug26007 |  5 -
 changes/bug26072 |  5 -
 changes/bug26116 |  7 ---
 changes/bug26196 |  4 
 changes/bug26269 |  5 -
 changes/bug26485 |  4

[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2019-01-23 Thread nickm

commit 5ec566edda60f0c9deec366f51c3956cbd5c2d49
Merge: 8e1e71cc0 f9050681c
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:32 2019 -0500

Merge branch 'maint-0.3.5'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-01-23 Thread nickm

commit 1c5f03fba7e0ccf3381cfeb609b5229f7911e359
Merge: 761f1bf71 d1c0dbabf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4




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

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-23 Thread nickm

commit f9050681c032bd339bdf6314c9ee8e577d37cedc
Merge: d9fde8760 1c5f03fba
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2019-01-23 Thread nickm

commit 46ab93ca7799e0ccab70d2f18432afd6c716
Merge: 06338dc60 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:49:26 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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

[tor-commits] [tor/release-0.2.9] maint-0.2.9: remove changes files that are merged in 0.2.9 releases

2019-01-23 Thread nickm

commit dd6c2b0ad77b5bfbf7f06b1d73f8ab85d81154bf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:48:28 2019 -0500

maint-0.2.9: remove changes files that are merged in 0.2.9 releases

Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
---
 changes/19974|  5 -
 changes/20460|  4 
 changes/20492|  4 
 changes/21359|  8 
 changes/bastet_v6|  4 
 changes/bug15582 |  4 
 changes/bug18100 |  5 -
 changes/bug18329-minimal |  6 --
 changes/bug19025 |  4 
 changes/bug19869 |  4 
 changes/bug19926_029_info|  3 ---
 changes/bug19960 |  4 
 changes/bug19968 | 11 ---
 changes/bug19969 | 10 --
 changes/bug20059 |  3 ---
 changes/bug20085 |  4 
 changes/bug20235 |  4 
 changes/bug20247 |  4 
 changes/bug20306_029 |  4 
 changes/bug20307 |  7 ---
 changes/bug20401 |  4 
 changes/bug20423 |  6 --
 changes/bug20424_029_minimal |  4 
 changes/bug20472 |  5 -
 changes/bug20484 |  5 -
 changes/bug20487 |  4 
 changes/bug20509 |  5 -
 changes/bug20529 |  4 
 changes/bug20533 |  7 ---
 changes/bug20534 |  8 
 changes/bug20536 |  6 --
 changes/bug20551 |  3 ---
 changes/bug20553 |  3 ---
 changes/bug20560 |  4 
 changes/bug20587 |  5 -
 changes/bug20588 |  3 ---
 changes/bug20591 |  3 ---
 changes/bug20593 |  6 --
 changes/bug20597 |  5 -
 changes/bug20613 |  6 --
 changes/bug20634 |  3 ---
 changes/bug20638 |  5 -
 changes/bug20710_025 |  4 
 changes/bug20715 |  4 
 changes/bug20716 |  3 ---
 changes/bug20810 |  4 
 changes/bug20864 |  4 
 changes/bug20875 |  4 
 changes/bug20935 |  3 ---
 changes/bug21018 | 11 ---
 changes/bug21035 |  6 --
 changes/bug21051 |  3 ---
 changes/bug21074_downgrade   |  4 
 changes/bug21108_029 |  6 --
 changes/bug21278_extras  |  3 ---
 changes/bug21278_prevention  |  4 
 changes/bug21280 |  5 -
 changes/bug21357 |  7 ---
 changes/bug21394 |  9 -
 changes/bug21450 |  4 
 changes/bug21507 |  5 -
 changes/bug21576 |  4 
 changes/bug21943 |  6 --
 changes/bug22034 |  4 
 changes/bug22245 |  5 -
 changes/bug22349 |  9 -
 changes/bug22370 |  4 
 changes/bug22446 |  4 
 changes/bug22460_case2   |  8 
 changes/bug22490 |  3 ---
 changes/bug22516 |  5 -
 changes/bug22636 |  8 
 changes/bug22644 |  5 -
 changes/bug22737 | 12 
 changes/bug22789 |  7 ---
 changes/bug22797 |  4 
 changes/bug22801 |  5 -
 changes/bug22838_028 |  5 -
 changes/bug22915 |  3 ---
 changes/bug22916_027 |  3 ---
 changes/bug23030_029 |  7 ---
 changes/bug23081 |  8 
 changes/bug23291 |  3 ---
 changes/bug23318 | 11 ---
 changes/bug23470 |  6 --
 changes/bug23690 |  5 -
 changes/bug23693 |  6 --
 changes/bug23874 |  3 ---
 changes/bug23985 |  9 -
 changes/bug24167 |  7 ---
 changes/bug24170 |  3 ---
 changes/bug24198 |  4 
 changes/bug24313 |  5 -
 changes/bug24480 |  3 ---
 changes/bug24633 |  5 -
 changes/bug24666 |  7 ---
 changes/bug24736 |  6 --
 changes/bug24854 |  3 ---
 changes/bug24895 |  8 
 changes/bug24898-029 |  6 --
 changes/bug24952 |  5 -
 changes/bug24969 |  3 ---
 changes/bug24978 |  7 ---
 changes/bug25223 |  4 
 changes/bug25249 |  3 ---
 changes/bug25249.2   |  3 ---
 changes/bug25440 |  5 -
 changes/bug25629 |  3 ---
 changes/bug26007 |  5 -
 changes/bug26072 |  5 -
 changes/bug26116 |  7 ---
 changes/bug26196 |  4 
 changes/bug26269 |  5 -
 changes/bug26485 |  4

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-23 Thread nickm

commit d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:50:38 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.




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

[tor-commits] [tor/master] maint-0.2.9: remove changes files that are merged in 0.2.9 releases

2019-01-23 Thread nickm

commit dd6c2b0ad77b5bfbf7f06b1d73f8ab85d81154bf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:48:28 2019 -0500

maint-0.2.9: remove changes files that are merged in 0.2.9 releases

Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
---
 changes/19974|  5 -
 changes/20460|  4 
 changes/20492|  4 
 changes/21359|  8 
 changes/bastet_v6|  4 
 changes/bug15582 |  4 
 changes/bug18100 |  5 -
 changes/bug18329-minimal |  6 --
 changes/bug19025 |  4 
 changes/bug19869 |  4 
 changes/bug19926_029_info|  3 ---
 changes/bug19960 |  4 
 changes/bug19968 | 11 ---
 changes/bug19969 | 10 --
 changes/bug20059 |  3 ---
 changes/bug20085 |  4 
 changes/bug20235 |  4 
 changes/bug20247 |  4 
 changes/bug20306_029 |  4 
 changes/bug20307 |  7 ---
 changes/bug20401 |  4 
 changes/bug20423 |  6 --
 changes/bug20424_029_minimal |  4 
 changes/bug20472 |  5 -
 changes/bug20484 |  5 -
 changes/bug20487 |  4 
 changes/bug20509 |  5 -
 changes/bug20529 |  4 
 changes/bug20533 |  7 ---
 changes/bug20534 |  8 
 changes/bug20536 |  6 --
 changes/bug20551 |  3 ---
 changes/bug20553 |  3 ---
 changes/bug20560 |  4 
 changes/bug20587 |  5 -
 changes/bug20588 |  3 ---
 changes/bug20591 |  3 ---
 changes/bug20593 |  6 --
 changes/bug20597 |  5 -
 changes/bug20613 |  6 --
 changes/bug20634 |  3 ---
 changes/bug20638 |  5 -
 changes/bug20710_025 |  4 
 changes/bug20715 |  4 
 changes/bug20716 |  3 ---
 changes/bug20810 |  4 
 changes/bug20864 |  4 
 changes/bug20875 |  4 
 changes/bug20935 |  3 ---
 changes/bug21018 | 11 ---
 changes/bug21035 |  6 --
 changes/bug21051 |  3 ---
 changes/bug21074_downgrade   |  4 
 changes/bug21108_029 |  6 --
 changes/bug21278_extras  |  3 ---
 changes/bug21278_prevention  |  4 
 changes/bug21280 |  5 -
 changes/bug21357 |  7 ---
 changes/bug21394 |  9 -
 changes/bug21450 |  4 
 changes/bug21507 |  5 -
 changes/bug21576 |  4 
 changes/bug21943 |  6 --
 changes/bug22034 |  4 
 changes/bug22245 |  5 -
 changes/bug22349 |  9 -
 changes/bug22370 |  4 
 changes/bug22446 |  4 
 changes/bug22460_case2   |  8 
 changes/bug22490 |  3 ---
 changes/bug22516 |  5 -
 changes/bug22636 |  8 
 changes/bug22644 |  5 -
 changes/bug22737 | 12 
 changes/bug22789 |  7 ---
 changes/bug22797 |  4 
 changes/bug22801 |  5 -
 changes/bug22838_028 |  5 -
 changes/bug22915 |  3 ---
 changes/bug22916_027 |  3 ---
 changes/bug23030_029 |  7 ---
 changes/bug23081 |  8 
 changes/bug23291 |  3 ---
 changes/bug23318 | 11 ---
 changes/bug23470 |  6 --
 changes/bug23690 |  5 -
 changes/bug23693 |  6 --
 changes/bug23874 |  3 ---
 changes/bug23985 |  9 -
 changes/bug24167 |  7 ---
 changes/bug24170 |  3 ---
 changes/bug24198 |  4 
 changes/bug24313 |  5 -
 changes/bug24480 |  3 ---
 changes/bug24633 |  5 -
 changes/bug24666 |  7 ---
 changes/bug24736 |  6 --
 changes/bug24854 |  3 ---
 changes/bug24895 |  8 
 changes/bug24898-029 |  6 --
 changes/bug24952 |  5 -
 changes/bug24969 |  3 ---
 changes/bug24978 |  7 ---
 changes/bug25223 |  4 
 changes/bug25249 |  3 ---
 changes/bug25249.2   |  3 ---
 changes/bug25440 |  5 -
 changes/bug25629 |  3 ---
 changes/bug26007 |  5 -
 changes/bug26072 |  5 -
 changes/bug26116 |  7 ---
 changes/bug26196 |  4 
 changes/bug26269 |  5 -
 changes/bug26485 |  4

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-23 Thread nickm

commit d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:50:38 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.




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

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-01-23 Thread nickm

commit 1c5f03fba7e0ccf3381cfeb609b5229f7911e359
Merge: 761f1bf71 d1c0dbabf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

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

[tor-commits] [tor/maint-0.3.4] maint-0.2.9: remove changes files that are merged in 0.2.9 releases

2019-01-23 Thread nickm

commit dd6c2b0ad77b5bfbf7f06b1d73f8ab85d81154bf
Author: Nick Mathewson 
Date:   Wed Jan 23 09:48:28 2019 -0500

maint-0.2.9: remove changes files that are merged in 0.2.9 releases

Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
---
 changes/19974|  5 -
 changes/20460|  4 
 changes/20492|  4 
 changes/21359|  8 
 changes/bastet_v6|  4 
 changes/bug15582 |  4 
 changes/bug18100 |  5 -
 changes/bug18329-minimal |  6 --
 changes/bug19025 |  4 
 changes/bug19869 |  4 
 changes/bug19926_029_info|  3 ---
 changes/bug19960 |  4 
 changes/bug19968 | 11 ---
 changes/bug19969 | 10 --
 changes/bug20059 |  3 ---
 changes/bug20085 |  4 
 changes/bug20235 |  4 
 changes/bug20247 |  4 
 changes/bug20306_029 |  4 
 changes/bug20307 |  7 ---
 changes/bug20401 |  4 
 changes/bug20423 |  6 --
 changes/bug20424_029_minimal |  4 
 changes/bug20472 |  5 -
 changes/bug20484 |  5 -
 changes/bug20487 |  4 
 changes/bug20509 |  5 -
 changes/bug20529 |  4 
 changes/bug20533 |  7 ---
 changes/bug20534 |  8 
 changes/bug20536 |  6 --
 changes/bug20551 |  3 ---
 changes/bug20553 |  3 ---
 changes/bug20560 |  4 
 changes/bug20587 |  5 -
 changes/bug20588 |  3 ---
 changes/bug20591 |  3 ---
 changes/bug20593 |  6 --
 changes/bug20597 |  5 -
 changes/bug20613 |  6 --
 changes/bug20634 |  3 ---
 changes/bug20638 |  5 -
 changes/bug20710_025 |  4 
 changes/bug20715 |  4 
 changes/bug20716 |  3 ---
 changes/bug20810 |  4 
 changes/bug20864 |  4 
 changes/bug20875 |  4 
 changes/bug20935 |  3 ---
 changes/bug21018 | 11 ---
 changes/bug21035 |  6 --
 changes/bug21051 |  3 ---
 changes/bug21074_downgrade   |  4 
 changes/bug21108_029 |  6 --
 changes/bug21278_extras  |  3 ---
 changes/bug21278_prevention  |  4 
 changes/bug21280 |  5 -
 changes/bug21357 |  7 ---
 changes/bug21394 |  9 -
 changes/bug21450 |  4 
 changes/bug21507 |  5 -
 changes/bug21576 |  4 
 changes/bug21943 |  6 --
 changes/bug22034 |  4 
 changes/bug22245 |  5 -
 changes/bug22349 |  9 -
 changes/bug22370 |  4 
 changes/bug22446 |  4 
 changes/bug22460_case2   |  8 
 changes/bug22490 |  3 ---
 changes/bug22516 |  5 -
 changes/bug22636 |  8 
 changes/bug22644 |  5 -
 changes/bug22737 | 12 
 changes/bug22789 |  7 ---
 changes/bug22797 |  4 
 changes/bug22801 |  5 -
 changes/bug22838_028 |  5 -
 changes/bug22915 |  3 ---
 changes/bug22916_027 |  3 ---
 changes/bug23030_029 |  7 ---
 changes/bug23081 |  8 
 changes/bug23291 |  3 ---
 changes/bug23318 | 11 ---
 changes/bug23470 |  6 --
 changes/bug23690 |  5 -
 changes/bug23693 |  6 --
 changes/bug23874 |  3 ---
 changes/bug23985 |  9 -
 changes/bug24167 |  7 ---
 changes/bug24170 |  3 ---
 changes/bug24198 |  4 
 changes/bug24313 |  5 -
 changes/bug24480 |  3 ---
 changes/bug24633 |  5 -
 changes/bug24666 |  7 ---
 changes/bug24736 |  6 --
 changes/bug24854 |  3 ---
 changes/bug24895 |  8 
 changes/bug24898-029 |  6 --
 changes/bug24952 |  5 -
 changes/bug24969 |  3 ---
 changes/bug24978 |  7 ---
 changes/bug25223 |  4 
 changes/bug25249 |  3 ---
 changes/bug25249.2   |  3 ---
 changes/bug25440 |  5 -
 changes/bug25629 |  3 ---
 changes/bug26007 |  5 -
 changes/bug26072 |  5 -
 changes/bug26116 |  7 ---
 changes/bug26196 |  4 
 changes/bug26269 |  5 -
 changes/bug26485 |  4

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-23 Thread nickm

commit d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:50:38 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.




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

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-23 Thread nickm

commit f9050681c032bd339bdf6314c9ee8e577d37cedc
Merge: d9fde8760 1c5f03fba
Author: Nick Mathewson 
Date:   Wed Jan 23 09:51:02 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5




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

1 2 >

1 - 100 of 146 matches

Mail list logo