date:20140527

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

2014-05-27 Thread translation

commit ac58f54a1f3e074f1a7834b1b006e5e2f71a283c
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 12:45:15 2014 +

Update translations for https_everywhere
---
 sr/ssl-observatory.dtd |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/sr/ssl-observatory.dtd b/sr/ssl-observatory.dtd
index 070a556..ae8f43e 100644
--- a/sr/ssl-observatory.dtd
+++ b/sr/ssl-observatory.dtd
@@ -3,9 +3,9 @@
 !ENTITY ssl-observatory.popup.later Pitaj me kasnije
 !ENTITY ssl-observatory.popup.no Ne
 
-!ENTITY ssl-observatory.popup.text quot;HTTPS Svudaquot; moze detektovat 
napade
-protiv vaseg pretrazivaca slanjem certifikata koje primate do
-Observatorija.  Zelite li ukljuciti ovo?
+!ENTITY ssl-observatory.popup.text quot;HTTPS Svudaquot; moÅ¾e detektovati 
napade
+protiv vaÅ¡eg pretraÅ¾ivaca slanjem sertifikata kojeg
+dobijete u Observatorijumu.  Å½elite li da ukljuÄite to?
 
 !--!ENTITY ssl-observatory.popup.text 
 EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -45,10 +45,13 @@ veoma nametljivu korporativnu mrezu.
 Ovo ce uhaviti i poslati quot;Autonomni Systemski brojquot; vase mreze.  
Ovo ce nam pomoci u pronalazenju napada protiv HTTPS, i proveriti da li imamo 
Observatorij iz mreza na mestima kao sto su Iran i Syria gde su napadi cesti.
 
 !ENTITY ssl-observatory.prefs.show_cert_warning
-Show a warning when the Observatory detects a revoked certificate not caught 
by your browser
+PrikaÅ¾i upozorenje kad Obzervatorijum  otkrije opozvan sertifikat
+koji VaÅ¡ pretraÅ¾ivaÄ nije naÅ¡ao.
 
 !ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
-This will check submitted certificates against known Certificate Revocation 
Lists. Unfortunately we cannot guarantee that we will flag every revoked 
certificate, but if you do see a warning there's a good chance something is 
wrong.
+Ovo Äe proveravati sertifikate priloÅ¾ene protiv Liste Opozvanih Sertifikata.
+NaÅ¾alost, ne moÅ¾emo da garantujemo da Äemo obeleÅ¾iiti svaki opozvani 
sertifikat,
+ali ukoliko vidite upozorenje postoji dobra Å¡ansa da neÅ¡to nije u redu.
 
 !ENTITY ssl-observatory.prefs.done Gotovo
 
@@ -92,9 +95,9 @@ www.nesto.com, ali ne i ko je posetio sajt, ili koju stranicu 
su posetili specif
 !ENTITY ssl-observatory.warning.showcert Pokazi lanac certifikata
 !ENTITY ssl-observatory.warning.okay Razumem
 !ENTITY ssl-observatory.warning.text EFF-ov SSL Observatorij je uzrokovao 
upozorenje o HTTPS certifikat(ima) za ovaj sajt.
-!ENTITY ssl-observatory.warning.defense If you are logged in to this site, 
it may be advisable to change your password once you have a safe connection. 
(These warnings can be disabled in the quot;SSL Observatoryquot; tab of the 
HTTPS Everywhere preferences dialog.)
+!ENTITY ssl-observatory.warning.defense Ukoliko ste ulogovani na ovaj sajt, 
bilo bi preporuÄljivo da promenite svoju Å¡ifru Äim uspostavite sigurnu 
konekciju. (Ova upozorenja mogu da se iskljuÄe u quot;SSL 
Obzervatorijumquot; tabu i HTTPS Svuda postavke dijalogu.)
 
 !ENTITY ssl-observatory.prefs.self_signed
-Posalji i proveri samo potpisane certifikate
+PoÅ¡alji i proveri samopotpisane sertifikate
 !ENTITY ssl-observatory.prefs.self_signed_tooltip
-Ovo je preporucljivo: kriptografski problemi su osobito cesti u samo 
potpisanim ugradenim uredajima
+Ovo je preporuÄljivo: kriptografski problemi su posebno Äesti u 
samopotpisanim ugraÄenim ureÄajima

___
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

2014-05-27 Thread translation

commit 62dfd380fe044f924ee4b0c014341465664e03dc
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 12:45:21 2014 +

Update translations for https_everywhere_completed
---
 sr/ssl-observatory.dtd |   21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/sr/ssl-observatory.dtd b/sr/ssl-observatory.dtd
index 326a181..ae8f43e 100644
--- a/sr/ssl-observatory.dtd
+++ b/sr/ssl-observatory.dtd
@@ -3,9 +3,9 @@
 !ENTITY ssl-observatory.popup.later Pitaj me kasnije
 !ENTITY ssl-observatory.popup.no Ne
 
-!ENTITY ssl-observatory.popup.text quot;HTTPS Svudaquot; moze detektovat 
napade
-protiv vaseg pretrazivaca slanjem certifikata koje primate do
-Observatorija.  Zelite li ukljuciti ovo?
+!ENTITY ssl-observatory.popup.text quot;HTTPS Svudaquot; moÅ¾e detektovati 
napade
+protiv vaÅ¡eg pretraÅ¾ivaca slanjem sertifikata kojeg
+dobijete u Observatorijumu.  Å½elite li da ukljuÄite to?
 
 !--!ENTITY ssl-observatory.popup.text 
 EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -44,6 +44,15 @@ veoma nametljivu korporativnu mrezu.
 !ENTITY ssl-observatory.prefs.asn_tooltip
 Ovo ce uhaviti i poslati quot;Autonomni Systemski brojquot; vase mreze.  
Ovo ce nam pomoci u pronalazenju napada protiv HTTPS, i proveriti da li imamo 
Observatorij iz mreza na mestima kao sto su Iran i Syria gde su napadi cesti.
 
+!ENTITY ssl-observatory.prefs.show_cert_warning
+PrikaÅ¾i upozorenje kad Obzervatorijum  otkrije opozvan sertifikat
+koji VaÅ¡ pretraÅ¾ivaÄ nije naÅ¡ao.
+
+!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+Ovo Äe proveravati sertifikate priloÅ¾ene protiv Liste Opozvanih Sertifikata.
+NaÅ¾alost, ne moÅ¾emo da garantujemo da Äemo obeleÅ¾iiti svaki opozvani 
sertifikat,
+ali ukoliko vidite upozorenje postoji dobra Å¡ansa da neÅ¡to nije u redu.
+
 !ENTITY ssl-observatory.prefs.done Gotovo
 
 !ENTITY ssl-observatory.prefs.explanation 
@@ -86,9 +95,9 @@ www.nesto.com, ali ne i ko je posetio sajt, ili koju stranicu 
su posetili specif
 !ENTITY ssl-observatory.warning.showcert Pokazi lanac certifikata
 !ENTITY ssl-observatory.warning.okay Razumem
 !ENTITY ssl-observatory.warning.text EFF-ov SSL Observatorij je uzrokovao 
upozorenje o HTTPS certifikat(ima) za ovaj sajt.
-!ENTITY ssl-observatory.warning.defense Ako ste prijavljeni na ovaj sajt, 
bilo bi preporucljivo da promenite password kada budete na sigurnoj vezi.
+!ENTITY ssl-observatory.warning.defense Ukoliko ste ulogovani na ovaj sajt, 
bilo bi preporuÄljivo da promenite svoju Å¡ifru Äim uspostavite sigurnu 
konekciju. (Ova upozorenja mogu da se iskljuÄe u quot;SSL 
Obzervatorijumquot; tabu i HTTPS Svuda postavke dijalogu.)
 
 !ENTITY ssl-observatory.prefs.self_signed
-Posalji i proveri samo potpisane certifikate
+PoÅ¡alji i proveri samopotpisane sertifikate
 !ENTITY ssl-observatory.prefs.self_signed_tooltip
-Ovo je preporucljivo: kriptografski problemi su osobito cesti u samo 
potpisanim ugradenim uredajima
+Ovo je preporuÄljivo: kriptografski problemi su posebno Äesti u 
samopotpisanim ugraÄenim ureÄajima

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

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

2014-05-27 Thread translation

commit 9027e5fdb6ed3cf6a6c6107a387a30230bb352dc
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 13:45:02 2014 +

Update translations for bridgedb
---
 pt_BR/LC_MESSAGES/bridgedb.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index a2d3fe9..3e4c1df 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -13,8 +13,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-05-16 18:39+\n
-PO-Revision-Date: 2014-05-26 21:22+\n
-Last-Translator: Communia ameanean...@riseup.net\n
+PO-Revision-Date: 2014-05-27 13:41+\n
+Last-Translator: Anastasia01\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -194,7 +194,7 @@ msgstr Como iniciar o uso de suas pontes
 msgid 
 To enter bridges into Tor Browser, follow the instructions on the %s Tor\n
 Browser download page %s to start Tor Browser.
-msgstr 
+msgstr Para inserir pontes no navegador Tor, siga as instruÃ§oes no %s 
pÃ¡gina\n de downloads do navegador Tor %s para iniciÃ¡-lo.
 
 #: lib/bridgedb/strings.py:108
 msgid 

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

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2014-05-27 Thread translation

commit fc57e20eb55f4e3ab41f14661fd4c8b954c48da8
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 13:45:50 2014 +

Update translations for tor-and-https
---
 pt_BR.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index b8e986d..b190a35 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -6,7 +6,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2014-05-24 18:11+\n
-PO-Revision-Date: 2014-05-26 18:53+\n
+PO-Revision-Date: 2014-05-27 13:32+\n
 Last-Translator: Anastasia01\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
@@ -128,7 +128,7 @@ msgstr ConexÃ£o de Internet
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Eavesdropping
-msgstr 
+msgstr Bisbilhotar
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:346

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

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

2014-05-27 Thread translation

commit 8ee6d01e451b9f5649258d78dbe165dc2891e88e
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 14:15:03 2014 +

Update translations for bridgedb
---
 pt_BR/LC_MESSAGES/bridgedb.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 3e4c1df..744f94c 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-05-16 18:39+\n
-PO-Revision-Date: 2014-05-27 13:41+\n
+PO-Revision-Date: 2014-05-27 14:12+\n
 Last-Translator: Anastasia01\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
@@ -200,7 +200,7 @@ msgstr Para inserir pontes no navegador Tor, siga as 
instruÃ§oes no %s pÃ¡gina\
 msgid 
 When the 'Tor Network Settings' dialogue pops up, click 'Configure' and 
follow\n
 the wizard until it asks:
-msgstr 
+msgstr Quando a janela 'ConfiguraÃ§Ãµes da Rede Tor' aparecer, clique em 
'Configurar' e siga\no assistente atÃ© que ele pergunte:
 
 #: lib/bridgedb/strings.py:111
 msgid 
@@ -214,7 +214,7 @@ msgid 
 paste the bridge lines into the text input box. Finally, click 'Connect', 
and\n
 you should be good to go! If you experience trouble, try clicking the 
'Help'\n
 button in the 'Tor Network Settings' wizard for further assistance.
-msgstr 
+msgstr Selecione 'Sim' e clique em 'PrÃ³ximo'. Para configurar suas novas 
pontes, copie e\ncole as coordenadas das pontes na caixa de texto de saÃda. 
Por fim, clique em 'Conectar'.\nDeve ser o suficiente! Se encontrar problemas, 
tente clicar no botÃ£o\n'Ajuda' no assistente de 'ConfiguraÃ§Ãµes da Rede Tor'  
mais uma maior assistÃªncia.
 
 #: lib/bridgedb/strings.py:122
 msgid Displays this message.
@@ -222,7 +222,7 @@ msgstr Mostrar essa mensagem.
 
 #: lib/bridgedb/strings.py:123
 msgid Request vanilla bridges.
-msgstr 
+msgstr Solicitar pontes VANILLA.
 
 #: lib/bridgedb/strings.py:124
 msgid Request IPv6 bridges.

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

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

2014-05-27 Thread translation

commit 99bca83f03c1e5203f60b0ca31f578e4dba6ca0c
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 15:15:05 2014 +

Update translations for bridgedb_completed
---
 pt_BR/LC_MESSAGES/bridgedb.po |  341 ++---
 1 file changed, 288 insertions(+), 53 deletions(-)

diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 3d6ba21..08ea6f5 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -1,19 +1,21 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Translators:
-# Communia ameanean...@riseup.net, 2013
+# Communia ameanean...@riseup.net, 2013-2014
 # Augustine evan...@geocities.com, 2013
+# Humberto Sartini humbe...@hss.blog.br, 2014
+# Anastasia01, 2014
 # Snake Plissken , 2012
+# recognitium rodrigoesbor...@gmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-03-27 21:41+\n
-PO-Revision-Date: 2013-08-20 22:20+\n
-Last-Translator: Communia ameanean...@riseup.net\n
+Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
+POT-Creation-Date: 2014-05-16 18:39+\n
+PO-Revision-Date: 2014-05-27 15:03+\n
+Last-Translator: recognitium rodrigoesbor...@gmail.com\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -22,82 +24,315 @@ msgstr 
 Language: pt_BR\n
 Plural-Forms: nplurals=2; plural=(n  1);\n
 
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. bridge
+#. bridges
+#. BridgeDB
+#. pluggable transport
+#. pluggable transports
+#. obfs2
+#. obfs3
+#. scramblesuit
+#. fte
+#. Tor
+#. Tor Browser
+#. TBB
+#: lib/bridgedb/HTTPServer.py:124
+msgid Sorry! Something went wrong with your request.
+msgstr Desculpe! Algo errado ocorreu na sua solicitaÃ§Ã£o.
+
+#: lib/bridgedb/strings.py:18
+msgid [This is an automated message; please do not reply.]
+msgstr [Esta Ã© uma mensagem automÃ¡tica; por favor, nÃ£o responda.]
+
+#: lib/bridgedb/strings.py:20
+msgid Here are your bridges:
+msgstr Aqui estÃ£o suas pontes:
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid 
+You have exceeded the rate limit. Please slow down! The minimum time 
between\n
+emails is %s hours. All further emails during this time period will be 
ignored.
+msgstr VocÃª excedeu a taxa limite. Mais devagar, por favor! O tempo mÃnimo 
entre\ne-mails Ã© de %s horas. Todos os outros e-mails durante este perÃodo 
serÃ£o ignorados.
+
+#: lib/bridgedb/strings.py:25
+msgid 
+COMMANDs: (combine COMMANDs to specify multiple options simultaneously)
+msgstr COMANDOS: (combinar COMANDOS para especificar mÃºltiplas opÃ§Ãµes 
simultaneamente)
+
+#: lib/bridgedb/strings.py:27
+msgid Welcome to BridgeDB!
+msgstr Bem vindo ao BridgeDB!
+
+#. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
+#: lib/bridgedb/strings.py:29
+msgid Currently supported transport TYPEs:
+msgstr Tipos de transportes atualmente compatÃveis:
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid Hey, %s!
+msgstr Oi, %s!
+
+#: lib/bridgedb/strings.py:31
+msgid Hello, friend!
+msgstr OlÃ¡, amigo!
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+msgid Public Keys
+msgstr Chaves PÃºblicas
+
+#. TRANSLATORS: This string will end up saying something like:
+#. This email was generated with rainbows, unicorns, and sparkles
+#. for al...@example.com on Friday, 09 May, 2014 at 18:59:39.
+#: lib/bridgedb/strings.py:36
+#, python-format
+msgid 
+This email was generated with rainbows, unicorns, and sparkles\n
+for %s on %s at %s.
+msgstr Este e-mail foi gerado com arco-Ãris, unicÃ³rnios e faÃscas por  %s, 
%s, Ã s %s.
+
+#: lib/bridgedb/strings.py:42
+#, python-format
+msgid 
+BridgeDB can provide bridges with several %stypes of Pluggable 
Transports%s,\n
+which can help obfuscate your connections to the Tor Network, making it 
more\n
+difficult for anyone watching your internet traffic to determine that you 
are\n
+using Tor.\n
+\n
+msgstr BridgeDB pode fornecer pontes com vÃ¡rios %stipos de ââTransportes 
PlugÃ¡veis%s,\nque podem ajudar a ofuscar suas conexÃµes com a Rede Tor, 
tornando mais\nddifÃcil para qualquer um ver seu trÃ¡fego de internet para 
determinar que vocÃª estÃ¡\nusando o Tor.\n
+
+#: lib/bridgedb/strings.py:48
+msgid 
+Some bridges with IPv6 addresses are also available, though some Pluggable\n
+Transports aren't IPv6 compatible.\n
+\n
+msgstr Algumas pontes com endereÃ§os

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2014-05-27 Thread translation

commit 19415e3d773f7be1519a19383936d3cfc80d4e45
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 15:15:56 2014 +

Update translations for tor-and-https_completed
---
 pt_BR.po |  138 ++
 1 file changed, 138 insertions(+)

diff --git a/pt_BR.po b/pt_BR.po
new file mode 100644
index 000..c9bed3e
--- /dev/null
+++ b/pt_BR.po
@@ -0,0 +1,138 @@
+# 
+# Translators:
+# Communia ameanean...@riseup.net, 2014
+# Anastasia01, 2014
+# recognitium rodrigoesbor...@gmail.com, 2014
+msgid 
+msgstr 
+Project-Id-Version: The Tor Project\n
+POT-Creation-Date: 2014-05-24 18:11+\n
+PO-Revision-Date: 2014-05-27 14:52+\n
+Last-Translator: recognitium rodrigoesbor...@gmail.com\n
+Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Language: pt_BR\n
+Plural-Forms: nplurals=2; plural=(n  1);\n
+
+#. (itstool) path: C/tor-and-https.svg/svg@direction
+#. (itstool) comment: C/tor-and-https.svg/svg@direction
+#. Specify ltr for left-to-right languages or rtl for right-to-left
+#. languages (e.g. Arabic or Hebrew).
+#: C/tor-and-https.svg:3
+msgid ltr
+msgstr epd
+
+#. (itstool) path: svg/title
+#: C/tor-and-https.svg:14
+#, no-wrap
+msgid Tor and HTTPS
+msgstr Tor e HTTPS
+
+#. (itstool) path: defs/text
+#. Keep it short: 7em max. Seven times the capital letter M.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Site.com
+msgstr Site.com
+
+#. (itstool) path: defs/text
+#. Keep it short: 7em max. Seven times the capital letter M.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid user / pw
+msgstr usuÃ¡rio/pw
+
+#. (itstool) path: defs/text
+#. Keep it short: 7em max. Seven times the capital letter M.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid data
+msgstr dados
+
+#. (itstool) path: defs/text
+#. Keep it short: 7em max. Seven times the capital letter M.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid location
+msgstr localizaÃ§Ã£o 
+
+#. (itstool) path: defs/text
+#. Keep it short: 3em max.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid WiFi
+msgstr WIFI
+
+#. (itstool) path: defs/text
+#. Keep it short: 4em max.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid ISP
+msgstr PSI
+
+#. (itstool) path: defs/text
+#. Keep it short: 8em is ok, 9em is max.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Hacker
+msgstr Hacker
+
+#. (itstool) path: defs/text
+#. Keep it short: 8em is ok, 9em is max.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Lawyer
+msgstr Advogado
+
+#. (itstool) path: defs/text
+#. Keep it short: 8em is ok, 9em is max.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Sysadmin
+msgstr Administrador de sistema
+
+#. (itstool) path: defs/text
+#. Keep it short: 8em is ok, 9em is max.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Police
+msgstr PolÃtica
+
+#. (itstool) path: defs/text
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid NSA
+msgstr ANS (AgÃªncia Nacional de SeguranÃ§a - National Security Agency)
+
+#. (itstool) path: defs/text
+#. Keep it short: 8em is ok, 9em is max.
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Tor relay
+msgstr Retransmissor Tor
+
+#. (itstool) path: defs/text
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Key
+msgstr Chave
+
+#. (itstool) path: defs/text
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Internet connection
+msgstr ConexÃ£o de Internet
+
+#. (itstool) path: defs/text
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Eavesdropping
+msgstr Bisbilhotar
+
+#. (itstool) path: defs/text
+#: C/tor-and-https.svg:346
+#, no-wrap
+msgid Data sharing
+msgstr Compartilhamento de Dados

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

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2014-05-27 Thread translation

commit 3f6de4c3cbc52af44dec0794257cab27b55d826b
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 15:15:53 2014 +

Update translations for tor-and-https
---
 pt_BR.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index b190a35..c9bed3e 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -2,12 +2,13 @@
 # Translators:
 # Communia ameanean...@riseup.net, 2014
 # Anastasia01, 2014
+# recognitium rodrigoesbor...@gmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2014-05-24 18:11+\n
-PO-Revision-Date: 2014-05-27 13:32+\n
-Last-Translator: Anastasia01\n
+PO-Revision-Date: 2014-05-27 14:52+\n
+Last-Translator: recognitium rodrigoesbor...@gmail.com\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -21,7 +22,7 @@ msgstr 
 #. languages (e.g. Arabic or Hebrew).
 #: C/tor-and-https.svg:3
 msgid ltr
-msgstr 
+msgstr epd
 
 #. (itstool) path: svg/title
 #: C/tor-and-https.svg:14
@@ -69,7 +70,7 @@ msgstr WIFI
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid ISP
-msgstr 
+msgstr PSI
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
@@ -97,7 +98,7 @@ msgstr Administrador de sistema
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Police
-msgstr 
+msgstr PolÃtica
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:346

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

[tor-commits] [tor-launcher/master] Bug #10425: geoip6 file is missing in TBB.

2014-05-27 Thread brade

commit 22ab705efb3fa112ad0e94d3792e23a508c71ace
Author: Kathy Brade br...@pearlcrescent.com
Date:   Tue May 27 11:27:25 2014 -0400

Bug #10425: geoip6 file is missing in TBB.

When starting tor, pass the geoip6 file location (within the tor data dir)
via the GeoIPv6File command line config option.
---
 src/components/tl-process.js |5 +
 1 file changed, 5 insertions(+)

diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 2efea99..4316a76 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -318,6 +318,9 @@ TorProcessService.prototype =
   var geoipFile = dataDir.clone();
   geoipFile.append(geoip);
 
+  var geoip6File = dataDir.clone();
+  geoip6File.append(geoip6);
+
   var args = [];
   if (torrcDefaultsFile)
   {
@@ -330,6 +333,8 @@ TorProcessService.prototype =
   args.push(dataDir.path);
   args.push(GeoIPFile);
   args.push(geoipFile.path);
+  args.push(GeoIPv6File);
+  args.push(geoip6File.path);
   args.push(HashedControlPassword);
   args.push(hashedPassword);
 

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

[tor-commits] r26796: {website} Sophos FAQ should be more precise. (website/trunk/docs/en)

2014-05-27 Thread Matt Pagan

Author: mttp
Date: 2014-05-27 15:32:02 + (Tue, 27 May 2014)
New Revision: 26796

Modified:
   website/trunk/docs/en/faq.wml
Log:
Sophos FAQ should be more precise. 



Modified: website/trunk/docs/en/faq.wml
===
--- website/trunk/docs/en/faq.wml   2014-05-27 00:09:23 UTC (rev 26795)
+++ website/trunk/docs/en/faq.wml   2014-05-27 15:32:02 UTC (rev 26796)
@@ -82,7 +82,7 @@
 lia href=#UbuntuI'm using Ubuntu, and I can't start Tor Browser.
 /a/li
 lia href=#SophosOnMacI'm using the Sophos anti-virus
-software on my Mac, and Tor Browser won't start./a/li
+software on my Mac, and Tor starts but I can't browse anywhere./a/li
 lia href=#TBBOtherExtensionsCan I install other Firefox
 extensions? Which extensions should I avoid using?/a/li
 lia href=#TBBJavaScriptEnabledWhy is NoScript configured to
@@ -1176,7 +1176,7 @@
 
 a id=SophosOnMac/a
 h3a class=anchor href=#SophosOnMacI'm using the Sophos anti-virus
-software on my Mac, and Tor Browser won't start./a/h3
+software on my Mac, and Tor starts but I can't browse anywhere./a/h3
 p
 You'll need to modify Sophos anti-virus so that Tor can connect to the
 internet. Go to Preferences - Web Protection - General, and turn off

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

[tor-commits] [tor-browser-bundle/master] Checkout tor-browser-builder-3 during fetch-input.sh

2014-05-27 Thread mikeperry

commit a9233e60ea2f8b80c42998800cc9e7324a7dfc5d
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue May 27 08:40:24 2014 -0700

Checkout tor-browser-builder-3 during fetch-input.sh

This may have been causing issues with the nightlies.
---
 gitian/fetch-inputs.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 77356d7..0eceaf7 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -289,8 +289,8 @@ cd ..
 git remote set-url origin 
https://git.torproject.org/builders/gitian-builder.git
 git fetch origin
 git fetch --tags origin # XXX - why do we fetch tags specifically?
-git checkout tor-browser-builder-2
-git merge origin/tor-browser-builder-2
+git checkout tor-browser-builder-3
+git merge origin/tor-browser-builder-3
 cd inputs
 
 while read dir url tag; do

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

[tor-commits] [user-manual/master] Stop abusing sort title and use groups instead

2014-05-27 Thread lunar

commit 4da906a523e95d45aeb6efdf9d8f04f6d169c622
Author: Lunar lu...@torproject.org
Date:   Tue May 27 11:07:34 2014 +0200

Stop abusing sort title and use groups instead

According to Mallard's specification:

Sort titles allow you to specify alternate text to be used when sorting 
the
page or section. Certain automatic link sections will sort the nodes 
they
link to. When this happens, providing a sort title allows you to control
how the node is collated. This is useful for excluding leading articles
such as âanâ and âtheâ.

The order of topic pages on the main index is better controlled by using
grouping capabilities of automatic links.
---
 C/bridges.page |1 -
 C/circumvention.page   |1 -
 C/how-tor-works.page   |3 +--
 C/known-issues.page|3 +--
 C/troubleshooting.page |3 +--
 C/uninstalling.page|1 -
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/C/bridges.page b/C/bridges.page
index 9964928..6c4cc57 100644
--- a/C/bridges.page
+++ b/C/bridges.page
@@ -5,7 +5,6 @@
 
 info
   descWhat bridges are and how to use them./desc
-  title type='sort'05 Bridges/title
   link type=guide xref=index /
 /info
 
diff --git a/C/circumvention.page b/C/circumvention.page
index b228699..5fc1f03 100644
--- a/C/circumvention.page
+++ b/C/circumvention.page
@@ -4,7 +4,6 @@
   id=circumvention
 
 info
-  title type='sort'04 Circumvention/title
   descWhat to do if the Tor network is blocked./desc
   link type=guide xref=index /
 /info
diff --git a/C/how-tor-works.page b/C/how-tor-works.page
index ecbacfa..930a237 100644
--- a/C/how-tor-works.page
+++ b/C/how-tor-works.page
@@ -3,9 +3,8 @@
   id=how-tor-works
 
   info
-title type='sort'01 Tor/title
 descHow Tor works./desc
-link type=guide xref=index/
+link type=guide xref=index group=#first/
   /info
 
   titleTor/title
diff --git a/C/known-issues.page b/C/known-issues.page
index 33e0c7e..327b8be 100644
--- a/C/known-issues.page
+++ b/C/known-issues.page
@@ -5,8 +5,7 @@
 
 info
   descA list of known issues./desc
-  title type='sort'03 Known Issues/title
-  link type=guide xref=index/
+  link type=guide xref=index group=#last /
 /info
 
 titleKnown Issues/title
diff --git a/C/troubleshooting.page b/C/troubleshooting.page
index ca9c480..d1cda52 100644
--- a/C/troubleshooting.page
+++ b/C/troubleshooting.page
@@ -4,9 +4,8 @@
   id=troubleshooting
 
 info
-  title type=sort02 Troubleshooting/title
   descWhat to do if Tor Browser doesn't work./desc
-  link type=guide xref=index/
+  link type=guide xref=index group=#last /
 /info
 
 titleTroubleshooting/title
diff --git a/C/uninstalling.page b/C/uninstalling.page
index 14e875d..5c8ca62 100644
--- a/C/uninstalling.page
+++ b/C/uninstalling.page
@@ -5,7 +5,6 @@
 
 info
   descHow to remove Tor Browser from your system./desc
-  title type='sort'06 Uninstalling/title
   link type=guide xref=index/
 /info
 



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

[tor-commits] [user-manual/master] Rework page about Tor to include warnings and the Tor and HTTPS visual

2014-05-27 Thread lunar

commit d97c9d6f1702e66dc719d697214cfcdf65cb5c2c
Author: Lunar lu...@torproject.org
Date:   Tue May 27 18:04:48 2014 +0200

Rework page about Tor to include warnings and the Tor and HTTPS visual
---
 C/how-tor-works.page |   37 
 C/tor.page   |  228 ++
 Makefile.am  |   12 +++
 3 files changed, 240 insertions(+), 37 deletions(-)

diff --git a/C/how-tor-works.page b/C/how-tor-works.page
deleted file mode 100644
index 930a237..000
--- a/C/how-tor-works.page
+++ /dev/null
@@ -1,37 +0,0 @@
-page xmlns=http://projectmallard.org/1.0/;
-  type=topic
-  id=how-tor-works
-
-  info
-descHow Tor works./desc
-link type=guide xref=index group=#first/
-  /info
-
-  titleTor/title
-  p
-Tor is a network of virtual tunnels that allows you to improve your
-privacy and security on the Internet. Tor works by sending your
-traffic through three random servers (also known as emrelays/em)
-in the Tor network, before the traffic is sent out onto the public
-Internet
-  /p
-  media type=image src=media/how-tor-works.png /
-  p
-The image above illustrates a user browsing to different websites
-over Tor. The green monitors represent relays in the Tor network,
-while the three keys represent the layers of encryption between the
-user and each relay.
-  /p
-  p
-Tor will anonymize the origin of your traffic, and it will encrypt
-everything between you and the Tor network. Tor will also encrypt
-your traffic inside the Tor network, but it cannot encrypt your
-traffic between the Tor network and its final destination.
-  /p
-  p
-If you are communicating sensitive information, for example when
-logging on to a website with a username and password, make sure that
-you are using HTTPS (e.g.  inputemhttps/em://torproject.org//input,
-not inputemhttp/em://torproject.org//input).
-  /p
-/page
diff --git a/C/tor.page b/C/tor.page
new file mode 100644
index 000..2e86158
--- /dev/null
+++ b/C/tor.page
@@ -0,0 +1,228 @@
+page xmlns=http://projectmallard.org/1.0/;
+  xmlns:its=http://www.w3.org/2005/11/its;
+  xmlns:xi=http://www.w3.org/2001/XInclude;
+  type=topic
+  id=tor
+
+  info
+link type=guide xref=index group=#first/
+descLearn what Tor can do to protect your privacy and anonymity./desc
+  /info
+
+  titleTor/title
+
+  section id=what-tor-will-do
+titleWhat Tor will do/title
+
+p
+  The app its:translate=noTor Browser/app uses the app
+  its:translate=noTor/app network to protect your privacy
+  and anonymity. Using the app its:translate=noTor/app network has 
two
+  main properties:
+/p
+
+list
+  item
+p
+  The Internet access provider will not be able to learn the sites
+  being visited and will not be able to monitor the content of
+  the communication.
+/p
+  /item
+  item
+p
+  The sites will see a connection coming from the app
+  its:translate=noTor/app network and will not learn
+  the actual Internet connection used to visit them.
+/p
+  /item
+/list
+
+p
+  On top of that, the app its:translate=noTor Browser/app is designed
+  to minimize the ability of websites to fingerprint the browser.
+/p
+p
+  The Tor Browser does not keep any browsing history. emCookies/em
+  are only valid for a single session: until the app 
its:translate=noTor
+  Browser/app is exited or a !-- XXX: add link --guiNew 
Identity/gui
+  is requested.
+/p
+
+!-- XXX: add Tor Browser team/mikeperry about things that are worth
+adding here. --
+  /section
+
+  section id=what-tor-will-not-do
+titleWhat Tor will emnot/em do/title
+
+p
+  app its:translate=noTor/app and the app its:translate=noTor
+  Browser/app will protect your privacy and anonymity only if used
+  appropriately.
+/p
+
+list
+  item
+p
+  app its:translate=noTor/app will not encrypt the whole
+  communication. What is sent to the app its:translate=noTor/app
+  network is what leaves the app its:translate=noTor/app network.
+  For web browsing, this means that any confidential information
+  should be sent using the HTTPS protocol.
+  !-- XXX: add a link to another topic page / document HTTPS 
Everywhere
+  --
+  !-- XXX: mention hidden services? --
+/p
+  /item
+  item
+p
+  If you give a website identifying information (e.g. a name, a
+  emlogin/em), you will no longer be an anonymous visitor of this
+  website.
+/p
+  /item
+  item
+p
+  If you transfer files, they can contain identifying information in 
their
+  metadata, like the camera serial number.
+/p
+  /item
+  item
+p
+  Only connections made

[tor-commits] [user-manual/master] Change main title to the name of the document

2014-05-27 Thread lunar

commit 089985a34ebce448bdd8192a124b5c149eb885a1
Author: Lunar lu...@torproject.org
Date:   Tue May 27 10:53:38 2014 +0200

Change main title to the name of the document
---
 C/index.page |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C/index.page b/C/index.page
index 84ef2f5..1df3448 100644
--- a/C/index.page
+++ b/C/index.page
@@ -3,7 +3,7 @@
   xmlns:its=http://www.w3.org/2005/11/its;
   type=guide
   id=index
-  titleTor Browser Help/title
+  titleTor Browser User Manual/title
   p its:locNote=lt;span/gt; will be replaced by current Tor Browser 
version
 Version:
 span its:translate=noxi:include href=../tor-browser-version.txt 
parse=text//span



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

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

2014-05-27 Thread translation

commit 3f8f44bcb5539918fc8a3a2eb820697293fb9e6d
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 16:15:32 2014 +

Update translations for tor-launcher-network-settings
---
 fi/network-settings.dtd |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fi/network-settings.dtd b/fi/network-settings.dtd
index 19cc04f..934ddf0 100644
--- a/fi/network-settings.dtd
+++ b/fi/network-settings.dtd
@@ -12,7 +12,7 @@
 !ENTITY torSettings.configurePrompt2 I need to configure bridge, firewall, 
or proxy settings.
 !ENTITY torSettings.configure Configure
 !ENTITY torSettings.connectPrompt2 I would like to connect directly to the 
Tor network.
-!ENTITY torSettings.connectPrompt3 This will work in most situations.
+!ENTITY torSettings.connectPrompt3 TÃ¤mÃ¤ toimii monissa tilanteissa.
 !ENTITY torSettings.connect YhdistÃ¤
 
 !ENTITY torSettings.proxyQuestion Tarvitseeko tÃ¤mÃ¤ tietokone proxya 
pÃ¤Ã¤stÃ¤kseen internettiin?
@@ -22,19 +22,19 @@
 !ENTITY torSettings.firewallQuestion Does this computer's Internet 
connection go through a firewall that only allows connections to certain 
ports?
 !ENTITY torSettings.firewallHelp Ellet ole varma kuinka vastata tÃ¤hÃ¤n 
kysymykseen, valitse Ei. Muuta tÃ¤tÃ¤ asetusta jos yhteyden saamisessa 
Tor-verkkoon on ongelmia.
 !ENTITY torSettings.enterFirewall Luettele pilkuin erotettuina ne portit, 
jotka palomuuri sallii. 
-!ENTITY torSettings.bridgeQuestion Does your Internet Service Provider (ISP) 
block or otherwise censor connections to the Tor Network?
+!ENTITY torSettings.bridgeQuestion Sensuroiko tai estÃ¤Ã¤kÃ¶ sinun 
operaattorisi (ISP) yhteydet Tor-verkkoon?
 !ENTITY torSettings.bridgeHelp If you are not sure how to answer this 
question, choose No.#160; If you choose Yes, you will be asked to configure 
Tor Bridges, which are unlisted relays that make it more difficult to block 
connections to the Tor Network.
 !ENTITY torSettings.bridgeSettingsPrompt You may use the provided set of 
bridges or you may obtain and enter a custom set of bridges.
 
 !-- Other: --
 
-!ENTITY torsettings.startingTor Waiting for Tor to startâ¦
-!ENTITY torsettings.restart KÃ¤ynnistÃ¤ Vidalia uudelleen
+!ENTITY torsettings.startingTor Odotetaan Torin kÃ¤ynnistymistÃ¤...
+!ENTITY torsettings.restart KÃ¤ynnistÃ¤ uudelleen
 
-!ENTITY torsettings.optional Optional
+!ENTITY torsettings.optional Vaihtoehtoinen
 
-!ENTITY torsettings.useProxy.checkbox This computer needs to use a proxy to 
access the Internet
-!ENTITY torsettings.useProxy.type Proxy Type:
+!ENTITY torsettings.useProxy.checkbox TÃ¤mÃ¤ tietokone tarvitsee kÃ¤yttÃ¤Ã¤ 
proxya pÃ¤Ã¤stÃ¤kseen internettiin.
+!ENTITY torsettings.useProxy.type Proxy tyyppi:
 !ENTITY torsettings.useProxy.address Osoite:
 !ENTITY torsettings.useProxy.address.placeholder IP osoite tai isÃ¤nnÃ¤n 
nimi
 !ENTITY torsettings.useProxy.port Portti:
@@ -45,7 +45,7 @@
 !ENTITY torsettings.useProxy.type.http HTTP / HTTPS
 !ENTITY torsettings.firewall.checkbox TÃ¤mÃ¤n tietokoneen palomuuri sallii 
yhteydet vain tiettyjen porttien kautta.
 !ENTITY torsettings.firewall.allowedPorts Sallitut portit:
-!ENTITY torsettings.useBridges.checkbox My Internet Service Provider (ISP) 
blocks connections to the Tor network
+!ENTITY torsettings.useBridges.checkbox Minun internet-yhteyden tarjoaja 
(ISP) estÃ¤Ã¤ yhteydet Tor verkkoon.
 !ENTITY torsettings.useBridges.default Connect with provided bridges
 !ENTITY torsettings.useBridges.type Siirtotyyppi:
 !ENTITY torsettings.useBridges.custom Enter custom bridges
@@ -59,6 +59,6 @@
 !ENTITY torsettings.bridgeHelp2Heading Through the Web
 !ENTITY torsettings.bridgeHelp2 Use a web browser to visit 
https://bridges.torproject.org;
 !ENTITY torsettings.bridgeHelp3Heading Through the Email Autoresponder
-!ENTITY torsettings.bridgeHelp3 Send email to brid...@torproject.org with 
the line 'get bridges' by itself in the body of the message.#160; However, to 
make it harder for an attacker to learn a lot of bridge addresses, you must 
send this request from a gmail.com or yahoo.com email address.
+!ENTITY torsettings.bridgeHelp3 LÃ¤hetÃ¤ sÃ¤hkÃ¶postia: 
brid...@torproject.org tekstin kanssa 'get bridges'  160
 !ENTITY torsettings.bridgeHelp4Heading Through the Help Desk
 !ENTITY torsettings.bridgeHelp4 As a last resort, you can request bridge 
addresses by sending a polite email message to h...@rt.torproject.org.#160; 
Please note that a person will need to respond to each request.

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

[tor-commits] [stem/master] Adding or-applet to our examples page

2014-05-27 Thread atagar

commit 8867b4158f16d015cc10f21a048e9548f71342e5
Author: Damian Johnson ata...@torproject.org
Date:   Tue May 27 09:44:00 2014 -0700

Adding or-applet to our examples page
---
 docs/tutorials/double_double_toil_and_trouble.rst |1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/tutorials/double_double_toil_and_trouble.rst 
b/docs/tutorials/double_double_toil_and_trouble.rst
index 73b6425..19c8d28 100644
--- a/docs/tutorials/double_double_toil_and_trouble.rst
+++ b/docs/tutorials/double_double_toil_and_trouble.rst
@@ -66,6 +66,7 @@ Applications
 `torirc https://github.com/alfred-gw/torirc`_
 IRC-like chat client using Tor hidden services.
 `exit-funding https://github.com/torservers/exit-funding`_   
 Script to estimate how much exit relays have been 
used.
 `torsearch https://github.com/wfn/torsearch`_
 Search engine prototype for descriptor data.
+`or-applet https://github.com/Yawning/or-applet`_
 GUI widget to provide circuit information and an 
interactive interpreter.
 
===
 ==
 
 Scripts

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

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

2014-05-27 Thread translation

commit f6fd1a807b9003acbe35b166844e86b6373d8771
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 19:15:46 2014 +

Update translations for torbutton-torbuttondtd
---
 pt_BR/torbutton.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index bebdbb9..69c3e59 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -125,12 +125,12 @@
 !ENTITY torbutton.cookiedialog.domainCol Hospedeiro
 !ENTITY torbutton.cookiedialog.nameCol Nome
 !ENTITY torbutton.cookiedialog.pathCol Caminho
-!ENTITY torbutton.cookiedialog.protectCookie Protoger Cookie
+!ENTITY torbutton.cookiedialog.protectCookie Proteger Cookie
 !ENTITY torbutton.cookiedialog.removeCookie Remover Cookie
 !ENTITY torbutton.cookiedialog.unprotectCookie Desproteger Cookie
 !ENTITY torbutton.cookiedialog.removeAllBut Remover Tudo Exceto Protegidos
 !ENTITY torbutton.cookiedialog.saveAllCookies Proteger Novos Cookies
-!ENTITY torbutton.cookiedialog.doNotSaveAllCookies NÃ£o Prototeger Novos 
COOKIES
+!ENTITY torbutton.cookiedialog.doNotSaveAllCookies NÃ£o Proteger Novos 
Cookies
 !ENTITY torbutton.prefs.disable_livemarks Disable livemarks updates during 
Tor usage
 !ENTITY torbutton.prefs.dtd_recommended (recomendado)
 !ENTITY torbutton.prefs.dtd_optional (opcional)
@@ -146,5 +146,5 @@
 !ENTITY torbutton.prefs.transparentTor TorificaÃ§Ã£o Transparente (Requer 
transpoxy customizado ou roteador Tor)
 !ENTITY torbutton.prefs.block_disk NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o 
ou dados do site (permite NavegaÃ§Ã£o em modo privado)
 !ENTITY torbutton.prefs.restrict_thirdparty Restringir os cookies de 
terceiros e outros dados de controle
-!ENTITY torbutton.prefs.block_plugins Desabilita plugins do browser (como o 
Flash)
-!ENTITY torbutton.prefs.resist_fingerprinting Alterar os dados que 
distinguem vocÃª de outros usuÃ¡rios do Tor Browser
+!ENTITY torbutton.prefs.block_plugins Desabilitar plugins do navegador (como 
o Flash)
+!ENTITY torbutton.prefs.resist_fingerprinting Alterar os dados que 
distinguem vocÃª de outros usuÃ¡rios do Navegador Tor

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

[tor-commits] [user-manual/master] whitespace

2014-05-27 Thread lunar

commit 54a268114098cd111acb188a7c91be329cc173a0
Author: Lunar lu...@torproject.org
Date:   Tue May 27 22:46:11 2014 +0200

whitespace
---
 C/index.page |1 -
 1 file changed, 1 deletion(-)

diff --git a/C/index.page b/C/index.page
index 1df3448..764fcde 100644
--- a/C/index.page
+++ b/C/index.page
@@ -9,4 +9,3 @@
 span its:translate=noxi:include href=../tor-browser-version.txt 
parse=text//span
   /p
 /page
-

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

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

2014-05-27 Thread translation

commit 26bbebbb95ec3ffa10b111cc04aa9e4da3a83b6b
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 21:15:13 2014 +

Update translations for torcheck_completed
---
 es/torcheck.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/es/torcheck.po b/es/torcheck.po
index 9ea6583..1f2388b 100644
--- a/es/torcheck.po
+++ b/es/torcheck.po
@@ -6,6 +6,7 @@
 # her_tor_es_ar cvma...@gmail.com, 2014
 # cronayu itacron...@hotmail.com, 2012
 # Envite env...@rolamasao.org, 2013
+# Paidos omar_garcia_sie...@hotmail.com, 2014
 # Shyish jgongarr...@hotmail.com, 2011
 # strel, 2013-2014
 # strel, 2012
@@ -15,8 +16,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2014-05-23 11:11+\n
-Last-Translator: alexiulacio alexi.ula...@gmail.com\n
+PO-Revision-Date: 2014-05-27 21:11+\n
+Last-Translator: Paidos omar_garcia_sie...@hotmail.com\n
 Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -40,7 +41,7 @@ msgstr Hay una actualizaciÃ³n de seguridad disponible para 
el Paquete de Navega
 msgid 
 a href=\https://www.torproject.org/download/download-easy.html\;Click 
 here to go to the download page/a
-msgstr a 
href=\https://www.torproject.org/download/download-easy.html\;Pulse aquÃ 
para ir a la pÃ¡gina de descarga/a
+msgstr a 
href=\https://www.torproject.org/download/download-easy.html\;Click here to 
go to the download page/a
 
 msgid Sorry. You are not using Tor.
 msgstr Lo sentimos, no estÃ¡ usando Tor.

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

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

2014-05-27 Thread translation

commit de47db8d2264b52b77107dd12344941377d38f99
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 27 21:15:09 2014 +

Update translations for torcheck
---
 es/torcheck.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/es/torcheck.po b/es/torcheck.po
index 9ea6583..1f2388b 100644
--- a/es/torcheck.po
+++ b/es/torcheck.po
@@ -6,6 +6,7 @@
 # her_tor_es_ar cvma...@gmail.com, 2014
 # cronayu itacron...@hotmail.com, 2012
 # Envite env...@rolamasao.org, 2013
+# Paidos omar_garcia_sie...@hotmail.com, 2014
 # Shyish jgongarr...@hotmail.com, 2011
 # strel, 2013-2014
 # strel, 2012
@@ -15,8 +16,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2014-05-23 11:11+\n
-Last-Translator: alexiulacio alexi.ula...@gmail.com\n
+PO-Revision-Date: 2014-05-27 21:11+\n
+Last-Translator: Paidos omar_garcia_sie...@hotmail.com\n
 Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -40,7 +41,7 @@ msgstr Hay una actualizaciÃ³n de seguridad disponible para 
el Paquete de Navega
 msgid 
 a href=\https://www.torproject.org/download/download-easy.html\;Click 
 here to go to the download page/a
-msgstr a 
href=\https://www.torproject.org/download/download-easy.html\;Pulse aquÃ 
para ir a la pÃ¡gina de descarga/a
+msgstr a 
href=\https://www.torproject.org/download/download-easy.html\;Click here to 
go to the download page/a
 
 msgid Sorry. You are not using Tor.
 msgstr Lo sentimos, no estÃ¡ usando Tor.

___
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 'bug11622'

2014-05-27 Thread nickm

commit ba9946dda702162f2fc7c35d79825604433eb0a9
Merge: 824bebd f0945ac
Author: Nick Mathewson ni...@torproject.org
Date:   Tue May 27 17:35:04 2014 -0400

Merge branch 'bug11622'

 changes/11622|3 +++
 src/common/sandbox.c |   36 ++--
 src/common/sandbox.h |   16 
 3 files changed, 37 insertions(+), 18 deletions(-)

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

[tor-commits] [tor/master] Make sandbox.c compile on arm

2014-05-27 Thread nickm

commit b0c1c700114aa8d4dfc180d85870c5bbe15fcacb
Author: Nick Mathewson ni...@torproject.org
Date:   Tue May 27 14:50:44 2014 -0400

Make sandbox.c compile on arm

This is a minimal set of changes for compilation; I need a more
recent kernel to test this stuff.
---
 changes/11622|3 +++
 src/common/sandbox.c |   33 -
 src/common/sandbox.h |   16 
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/changes/11622 b/changes/11622
new file mode 100644
index 000..9e4be41
--- /dev/null
+++ b/changes/11622
@@ -0,0 +1,3 @@
+  o Minor bugfixes (linux seccomp sandbox)
+- Make the seccomp sandbox code compile with ARM linux. Fixes bug
+  11622; bugfix on 0.2.5.1-alpha.
\ No newline at end of file
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index bb2b3ed..e34268c 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -67,6 +67,28 @@
 #include execinfo.h
 #endif
 
+/**
+ * Linux 32 bit definitions
+ */
+#if defined(__i386__)
+
+#define REG_SYSCALL REG_EAX
+#define M_SYSCALL gregs[REG_SYSCALL]
+
+/**
+ * Linux 64 bit definitions
+ */
+#elif defined(__x86_64__)
+
+#define REG_SYSCALL REG_RAX
+#define M_SYSCALL gregs[REG_SYSCALL]
+
+#elif defined(__arm__)
+
+#define M_SYSCALL arm_r7
+
+#endif
+
 /**Determines if at least one sandbox is active.*/
 static int sandbox_active = 0;
 /** Holds the parameter list configuration for the sandbox.*/
@@ -113,7 +135,9 @@ static int filter_nopar_gen[] = {
 #ifdef __NR_getgid32
 SCMP_SYS(getgid32),
 #endif
+#ifdef __NR_getrlimt
 SCMP_SYS(getrlimit),
+#endif
 SCMP_SYS(gettimeofday),
 SCMP_SYS(gettid),
 SCMP_SYS(getuid),
@@ -126,7 +150,10 @@ static int filter_nopar_gen[] = {
 #endif
 SCMP_SYS(mkdir),
 SCMP_SYS(mlockall),
+#ifdef __NR_mmap
+/*  restrict this in the same ways as mmap2 */
 SCMP_SYS(mmap),
+#endif
 SCMP_SYS(munmap),
 SCMP_SYS(read),
 SCMP_SYS(rt_sigreturn),
@@ -245,8 +272,12 @@ static int
 sb_time(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
 {
   (void) filter;
+#ifdef __NR_time
   return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(time),
SCMP_CMP(0, SCMP_CMP_EQ, 0));
+#else
+  return 0;
+#endif
 }
 
 /**
@@ -1499,7 +1530,7 @@ sigsys_debugging(int nr, siginfo_t *info, void 
*void_context)
   if (!ctx)
 return;
 
-  syscall = (int) ctx-uc_mcontext.gregs[REG_SYSCALL];
+  syscall = (int) ctx-uc_mcontext.M_SYSCALL;
 
 #ifdef USE_BACKTRACE
   depth = backtrace(syscall_cb_buf, MAX_DEPTH);
diff --git a/src/common/sandbox.h b/src/common/sandbox.h
index b572152..c3c6766 100644
--- a/src/common/sandbox.h
+++ b/src/common/sandbox.h
@@ -119,22 +119,6 @@ typedef struct {
   sandbox_cfg_t *filter_dynamic;
 } sandbox_t;
 
-/**
- * Linux 32 bit definitions
- */
-#if defined(__i386__)
-
-#define REG_SYSCALL REG_EAX
-
-/**
- * Linux 64 bit definitions
- */
-#elif defined(__x86_64__)
-
-#define REG_SYSCALL REG_RAX
-
-#endif
-
 #endif // USE_LIBSECCOMP
 
 #ifdef USE_LIBSECCOMP



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

[tor-commits] [tor/master] Log the errno value if seccomp_load() fails.

2014-05-27 Thread nickm

commit f0945ac270d08da146b415513fc68c7782f071be
Author: Nick Mathewson ni...@torproject.org
Date:   Tue May 27 15:08:10 2014 -0400

Log the errno value if seccomp_load() fails.

(This is how I found out I was trying to test with a kernel too old
for seccomp. I think.)
---
 src/common/sandbox.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index e34268c..7586c0c 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -1470,7 +1470,8 @@ install_syscall_filter(sandbox_cfg_t* cfg)
 
   // loading the seccomp2 filter
   if ((rc = seccomp_load(ctx))) {
-log_err(LD_BUG, (Sandbox) failed to load!);
+log_err(LD_BUG, (Sandbox) failed to load: %d (%s)!, rc,
+strerror(-rc));
 goto end;
   }
 



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

[tor-commits] [torspec/master] Revise prop 140 for dirspec 3 + other improvements

2014-05-27 Thread nickm

commit 5cabb13d5119164befa241b2fea861f64474fe7c
Author: Daniel MartÃ mv...@mvdan.cc
Date:   Tue May 27 23:31:57 2014 +0200

Revise prop 140 for dirspec 3 + other improvements

Signed-off-by: Daniel MartÃ mv...@mvdan.cc
---
 proposals/140-consensus-diffs.txt |   37 +++--
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/proposals/140-consensus-diffs.txt 
b/proposals/140-consensus-diffs.txt
index f3fcb2b..aa71f79 100644
--- a/proposals/140-consensus-diffs.txt
+++ b/proposals/140-consensus-diffs.txt
@@ -9,6 +9,9 @@ Status: Accepted
   22-May-2009: Restricted the ed format even more strictly for ease of
   implementation. -nickm
 
+  25-May-2014: Adapted to the new dir-spec version 3 and made the diff urls
+  backwards-compatible. -mvdan
+
 1. Overview.
 
   Tor clients and servers need a list of which relays are on the
@@ -19,6 +22,10 @@ Status: Accepted
   once they have a consensus instead of hourly downloading a full
   consensus.
 
+  This does not only apply to ordinary directory consensuses, but to the
+  newer microdescriptor consensuses added in the third version of the
+  directory specification.
+
 2. Numbers
 
   After implementing proposal 138 which removes nodes that are not
@@ -77,12 +84,13 @@ Status: Accepted
   Directory authorities and servers need to keep up to X [XXX: depends
   on how long clients try to download diffs per above] old consensus
   documents so they can build diffs.  They should offer a diff to the
-  most recent consensus at the URL
+  most recent consensus at the following request:
 
-  
http://tor.noreply.org/tor/status-vote/current/consensus/diff/HASH/FPRLIST
+  HTTP/1.0 GET /tor/status-vote/current/consensus/FPRLIST.z
+  X-Or-Diff-From-Consensus: HASH1 HASH2...
 
-  where hash is the full digest of the consensus the client currently
-  has, and FPRLIST is a list of (abbreviated) fingerprints of
+  where the hashes are the full digests of the consensuses the client
+  currently has, and FPRLIST is a list of (abbreviated) fingerprints of
   authorities the client trusts.
 
   Servers will only return a consensus if more than half of the requested
@@ -93,8 +101,14 @@ Status: Accepted
   conditional consensus downloads that Tor supports starting with
   0.1.2.1-alpha.)
 
-  If a server cannot offer a diff from the consensus identified by the
-  hash but has a current consensus it MUST return the full consensus.
+  The advantage of using the same URL that is currently used for
+  consensuses is that the client doesn't need to know whether a server
+  supports consensus diffs.  If it doesn't, it will simply ignore the
+  extra header and return the full consensus.
+
+  If a server cannot offer a diff from one of the consensuses identified
+  by one of the hashes but has a current consensus it MUST return the
+  full consensus.
 
   [XXX: what should we do when the client already has the latest
   consensus?  I can think of the following options:
@@ -113,7 +127,12 @@ Status: Accepted
   to be a full consensus download and would therefore currently start
   with network-status-version 3.
 
-  Following the network-status-diff header line is a diff, or patch, in
+  Following the network-status-diff line is another header line, starting with
+  the token hash followed by the full digest of the consensus that this diff
+  applies to and the full digest of the consensus that the resulting consensus
+  should have.
+
+  Following the network-status-diff header lines is a diff, or patch, in
   limited ed format.  We choose this format because it is easy to create
   and process with standard tools (patch, diff -e, ed).  This will help
   us in developing and testing this proposal and it should make future
@@ -132,7 +151,6 @@ Status: Accepted
   following block.
- n1a  Append the following block after line n1.
- a  Append the following block after the current line.
-   - s/.//  Remove the first character in the current line.
 
   Note that line numbers always apply to the file after all previous
   commands have already been applied.
@@ -151,5 +169,4 @@ Status: Accepted
   appended to the diff after the line with the command.  A line with
   just a period (.) ends the block (and is not part of the lines
   to add).  Note that it is impossible to insert a line with just
-  a single dot.  Recommended procedure is to insert a line with
-  two dots, then remove the first character of that line using s/.//.
+  a single dot.

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

[tor-commits] [ooni-probe/master] dns_consistency.py: typos

2014-05-27 Thread art

commit 6eb1607b51a6d2e18620065361af3cbc5d1d0a21
Author: Simone Basso bassosim...@gmail.com
Date:   Wed May 28 00:09:00 2014 +0200

dns_consistency.py: typos
---
 ooni/nettests/blocking/dns_consistency.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/nettests/blocking/dns_consistency.py 
b/ooni/nettests/blocking/dns_consistency.py
index d6e048f..7959e99 100644
--- a/ooni/nettests/blocking/dns_consistency.py
+++ b/ooni/nettests/blocking/dns_consistency.py
@@ -94,14 +94,14 @@ class DNSConsistencyTest(dnst.DNSTest):
 tested and an A lookup on the known good DNS server.
 
 We then compare the results from test_resolvers and that from
-control_resolver and see if the match up.
+control_resolver and see if they match up.
 If they match up then no censorship is happening (tampering: false).
 
 If they do not we do a reverse lookup (PTR) on the test_resolvers and
 the control resolver for every IP address we got back and check to see
 if anyone of them matches the control ones.
 
-If they do then we take not of the fact that censorship is probably not
+If they do, then we take note of the fact that censorship is probably 
not
 happening (tampering: reverse-match).
 
 If they do not match then censorship is probably going on (tampering:



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

[tor-commits] [ooni-probe/master] Implementation of the v0.3 spec

2014-05-27 Thread art

commit c81de40d7d2f8ebf82e63607af5b50112a40a368
Author: kudrom kud...@riseup.net
Date:   Sat May 17 20:13:00 2014 +0200

Implementation of the v0.3 spec
---
 ooni/nettests/manipulation/captiveportal.py |   42 +++
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/ooni/nettests/manipulation/captiveportal.py 
b/ooni/nettests/manipulation/captiveportal.py
index 35bfa75..eb28104 100644
--- a/ooni/nettests/manipulation/captiveportal.py
+++ b/ooni/nettests/manipulation/captiveportal.py
@@ -64,7 +64,7 @@ class CaptivePortal(httpt.HTTPTest, dnst.DNSTest):
 
 name = captiveportal
 description = Captive Portal Test
-version = '0.2'
+version = '0.3'
 author = Isis Lovecruft
 usageOptions = UsageOptions
 requiresRoot = False
@@ -265,11 +265,11 @@ class CaptivePortal(httpt.HTTPTest, dnst.DNSTest):
 hostname = self.hostname_to_0x20(hostname)
 
 for auth_ns in resolved_auth_ns:
+querynames.append(hostname)
 try:
 answer = yield self.performSOALookup(hostname, (auth_ns, 53))
 except Exception:
 continue
-querynames.append(hostname)
 for soa in answer:
 answernames.append(soa[0])
 serials.append(str(soa[1]))
@@ -291,17 +291,22 @@ class CaptivePortal(httpt.HTTPTest, dnst.DNSTest):
 log.msg(Some SOA serial numbers did not match the rest!)
 serial_match = False
 
-ret = name_match, serial_match, querynames, answernames, serials
-
 if name_match and serial_match:
 log.msg(Your DNS queries do not appear to be tampered.)
-defer.returnValue(ret)
 elif name_match or serial_match:
 log.msg(Something is tampering with your DNS queries.)
-defer.returnValue(ret)
 elif not name_match and not serial_match:
 log.msg(Your DNS queries are definitely being tampered with.)
-defer.returnValue(ret)
+
+ret = {
+'result': name_match and serial_match,
+'name_match': name_match,
+'serial_match': serial_match,
+'querynames': querynames,
+'answernames': answernames,
+'SOA_serials': serials
+}
+defer.returnValue(ret)
 
 def get_random_url_safe_string(self, length):
 
@@ -422,16 +427,20 @@ class CaptivePortal(httpt.HTTPTest, dnst.DNSTest):
 log.msg(Running the Google Chrome DNS-based captive portal test...)
 
 gmatch, google_dns_result = yield self.compare_random_hostnames(3, 10)
+ret = {
+'result': gmatch,
+'addresses': google_dns_result
+}
 
 if gmatch:
 log.msg(Google Chrome DNS-based captive portal test did not)
 log.msg(detect a captive portal.)
-defer.returnValue(google_dns_result)
+defer.returnValue(ret)
 else:
 log.msg(Google Chrome DNS-based captive portal test believes)
 log.msg(you are in a captive portal, or else something very)
 log.msg(odd is happening with your DNS.)
-defer.returnValue(google_dns_result)
+defer.returnValue(ret)
 
 @defer.inlineCallbacks
 def ms_dns_cp_test(self):
@@ -447,6 +456,10 @@ class CaptivePortal(httpt.HTTPTest, dnst.DNSTest):
 
 msmatch, ms_dns_result = yield 
self.dns_resolve_match(dns.msftncsi.com,
   
131.107.255.255)
+ret = {
+'result': msmatch,
+'address': ms_dns_result
+}
 if msmatch:
 log.msg(Microsoft NCSI DNS-based captive portal test did not)
 log.msg(detect a captive portal.)
@@ -517,10 +530,9 @@ class CaptivePortal(httpt.HTTPTest, dnst.DNSTest):
 log.msg(is filtered.)
 defer.returnValue(False)
 
-result = []
+result = {}
 for vt in vendor_tests:
 report = {}
-report['vt'] = vt
 
 experiment_url = vt[0]
 control_result = vt[1]
@@ -541,7 +553,13 @@ class CaptivePortal(httpt.HTTPTest, dnst.DNSTest):
 
 else:
 log.err(Ooni is trying to run an undefined CP vendor test.)
-result.append(report)
+
+report['URL'] = experiment_url
+report['http_status_summary'] = control_result
+report['http_status_number'] = control_code
+report['User_Agent'] = vt[3]
+result[test_name] = report
+
 defer.returnValue(result)
 
 @defer.inlineCallbacks



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

[tor-commits] [ooni-probe/master] Merge pull request #1 from bassosimone/patch-1

2014-05-27 Thread art

commit 852d8e5e489797819cb5a2b4c5c4af6519035341
Merge: 6c3086b 6eb1607
Author: Arturo FilastÃ² hell...@users.noreply.github.com
Date:   Wed May 28 00:09:33 2014 +0200

Merge pull request #1 from bassosimone/patch-1

dns_consistency.py: typos

 ooni/nettests/blocking/dns_consistency.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

[tor-commits] [ooni-probe/master] Merge pull request #326 from kudrom/spec_v0.3

2014-05-27 Thread art

commit da6ac0f0f048102aa6160e0bccb69aa567f2dabf
Merge: 6c3086b c81de40
Author: Arturo FilastÃ² hell...@users.noreply.github.com
Date:   Mon May 26 18:48:17 2014 +0200

Merge pull request #326 from kudrom/spec_v0.3

Implementation of the v0.3 spec for the captive portal test

 ooni/nettests/manipulation/captiveportal.py |   42 +++
 1 file changed, 30 insertions(+), 12 deletions(-)



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

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

2014-05-27 Thread art

commit 2764cc2bca9fc60f978b3361ab2e8de372bc5af6
Merge: 852d8e5 da6ac0f
Author: Arturo FilastÃ² a...@fuffa.org
Date:   Wed May 28 00:10:46 2014 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Implementation of the v0.3 spec

 ooni/nettests/manipulation/captiveportal.py |   42 +++
 1 file changed, 30 insertions(+), 12 deletions(-)

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

[tor-commits] [tor/master] sandbox: permit listen(2)

2014-05-27 Thread nickm

commit a056ffabbbdc76598830331c6550740a24fadeb8
Author: Nick Mathewson ni...@torproject.org
Date:   Tue May 27 19:28:12 2014 -0400

sandbox: permit listen(2)

Fix for 12115; bugfix on 0.2.5.1-alpha
---
 changes/bug12115 |3 +++
 src/common/sandbox.c |1 +
 2 files changed, 4 insertions(+)

diff --git a/changes/bug12115 b/changes/bug12115
new file mode 100644
index 000..7b84649
--- /dev/null
+++ b/changes/bug12115
@@ -0,0 +1,3 @@
+  o Minor bugfixes (linux seccomp sandbox):
+- Avoid crashing when re-opening listener ports with the seccomp
+  sandbox active. Fixes bug 12115; bugfix on 0.2.5.1-alpha.
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 7586c0c..ba1956b 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -186,6 +186,7 @@ static int filter_nopar_gen[] = {
 
 // socket syscalls
 SCMP_SYS(bind),
+SCMP_SYS(listen),
 SCMP_SYS(connect),
 SCMP_SYS(getsockname),
 SCMP_SYS(recvmsg),

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

[tor-commits] [tor/master] sandbox: Allow DirPortFrontPage unconditionally if it's set

2014-05-27 Thread nickm

commit 14842de9a731b6bbb348583645a31a3f3ab68af8
Author: Nick Mathewson ni...@torproject.org
Date:   Tue May 27 19:21:11 2014 -0400

sandbox: Allow DirPortFrontPage unconditionally if it's set

fixes 12114; bug not in any release.

Improves fix for 12028
---
 src/or/main.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index 8b79c42..a3be9a2 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2870,6 +2870,11 @@ sandbox_init_filter(void)
 }
   }
 
+  if (options-DirPortFrontPage) {
+sandbox_cfg_allow_open_filename(cfg,
+tor_strdup(options-DirPortFrontPage));
+  }
+
   // orport
   if (server_mode(get_options())) {
 sandbox_cfg_allow_open_filename_array(cfg,
@@ -2905,11 +2910,6 @@ sandbox_init_filter(void)
 NULL, 0
 );
 
-if (options-DirPortFrontPage) {
-  sandbox_cfg_allow_open_filename(cfg,
-  tor_strdup(options-DirPortFrontPage));
-}
-
 RENAME_SUFFIX(fingerprint, .tmp);
 RENAME_SUFFIX2(keys, secret_onion_key_ntor, .tmp);
 RENAME_SUFFIX2(keys, secret_id_key, .tmp);



___
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

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

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

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

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

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

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

[tor-commits] [tor-launcher/master] Bug #10425: geoip6 file is missing in TBB.

[tor-commits] r26796: {website} Sophos FAQ should be more precise. (website/trunk/docs/en)

[tor-commits] [tor-browser-bundle/master] Checkout tor-browser-builder-3 during fetch-input.sh

[tor-commits] [user-manual/master] Stop abusing sort title and use groups instead

[tor-commits] [user-manual/master] Rework page about Tor to include warnings and the Tor and HTTPS visual

[tor-commits] [user-manual/master] Change main title to the name of the document

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

[tor-commits] [stem/master] Adding or-applet to our examples page

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

[tor-commits] [user-manual/master] whitespace

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

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

[tor-commits] [tor/master] Merge branch 'bug11622'

[tor-commits] [tor/master] Make sandbox.c compile on arm

[tor-commits] [tor/master] Log the errno value if seccomp_load() fails.

[tor-commits] [torspec/master] Revise prop 140 for dirspec 3 + other improvements

[tor-commits] [ooni-probe/master] dns_consistency.py: typos

[tor-commits] [ooni-probe/master] Implementation of the v0.3 spec

[tor-commits] [ooni-probe/master] Merge pull request #1 from bassosimone/patch-1

[tor-commits] [ooni-probe/master] Merge pull request #326 from kudrom/spec_v0.3

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[tor-commits] [tor/master] sandbox: permit listen(2)

[tor-commits] [tor/master] sandbox: Allow DirPortFrontPage unconditionally if it's set

31 matches

Site Navigation

Mail list logo

Footer information