date:20180913

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

2018-09-13 Thread translation

commit 467e6107e1de46341078840f434f958848b63299
Author: Translation commit bot 
Date:   Fri Sep 14 06:18:54 2018 +

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

diff --git a/contents+es.po b/contents+es.po
index 0baf4179d..1680af608 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-14 00:37+CET\n"
+"POT-Creation-Date: 2018-09-13 22:35+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: cacu , 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"

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

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

2018-09-13 Thread translation

commit 9e62f1f597cf81f71570ee93a7718e262d448957
Author: Translation commit bot 
Date:   Fri Sep 14 06:19:00 2018 +

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

diff --git a/contents+es.po b/contents+es.po
index 0baf4179d..1680af608 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-14 00:37+CET\n"
+"POT-Creation-Date: 2018-09-13 22:35+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: cacu , 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"

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

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

2018-09-13 Thread translation

commit 6b55ddfc4f3812ac76fd23ab9a606f0b6d291fee
Author: Translation commit bot 
Date:   Fri Sep 14 05:48:58 2018 +

Update translations for support-portal_completed
---
 contents+tr.po | 4 
 1 file changed, 4 insertions(+)

diff --git a/contents+tr.po b/contents+tr.po
index ede89e873..e8599cc1d 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -1389,6 +1389,8 @@ msgid ""
 "Green onion with a padlock to identify .onion "
 "website with https"
 msgstr ""
+"https ile EriÅilen .onion Web Sitelerini Belirten "
+"YeÅil SoÄan ve Kilit Simgesi"
 
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -3902,6 +3904,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/censorship/censorship-2/
 #: (content/censorship/censorship-2/contents+en.lrquestion.seo_slug)

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

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

2018-09-13 Thread translation

commit f7ff821ad88026042b7cb366007142702ff79eec
Author: Translation commit bot 
Date:   Fri Sep 14 05:48:51 2018 +

Update translations for support-portal
---
 contents+tr.po | 4 
 1 file changed, 4 insertions(+)

diff --git a/contents+tr.po b/contents+tr.po
index ede89e873..e8599cc1d 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -1389,6 +1389,8 @@ msgid ""
 "Green onion with a padlock to identify .onion "
 "website with https"
 msgstr ""
+"https ile EriÅilen .onion Web Sitelerini Belirten "
+"YeÅil SoÄan ve Kilit Simgesi"
 
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -3902,6 +3904,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/censorship/censorship-2/
 #: (content/censorship/censorship-2/contents+en.lrquestion.seo_slug)

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

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

2018-09-13 Thread translation

commit ff2409a35fcf31d182c5afd46e58057a37452bea
Author: Translation commit bot 
Date:   Fri Sep 14 02:45:33 2018 +

Update translations for https_everywhere
---
 vi/https-everywhere.dtd | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/vi/https-everywhere.dtd b/vi/https-everywhere.dtd
index 6d886bb10..53ca3eab5 100644
--- a/vi/https-everywhere.dtd
+++ b/vi/https-everywhere.dtd
@@ -2,10 +2,10 @@
 
 
 
-
+
 
 
-
+
 
 
 
@@ -14,22 +14,22 @@
 
 
 
-
-
+
+
 
-
-
-
-
+
+
+
+
 
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 

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

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

2018-09-13 Thread translation

commit 15c3d845fd99cae8a359bb3b4bc1c6e34c2c557f
Author: Translation commit bot 
Date:   Thu Sep 13 22:48:55 2018 +

Update translations for support-portal_completed
---
 contents+es.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 22da6d65c..0baf4179d 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-13 22:35+CET\n"
+"POT-Creation-Date: 2018-09-14 00:37+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: cacu , 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -1403,8 +1403,8 @@ msgid ""
 "Green onion with a padlock to identify .onion "
 "website with https"
 msgstr ""
-"Green onion con un candado para indentificar sitios"
-" .onion con https"
+"Cebolla verde con un candado para indentificar "
+"sitios .onion con https"
 
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -3409,7 +3409,7 @@ msgid ""
 "Browser in the following languages:"
 msgstr ""
 "Actualmente ofrecemos el https://www.torproject.org/projects/torbrowser.html.en\";>navegador "
+"href=\"https://www.torproject.org/projects/torbrowser.html.en\";>Navegador "
 "Tor en los siguientes idiomas:"
 
 #: http//localhost/tormessenger/

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

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

2018-09-13 Thread translation

commit 56ad09af9d0a0bf5b22bcba66fb3df6d75748f23
Author: Translation commit bot 
Date:   Thu Sep 13 22:48:47 2018 +

Update translations for support-portal
---
 contents+es.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 22da6d65c..0baf4179d 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-13 22:35+CET\n"
+"POT-Creation-Date: 2018-09-14 00:37+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: cacu , 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -1403,8 +1403,8 @@ msgid ""
 "Green onion with a padlock to identify .onion "
 "website with https"
 msgstr ""
-"Green onion con un candado para indentificar sitios"
-" .onion con https"
+"Cebolla verde con un candado para indentificar "
+"sitios .onion con https"
 
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -3409,7 +3409,7 @@ msgid ""
 "Browser in the following languages:"
 msgstr ""
 "Actualmente ofrecemos el https://www.torproject.org/projects/torbrowser.html.en\";>navegador "
+"href=\"https://www.torproject.org/projects/torbrowser.html.en\";>Navegador "
 "Tor en los siguientes idiomas:"
 
 #: http//localhost/tormessenger/

___
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

2018-09-13 Thread translation

commit 5bf2270dcbe1128b8b60ea295b192d1d9baf8d0a
Author: Translation commit bot 
Date:   Thu Sep 13 22:15:27 2018 +

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

diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd
index b75ad61ea..32414c996 100644
--- a/ka/ssl-observatory.dtd
+++ b/ka/ssl-observatory.dtd
@@ -34,18 +34,18 @@ to turn it on?">-->
 
 
 
+"á¡áá á¢áá¤áááá¢áááá¡ Tor-áá 
á¨áááá¬áááá áááááááá¡ 
ááááá¦ááááááá¡ áá¡áá ááááááá 
(á¡áááá áááá¡ Tor)">
 
+"áá¡ ááá áááá¢á á á¡áááá áááá¡ Tor-áá¡ 
ááá§áááááá¡á áá ááá¨ááááá¡">
 
 
+"á áááá¡ááª áá®áá á¡áá á¢áá¤áááá¢á¡ 
áá®ááááá, áááá®á¡áááá Observatory-á¡ 
ááá¢áá ááá¢áá¡ á áááá 
áááá¬ááááááááá á®áá á áááá 
áááá£áá">
 
 
 
 
+"ááá¤á áá®áááááá¡ á©áááááá, á ááªá 
Observatory áá¦áááá©ááá¡ ááá£á¥áááá£á á¡áá 
á¢áá¤áááá¢á¡, á ááááá¡ááª áá áá£ááá á 
áá  á¨ááá¦á£áááá¡">
 
 

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

[tor-commits] [tor/master] Include torint.h in socketpair.c for intptr_t definition.

2018-09-13 Thread nickm

commit d8280216c0c940fef33982a3d98524e61abf7634
Author: Nick Mathewson 
Date:   Thu Sep 13 17:54:26 2018 -0400

Include torint.h in socketpair.c for intptr_t definition.
---
 src/lib/net/socketpair.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c
index 8dd04d048..380338f15 100644
--- a/src/lib/net/socketpair.c
+++ b/src/lib/net/socketpair.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2018, The Tor Project, Inc. */
 
+#include "lib/cc/torint.h"
 #include "lib/net/socketpair.h"
 #include "lib/net/inaddr_st.h"
 #include "lib/arch/bytes.h"

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

[tor-commits] [tor/master] Fix a 32-bit off_t/size_t warning in crypto_rsa.c

2018-09-13 Thread nickm

commit 92357a07bd7e695def1b2416d3a85b5f10e4e196
Author: Nick Mathewson 
Date:   Thu Sep 13 17:49:36 2018 -0400

Fix a 32-bit off_t/size_t warning in crypto_rsa.c

Bug not in any released Tor.
---
 src/lib/crypt_ops/crypto_rsa.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c
index 6a9e2948f..567b4531a 100644
--- a/src/lib/crypt_ops/crypto_rsa.c
+++ b/src/lib/crypt_ops/crypto_rsa.c
@@ -551,9 +551,12 @@ crypto_pk_read_private_key_from_filename(crypto_pk_t *env,
   char *buf = read_file_to_str(keyfile, 0, &st);
   if (!buf)
 return -1;
+  if (st.st_size > SSIZE_MAX)
+return -1;
 
-  int rv = crypto_pk_read_private_key_from_string(env, buf, st.st_size);
-  memwipe(buf, 0, st.st_size);
+  int rv = crypto_pk_read_private_key_from_string(env, buf,
+  (ssize_t)st.st_size);
+  memwipe(buf, 0, (size_t)st.st_size);
   tor_free(buf);
   return rv;
 }

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

[tor-commits] [tor/master] Fix a shadowed-global warning in geoip.c

2018-09-13 Thread nickm

commit 83b8a76f0c246bde442f36681a59a735896110cd
Author: Nick Mathewson 
Date:   Thu Sep 13 17:48:33 2018 -0400

Fix a shadowed-global warning in geoip.c

Bugfix on 5ab2110eb6b4ae9082430081cb2800018cf0dcd6; bug not in any
released Tor.
---
 src/feature/stats/geoip.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/feature/stats/geoip.c b/src/feature/stats/geoip.c
index d891bd80e..019aa7a28 100644
--- a/src/feature/stats/geoip.c
+++ b/src/feature/stats/geoip.c
@@ -1121,13 +1121,13 @@ geoip_get_dirreq_history(dirreq_type_t type)
 dltimes = tor_calloc(complete, sizeof(uint32_t));
 SMARTLIST_FOREACH_BEGIN(dirreq_completed, dirreq_map_entry_t *, ent) {
   uint32_t bytes_per_second;
-  uint32_t time_diff = (uint32_t) tv_mdiff(&ent->request_time,
+  uint32_t time_diff_ = (uint32_t) tv_mdiff(&ent->request_time,
&ent->completion_time);
-  if (time_diff == 0)
-time_diff = 1; /* Avoid DIV/0; "instant" answers are impossible
+  if (time_diff_ == 0)
+time_diff_ = 1; /* Avoid DIV/0; "instant" answers are impossible
 * by law of nature or something, but a millisecond
 * is a bit greater than "instantly" */
-  bytes_per_second = (uint32_t)(1000 * ent->response_size / time_diff);
+  bytes_per_second = (uint32_t)(1000 * ent->response_size / time_diff_);
   dltimes[ent_sl_idx] = bytes_per_second;
 } SMARTLIST_FOREACH_END(ent);
 median_uint32(dltimes, complete); /* sorts as a side effect. */



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

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

2018-09-13 Thread translation

commit 17b602d539551607288d0347cc11c14b06968f41
Author: Translation commit bot 
Date:   Thu Sep 13 21:48:59 2018 +

Update translations for support-portal_completed
---
 contents+es.po | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contents+es.po b/contents+es.po
index acb3293a5..22da6d65c 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -3922,6 +3922,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/censorship/censorship-2/
 #: (content/censorship/censorship-2/contents+en.lrquestion.seo_slug)

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

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

2018-09-13 Thread translation

commit 8f77f875afb311d205d19cc8930c0ca6bbef302b
Author: Translation commit bot 
Date:   Thu Sep 13 21:48:53 2018 +

Update translations for support-portal
---
 contents+ca.po |  4 
 contents+es.po |  2 ++
 contents+id.po | 30 --
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index adcc39f50..6f062d73b 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -2478,6 +2478,8 @@ msgid ""
 "Tor Browser will prompt you to update the software once a new version has "
 "been released."
 msgstr ""
+"Navegador Tor us demanarÃ  que actualitzeu el programari una vegada que "
+"s'hagi publicat una versiÃ³ nova."
 
 #: http//localhost/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -4104,6 +4106,8 @@ msgid ""
 "The Torbutton icon (the little onion in the top left corner of the browser) "
 "will display a yellow triangle."
 msgstr ""
+"La icona Tor (la ceba petita en l'extrem superior esquerre del navegador) "
+"mostrarÃ  un triangle groc."
 
 #: http//localhost/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
diff --git a/contents+es.po b/contents+es.po
index acb3293a5..22da6d65c 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -3922,6 +3922,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/censorship/censorship-2/
 #: (content/censorship/censorship-2/contents+en.lrquestion.seo_slug)
diff --git a/contents+id.po b/contents+id.po
index ce8b0c95e..98d22af32 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -2114,6 +2114,8 @@ msgid ""
 "13-11-17 19:53:49.300 [WARN]  1 connections died in state connect()ing with "
 "SSL state (No SSL object)"
 msgstr ""
+"13-11-17 19:53:49.300 [WARN]  1 connections died in state connect()ing with "
+"SSL state (No SSL object)"
 
 #: http//localhost/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)
@@ -2346,6 +2348,9 @@ msgid ""
 "the latest version of Tor Browser, hosted at a variety of locations that are"
 " less likely to be censored, such as Dropbox, Google Drive, and GitHub."
 msgstr ""
+"GetTor adalah service yang yang otomatis merespon pesan berisi tautan ke "
+"versi terakhir Tor Browser, yang dihosting di lokasi beragam sehingga "
+"kemungkinan kecil disensor, seperti Dropbox, Google Drive, dan GitHub."
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -2647,7 +2652,7 @@ msgstr ""
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ lsb_release -c"
-msgstr ""
+msgstr "$ lsb_release -c"
 
 #: http//localhost/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.seo_slug)
@@ -2961,6 +2966,9 @@ msgid ""
 "https://tb-manual.torproject.org/en-";
 "US/troubleshooting.html\">Tor Browser manual."
 msgstr ""
+"Jika ini tidak memperbaiki masalah koneksi, lihat halaman Troubleshooting di"
+" https://tb-manual.torproject.org/en-";
+"US/troubleshooting.html\">petunjuk Tor Browser."
 
 #: http//localhost/tbb/tbb-30/
 #: (content/tbb/tbb-30/contents+en.lrquestion.description)
@@ -3200,6 +3208,12 @@ msgid ""
 "signatures.html.en\">verifying the download), the fingerprint of "
 "the key used to make the signature, and the packageâs checksum."
 msgstr ""
+"GetTor akan merespon dengan email yang memuat tautan dari sumber pengunduh "
+"paket Tor Browser, tanda tangan kriptografi (https://www.torproject.org/docs/verifying-";
+"signatures.html.en\">diperlukan untuk memverikasi unduhan), sidik"
+" jari pengguna utama yang akan digunakan untuk membuat tanda tangan, dan "
+"paket checksum."
 
 #: http//localhost/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -3315,6 +3329,9 @@ msgid ""
 "href=\"https://www.torbsd.org/\";>TorBSD project, but their Tor "
 "Browser is not officially supported."
 msgstr ""
+"Ada proyek bernama https://www.torbsd.org/\";>TorBSD, tapi Tor Browser versi "
+"mereka tidak secara resmi didukung."
 
 #: http//localhost/operators/operators-2/
 #: (content/operators/operators-2/contents+en.lrquestion.seo_slug)
@@ -3453,6 +3470,8 @@ msgid ""
 "There is no official version of Tor for iOS yet, though we recommend "
 "https://onionbrowser.com/\";>Onion Browser."
 msgstr ""
+"Belum ada versi resmi untuk iOS, walau kami menyarankan peramban https://onionbrowser.com/\";>Onion Browser."
 
 #: http//localhost/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
@@ -3784,6 +3803,8 @@ msgid ""
 "To get links for downloading Tor Browser, send a message to "
 "get...@torproject.org with one of the following codes in it:"
 msgstr ""
+"Untuk mendapatkan tautan untuk mengunduh Tor Browser, kirim pesan ke "
+"get...@torproject.org dengan salah satu kode berikut di dalamnya:"
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)
@@ -3991,6 +4012,7 @@ msgstr "Bagaimana cara mengunduh Tor jika t

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

2018-09-13 Thread translation

commit b2f0c2fe0c3163803f6abe30e91dda17da07589d
Author: Translation commit bot 
Date:   Thu Sep 13 21:45:27 2018 +

Update translations for https_everywhere
---
 ka/ssl-observatory.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd
index b87c2661f..b75ad61ea 100644
--- a/ka/ssl-observatory.dtd
+++ b/ka/ssl-observatory.dtd
@@ -30,9 +30,9 @@ to turn it on?">-->
 "áááááááááá áá á¨áááá¬áááá á¡áá 
á¢áá¤áááá¢áááá¡, á áááááááª 
á®ááááá¬áá áááá á«áá áá£áá á¡áá 
á¢áá¤áááá¢áááá¡ á£á©ááá£áá 
ááááªáááááá¡ áááá .">
 
 
+"áá¡ á£á¡áá¤á áá®áá (áá ááá áá ááá áá) 
ááá¡á á©áá ááá, áá£ áá  áá§ááááá 
ááá¢áá áááááááá áááá ááá ááá 
ááªáá£á á¥á¡ááá¡ áá Kaspersky-áá¡ ááá¢áááá 
á£á¡á£á áá ááá áááá¡, á ááááááª áááá 
áááááááá¡ áá¥áááá¡ ááá¢áá ááá¢á¨á 
TLS-áá áá¥á¡áá¡á áá ááá ááá á«áá áá£áá 
á¡áá á¢áá¤áááá¢áá¡ ááááááªáááá¡ 
á¡áá¨á£áááááá ááááááááááááá¡. 
áá¡áááá¡á á¥á¡áááá á¡áá áááááááá¡ 
á¨áááá®ááááá¨á, áá£ á©áá áá£ááá, 
á¨áááááá á¨áá¡áá«ááá á®ááá£áá 
ááá®ááá¡ á¡ááá¢áááá¡ áá¡ https:// 
ááá¡áááá áááá, á áááááááª áá
  áá áá¥á¡áá áá§á ááááá®á£áááá£áá, 
áááááªááá£áá á¡áá á¢áá¤áááá¢áááá¡ 
á£áááááá£á áááááá áááááááááá á.  
áá¡á á áá, áá¡ ááá áááá¢á á 
áááá£ááá¡á®ááááá ááááá áá£ááá.">
 
-
+
 
 ___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2018-09-13 Thread translation

commit f1cfc9645217c1ed72a27a0831ac7524f7ceff2b
Author: Translation commit bot 
Date:   Thu Sep 13 21:18:50 2018 +

Update translations for support-portal
---
 contents+ca.po|  4 +++-
 contents+pt_BR.po | 29 -
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index 3b445ddcf..adcc39f50 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -727,7 +727,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
 msgid "New Circuit for this Site"
-msgstr ""
+msgstr " Circuit Nou per a aquest lloc"
 
 #: http//localhost/tbb/tbb-3/
 #: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug)
@@ -1188,6 +1188,8 @@ msgid ""
 "Please see the https://www.eff.org/https-";
 "everywhere/faq\">HTTPS Everywhere FAQ."
 msgstr ""
+"Siusplau mira lahttps://www.eff.org/https-";
+"everywhere/faq\">HTTPS Everywhere FAQ."
 
 #: http//localhost/misc/misc-5/
 #: (content/misc/misc-5/contents+en.lrquestion.seo_slug)
diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 3d5feaaca..ce6f686b9 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -2551,6 +2551,8 @@ msgid ""
 "11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor "
 "network"
 msgstr ""
+"11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor "
+"network"
 
 #: http//localhost/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
@@ -2650,6 +2652,8 @@ msgid ""
 "13-11-17 19:53:49.300 [WARN]  9 connections died in state handshaking (TLS) "
 "with SSL state SSLv2/v3 read server hello A in HANDSHAKE"
 msgstr ""
+"13-11-17 19:53:49.300 [WARN]  9 connections died in state handshaking (TLS) "
+"with SSL state SSLv2/v3 read server hello A in HANDSHAKE"
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)
@@ -2665,7 +2669,7 @@ msgstr ""
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ lsb_release -c"
-msgstr ""
+msgstr "$ lsb_release -c"
 
 #: http//localhost/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.seo_slug)
@@ -2705,6 +2709,10 @@ msgid ""
 "href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>Tor "
 "Relay Guide."
 msgstr ""
+"Para ver recursos mais detalhados sobre a operaÃ§Ã£o de um relay, veja "
+"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>Guia "
+"Tor Relay."
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2895,6 +2903,9 @@ msgid ""
 " to the directory authorities to let clients know what address, ports, keys,"
 " etc your relay is using."
 msgstr ""
+"Quando ele confirma que estÃ¡ acessÃvel, ele vai enviar um \"descritor do "
+"servidor\" para o diretÃ³rio de autoridades para deixar os clientes saberem "
+"qual endereÃ§o, porta, chaves, etc seu retransmissor estÃ¡ usando."
 
 #: http//localhost/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3832,7 +3843,7 @@ msgstr ""
 #: http//localhost/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "#MyFamily $keyid,$keyid,..."
-msgstr ""
+msgstr "#MyFamily $keyid,$keyid,..."
 
 #: http//localhost/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -3984,7 +3995,7 @@ msgstr "Executar-tor-no-windows-phone"
 #: http//localhost/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "Log notice file /var/log/tor/notices.log"
-msgstr ""
+msgstr "Log notice file /var/log/tor/notices.log"
 
 #: http//localhost/misc/misc-11/
 #: (content/misc/misc-11/contents+en.lrquestion.title)
@@ -4063,7 +4074,7 @@ msgstr ""
 #: http//localhost/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy"
-msgstr ""
+msgstr "ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.title)
 msgid "Operators"
@@ -4238,6 +4249,8 @@ msgid ""
 "13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with "
 "directory server"
 msgstr ""
+"13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with "
+"directory server"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -4348,7 +4361,7 @@ msgstr "NÃ£o consigo acessar o X.onion!"
 #: http//localhost/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "ExtORPort auto"
-msgstr ""
+msgstr "ExtORPort auto"
 
 #: http//localhost/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
@@ -4382,6 +4395,8 @@ msgid ""
 "## Set your bandwidth rate (leave commented and Tor will run without "
 "ba

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

2018-09-13 Thread translation

commit 279ef0307646e7b4f9a682225febe4e5904e27c1
Author: Translation commit bot 
Date:   Thu Sep 13 21:16:04 2018 +

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

diff --git a/es_AR.po b/es_AR.po
index a70292fa5..d884c7a52 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:16+0200\n"
-"PO-Revision-Date: 2018-09-13 20:45+\n"
+"PO-Revision-Date: 2018-09-13 20: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"
@@ -40,7 +40,7 @@ msgid ""
 "Check your network connection, and restart Tails to try upgrading again.\n"
 "\n"
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr "No se pudo determinar si hay actualizaciones disponibles desde 
nuestro sitio web.\n\nComprobÃ¡ tu conexiÃ³n de red, y reiniciÃ¡ Tails para 
intentar actualizarlo nuevamente.\n\nSi el problema persiste, andÃ¡ a 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
+msgstr "No se pudo determinar si una actualizaciÃ³n estÃ¡ disponible en 
nuestro sitio web.\n\nComprobÃ¡ tu conexiÃ³n de red, y reiniciÃ¡ Tails para 
intentar actualizarlo nuevamente.\n\nSi el problema persiste, andÃ¡ a 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
 #: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
@@ -65,7 +65,7 @@ msgstr "No hay suficiente memoria disponible en el sistema"
 #: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
-msgstr "No hay una explicacion disponible para '%{reason}s'."
+msgstr "No hay una explicaciÃ³n disponible para '%{reason}s'."
 
 #: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"

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

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

2018-09-13 Thread translation

commit 006e69520e3766577e017fc15e2e904c812534a9
Author: Translation commit bot 
Date:   Thu Sep 13 21:15:59 2018 +

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

diff --git a/es_AR.po b/es_AR.po
index a70292fa5..d884c7a52 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:16+0200\n"
-"PO-Revision-Date: 2018-09-13 20:45+\n"
+"PO-Revision-Date: 2018-09-13 20: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"
@@ -40,7 +40,7 @@ msgid ""
 "Check your network connection, and restart Tails to try upgrading again.\n"
 "\n"
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr "No se pudo determinar si hay actualizaciones disponibles desde 
nuestro sitio web.\n\nComprobÃ¡ tu conexiÃ³n de red, y reiniciÃ¡ Tails para 
intentar actualizarlo nuevamente.\n\nSi el problema persiste, andÃ¡ a 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
+msgstr "No se pudo determinar si una actualizaciÃ³n estÃ¡ disponible en 
nuestro sitio web.\n\nComprobÃ¡ tu conexiÃ³n de red, y reiniciÃ¡ Tails para 
intentar actualizarlo nuevamente.\n\nSi el problema persiste, andÃ¡ a 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
 #: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
@@ -65,7 +65,7 @@ msgstr "No hay suficiente memoria disponible en el sistema"
 #: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
-msgstr "No hay una explicacion disponible para '%{reason}s'."
+msgstr "No hay una explicaciÃ³n disponible para '%{reason}s'."
 
 #: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"

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

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

2018-09-13 Thread translation

commit 44ab8884a0740ca04c498b3c1b528e04a7cf69c4
Author: Translation commit bot 
Date:   Thu Sep 13 20:49:21 2018 +

Update translations for support-portal
---
 contents+bn_BD.po | 37 ++---
 contents+ca.po| 30 ++
 contents+de.po| 30 ++
 contents+el.po| 26 ++
 contents+es.po| 31 ---
 contents+es_AR.po | 46 +-
 contents+fa.po| 26 ++
 contents+fr.po| 30 ++
 contents+ga.po| 30 ++
 contents+he.po| 26 ++
 contents+id.po| 30 ++
 contents+it.po| 30 ++
 contents+nb.po| 26 ++
 contents+pt.po| 26 ++
 contents+pt_BR.po | 30 ++
 contents+ru.po| 26 ++
 contents+tr.po| 31 ++-
 contents+zh_CN.po | 26 ++
 contents.pot  | 33 -
 19 files changed, 213 insertions(+), 357 deletions(-)

diff --git a/contents+bn_BD.po b/contents+bn_BD.po
index 0b1a56f96..bc42e5f62 100644
--- a/contents+bn_BD.po
+++ b/contents+bn_BD.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-13 21:58+CET\n"
+"POT-Creation-Date: 2018-09-13 22:35+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Bengali (Bangladesh) 
(https://www.transifex.com/otf/teams/1519/bn_BD/)\n"
@@ -714,7 +714,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
 msgid "New Circuit for this Site"
-msgstr ""
+msgstr "à¦à¦ à¦¸à¦¾à¦à¦à§à¦° à¦à¦¨à§à¦¯ 
à¦¨à¦¤à§à¦¨ à¦¸à¦¾à¦°à§à¦à¦¿à¦"
 
 #: http//localhost/tbb/tbb-3/
 #: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug)
@@ -737,17 +737,6 @@ msgstr ""
 "/download-easy.html.en\">à¦à¦° à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦° 
à¦¡à¦¾à¦à¦¨à¦²à§à¦¡ à¦à¦°à§, à¦à¦¬à¦ à¦¤à¦¾à¦°à¦ªà¦° à¦à¦à¦¿ "
 "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦à¦°à§ à¦¨à§à¦à¦¿à¦à§à¦ à¦à¦°à¦¤à§ à¦
à¦¬à¦°à§à¦¦à§à¦§ à¦à¦°à¦¾ à¦¹à¦¯à¦¼à§à¦à§ à¦à¦®à¦¨ à¦¸à¦¾à¦à¦ à¦
à§à¦¯à¦¾à¦à§à¦¸à§à¦¸à¦° à¦à¦¨à§à¦®à¦¤à¦¿ à¦¦à§à¦¬à§à¥¤"
 
-#: http//localhost/operators/operators-3/
-#: (content/operators/operators-3/contents+en.lrquestion.description)
-msgid ""
-"For the most in-depth resource on running a relay, see the https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>Tor "
-"Relay Guide."
-msgstr ""
-"à¦à¦à¦à¦¿ à¦°à¦¿à¦²à§ à¦à¦¾à¦²à§ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯ 
à¦¸à¦¬à¦à§à¦¯à¦¼à§ à¦¬à§à¦¶à¦¿ à¦à¦à§à¦°à¦¤à¦¾à¦° 
à¦¸à¦à¦¸à§à¦¥à¦¾à¦¨à§à¦° à¦à¦¨à§à¦¯, https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>à¦à¦° 
à¦°à¦¿à¦²à§"
-" à¦à¦¾à¦à¦¡ à¦¦à§à¦à§à¦¨ à¥¤"
-
 #: http//localhost/misc/misc-2/
 #: (content/misc/misc-2/contents+en.lrquestion.description)
 msgid ""
@@ -1374,6 +1363,13 @@ msgstr "tor-funding"
 msgid "Tor browser will install the updates."
 msgstr "à¦à¦° à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦° à¦¹à¦¾à¦²à¦¨à¦¾à¦à¦¾à¦¦ 
à¦¸à¦à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¬à§ à¥¤"
 
+#: http//localhost/onionservices/onionservices-2/
+#: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
+msgid ""
+"Green onion with a padlock to identify .onion "
+"website with https"
+msgstr ""
+
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid ""
@@ -2658,14 +2654,16 @@ msgstr "à¦à¦®à¦¿ à¦à¦¿ à¦à¦®à¦¾à¦° 
à¦¡à¦¿à¦«à¦²à§à¦ à¦¬à§à¦°à¦¾à¦à¦à¦¾
 #: (content/operators/operators-1/contents+en.lrquestion.description)
 #: http//localhost/operators/operators-2/
 #: (content/operators/operators-2/contents+en.lrquestion.description)
+#: http//localhost/operators/operators-3/
+#: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid ""
 "For the most in-depth resource on running a relay, see the https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>Tor "
 "Relay Guide."
 msgstr ""
-"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>à¦à¦à¦à¦¿"
-" à¦°à¦¿à¦²à§ à¦à¦¾à¦²à§ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯ à¦¸à¦¬à¦à§à¦¯à¦¼à§ 
à¦¬à§à¦¶à¦¿ à¦à¦à§à¦°à¦¤à¦¾à¦° à¦¸à¦à¦¸à§à¦¥à¦¾à¦¨à§à¦° à¦à¦¨à§à¦¯, 
à¦à¦° à¦°à¦¿à¦²à§ "
-"à¦à¦¾à¦à¦¡ à¦¦à§à¦à§à¦¨ à¥¤"
+"à¦à¦à¦à¦¿ à¦°à¦¿à¦²à§ à¦à¦¾à¦²à§ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯ 
à¦¸à¦¬à¦à§à¦¯à¦¼à§ à¦¬à§à¦¶à¦¿ à¦à¦à§à¦°à¦¤à¦¾à¦° 
à¦¸à¦à¦¸à§à¦¥à¦¾à¦¨à§à¦° à¦à¦¨à§à¦¯, https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>à¦à¦° 
à¦°à¦¿à¦²à§"
+" à¦à¦¾à¦à¦¡ à¦¦à§à¦à§à¦¨ à¥¤"
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -3144

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

2018-09-13 Thread translation

commit 146438c1ea2ed6c2ef6713cc1ef9409ad74de161
Author: Translation commit bot 
Date:   Thu Sep 13 20:49:30 2018 +

Update translations for support-portal_completed
---
 contents+es.po|  31 
 contents+es_AR.po | 206 +++---
 contents+tr.po|  31 +++-
 contents.pot  |  33 -
 4 files changed, 153 insertions(+), 148 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index a24b38a52..acb3293a5 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-13 21:58+CET\n"
+"POT-Creation-Date: 2018-09-13 22:35+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: cacu , 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -757,17 +757,6 @@ msgstr ""
 "easy.html.en\">navegador Tor y luego usÃ¡ndolo para navegar hacia "
 "el sitio bloqueado."
 
-#: http//localhost/operators/operators-3/
-#: (content/operators/operators-3/contents+en.lrquestion.description)
-msgid ""
-"For the most in-depth resource on running a relay, see the https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>Tor "
-"Relay Guide."
-msgstr ""
-"Para la fuente mÃ¡s detallada sobre tener un repetidor, mira la https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>GuÃa de"
-" repetidores de Tor."
-
 #: http//localhost/misc/misc-2/
 #: (content/misc/misc-2/contents+en.lrquestion.description)
 msgid ""
@@ -1408,6 +1397,15 @@ msgstr "financiaciÃ³n-de-tor"
 msgid "Tor browser will install the updates."
 msgstr "El Tor Browser instalarÃ¡ las actualizaciones."
 
+#: http//localhost/onionservices/onionservices-2/
+#: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
+msgid ""
+"Green onion with a padlock to identify .onion "
+"website with https"
+msgstr ""
+"Green onion con un candado para indentificar sitios"
+" .onion con https"
+
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid ""
@@ -2723,6 +2721,8 @@ msgstr "Â¿Puedo establecer el Tor Browser como mi 
navegador predeterminado?"
 #: (content/operators/operators-1/contents+en.lrquestion.description)
 #: http//localhost/operators/operators-2/
 #: (content/operators/operators-2/contents+en.lrquestion.description)
+#: http//localhost/operators/operators-3/
+#: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid ""
 "For the most in-depth resource on running a relay, see the https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>Tor "
@@ -3222,13 +3222,6 @@ msgstr ""
 msgid "Misc"
 msgstr "Misc"
 
-#: http//localhost/onionservices/onionservices-2/
-#: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
-msgid ""
-"Green onion with a padloack to identify .onion "
-"website with https"
-msgstr ""
-
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* obfs4proxy.exe (if you use bridges)"
diff --git a/contents+es_AR.po b/contents+es_AR.po
index 2916d9c4a..69ee10af4 100644
--- a/contents+es_AR.po
+++ b/contents+es_AR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-07 17:41+CET\n"
+"POT-Creation-Date: 2018-09-13 22:35+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Zuhualime Akoochimoya, 2018\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
@@ -295,11 +295,6 @@ msgstr ""
 msgid "setting-tor-browser-as-default"
 msgstr "ajustando-navegador-tor-por-defecto"
 
-#: http//localhost/tbb/tbb-37/
-#: (content/tbb/tbb-37/contents+en.lrquestion.description)
-msgid "We currently offer Tor Browser in the following languages:"
-msgstr "Al momento ofrecemos el navegador Tor en los siguientes lenguajes:"
-
 #: http//localhost/tbb/tbb-15/
 #: (content/tbb/tbb-15/contents+en.lrquestion.description)
 msgid ""
@@ -556,6 +551,15 @@ msgstr ""
 "PodÃ©s ayudar a mejorar la velocidad de la red corriendo tu propio relevo, o "
 "animando a otros a hacerlo."
 
+#: http//localhost/onionservices/onionservices-2/
+#: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
+msgid ""
+""
+msgstr ""
+""
+
 #: http//localhost/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.description)
 msgid ""
@@ -572,14 +576,14 @@ msgstr ""
 "PodÃ©s actualizar el navegador Tor tan pronto como una nueva versiÃ³n sea "
 "lanzada."
 
-#: http//localhost/onionservices/onionservices-2/
-#: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
+#: http//localhost/tbb/tbb-29/
+#: (content/tbb/tbb-29/contents+en.lrquestion.description)
 msgid ""
-""
+""
 msgstr ""
-""
+""
 
 #: http//localhost/tbb/tbb-18/
 #: (content/tbb/tbb-18/contents+en.lrquestion.description)
@@ -590,8 +594,12 @@ msgstr

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

2018-09-13 Thread translation

commit 7404a124563340af264f5216e71ebe58416d1efd
Author: Translation commit bot 
Date:   Thu Sep 13 20:46:10 2018 +

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

diff --git a/es_AR.po b/es_AR.po
index dd1fe243c..a70292fa5 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:16+0200\n"
-"PO-Revision-Date: 2018-08-19 08:08+\n"
+"PO-Revision-Date: 2018-09-13 20:45+\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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
-msgstr "Para informaciÃ³n de depuraciÃ³n, ejecute el siguiente comando: sudo 
tails-debugging-info"
+msgstr "Para informaciÃ³n de depuraciÃ³n, ejecutÃ¡ el siguiente comando: sudo 
tails-debugging-info"
 
 #: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
@@ -40,7 +40,7 @@ msgid ""
 "Check your network connection, and restart Tails to try upgrading again.\n"
 "\n"
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr "No se pudo determinar si hay actualizaciones disponibles desde 
nuestro sitio web.\n\nComprueba tu conexiÃ³n de red, y reinicia Tails para 
intentar actualizarlo nuevamente.\n\nSi el problema persiste, ve a 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.es.html"
+msgstr "No se pudo determinar si hay actualizaciones disponibles desde 
nuestro sitio web.\n\nComprobÃ¡ tu conexiÃ³n de red, y reiniciÃ¡ Tails para 
intentar actualizarlo nuevamente.\n\nSi el problema persiste, andÃ¡ a 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
 #: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"

___
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

2018-09-13 Thread translation

commit 3011554da18ff81ce1d538bd123d2610154aa540
Author: Translation commit bot 
Date:   Thu Sep 13 20:46:28 2018 +

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

diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index f52b96b6f..eea8df7df 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-16 11:00+0200\n"
+"POT-Creation-Date: 2018-09-04 09:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Zuhualime Akoochimoya, 2018\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\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] Update translations for tails-greeter-2

2018-09-13 Thread translation

commit 0db2acdb4cb92701b9ebc3d7cc4b3167ad1e7764
Author: Translation commit bot 
Date:   Thu Sep 13 20:46:23 2018 +

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

diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index f52b96b6f..eea8df7df 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-16 11:00+0200\n"
+"POT-Creation-Date: 2018-09-04 09:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Zuhualime Akoochimoya, 2018\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"

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

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2018-09-13 Thread translation

commit be062cfa6d0d462f7dbffa0c7c5d974114e18214
Author: Translation commit bot 
Date:   Thu Sep 13 20:45:52 2018 +

Update translations for mat-gui_completed
---
 es_AR.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/es_AR.po b/es_AR.po
index 19aab056e..1ac7d3945 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -6,13 +6,14 @@
 # Daniel Gray, 2015
 # ezemelano , 2014
 # psss , 2016
+# Zuhualime Akoochimoya, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2017-09-19 16:57+\n"
-"Last-Translator: psss \n"
+"PO-Revision-Date: 2018-09-13 20:40+\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"
@@ -56,7 +57,7 @@ msgstr "Metadatos de %s"
 
 #: mat-gui:187
 msgid "Trash your meta, keep your data"
-msgstr "Eliminar sus metadatos, mantener sus datos"
+msgstr "EliminÃ¡ tus metadatos, mantenÃ© tus datos"
 
 #: mat-gui:192
 msgid "Website"
@@ -80,7 +81,7 @@ msgstr "Eliminar fichero no soportado de los archivos"
 
 #: mat-gui:241
 msgid "Remove non-supported (and so non-anonymised) file from output archive"
-msgstr "Eliminar fichero no soportado ( y no anonimizado) del archivo de 
salida"
+msgstr "Eliminar fichero no soportado ( y por lo tanto, no anonimizado) del 
archivo de salida"
 
 #: mat-gui:280
 msgid "Unknown"
@@ -116,7 +117,7 @@ msgstr "RazÃ³n"
 
 #: mat-gui:365
 msgid "Non-supported files in archive"
-msgstr "El archivo contiene archivos no soportados"
+msgstr "El archivo contiene ficheros no soportados"
 
 #: mat-gui:379
 msgid "Include"
@@ -125,7 +126,7 @@ msgstr "Incluir"
 #: mat-gui:397
 #, python-format
 msgid "MAT is not able to clean the following files, found in the %s archive"
-msgstr "MAT es incapaz de limpiar los siguientes archivos, hallados en el 
archivo %s"
+msgstr "MAT es incapaz de limpiar los siguientes ficheros, hallados en el 
archivo %s"
 
 #: mat-gui:413
 #, python-format
@@ -151,7 +152,7 @@ msgstr "_Ayuda"
 
 #: data/mat.glade:187
 msgid "Add"
-msgstr "Agrefgar"
+msgstr "Agregar"
 
 #: data/mat.glade:256
 msgid "State"

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

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

2018-09-13 Thread translation

commit 0974116b8bbac1412dac5d5fe7e954db5658114f
Author: Translation commit bot 
Date:   Thu Sep 13 20:46:05 2018 +

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

diff --git a/es_AR.po b/es_AR.po
index dd1fe243c..a70292fa5 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:16+0200\n"
-"PO-Revision-Date: 2018-08-19 08:08+\n"
+"PO-Revision-Date: 2018-09-13 20:45+\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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
-msgstr "Para informaciÃ³n de depuraciÃ³n, ejecute el siguiente comando: sudo 
tails-debugging-info"
+msgstr "Para informaciÃ³n de depuraciÃ³n, ejecutÃ¡ el siguiente comando: sudo 
tails-debugging-info"
 
 #: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
@@ -40,7 +40,7 @@ msgid ""
 "Check your network connection, and restart Tails to try upgrading again.\n"
 "\n"
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr "No se pudo determinar si hay actualizaciones disponibles desde 
nuestro sitio web.\n\nComprueba tu conexiÃ³n de red, y reinicia Tails para 
intentar actualizarlo nuevamente.\n\nSi el problema persiste, ve a 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.es.html"
+msgstr "No se pudo determinar si hay actualizaciones disponibles desde 
nuestro sitio web.\n\nComprobÃ¡ tu conexiÃ³n de red, y reiniciÃ¡ Tails para 
intentar actualizarlo nuevamente.\n\nSi el problema persiste, andÃ¡ a 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
 #: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"

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

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2018-09-13 Thread translation

commit 76a5d3f619da9d6c418f3410939a661da1aa030e
Author: Translation commit bot 
Date:   Thu Sep 13 20:45:47 2018 +

Update translations for mat-gui
---
 es_AR.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/es_AR.po b/es_AR.po
index 19aab056e..1ac7d3945 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -6,13 +6,14 @@
 # Daniel Gray, 2015
 # ezemelano , 2014
 # psss , 2016
+# Zuhualime Akoochimoya, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2017-09-19 16:57+\n"
-"Last-Translator: psss \n"
+"PO-Revision-Date: 2018-09-13 20:40+\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"
@@ -56,7 +57,7 @@ msgstr "Metadatos de %s"
 
 #: mat-gui:187
 msgid "Trash your meta, keep your data"
-msgstr "Eliminar sus metadatos, mantener sus datos"
+msgstr "EliminÃ¡ tus metadatos, mantenÃ© tus datos"
 
 #: mat-gui:192
 msgid "Website"
@@ -80,7 +81,7 @@ msgstr "Eliminar fichero no soportado de los archivos"
 
 #: mat-gui:241
 msgid "Remove non-supported (and so non-anonymised) file from output archive"
-msgstr "Eliminar fichero no soportado ( y no anonimizado) del archivo de 
salida"
+msgstr "Eliminar fichero no soportado ( y por lo tanto, no anonimizado) del 
archivo de salida"
 
 #: mat-gui:280
 msgid "Unknown"
@@ -116,7 +117,7 @@ msgstr "RazÃ³n"
 
 #: mat-gui:365
 msgid "Non-supported files in archive"
-msgstr "El archivo contiene archivos no soportados"
+msgstr "El archivo contiene ficheros no soportados"
 
 #: mat-gui:379
 msgid "Include"
@@ -125,7 +126,7 @@ msgstr "Incluir"
 #: mat-gui:397
 #, python-format
 msgid "MAT is not able to clean the following files, found in the %s archive"
-msgstr "MAT es incapaz de limpiar los siguientes archivos, hallados en el 
archivo %s"
+msgstr "MAT es incapaz de limpiar los siguientes ficheros, hallados en el 
archivo %s"
 
 #: mat-gui:413
 #, python-format
@@ -151,7 +152,7 @@ msgstr "_Ayuda"
 
 #: data/mat.glade:187
 msgid "Add"
-msgstr "Agrefgar"
+msgstr "Agregar"
 
 #: data/mat.glade:256
 msgid "State"

___
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

2018-09-13 Thread translation

commit 619018ae82ba60245a16a4f131f73dd66f31ad14
Author: Translation commit bot 
Date:   Thu Sep 13 20:45:11 2018 +

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

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index b7f3864b8..629565efb 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-13 20:15+\n"
+"PO-Revision-Date: 2018-09-13 20:18+\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"
@@ -374,15 +374,15 @@ msgstr "Pedir bridges ordinarios."
 
 #: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "Solicitar puentes de red IPv6."
+msgstr "Pedir bridges IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pedir un Transporte Conectable por TIPO."
+msgstr "Pedir un Pluggable Transport por TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
 #: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obtener una copia de la llave pÃºblica GnuPG de BridgeDB."
+msgstr "Obtener una copia de la clave pÃºblica GnuPG de BridgeDB."

___
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

2018-09-13 Thread translation

commit 1f3a9d5350b1d2312c729ff0c9866cb7df0f48dc
Author: Translation commit bot 
Date:   Thu Sep 13 20:45:16 2018 +

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

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index b7f3864b8..629565efb 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-13 20:15+\n"
+"PO-Revision-Date: 2018-09-13 20:18+\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"
@@ -374,15 +374,15 @@ msgstr "Pedir bridges ordinarios."
 
 #: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "Solicitar puentes de red IPv6."
+msgstr "Pedir bridges IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pedir un Transporte Conectable por TIPO."
+msgstr "Pedir un Pluggable Transport por TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
 #: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obtener una copia de la llave pÃºblica GnuPG de BridgeDB."
+msgstr "Obtener una copia de la clave pÃºblica GnuPG de BridgeDB."

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

[tor-commits] [tor/master] Avoid calling node_get_all_orports() from node_is_a_configured_bridge()

2018-09-13 Thread nickm

commit 1e77376e1ac316ec2612b385c6e05af39d9113a8
Author: rl1987 
Date:   Fri Aug 24 18:26:27 2018 +0300

Avoid calling node_get_all_orports() from node_is_a_configured_bridge()

All node_get_all_orports() does is allocate and return a smartlist
with at most two tor_addr_port_t members that match ORPort's of
node configuration. This is harmful for memory efficiency, as it
allocates the same stuff every time it is called. However,
node_is_a_configured_bridge() does not need to call it, as it
already has all the information to check if there is configured
bridge for a given node.

The new code is arranged in a way that hopefully makes each succeeding
linear search through bridge_list less likely.
---
 changes/bug27224 |   5 ++
 src/feature/client/bridges.c | 106 +++
 2 files changed, 102 insertions(+), 9 deletions(-)

diff --git a/changes/bug27224 b/changes/bug27224
new file mode 100644
index 0..d43890b81
--- /dev/null
+++ b/changes/bug27224
@@ -0,0 +1,5 @@
+  o Minor bugfixes (performance)::
+- Rework node_is_a_configured_bridge() to no longer
+  call node_get_all_orports(), which was performing too
+  many memory allocations. Fixes bug 27224; bugfix on
+  0.2.3.9.
diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c
index 4bffe1603..7f4422f78 100644
--- a/src/feature/client/bridges.c
+++ b/src/feature/client/bridges.c
@@ -31,6 +31,7 @@
 #include "feature/nodelist/node_st.h"
 #include "feature/nodelist/routerinfo_st.h"
 #include "feature/nodelist/routerstatus_st.h"
+#include "feature/nodelist/microdesc_st.h"
 
 /** Information about a configured bridge. Currently this just matches the
  * ones in the torrc file, but one day we may be able to learn about new
@@ -283,17 +284,105 @@ routerinfo_is_a_configured_bridge(const routerinfo_t *ri)
   return get_configured_bridge_by_routerinfo(ri) ? 1 : 0;
 }
 
-/** Return 1 if node is one of our configured bridges, else 0. */
+/**
+ * Return 1 iff bridge_list contains entry matching
+ * given; IPv4 address in host byte order (ipv4_addr
+ * and port (and no identity digest) OR it contains an
+ * entry whose identity matches digest. Otherwise,
+ * return 0.
+ */
+static int
+bridge_exists_with_ipv4h_addr_and_port(const uint32_t ipv4_addr,
+   const uint16_t port,
+   const char *digest)
+{
+  tor_addr_t node_ipv4;
+
+  if (tor_addr_port_is_valid_ipv4h(ipv4_addr, port, 0)) {
+tor_addr_from_ipv4h(&node_ipv4, ipv4_addr);
+
+   bridge_info_t *bridge =
+get_configured_bridge_by_addr_port_digest(&node_ipv4,
+  port,
+  digest);
+
+   return (bridge != NULL);
+  }
+
+  return 0;
+}
+
+/**
+ * Return 1 iff bridge_list contains entry matching given
+ * ipv6_addr and port (and no identity digest) OR
+ * it contains an  entry whose identity matches digest.
+ * Otherwise, return 0.
+ */
+static int
+bridge_exists_with_ipv6_addr_and_port(const tor_addr_t *ipv6_addr,
+  const uint16_t port,
+  const char *digest)
+{
+  if (!tor_addr_port_is_valid(ipv6_addr, port, 0))
+return 0;
+
+  bridge_info_t *bridge =
+   get_configured_bridge_by_addr_port_digest(ipv6_addr,
+ port,
+ digest);
+
+  return (bridge != NULL);
+}
+
+/** Return 1 if node is one of our configured bridges, else 0.
+ * More specifically, return 1 iff: a bridge_info_t object exists in
+ * bridge_list such that: 1) It's identity is equal to node
+ * identity OR 2) It's identity digest is zero, but it matches
+ * address and port of any ORPort in the node.
+ */
 int
 node_is_a_configured_bridge(const node_t *node)
 {
-  int retval = 0;
-  smartlist_t *orports = node_get_all_orports(node);
-  retval = get_configured_bridge_by_orports_digest(node->identity,
-   orports) != NULL;
-  SMARTLIST_FOREACH(orports, tor_addr_port_t *, p, tor_free(p));
-  smartlist_free(orports);
-  return retval;
+  /* First, let's try searching for a bridge with matching identity. */
+  if (BUG(tor_digest_is_zero(node->identity)))
+return 0;
+
+  if (find_bridge_by_digest(node->identity) != NULL)
+return 1;
+
+  /* At this point, we have established that no bridge exists with
+   * matching identity digest. However, we still pass it into
+   * bridge_exists_* functions because we want further code to
+   * check for absence of identity digest in a bridge.
+   */
+  if (node->ri) {
+if (bridge_exists_with_ipv4h_addr_and_port(node->ri->addr,
+   node->ri->or_port,
+   node->identity))
+  return 1;
+
+if (bridge_exists_with_ipv6_addr_

[tor-commits] [tor/master] Add a test case with a matching ip but mismatched identity.

2018-09-13 Thread nickm

commit 874eca6a8c318c6a8a913520299e36a2757aa490
Author: Nick Mathewson 
Date:   Thu Sep 13 16:30:11 2018 -0400

Add a test case with a matching ip but mismatched identity.
---
 src/test/test_bridges.c | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index 6fcb6fbbb..1cad5445f 100644
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -623,13 +623,25 @@ test_bridges_node_is_a_configured_bridge(void *arg)
   base16_decode(node_with_digest.identity, DIGEST_LEN,
 fingerprint, HEX_DIGEST_LEN);
 
-  tt_assert(node_is_a_configured_bridge(&node_with_digest));
-
   node_t node_ri_ipv4 = { .ri = &ri_ipv4 };
   base16_decode(node_ri_ipv4.identity, DIGEST_LEN,
 fingerprint2, HEX_DIGEST_LEN);
   tt_assert(node_is_a_configured_bridge(&node_ri_ipv4));
 
+  /* This will still match bridge0, since bridge0 has no digest set. */
+  memset(node_ri_ipv4.identity, 0x3f, DIGEST_LEN);
+  tt_assert(node_is_a_configured_bridge(&node_ri_ipv4));
+
+  /* It won't match bridge1, though, since bridge1 has a digest, and this
+ isn't it! */
+  node_ri_ipv4.ri->addr = 0x06060607;
+  node_ri_ipv4.ri->or_port = 6667;
+  tt_assert(! node_is_a_configured_bridge(&node_ri_ipv4));
+  /* If we set the fingerprint right, though, it will match. */
+  base16_decode(node_ri_ipv4.identity, DIGEST_LEN,
+"A10C4F666D27364036B562823E5830BC448E046A", HEX_DIGEST_LEN);
+  tt_assert(node_is_a_configured_bridge(&node_ri_ipv4));
+
   node_t node_rs_ipv4 = { .rs = &rs_ipv4 };
   base16_decode(node_rs_ipv4.identity, DIGEST_LEN,
 fingerprint2, HEX_DIGEST_LEN);



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

[tor-commits] [tor/master] Unit tests for ticket 27224.

2018-09-13 Thread nickm

commit 97419210945c3430d079f31d15ae55e1b9cd1fcc
Author: rl1987 
Date:   Thu Sep 13 16:21:44 2018 -0400

Unit tests for ticket 27224.

Since this is a refactoring ticket, these tests should pass before
and after the changes are made.
---
 src/test/test_bridges.c | 81 +
 1 file changed, 81 insertions(+)

diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index 07d6b88ed..6fcb6fbbb 100644
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -16,6 +16,10 @@
 #include "feature/client/bridges.h"
 #include "app/config/config.h"
 #include "feature/client/transports.h"
+#include "feature/nodelist/node_st.h"
+#include "feature/nodelist/routerinfo_st.h"
+#include "feature/nodelist/routerstatus_st.h"
+#include "feature/nodelist/microdesc_st.h"
 
 /* Test suite stuff */
 #include "test/test.h"
@@ -75,6 +79,7 @@ helper_add_bridges_to_bridgelist(void *arg)
   char *bridge5 = tor_strdup("apple 4.4.4.4: "
  " "
  "foo=abcdefghijklmnopqrstuvwxyz");
+  char *bridge6 = tor_strdup("[2001:0db8:85a3:::8a2e:0370:7334]:");
 
   mark_bridge_list();
 
@@ -93,6 +98,7 @@ helper_add_bridges_to_bridgelist(void *arg)
   ADD_BRIDGE(bridge3);
   ADD_BRIDGE(bridge4);
   ADD_BRIDGE(bridge5);
+  ADD_BRIDGE(bridge6);
 #undef ADD_BRIDGES
 
   sweep_bridge_list();
@@ -585,6 +591,80 @@ test_bridges_get_transport_by_bridge_addrport(void *arg)
   sweep_bridge_list();
 }
 
+static void
+test_bridges_node_is_a_configured_bridge(void *arg)
+{
+  routerinfo_t ri_ipv4 = { .addr = 0x06060606, .or_port =  };
+  routerstatus_t rs_ipv4 = { .addr = 0x06060606, .or_port =  };
+
+  routerinfo_t ri_ipv6 = { .ipv6_orport =  };
+  tor_addr_parse(&(ri_ipv6.ipv6_addr),
+ "2001:0db8:85a3:::8a2e:0370:7334");
+
+  routerstatus_t rs_ipv6 = { .ipv6_orport =  };
+  tor_addr_parse(&(rs_ipv6.ipv6_addr),
+ "2001:0db8:85a3:::8a2e:0370:7334");
+
+  microdesc_t md_ipv6 = { .ipv6_orport =  };
+  tor_addr_parse(&(md_ipv6.ipv6_addr),
+ "2001:0db8:85a3:::8a2e:0370:7334");
+
+  helper_add_bridges_to_bridgelist(arg);
+
+  node_t node_with_digest;
+  memset(&node_with_digest, 0, sizeof(node_with_digest));
+
+  const char fingerprint[HEX_DIGEST_LEN] =
+"";
+
+  const char fingerprint2[HEX_DIGEST_LEN] =
+"";
+
+  base16_decode(node_with_digest.identity, DIGEST_LEN,
+fingerprint, HEX_DIGEST_LEN);
+
+  tt_assert(node_is_a_configured_bridge(&node_with_digest));
+
+  node_t node_ri_ipv4 = { .ri = &ri_ipv4 };
+  base16_decode(node_ri_ipv4.identity, DIGEST_LEN,
+fingerprint2, HEX_DIGEST_LEN);
+  tt_assert(node_is_a_configured_bridge(&node_ri_ipv4));
+
+  node_t node_rs_ipv4 = { .rs = &rs_ipv4 };
+  base16_decode(node_rs_ipv4.identity, DIGEST_LEN,
+fingerprint2, HEX_DIGEST_LEN);
+  tt_assert(node_is_a_configured_bridge(&node_rs_ipv4));
+
+  node_t node_ri_ipv6 = { .ri = &ri_ipv6 };
+  base16_decode(node_ri_ipv6.identity, DIGEST_LEN,
+fingerprint2, HEX_DIGEST_LEN);
+  tt_assert(node_is_a_configured_bridge(&node_ri_ipv6));
+
+  node_t node_rs_ipv6 = { .rs = &rs_ipv6 };
+  base16_decode(node_rs_ipv6.identity, DIGEST_LEN,
+fingerprint2, HEX_DIGEST_LEN);
+  tt_assert(node_is_a_configured_bridge(&node_rs_ipv6));
+
+  node_t node_md_ipv6 = { .md = &md_ipv6 };
+  base16_decode(node_md_ipv6.identity, DIGEST_LEN,
+fingerprint2, HEX_DIGEST_LEN);
+  tt_assert(node_is_a_configured_bridge(&node_md_ipv6));
+
+  mark_bridge_list();
+  sweep_bridge_list();
+
+  tt_assert(!node_is_a_configured_bridge(&node_with_digest));
+  tt_assert(!node_is_a_configured_bridge(&node_ri_ipv4));
+  tt_assert(!node_is_a_configured_bridge(&node_ri_ipv6));
+  tt_assert(!node_is_a_configured_bridge(&node_rs_ipv4));
+  tt_assert(!node_is_a_configured_bridge(&node_rs_ipv6));
+  tt_assert(!node_is_a_configured_bridge(&node_md_ipv6));
+
+ done:
+  mark_bridge_list();
+  sweep_bridge_list();
+}
+
 #undef PT_PRIVATE /* defined(PT_PRIVATE) */
 
 #define B_TEST(name, flags) \
@@ -607,5 +687,6 @@ struct testcase_t bridges_tests[] = {
   B_TEST(get_transport_by_bridge_addrport_no_ptlist, 0),
   B_TEST(get_transport_by_bridge_addrport, 0),
   B_TEST(transport_is_needed, 0),
+  B_TEST(node_is_a_configured_bridge, 0),
   END_OF_TESTCASES
 };



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

2018-09-13 Thread nickm

commit b943721b2a3e31ee743fa2daaf70380b9e8f3e0e
Merge: fae7f96e7 1e77376e1
Author: Nick Mathewson 
Date:   Thu Sep 13 16:43:06 2018 -0400

Merge branch 'bug27224_take2_squashed'

 changes/bug27224 |   5 ++
 src/feature/client/bridges.c | 106 +++
 src/test/test_bridges.c  |  93 +
 3 files changed, 195 insertions(+), 9 deletions(-)

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

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

2018-09-13 Thread translation

commit 9ebf50bc76c41b6554ab1574a288a79ac74a3bbc
Author: Translation commit bot 
Date:   Thu Sep 13 20:19:24 2018 +

Update translations for support-portal_completed
---
 contents+es.po | 195 ++---
 contents+tr.po | 195 ++---
 contents.pot   | 194 ++--
 3 files changed, 353 insertions(+), 231 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index aa55f5afa..a24b38a52 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -5,14 +5,13 @@
 # Emma Peel, 2018
 # Eduardo Carmona , 2018
 # cacu , 2018
-# Silvana Nunez , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-07 17:41+CET\n"
+"POT-Creation-Date: 2018-09-13 21:58+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Silvana Nunez , 2018\n"
+"Last-Translator: cacu , 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -296,11 +295,6 @@ msgstr ""
 msgid "setting-tor-browser-as-default"
 msgstr "configurando-tor-por-defecto"
 
-#: http//localhost/tbb/tbb-37/
-#: (content/tbb/tbb-37/contents+en.lrquestion.description)
-msgid "We currently offer Tor Browser in the following languages:"
-msgstr "Actualmente presentamos el navegador Tor en los siguientes idiomas:"
-
 #: http//localhost/tbb/tbb-15/
 #: (content/tbb/tbb-15/contents+en.lrquestion.description)
 msgid ""
@@ -558,6 +552,15 @@ msgstr ""
 "Puedes ayudar a mejorar la velocidad de la red con tu propio repetidor, o "
 "animando a otros a hacerlo."
 
+#: http//localhost/onionservices/onionservices-2/
+#: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
+msgid ""
+""
+msgstr ""
+""
+
 #: http//localhost/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.description)
 msgid ""
@@ -573,14 +576,14 @@ msgid "You can update Tor Browser as soon as a new 
version is released."
 msgstr ""
 "Puedes actualizar el navegador Tor en cuanto se publica una nueva versiÃ³n."
 
-#: http//localhost/onionservices/onionservices-2/
-#: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
+#: http//localhost/tbb/tbb-29/
+#: (content/tbb/tbb-29/contents+en.lrquestion.description)
 msgid ""
-""
+""
 msgstr ""
-""
+""
 
 #: http//localhost/tbb/tbb-18/
 #: (content/tbb/tbb-18/contents+en.lrquestion.description)
@@ -591,8 +594,12 @@ msgstr ""
 "Lo sentimos, pero actualmente no hay soporte oficial para ejecutar el "
 "navegador Tor sobre *BSD."
 
+#: http//localhost/tbb/tbb-29/
+#: (content/tbb/tbb-29/contents+en.lrquestion.description)
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
+#: http//localhost/onionservices/onionservices-2/
+#: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
 msgid ""
 msgstr ""
 
@@ -723,6 +730,11 @@ msgstr ""
 "DeberÃas ver uno de estos errores de registro comunes (busca las siguientes "
 "lÃneas en tu registro Tor):"
 
+#: http//localhost/tbb/tbb-29/
+#: (content/tbb/tbb-29/contents+en.lrquestion.description)
+msgid "New Circuit for this Site"
+msgstr "Nuevo Circuito para este Sitio"
+
 #: http//localhost/tbb/tbb-3/
 #: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug)
 msgid "tell-which-website-are-visited-while-using-tor-browser"
@@ -1058,11 +1070,6 @@ msgstr "Â¿CÃ³mo puedo compartir ficheros anÃ³nimamente a 
travÃ©s de Tor?"
 msgid "* tor.real"
 msgstr "* tor.real"
 
-#: http//localhost/operators/operators-6/
-#: (content/operators/operators-6/contents+en.lrquestion.description)
-msgid "bandwidth caps)"
-msgstr "lÃmites al ancho de banda)"
-
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
 #: http//localhost/censorship/censorship-5/
@@ -1386,14 +1393,10 @@ msgstr ""
 msgid "I'm having a problem with NoScript."
 msgstr "Tengo un problema con NoScript."
 
-#: http//localhost/tbb/tbb-39/
-#: (content/tbb/tbb-39/contents+en.lrquestion.description)
-msgid ""
-"Sometimes Javascript-heavy websites can have functional issues over Tor "
-"Browser."
-msgstr ""
-"A veces, los sitios con mucho Javascript pueden tener problemas de "
-"funcionamiento en el navegador Tor."
+#: http//localhost/tbb/tbb-34/
+#: (content/tbb/tbb-34/contents+en.lrquestion.title)
+msgid "Why does Tor Browser ship with Javascript enabled?"
+msgstr "Â¿Por quÃ© el Tor Browser viene con JavaScript habilitado?"
 
 #: http//localhost/misc/misc-3/
 #: (content/misc/misc-3/contents+en.lrquestion.seo_slug)
@@ -1681,15 +1684,6 @@ msgstr ""
 msgid "first-address-relay-circuit"
 msgstr "primera-direcciÃ³n-del-circuito-de-repetidores"
 
-#: http//localhost/tbb/tbb-29/
-#: (content/tbb/tbb-29/contents+en.lrquestion.description)
-msgid ""
-""
-msgstr ""
-""
-
 #: http//localhost/tbb/tbb-28/
 #: (

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

2018-09-13 Thread translation

commit 65a6a1c12d566068670d49b459f85e59531c8191
Author: Translation commit bot 
Date:   Thu Sep 13 20:15:30 2018 +

Update translations for https_everywhere
---
 ka/ssl-observatory.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd
index f09c302e8..b87c2661f 100644
--- a/ka/ssl-observatory.dtd
+++ b/ka/ssl-observatory.dtd
@@ -27,7 +27,7 @@ to turn it on?">-->
 "á£á¡áá¤á áá®áá, ááá áá ááá ááá 
ááªáá£áá á¥á¡áááá á¡áá áááááááá¡áá¡, 
á ááááá¡ááª áááá©ááá á¡áááá£ááá 
á¨ááá á¥á¡áááá¡ á¡áá ááá áá¡ 
á¡áá®ááááá:">
 
 
+"áááááááááá áá á¨áááá¬áááá á¡áá 
á¢áá¤áááá¢áááá¡, á áááááááª 
á®ááááá¬áá áááá á«áá áá£áá á¡áá 
á¢áá¤áááá¢áááá¡ á£á©ááá£áá 
ááááªáááááá¡ áááá .">
 
 

___
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

2018-09-13 Thread translation

commit 48b332191e811c27e55d390f943f676a055de44e
Author: Translation commit bot 
Date:   Thu Sep 13 20:15:16 2018 +

Update translations for bridgedb_completed
---
 es_AR/LC_MESSAGES/bridgedb.po | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index c2857c25a..b7f3864b8 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-13 19:45+\n"
+"PO-Revision-Date: 2018-09-13 20:15+\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"
@@ -266,7 +266,7 @@ msgstr "%s Los Bridges %s son relevos de Tor que te ayudan 
a evitar la censura."
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Â¡Necesito una manera alternativa de obtener puentes!"
+msgstr "Â¡Necesito una manera alternativa de obtener bridges!"
 
 #: bridgedb/strings.py:108
 #, python-format
@@ -274,17 +274,17 @@ msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you 
must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Otra manera de obtener puentes de red es enviando un correo 
electrÃ³nico a %s.  Por favor note que debe enviar el correo usando una 
direcciÃ³n de uno de los siguientes proveedores de correo electrÃ³nico: %s, %s 
o %s."
+msgstr "Otra manera de obtener bridges es enviando un correo electrÃ³nico a 
%s.  Por favor notÃ¡ que debÃ©s enviar el correo electrÃ³nico usando una 
direcciÃ³n de uno de los siguientes proveedores:\n%s, %s o %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "Â¡Mis puentes no funcionan! Necesito ayuda!"
+msgstr "Â¡Mis bridges no funcionan! Â¡Necesito ayuda!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, envÃe un mensaje a %s."
+msgstr "Si Tor no funciona, deberÃas enviar un correo electrÃ³nico a %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -294,40 +294,40 @@ msgid ""
 "Try including as much info about your case as you can, including the list 
of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser 
version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Intente incluir toda la informaciÃ³n posible sobre su caso, incluyendo 
la lista de puentes de red y Transportes Conectables que intentÃ³ usar, la 
versiÃ³n de su Navegador Tor, y cualquier mensaje que Tor haya presentado, etc."
+msgstr "IntentÃ¡ incluir toda la informaciÃ³n posible sobre tu caso, 
incluyendo la lista de\nbridges y Pluggable Transports que intentaste usar, la 
versiÃ³n de tu Tor Browser,\ny cualquier mensaje que Tor haya presentado, etc."
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "AquÃ estÃ¡n sus lÃneas de puentes de red:"
+msgstr "AquÃ estÃ¡n tus lÃneas de bridges:"
 
 #: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Obtenga Puentes de Red!"
+msgstr "Â¡ObtenÃ© Bridges!"
 
 #: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "Por favor seleccione opciones para su tipo de puente de red:"
+msgstr "Por favor seleccionÃ¡ opciones para tipo de bridge:"
 
 #: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Â¿Necesita direcciones IPv6?"
+msgstr "Â¿NecesitÃ¡s direcciones IPv6?"
 
 #: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Necesita una %s?"
+msgstr "Â¿NecesitÃ¡s una %s?"
 
 #: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "Su navegador no muestra las imÃ¡genes correctamente."
+msgstr "Tu navegador no muestra las imÃ¡genes correctamente."
 
 #: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "Ingrese los caracteres de la imagen..."
+msgstr "IngresÃ¡ los caracteres de la imagen..."
 
 #: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "CÃ³mo comenzar a usar sus puentes de red"
+msgstr "CÃ³mo comenzar a usar tus bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #: bridgedb/strings.py:146
@@ -336,21 +336,21 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Para introducir puentes d

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

2018-09-13 Thread translation

commit 05fce903d541ab1896836cd8bcc431ba5ea48939
Author: Translation commit bot 
Date:   Thu Sep 13 20:15:11 2018 +

Update translations for bridgedb
---
 es_AR/LC_MESSAGES/bridgedb.po | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index c2857c25a..b7f3864b8 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-13 19:45+\n"
+"PO-Revision-Date: 2018-09-13 20:15+\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"
@@ -266,7 +266,7 @@ msgstr "%s Los Bridges %s son relevos de Tor que te ayudan 
a evitar la censura."
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Â¡Necesito una manera alternativa de obtener puentes!"
+msgstr "Â¡Necesito una manera alternativa de obtener bridges!"
 
 #: bridgedb/strings.py:108
 #, python-format
@@ -274,17 +274,17 @@ msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you 
must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Otra manera de obtener puentes de red es enviando un correo 
electrÃ³nico a %s.  Por favor note que debe enviar el correo usando una 
direcciÃ³n de uno de los siguientes proveedores de correo electrÃ³nico: %s, %s 
o %s."
+msgstr "Otra manera de obtener bridges es enviando un correo electrÃ³nico a 
%s.  Por favor notÃ¡ que debÃ©s enviar el correo electrÃ³nico usando una 
direcciÃ³n de uno de los siguientes proveedores:\n%s, %s o %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "Â¡Mis puentes no funcionan! Necesito ayuda!"
+msgstr "Â¡Mis bridges no funcionan! Â¡Necesito ayuda!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, envÃe un mensaje a %s."
+msgstr "Si Tor no funciona, deberÃas enviar un correo electrÃ³nico a %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -294,40 +294,40 @@ msgid ""
 "Try including as much info about your case as you can, including the list 
of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser 
version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Intente incluir toda la informaciÃ³n posible sobre su caso, incluyendo 
la lista de puentes de red y Transportes Conectables que intentÃ³ usar, la 
versiÃ³n de su Navegador Tor, y cualquier mensaje que Tor haya presentado, etc."
+msgstr "IntentÃ¡ incluir toda la informaciÃ³n posible sobre tu caso, 
incluyendo la lista de\nbridges y Pluggable Transports que intentaste usar, la 
versiÃ³n de tu Tor Browser,\ny cualquier mensaje que Tor haya presentado, etc."
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "AquÃ estÃ¡n sus lÃneas de puentes de red:"
+msgstr "AquÃ estÃ¡n tus lÃneas de bridges:"
 
 #: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Obtenga Puentes de Red!"
+msgstr "Â¡ObtenÃ© Bridges!"
 
 #: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "Por favor seleccione opciones para su tipo de puente de red:"
+msgstr "Por favor seleccionÃ¡ opciones para tipo de bridge:"
 
 #: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Â¿Necesita direcciones IPv6?"
+msgstr "Â¿NecesitÃ¡s direcciones IPv6?"
 
 #: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Necesita una %s?"
+msgstr "Â¿NecesitÃ¡s una %s?"
 
 #: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "Su navegador no muestra las imÃ¡genes correctamente."
+msgstr "Tu navegador no muestra las imÃ¡genes correctamente."
 
 #: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "Ingrese los caracteres de la imagen..."
+msgstr "IngresÃ¡ los caracteres de la imagen..."
 
 #: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "CÃ³mo comenzar a usar sus puentes de red"
+msgstr "CÃ³mo comenzar a usar tus bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #: bridgedb/strings.py:146
@@ -336,21 +336,21 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Para introducir puentes de red a su

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

2018-09-13 Thread translation

commit efe5a2104af5b2dd00d6a1736c0a9366b75fa600
Author: Translation commit bot 
Date:   Thu Sep 13 19:45:32 2018 +

Update translations for https_everywhere
---
 ka/ssl-observatory.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd
index 3278361c5..f09c302e8 100644
--- a/ka/ssl-observatory.dtd
+++ b/ka/ssl-observatory.dtd
@@ -3,9 +3,9 @@
 
 
 
-
+
 
 
 
 
+"áááááá§áááá¡ HTTPS Everywhere-áá SSL-Observatory?`">
 
 
 
 
 
 
+"áááá¡ á©áá ááá á£á¡áá¤á áá®áá, ááá áá 
ááá¢áá
+áááááááá ááááá ááá ááá ááªáá£áá 
á¥á¡áááá¡ ááááá§áááááá¡áá¡:">
 
 
+"á£á¡áá¤á áá®áá, ááá áá ááá ááá 
ááªáá£áá á¥á¡áááá á¡áá áááááááá¡áá¡, 
á ááááá¡ááª áááá©ááá á¡áááá£ááá 
á¨ááá á¥á¡áááá¡ á¡áá ááá áá¡ 
á¡áá®ááááá:">
 
 

___
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

2018-09-13 Thread translation

commit de9f05b2a8f01a9a3a8483668527c5189c2d0810
Author: Translation commit bot 
Date:   Thu Sep 13 19:45:16 2018 +

Update translations for bridgedb_completed
---
 es_AR/LC_MESSAGES/bridgedb.po | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index 947fa2ca7..c2857c25a 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-13 19:14+\n"
+"PO-Revision-Date: 2018-09-13 19:45+\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"
@@ -194,7 +194,7 @@ msgstr "Â¡Bienvenido a BridgeDB!"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transporte comunmente soportados"
+msgstr "TYPEs de transport actualmente soportados:"
 
 #: bridgedb/strings.py:56
 #, python-format
@@ -203,11 +203,11 @@ msgstr "Â¡Eh, %s!"
 
 #: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr "Hola amigo!"
+msgstr "Â¡Hola amigo!"
 
 #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
-msgstr "Llaves pÃºblicas"
+msgstr "Claves pÃºblicas"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
@@ -217,7 +217,7 @@ msgstr "Llaves pÃºblicas"
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Este email fue generado con arcoiris, unicornios y destellos para %s 
sobre %s en %s"
+msgstr "Este correo electrÃ³nico fue generado con arcoiris, unicornios y 
destellos\npara %s el %s a las %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -231,7 +231,7 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you 
are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB puede proveerle puentes de red con varios %stipos de 
Transportes Conectables%s, que pueden ayudar a ofuscar sus conexiones a la Red 
de Tor, haciendo mÃ¡s difÃcil que alguien que observe su trÃ¡fico de internet 
determine que usted estÃ¡ usando Tor.\n"
+msgstr "BridgeDB puede proveerte bridges con varios %stipos de Pluggable 
Transports%s,\nque pueden ayudar a ofuscar tus conexiones a Tor Network, 
haciendo mÃ¡s difÃcil\nque alguien que observe tu trÃ¡fico de internet 
determine que estÃ¡s\nusando Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: bridgedb/strings.py:79
@@ -239,7 +239,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Algunos puentes de red con direcciones IPv6 tambiÃ©n estÃ¡n 
disponibles, aunque algunos Transportes Conectables no son compatibles con 
IPv6.\n"
+msgstr "Algunos bridges con direcciones IPv6 tambiÃ©n estÃ¡n disponibles, aÃºn 
cuando algunos Pluggable\nTransports no son compatibles con IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -253,16 +253,16 @@ msgid ""
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can 
still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Adicionalmente, BridgeDB tiene varios puentes de red comunes y 
corrientes %s sin Transportes Conectables %s que tal vez no suenen tan genial, 
pero aÃºn pueden ayudar a burlar la censura de internet en muchos casos.\n"
+msgstr "Adicionalmente, BridgeDB tiene varios bridges ordinarios como papel de 
cuete, %s sin ningÃºn\nPluggable Transports %s, que tal vez no suenen tan 
genial, pero aÃºn pueden\nayudar a burlar la censura de internet en muchos 
casos.\n\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "Â¿QuÃ© son los puentes de red?"
+msgstr "Â¿QuÃ© son los bridges?"
 
 #: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Los Puentes de Red %s son nodos de retransmisiÃ³n de Tor que le 
ayudan a evitar la censura."
+msgstr "%s Los Bridges %s son relevos de Tor que te ayudan a evitar la 
censura."
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"

___
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

2018-09-13 Thread translation

commit aba1f6c940c5d85d44548edcc12a2fd8b71a2791
Author: Translation commit bot 
Date:   Thu Sep 13 19:45:11 2018 +

Update translations for bridgedb
---
 es_AR/LC_MESSAGES/bridgedb.po | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index 947fa2ca7..c2857c25a 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-13 19:14+\n"
+"PO-Revision-Date: 2018-09-13 19:45+\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"
@@ -194,7 +194,7 @@ msgstr "Â¡Bienvenido a BridgeDB!"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transporte comunmente soportados"
+msgstr "TYPEs de transport actualmente soportados:"
 
 #: bridgedb/strings.py:56
 #, python-format
@@ -203,11 +203,11 @@ msgstr "Â¡Eh, %s!"
 
 #: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr "Hola amigo!"
+msgstr "Â¡Hola amigo!"
 
 #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
-msgstr "Llaves pÃºblicas"
+msgstr "Claves pÃºblicas"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
@@ -217,7 +217,7 @@ msgstr "Llaves pÃºblicas"
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Este email fue generado con arcoiris, unicornios y destellos para %s 
sobre %s en %s"
+msgstr "Este correo electrÃ³nico fue generado con arcoiris, unicornios y 
destellos\npara %s el %s a las %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -231,7 +231,7 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you 
are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB puede proveerle puentes de red con varios %stipos de 
Transportes Conectables%s, que pueden ayudar a ofuscar sus conexiones a la Red 
de Tor, haciendo mÃ¡s difÃcil que alguien que observe su trÃ¡fico de internet 
determine que usted estÃ¡ usando Tor.\n"
+msgstr "BridgeDB puede proveerte bridges con varios %stipos de Pluggable 
Transports%s,\nque pueden ayudar a ofuscar tus conexiones a Tor Network, 
haciendo mÃ¡s difÃcil\nque alguien que observe tu trÃ¡fico de internet 
determine que estÃ¡s\nusando Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: bridgedb/strings.py:79
@@ -239,7 +239,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Algunos puentes de red con direcciones IPv6 tambiÃ©n estÃ¡n 
disponibles, aunque algunos Transportes Conectables no son compatibles con 
IPv6.\n"
+msgstr "Algunos bridges con direcciones IPv6 tambiÃ©n estÃ¡n disponibles, aÃºn 
cuando algunos Pluggable\nTransports no son compatibles con IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -253,16 +253,16 @@ msgid ""
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can 
still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Adicionalmente, BridgeDB tiene varios puentes de red comunes y 
corrientes %s sin Transportes Conectables %s que tal vez no suenen tan genial, 
pero aÃºn pueden ayudar a burlar la censura de internet en muchos casos.\n"
+msgstr "Adicionalmente, BridgeDB tiene varios bridges ordinarios como papel de 
cuete, %s sin ningÃºn\nPluggable Transports %s, que tal vez no suenen tan 
genial, pero aÃºn pueden\nayudar a burlar la censura de internet en muchos 
casos.\n\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "Â¿QuÃ© son los puentes de red?"
+msgstr "Â¿QuÃ© son los bridges?"
 
 #: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Los Puentes de Red %s son nodos de retransmisiÃ³n de Tor que le 
ayudan a evitar la censura."
+msgstr "%s Los Bridges %s son relevos de Tor que te ayudan a evitar la 
censura."
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting 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

2018-09-13 Thread translation

commit 90f9b8b27732e2813807790294c47c6b55f7f7d4
Author: Translation commit bot 
Date:   Thu Sep 13 19:15:20 2018 +

Update translations for bridgedb_completed
---
 es_AR/LC_MESSAGES/bridgedb.po | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index be2571649..947fa2ca7 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-13 18:43+\n"
+"PO-Revision-Date: 2018-09-13 19:14+\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"
@@ -67,7 +67,7 @@ msgstr "Mostrar CÃ³digo QR"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "CÃ³digo QR para sus lÃneas de puentes de red"
+msgstr "CÃ³digo QR para tus lÃneas de bridge"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -86,18 +86,18 @@ msgstr "Ha ocurrido un error al obtener tu cÃ³digo QR."
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Este cÃ³digo QR contiene tus lÃneas de puente de red. Escanealo con 
un lector de cÃ³digos QR para copiarlas en tus dispositivos mÃ³viles y otros."
+msgstr "Este cÃ³digo QR contiene tus lÃneas de bridge. Escanealo con un 
lector de cÃ³digos QR para copiarlas en tus dispositivos mÃ³viles y otros."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr "En este momento no existen puentes de red disponibles..."
+msgstr "En este momento no existen bridges disponibles..."
 
 #: bridgedb/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Â¡Tal vez deberÃas %s volver %s y escoger otro tipo de puente de red!"
+msgstr "Â¡Tal vez deberÃas %s volver %s y escoger otro tipo de bridge!"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -117,7 +117,7 @@ msgstr "Paso %s2%s"
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "Obtener %s puentes de red %s"
+msgstr "Obtener %s bridges %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
@@ -127,7 +127,7 @@ msgstr "Paso %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ahora %s agregÃ¡ los puentes de red a Tor Browser %s"
+msgstr "Ahora %s agregÃ¡ los bridges a Tor Browser %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -136,7 +136,7 @@ msgstr "Ahora %s agregÃ¡ los puentes de red a Tor Browser 
%s"
 #: bridgedb/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "Â¡%sS%solamente dÃ¡me puentes de red!"
+msgstr "Â¡%sS%solamente dÃ¡me bridges!"
 
 #: bridgedb/https/templates/options.html:51
 msgid "Advanced Options"
@@ -156,7 +156,7 @@ msgstr "ninguno"
 #: bridgedb/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
-msgstr "%sS%si!"
+msgstr "Â¡%sS%sÃ!"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -164,7 +164,7 @@ msgstr "%sS%si!"
 #: bridgedb/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%sO%sbtener puentes de red"
+msgstr "%sO%sbtener bridges"
 
 #: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
@@ -172,24 +172,24 @@ msgstr "[Este es un mensaje automÃ¡tico; por favor, no 
responda.]"
 
 #: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "AquÃ estÃ¡n sus puentes de red:"
+msgstr "AquÃ estÃ¡n tus bridges:"
 
 #: bridgedb/strings.py:47
 #, 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 "Se ha excedido el lÃmite de la tasa.  Por favor, vaya mÃ¡s despacio! 
El tiempo mÃnimo entre emails es %s horas.  Todos los emails siguientes en 
este lapso de tiempo serÃ¡n ignorados."
+msgstr "Te has excedido el lÃmite de tasa. Â¡Por favor, andÃ¡ mÃ¡s despacio! 
El tiempo mÃnimo entre\ncorreos electrÃ³nicos es %s horas. Todos los correos 
electrÃ³nicos siguientes en este lapso de tiempo serÃ¡n ignorados."
 
 #:

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

2018-09-13 Thread translation

commit 43cb8c0179ee0296678ba3b3f89e0f152483267f
Author: Translation commit bot 
Date:   Thu Sep 13 19:15:14 2018 +

Update translations for bridgedb
---
 es_AR/LC_MESSAGES/bridgedb.po | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index be2571649..947fa2ca7 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-13 18:43+\n"
+"PO-Revision-Date: 2018-09-13 19:14+\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"
@@ -67,7 +67,7 @@ msgstr "Mostrar CÃ³digo QR"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "CÃ³digo QR para sus lÃneas de puentes de red"
+msgstr "CÃ³digo QR para tus lÃneas de bridge"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -86,18 +86,18 @@ msgstr "Ha ocurrido un error al obtener tu cÃ³digo QR."
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Este cÃ³digo QR contiene tus lÃneas de puente de red. Escanealo con 
un lector de cÃ³digos QR para copiarlas en tus dispositivos mÃ³viles y otros."
+msgstr "Este cÃ³digo QR contiene tus lÃneas de bridge. Escanealo con un 
lector de cÃ³digos QR para copiarlas en tus dispositivos mÃ³viles y otros."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr "En este momento no existen puentes de red disponibles..."
+msgstr "En este momento no existen bridges disponibles..."
 
 #: bridgedb/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Â¡Tal vez deberÃas %s volver %s y escoger otro tipo de puente de red!"
+msgstr "Â¡Tal vez deberÃas %s volver %s y escoger otro tipo de bridge!"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -117,7 +117,7 @@ msgstr "Paso %s2%s"
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "Obtener %s puentes de red %s"
+msgstr "Obtener %s bridges %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
@@ -127,7 +127,7 @@ msgstr "Paso %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ahora %s agregÃ¡ los puentes de red a Tor Browser %s"
+msgstr "Ahora %s agregÃ¡ los bridges a Tor Browser %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -136,7 +136,7 @@ msgstr "Ahora %s agregÃ¡ los puentes de red a Tor Browser 
%s"
 #: bridgedb/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "Â¡%sS%solamente dÃ¡me puentes de red!"
+msgstr "Â¡%sS%solamente dÃ¡me bridges!"
 
 #: bridgedb/https/templates/options.html:51
 msgid "Advanced Options"
@@ -156,7 +156,7 @@ msgstr "ninguno"
 #: bridgedb/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
-msgstr "%sS%si!"
+msgstr "Â¡%sS%sÃ!"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -164,7 +164,7 @@ msgstr "%sS%si!"
 #: bridgedb/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%sO%sbtener puentes de red"
+msgstr "%sO%sbtener bridges"
 
 #: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
@@ -172,24 +172,24 @@ msgstr "[Este es un mensaje automÃ¡tico; por favor, no 
responda.]"
 
 #: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "AquÃ estÃ¡n sus puentes de red:"
+msgstr "AquÃ estÃ¡n tus bridges:"
 
 #: bridgedb/strings.py:47
 #, 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 "Se ha excedido el lÃmite de la tasa.  Por favor, vaya mÃ¡s despacio! 
El tiempo mÃnimo entre emails es %s horas.  Todos los emails siguientes en 
este lapso de tiempo serÃ¡n ignorados."
+msgstr "Te has excedido el lÃmite de tasa. Â¡Por favor, andÃ¡ mÃ¡s despacio! 
El tiempo mÃnimo entre\ncorreos electrÃ³nicos es %s horas. Todos los correos 
electrÃ³nicos siguientes en este lapso de tiempo serÃ¡n ignorados."
 
 #: bridgedb/s

[tor-commits] [tor/master] Add an --enable-pic option for people who hack Tor into libraries

2018-09-13 Thread nickm

commit 0aec613a7870a929ba21de4fe97dbd2fdeada86c
Author: Nick Mathewson 
Date:   Wed Sep 12 10:10:29 2018 -0400

Add an --enable-pic option for people who hack Tor into libraries

Closes ticket 23846
---
 changes/ticket23846 |  5 +
 configure.ac| 10 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/changes/ticket23846 b/changes/ticket23846
new file mode 100644
index 0..73850482b
--- /dev/null
+++ b/changes/ticket23846
@@ -0,0 +1,5 @@
+  o Minor features (build):
+- If you pass the "--enable-pic" option to configure, Tor will try to
+  tell the compiler to build position-independent code suitable to
+  link into a library. (The default remains -fPIE, for code suitable for a
+  relocatable executable.) Closes ticket 23846.
diff --git a/configure.ac b/configure.ac
index 643068724..bd300ba1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,8 @@ AC_ARG_ENABLE(zstd-advanced-apis,
AS_HELP_STRING(--disable-zstd-advanced-apis, [Build without support for 
zstd's "static-only" APIs.]))
 AC_ARG_ENABLE(nss,
AS_HELP_STRING(--enable-nss, [Use Mozilla's NSS TLS library. 
(EXPERIMENTAL)]))
+AC_ARG_ENABLE(pic,
+   AS_HELP_STRING(--enable-pic, [Build Tor's binaries as position-independent 
code, suitable to link as a library.]))
 
 if test "x$enable_coverage" != "xyes" -a "x$enable_asserts_in_tests" = "xno" ; 
then
 AC_MSG_ERROR([Can't disable assertions outside of coverage build])
@@ -1138,6 +1140,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
 #error
 #endif])], have_clang=yes, have_clang=no)
 
+if test "x$enable_pic" = "xyes"; then
+TOR_CHECK_CFLAGS(-fPIC)
+fi
+
 if test "x$enable_gcc_hardening" != "xno"; then
 CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
 if test "x$have_clang" = "xyes"; then
@@ -1157,7 +1163,9 @@ m4_ifdef([AS_VAR_IF],[
 TOR_CHECK_CFLAGS(-Wstack-protector)
 TOR_CHECK_CFLAGS(--param ssp-buffer-size=1)
 if test "$bwin32" = "false" && test "$enable_libfuzzer" != "yes" && test 
"$enable_oss_fuzz" != "yes"; then
-   TOR_CHECK_CFLAGS(-fPIE)
+   if test "$enable_pic" != "yes"; then
+   TOR_CHECK_CFLAGS(-fPIE)
+   fi
TOR_CHECK_LDFLAGS(-pie, "$all_ldflags_for_check", "$all_libs_for_check")
 fi
 TOR_TRY_COMPILE_WITH_CFLAGS(-fwrapv, also_link, CFLAGS_FWRAPV="-fwrapv", 
true)



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

[tor-commits] [tor/master] Explain PIE/PIC rationale for 23846.

2018-09-13 Thread nickm

commit fae7f96e7bac60b6e6f23bfcef239a3686093cb8
Author: Nick Mathewson 
Date:   Thu Sep 13 14:53:20 2018 -0400

Explain PIE/PIC rationale for 23846.
---
 configure.ac | 4 
 1 file changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index bd300ba1b..f0673cf4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1164,8 +1164,12 @@ m4_ifdef([AS_VAR_IF],[
 TOR_CHECK_CFLAGS(--param ssp-buffer-size=1)
 if test "$bwin32" = "false" && test "$enable_libfuzzer" != "yes" && test 
"$enable_oss_fuzz" != "yes"; then
if test "$enable_pic" != "yes"; then
+   # If we have already enabled -fPIC, then we don't also need to
+   # compile with -fPIE...
TOR_CHECK_CFLAGS(-fPIE)
fi
+   # ... but we want to link our executables with -pie in any case, since
+   # they're executables, not a library.
TOR_CHECK_LDFLAGS(-pie, "$all_ldflags_for_check", "$all_libs_for_check")
 fi
 TOR_TRY_COMPILE_WITH_CFLAGS(-fwrapv, also_link, CFLAGS_FWRAPV="-fwrapv", 
true)

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

2018-09-13 Thread nickm

commit eaf7d16826a7d019ffc9990dcd88add48c195328
Merge: 85aba48a6 0aec613a7
Author: Nick Mathewson 
Date:   Thu Sep 13 14:51:21 2018 -0400

Merge branch 'ticket23846'

 changes/ticket23846 |  5 +
 configure.ac| 10 +-
 2 files changed, 14 insertions(+), 1 deletion(-)



___
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

2018-09-13 Thread translation

commit 44895bf06bb3835ff9931f2dc1661f11c3929efc
Author: Translation commit bot 
Date:   Thu Sep 13 18:46:33 2018 +

Update translations for tails-openpgp-applet_completed
---
 es_AR/openpgp-applet.pot | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/es_AR/openpgp-applet.pot b/es_AR/openpgp-applet.pot
index 488d7a2f0..f83b0504b 100644
--- a/es_AR/openpgp-applet.pot
+++ b/es_AR/openpgp-applet.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-09-13 18:16+\n"
+"PO-Revision-Date: 2018-09-13 18:23+\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"
@@ -122,11 +122,11 @@ msgstr "Firmar mensaje como:"
 
 #: bin/openpgp-applet:549
 msgid "Choose keys"
-msgstr "Elija las claves"
+msgstr "ElegÃ las claves"
 
 #: bin/openpgp-applet:589
 msgid "Do you trust these keys?"
-msgstr "Â¿Tiene confianza en esas claves?"
+msgstr "Â¿ConfiÃ¡s en Ã©stas claves?"
 
 #: bin/openpgp-applet:592
 msgid "The following selected key is not fully trusted:"
@@ -138,7 +138,7 @@ msgstr[1] "Las siguientes claves no son completamente 
confiables: "
 msgid "Do you trust this key enough to use it anyway?"
 msgid_plural "Do you trust these keys enough to use them anyway?"
 msgstr[0] "Â¿Tiene suficiente confianza en esta clave para utilizarla 
igualmente?"
-msgstr[1] "Â¿Tiene suficiente confianza en estas claves para utilizarlas 
igualmente?"
+msgstr[1] "Â¿TenÃ©s suficiente confianza en Ã©stas claves para utilizarlas 
igualmente?"
 
 #: bin/openpgp-applet:623
 msgid "No keys selected"
@@ -148,7 +148,7 @@ msgstr "No hay claves seleccionadas"
 msgid ""
 "You must select a private key to sign the message, or some public keys to "
 "encrypt the message, or both."
-msgstr "Debe seleccionar una clave privada para firmar el mensaje, alguna 
clave pÃºblica para cifrar el mensaje o ambas."
+msgstr "DebÃ©s seleccionar una clave privada para firmar el mensaje, alguna 
clave pÃºblica para encriptarlo, o ambas."
 
 #: bin/openpgp-applet:653
 msgid "No keys available"
@@ -157,7 +157,7 @@ msgstr "No hay claves disponibles"
 #: bin/openpgp-applet:655
 msgid ""
 "You need a private key to sign messages or a public key to encrypt messages."
-msgstr "Necesita una clave privada para firmar mensajes, o una clave publica 
para cifrar mensajes."
+msgstr "NecesitÃ¡s una clave privada para firmar mensajes, o una clave 
pÃºblica para encriptarlos."
 
 #: bin/openpgp-applet:783
 msgid "GnuPG error"

___
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

2018-09-13 Thread translation

commit bfc9b700b573588de94091661cf6ed30b0fa816f
Author: Translation commit bot 
Date:   Thu Sep 13 18:46:28 2018 +

Update translations for tails-openpgp-applet
---
 es_AR/openpgp-applet.pot | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/es_AR/openpgp-applet.pot b/es_AR/openpgp-applet.pot
index 488d7a2f0..f83b0504b 100644
--- a/es_AR/openpgp-applet.pot
+++ b/es_AR/openpgp-applet.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-09-13 18:16+\n"
+"PO-Revision-Date: 2018-09-13 18:23+\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"
@@ -122,11 +122,11 @@ msgstr "Firmar mensaje como:"
 
 #: bin/openpgp-applet:549
 msgid "Choose keys"
-msgstr "Elija las claves"
+msgstr "ElegÃ las claves"
 
 #: bin/openpgp-applet:589
 msgid "Do you trust these keys?"
-msgstr "Â¿Tiene confianza en esas claves?"
+msgstr "Â¿ConfiÃ¡s en Ã©stas claves?"
 
 #: bin/openpgp-applet:592
 msgid "The following selected key is not fully trusted:"
@@ -138,7 +138,7 @@ msgstr[1] "Las siguientes claves no son completamente 
confiables: "
 msgid "Do you trust this key enough to use it anyway?"
 msgid_plural "Do you trust these keys enough to use them anyway?"
 msgstr[0] "Â¿Tiene suficiente confianza en esta clave para utilizarla 
igualmente?"
-msgstr[1] "Â¿Tiene suficiente confianza en estas claves para utilizarlas 
igualmente?"
+msgstr[1] "Â¿TenÃ©s suficiente confianza en Ã©stas claves para utilizarlas 
igualmente?"
 
 #: bin/openpgp-applet:623
 msgid "No keys selected"
@@ -148,7 +148,7 @@ msgstr "No hay claves seleccionadas"
 msgid ""
 "You must select a private key to sign the message, or some public keys to "
 "encrypt the message, or both."
-msgstr "Debe seleccionar una clave privada para firmar el mensaje, alguna 
clave pÃºblica para cifrar el mensaje o ambas."
+msgstr "DebÃ©s seleccionar una clave privada para firmar el mensaje, alguna 
clave pÃºblica para encriptarlo, o ambas."
 
 #: bin/openpgp-applet:653
 msgid "No keys available"
@@ -157,7 +157,7 @@ msgstr "No hay claves disponibles"
 #: bin/openpgp-applet:655
 msgid ""
 "You need a private key to sign messages or a public key to encrypt messages."
-msgstr "Necesita una clave privada para firmar mensajes, o una clave publica 
para cifrar mensajes."
+msgstr "NecesitÃ¡s una clave privada para firmar mensajes, o una clave 
pÃºblica para encriptarlos."
 
 #: bin/openpgp-applet:783
 msgid "GnuPG error"

___
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

2018-09-13 Thread translation

commit 05e31b1599f9117ddc2f3a933f9f602b6de0b17d
Author: Translation commit bot 
Date:   Thu Sep 13 18:45:18 2018 +

Update translations for bridgedb_completed
---
 es_AR/LC_MESSAGES/bridgedb.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index 77698de03..be2571649 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -10,13 +10,14 @@
 # JosÃ© FabiÃ¡n, 2014
 # ezemelano , 2014
 # Pablo Di Noto , 2016
+# Zuhualime Akoochimoya, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-09-19 16:57+\n"
-"Last-Translator: Pablo Di Noto \n"
+"PO-Revision-Date: 2018-09-13 18:43+\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"
@@ -38,7 +39,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Â¡Lo sentimos! Algo saliÃ³ mal con su solicitud."
+msgstr "Â¡Lo sentimos! Algo saliÃ³ mal con tu solicitud."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
@@ -50,7 +51,7 @@ msgstr "CÃ³digo fuente"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr "Log de cambios"
+msgstr "BitÃ¡cora de cambios"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
@@ -79,13 +80,13 @@ msgstr "Â¡Oh, sonamos!"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr "Ha ocurrido un error al obtener su cÃ³digo QR."
+msgstr "Ha ocurrido un error al obtener tu cÃ³digo QR."
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Este cÃ³digo QR contiene sus lineas de puente de red. Escaneelo con un 
lector de cÃ³digos QR hacia su dispositivo mÃ³vil y otros."
+msgstr "Este cÃ³digo QR contiene tus lÃneas de puente de red. Escanealo con 
un lector de cÃ³digos QR para copiarlas en tus dispositivos mÃ³viles y otros."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
@@ -96,7 +97,7 @@ msgstr "En este momento no existen puentes de red 
disponibles..."
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Tal vez deberÃa %s volver %s y escoger otro tipo de puente de red."
+msgstr "Â¡Tal vez deberÃas %s volver %s y escoger otro tipo de puente de red!"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -126,7 +127,7 @@ msgstr "Paso %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ahora %s agregue los puentes de red al Buscador Tor %s"
+msgstr "Ahora %s agregÃ¡ los puentes de red a Tor Browser %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -135,7 +136,7 @@ msgstr "Ahora %s agregue los puentes de red al Buscador Tor 
%s"
 #: bridgedb/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sS%solamente deme puentes de red!"
+msgstr "Â¡%sS%solamente dÃ¡me puentes de red!"
 
 #: bridgedb/https/templates/options.html:51
 msgid "Advanced Options"

___
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

2018-09-13 Thread translation

commit 707603892cc5e637be9319b727c348da46ccc661
Author: Translation commit bot 
Date:   Thu Sep 13 18:45:12 2018 +

Update translations for bridgedb
---
 es_AR/LC_MESSAGES/bridgedb.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index 77698de03..be2571649 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -10,13 +10,14 @@
 # JosÃ© FabiÃ¡n, 2014
 # ezemelano , 2014
 # Pablo Di Noto , 2016
+# Zuhualime Akoochimoya, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-09-19 16:57+\n"
-"Last-Translator: Pablo Di Noto \n"
+"PO-Revision-Date: 2018-09-13 18:43+\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"
@@ -38,7 +39,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Â¡Lo sentimos! Algo saliÃ³ mal con su solicitud."
+msgstr "Â¡Lo sentimos! Algo saliÃ³ mal con tu solicitud."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
@@ -50,7 +51,7 @@ msgstr "CÃ³digo fuente"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr "Log de cambios"
+msgstr "BitÃ¡cora de cambios"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
@@ -79,13 +80,13 @@ msgstr "Â¡Oh, sonamos!"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr "Ha ocurrido un error al obtener su cÃ³digo QR."
+msgstr "Ha ocurrido un error al obtener tu cÃ³digo QR."
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Este cÃ³digo QR contiene sus lineas de puente de red. Escaneelo con un 
lector de cÃ³digos QR hacia su dispositivo mÃ³vil y otros."
+msgstr "Este cÃ³digo QR contiene tus lÃneas de puente de red. Escanealo con 
un lector de cÃ³digos QR para copiarlas en tus dispositivos mÃ³viles y otros."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
@@ -96,7 +97,7 @@ msgstr "En este momento no existen puentes de red 
disponibles..."
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Tal vez deberÃa %s volver %s y escoger otro tipo de puente de red."
+msgstr "Â¡Tal vez deberÃas %s volver %s y escoger otro tipo de puente de red!"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -126,7 +127,7 @@ msgstr "Paso %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ahora %s agregue los puentes de red al Buscador Tor %s"
+msgstr "Ahora %s agregÃ¡ los puentes de red a Tor Browser %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -135,7 +136,7 @@ msgstr "Ahora %s agregue los puentes de red al Buscador Tor 
%s"
 #: bridgedb/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sS%solamente deme puentes de red!"
+msgstr "Â¡%sS%solamente dÃ¡me puentes de red!"
 
 #: bridgedb/https/templates/options.html:51
 msgid "Advanced Options"

___
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

2018-09-13 Thread translation

commit 683a43f2ec1f2661b08a71d8cf06d0fc49152961
Author: Translation commit bot 
Date:   Thu Sep 13 18:16:27 2018 +

Update translations for tails-openpgp-applet_completed
---
 es_AR/openpgp-applet.pot | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/es_AR/openpgp-applet.pot b/es_AR/openpgp-applet.pot
index c62357059..488d7a2f0 100644
--- a/es_AR/openpgp-applet.pot
+++ b/es_AR/openpgp-applet.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-09-12 22:47+\n"
+"PO-Revision-Date: 2018-09-13 18:16+\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"
@@ -42,11 +42,11 @@ msgstr "Encriptar el portapapeles con _Frase de contraseÃ±a"
 
 #: bin/openpgp-applet:235
 msgid "Sign/Encrypt Clipboard with Public _Keys"
-msgstr "Cifrar y firmar el portapapeles con Clave _PÃºblica"
+msgstr "Encriptar y firmar el portapapeles con Clave _PÃºblica"
 
 #: bin/openpgp-applet:240
 msgid "_Decrypt/Verify Clipboard"
-msgstr "_Descifrar/Verificar el portapapeles"
+msgstr "_Desencriptar/Verificar el portapapeles"
 
 #: bin/openpgp-applet:244
 msgid "_Manage Keys"
@@ -74,7 +74,7 @@ msgstr "Nivel de confianza Completa "
 
 #: bin/openpgp-applet:347
 msgid "Ultimate Trust"
-msgstr "Nivel de confianza Total"
+msgstr "Nivel de confianza Extremo"
 
 #: bin/openpgp-applet:400
 msgid "Name"
@@ -114,7 +114,7 @@ msgstr "Ocultar destinatarios"
 msgid ""
 "Hide the user IDs of all recipients of an encrypted message. Otherwise "
 "anyone that sees the encrypted message can see who the recipients are."
-msgstr "Ocultar los ID de usuario de todos los destinatarios de un mensaje 
cifrado. De otra manera, cualquiera que pueda ver el mensaje cifrado puede ver 
quienes son los destinatarios."
+msgstr "Ocultar los ID de usuario de todos los destinatarios de un mensaje 
cifrado. De otra manera, cualquiera que pueda ver el mensaje encriptado puede 
ver quienes son los destinatarios."
 
 #: bin/openpgp-applet:545
 msgid "Sign message as:"

___
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

2018-09-13 Thread translation

commit ffe3fb6fea63da023c62dff57b63639da9a3f8a7
Author: Translation commit bot 
Date:   Thu Sep 13 18:16:21 2018 +

Update translations for tails-openpgp-applet
---
 es_AR/openpgp-applet.pot | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/es_AR/openpgp-applet.pot b/es_AR/openpgp-applet.pot
index c62357059..488d7a2f0 100644
--- a/es_AR/openpgp-applet.pot
+++ b/es_AR/openpgp-applet.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-09-12 22:47+\n"
+"PO-Revision-Date: 2018-09-13 18:16+\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"
@@ -42,11 +42,11 @@ msgstr "Encriptar el portapapeles con _Frase de contraseÃ±a"
 
 #: bin/openpgp-applet:235
 msgid "Sign/Encrypt Clipboard with Public _Keys"
-msgstr "Cifrar y firmar el portapapeles con Clave _PÃºblica"
+msgstr "Encriptar y firmar el portapapeles con Clave _PÃºblica"
 
 #: bin/openpgp-applet:240
 msgid "_Decrypt/Verify Clipboard"
-msgstr "_Descifrar/Verificar el portapapeles"
+msgstr "_Desencriptar/Verificar el portapapeles"
 
 #: bin/openpgp-applet:244
 msgid "_Manage Keys"
@@ -74,7 +74,7 @@ msgstr "Nivel de confianza Completa "
 
 #: bin/openpgp-applet:347
 msgid "Ultimate Trust"
-msgstr "Nivel de confianza Total"
+msgstr "Nivel de confianza Extremo"
 
 #: bin/openpgp-applet:400
 msgid "Name"
@@ -114,7 +114,7 @@ msgstr "Ocultar destinatarios"
 msgid ""
 "Hide the user IDs of all recipients of an encrypted message. Otherwise "
 "anyone that sees the encrypted message can see who the recipients are."
-msgstr "Ocultar los ID de usuario de todos los destinatarios de un mensaje 
cifrado. De otra manera, cualquiera que pueda ver el mensaje cifrado puede ver 
quienes son los destinatarios."
+msgstr "Ocultar los ID de usuario de todos los destinatarios de un mensaje 
cifrado. De otra manera, cualquiera que pueda ver el mensaje encriptado puede 
ver quienes son los destinatarios."
 
 #: bin/openpgp-applet:545
 msgid "Sign message as:"

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

[tor-commits] [tor/master] Fix a bug warning when sending an error on an HTTPTunnelPort conn

2018-09-13 Thread nickm

commit ff0be080598a8719032fd8c57aed9a42888b97b0
Author: Nick Mathewson 
Date:   Tue Aug 21 10:12:04 2018 -0400

Fix a bug warning when sending an error on an HTTPTunnelPort conn

Fixes bug 26470; bugfix on 0.3.2.1-alpha.
---
 changes/bug26470 | 4 
 src/or/connection_edge.c | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/bug26470 b/changes/bug26470
new file mode 100644
index 0..854ec7ea7
--- /dev/null
+++ b/changes/bug26470
@@ -0,0 +1,4 @@
+  o Minor bugfixes (HTTP tunnel):
+- Fix a bug warning when closing an HTTP tunnel connection due to
+  an HTTP request we couldn't handle. Fixes bug 26470; bugfix on
+  0.3.2.1-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f178917f0..b4e544c8f 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2537,8 +2537,11 @@ connection_ap_process_http_connect(entry_connection_t 
*conn)
  err:
   if (BUG(errmsg == NULL))
 errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n";
-  log_warn(LD_EDGE, "Saying %s", escaped(errmsg));
+  log_info(LD_EDGE, "HTTP tunnel error: saying %s", escaped(errmsg));
   connection_buf_add(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn));
+  /* Mark it as "has_finished" so that we don't try to send an extra socks
+   * reply. */
+  conn->socks_request->has_finished = 1;
   connection_mark_unattached_ap(conn,
 END_STREAM_REASON_HTTPPROTOCOL|
 END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
@@ -4162,4 +4165,3 @@ connection_edge_free_all(void)
   smartlist_free(pending_entry_connections);
   pending_entry_connections = NULL;
 }
-



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

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

2018-09-13 Thread translation

commit f085afbbf24c9309fcf46dd7de88380390d7f6c2
Author: Translation commit bot 
Date:   Thu Sep 13 17:48:58 2018 +

Update translations for support-portal
---
 contents+pt_BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 589890b02..332916397 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -2046,8 +2046,8 @@ msgid ""
 "https://duckduckgo.com/\";>DuckDuckGo is the "
 "default search engine in Tor Browser."
 msgstr ""
-"https://duckduckgo.com/\";>DuckDuckGoÃ© o buscador "
-"padrÃ£o no navegador Tor."
+"https://duckduckgo.com/\";>DuckDuckGo Ã© o buscador"
+" padrÃ£o no navegador Tor."
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)

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

[tor-commits] [tor/master] nodelist: use strcmpstart() instead of strncmp()

2018-09-13 Thread nickm

commit ab91302fd04d3ee03a2855c1ffb8570923f8d40c
Author: cypherpunks 
Date:   Tue Sep 11 00:41:32 2018 +

nodelist: use strcmpstart() instead of strncmp()

in rend_parse_v2_service_descriptor.
Fix on c58675ca728f12b42f65e5b8964ae695c2e0ec2d
---
 changes/ticket27630| 3 +++
 src/feature/nodelist/routerparse.c | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changes/ticket27630 b/changes/ticket27630
new file mode 100644
index 0..8a5f5d6b5
--- /dev/null
+++ b/changes/ticket27630
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Use the simpler strcmpstart() helper in rend_parse_v2_service_descriptor
+  instead of strncmp(). Closes ticket 27630.
diff --git a/src/feature/nodelist/routerparse.c 
b/src/feature/nodelist/routerparse.c
index 73d320de4..b76b2974f 100644
--- a/src/feature/nodelist/routerparse.c
+++ b/src/feature/nodelist/routerparse.c
@@ -5167,8 +5167,7 @@ 
rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out,
 
   tor_assert(desc);
   /* Check if desc starts correctly. */
-  if (strncmp(desc, "rendezvous-service-descriptor ",
-  strlen("rendezvous-service-descriptor "))) {
+  if (strcmpstart(desc, "rendezvous-service-descriptor ")) {
 log_info(LD_REND, "Descriptor does not start correctly.");
 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 remote-tracking branch 'UntoSten/inform-about-conf-includes'

2018-09-13 Thread nickm

commit 2d05500a1eacf3680a1b45992306c4b38f965616
Merge: 787da5185 ba3c78509
Author: Nick Mathewson 
Date:   Thu Sep 13 13:35:59 2018 -0400

Merge remote-tracking branch 'UntoSten/inform-about-conf-includes'

 src/lib/encoding/confline.c | 3 +++
 1 file changed, 3 insertions(+)



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

[tor-commits] [tor/master] nodelist: fix docs for networkstatus_read_cached_consensus_impl

2018-09-13 Thread nickm

commit cb9fa3b04c7d35eb04bb5f695606bfafe97c88d1
Author: cypherpunks 
Date:   Tue Sep 11 22:21:09 2018 +

nodelist: fix docs for networkstatus_read_cached_consensus_impl

Fix on c12d2cb2dcfe52aadf528a70433b468327472eaf.
---
 src/feature/nodelist/networkstatus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/feature/nodelist/networkstatus.c 
b/src/feature/nodelist/networkstatus.c
index 6492b828b..6e386628d 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -201,7 +201,7 @@ networkstatus_reset_download_failures(void)
 
 /**
  * Read and and return the cached consensus of type flavorname.  If
- * unverified is false, get the one we haven't verified. Return NULL if
+ * unverified is true, get the one we haven't verified. Return NULL if
  * the file isn't there. */
 static char *
 networkstatus_read_cached_consensus_impl(int flav,



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

[tor-commits] [tor/master] Changes file for 27186

2018-09-13 Thread nickm

commit 3adef11d10aa0019f07ea10264504e82541b3aa7
Author: Nick Mathewson 
Date:   Thu Sep 13 13:37:29 2018 -0400

Changes file for 27186
---
 changes/27186 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/27186 b/changes/27186
new file mode 100644
index 0..522580e91
--- /dev/null
+++ b/changes/27186
@@ -0,0 +1,4 @@
+  o Minor features (UI):
+- Log each included configuration file or directory as we read it, to
+  provide more visibility about where Tor is reading from.
+  Patch from Unto Sten; closes ticket 27186.

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

[tor-commits] [tor/master] Inform users about configuration file and directory includes

2018-09-13 Thread nickm

commit ba3c785092fce23ce9ec52c89ed69b2c0f0f92f6
Author: Unto Sten 
Date:   Fri Aug 17 14:08:59 2018 +0300

Inform users about configuration file and directory includes

This patch makes it clearer to users what settings Tor daemon
is actually using. I think it is pretty important.
---
 src/lib/encoding/confline.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/encoding/confline.c b/src/lib/encoding/confline.c
index dd5193d3a..71ce5b842 100644
--- a/src/lib/encoding/confline.c
+++ b/src/lib/encoding/confline.c
@@ -148,6 +148,9 @@ config_get_lines_aux(const char *string, config_line_t 
**result, int extended,
   tor_free(v);
   return -1;
 }
+log_notice(LD_CONFIG, "Included configuration file or "
+   "directory at recursion level %d: \"%s\".",
+   recursion_level, v);
 *next = include_list;
 if (list_last)
   next = &list_last->next;



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

[tor-commits] [tor/master] Merge remote-tracking branch 'onionk/strcmpstart1'

2018-09-13 Thread nickm

commit 787da5185c531c890343c0b95190de9f48246934
Merge: e8b81d7dc cb9fa3b04
Author: Nick Mathewson 
Date:   Thu Sep 13 13:30:53 2018 -0400

Merge remote-tracking branch 'onionk/strcmpstart1'

 changes/ticket27630  | 3 +++
 src/feature/nodelist/networkstatus.c | 2 +-
 src/feature/nodelist/routerparse.c   | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/master] Fix a memory leak in tortls/openssl/context_new test.

2018-09-13 Thread nickm

commit d28018ea1eb4140353c2af3bdd03d2bf6b7a5ffd
Author: Nick Mathewson 
Date:   Thu Sep 13 12:43:37 2018 -0400

Fix a memory leak in tortls/openssl/context_new test.

Bugfix on 0.3.5.x; bugfix not on any released Tor.
---
 src/test/test_tortls_openssl.c | 44 +++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c
index 608625288..e3dd6adaa 100644
--- a/src/test/test_tortls_openssl.c
+++ b/src/test/test_tortls_openssl.c
@@ -1848,16 +1848,44 @@ fixed_tor_tls_create_certificate(crypto_pk_t *rsa,
   (void)cname;
   (void)cname_sign;
   (void)cert_lifetime;
-  return fixed_tor_tls_create_certificate_result[
+  X509 *result = fixed_tor_tls_create_certificate_result[
  fixed_tor_tls_create_certificate_result_index++];
+  if (result)
+return X509_dup(result);
+  else
+return NULL;
+}
+
+static void
+fixed_tor_tls_create_certificate_results_free(void)
+{
+  unsigned i;
+  for (i = 0; i < ARRAY_LENGTH(fixed_tor_tls_create_certificate_result); ++i) {
+X509 *cert = fixed_tor_tls_create_certificate_result[i];
+if (cert)
+  X509_free(cert);
+fixed_tor_tls_create_certificate_result[i] = NULL;
+  }
+}
+
+static void
+fixed_tor_x509_cert_new_results_free(void)
+{
+  unsigned i;
+  for (i = 0; i < ARRAY_LENGTH(fixed_tor_x509_cert_new_result); ++i) {
+tor_x509_cert_free(fixed_tor_x509_cert_new_result[i]);
+  }
 }
 
 static tor_x509_cert_t *
 fixed_tor_x509_cert_new(tor_x509_cert_impl_t *x509_cert)
 {
   (void) x509_cert;
-  return fixed_tor_x509_cert_new_result[
-  fixed_tor_x509_cert_new_result_index++];
+  tor_x509_cert_t **certp =
+&fixed_tor_x509_cert_new_result[fixed_tor_x509_cert_new_result_index++];
+  tor_x509_cert_t *cert = *certp;
+  *certp = NULL;
+  return cert;
 }
 
 static void
@@ -1937,6 +1965,7 @@ test_tortls_context_new(void *ignored)
   fixed_tor_tls_create_certificate_result[2] = X509_new();
   ret = tor_tls_context_new(NULL, 0, 0, 0);
   tt_assert(!ret);
+  fixed_tor_tls_create_certificate_results_free();
 
   fixed_crypto_pk_new_result_index = 0;
   fixed_crypto_pk_new_result[0] = pk7;
@@ -1949,6 +1978,7 @@ test_tortls_context_new(void *ignored)
   fixed_tor_tls_create_certificate_result[2] = X509_new();
   ret = tor_tls_context_new(NULL, 0, 0, 0);
   tt_assert(!ret);
+  fixed_tor_tls_create_certificate_results_free();
 
   fixed_crypto_pk_new_result_index = 0;
   fixed_crypto_pk_new_result[0] = pk9;
@@ -1961,6 +1991,7 @@ test_tortls_context_new(void *ignored)
   fixed_tor_tls_create_certificate_result[2] = NULL;
   ret = tor_tls_context_new(NULL, 0, 0, 0);
   tt_assert(!ret);
+  fixed_tor_tls_create_certificate_results_free();
 
   MOCK(tor_x509_cert_new, fixed_tor_x509_cert_new);
   fixed_crypto_pk_new_result_index = 0;
@@ -1978,6 +2009,7 @@ test_tortls_context_new(void *ignored)
   fixed_tor_x509_cert_new_result[2] = NULL;
   ret = tor_tls_context_new(NULL, 0, 0, 0);
   tt_assert(!ret);
+  fixed_tor_tls_create_certificate_results_free();
 
   fixed_crypto_pk_new_result_index = 0;
   fixed_crypto_pk_new_result[0] = pk13;
@@ -1994,6 +2026,8 @@ test_tortls_context_new(void *ignored)
   fixed_tor_x509_cert_new_result[2] = NULL;
   ret = tor_tls_context_new(NULL, 0, 0, 0);
   tt_assert(!ret);
+  fixed_tor_tls_create_certificate_results_free();
+  fixed_tor_x509_cert_new_results_free();
 
   fixed_crypto_pk_new_result_index = 0;
   fixed_crypto_pk_new_result[0] = pk15;
@@ -2010,6 +2044,8 @@ test_tortls_context_new(void *ignored)
   fixed_tor_x509_cert_new_result[2] = NULL;
   ret = tor_tls_context_new(NULL, 0, 0, 0);
   tt_assert(!ret);
+  fixed_tor_tls_create_certificate_results_free();
+  fixed_tor_x509_cert_new_results_free();
 
   fixed_crypto_pk_new_result_index = 0;
   fixed_crypto_pk_new_result[0] = pk17;
@@ -2028,6 +2064,8 @@ test_tortls_context_new(void *ignored)
   tt_assert(!ret);
 
  done:
+  fixed_tor_tls_create_certificate_results_free();
+  fixed_tor_x509_cert_new_results_free();
   UNMOCK(tor_x509_cert_new);
   UNMOCK(tor_tls_create_certificate);
   UNMOCK(crypto_pk_generate_key_with_bits);



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

[tor-commits] [tor/master] Fix a memory leak in tortls/openssl/try_to_extract_certs_from_tls

2018-09-13 Thread nickm

commit 15596f6c0c0a8aea262c225ebb99ce0caeecc562
Author: Nick Mathewson 
Date:   Thu Sep 13 12:47:42 2018 -0400

Fix a memory leak in tortls/openssl/try_to_extract_certs_from_tls

Since this is an "intrusive" test, it only shows up for openssl <1.1

This is a bugfix on 0.3.5.x; bug not in any released Tor.
---
 src/test/test_tortls_openssl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c
index 608625288..3928b754a 100644
--- a/src/test/test_tortls_openssl.c
+++ b/src/test/test_tortls_openssl.c
@@ -1007,6 +1007,7 @@ test_tortls_try_to_extract_certs_from_tls(void *ignored)
   tt_assert(cert == c1);
   tt_assert(id_cert);
   X509_free(cert); /* decrease refcnt */
+  X509_free(id_cert); /* decrease refcnt */
 
  done:
   sk_X509_free(sess->cert_chain);



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

[tor-commits] [tor/master] Merge branches 'bug27684' and 'bug27685'

2018-09-13 Thread nickm

commit e8b81d7dc5cb03a97136125d3ea50788fad9eab3
Merge: db27a70c9 15596f6c0 d28018ea1
Author: Nick Mathewson 
Date:   Thu Sep 13 13:09:57 2018 -0400

Merge branches 'bug27684' and 'bug27685'

 src/test/test_tortls_openssl.c | 45 +++---
 1 file changed, 42 insertions(+), 3 deletions(-)

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

[tor-commits] [orbot/master] Merge branch 'deprecated_torrc' of https://github.com/Unpublished/orbot into Unpublished-deprecated_torrc

2018-09-13 Thread n8fr8

commit b2bf3d9a4bce9976da3d557fb8b67032e321f30e
Merge: 06c343c8 f74dea24
Author: n8fr8 
Date:   Wed Sep 5 22:12:43 2018 -0400

Merge branch 'deprecated_torrc' of https://github.com/Unpublished/orbot 
into Unpublished-deprecated_torrc

 BUILD  |   7 +-
 app/build.gradle   |   4 +-
 app/proguard-rules.txt |   8 +
 .../ui/onboarding/BridgeWizardActivity.java| 212 ++---
 app/src/main/res/layout/content_bridge_wizard.xml  |  70 +++
 app/src/main/res/layout/layout_diag.xml|  14 --
 app/src/main/res/values/strings.xml|   4 +-
 .../org/torproject/android/service/TorService.java |   5 +-
 .../android/service/util/NativeLoader.java |   6 +-
 9 files changed, 108 insertions(+), 222 deletions(-)




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

[tor-commits] [orbot/master] Merge branch 'master' of github.com:n8fr8/orbot

2018-09-13 Thread n8fr8

commit 129b55a4e3c0a7e54a71c94e651154145171014e
Merge: 1bef9632 b0a49903
Author: n8fr8 
Date:   Thu Sep 6 23:24:38 2018 -0400

Merge branch 'master' of github.com:n8fr8/orbot

 app/src/main/res/values-de/strings.xml | 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] [orbot/master] Merge branch 'Unpublished-deprecated_torrc'

2018-09-13 Thread n8fr8

commit 1bef963271634d0315b314016184f70f122e6525
Merge: 06c343c8 b2bf3d9a
Author: n8fr8 
Date:   Thu Sep 6 23:24:25 2018 -0400

Merge branch 'Unpublished-deprecated_torrc'

 BUILD  |   7 +-
 app/build.gradle   |   4 +-
 app/proguard-rules.txt |   8 +
 .../ui/onboarding/BridgeWizardActivity.java| 212 ++---
 app/src/main/res/layout/content_bridge_wizard.xml  |  70 +++
 app/src/main/res/layout/layout_diag.xml|  14 --
 app/src/main/res/values/strings.xml|   4 +-
 .../org/torproject/android/service/TorService.java |   5 +-
 .../android/service/util/NativeLoader.java |   6 +-
 9 files changed, 108 insertions(+), 222 deletions(-)



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

[tor-commits] [orbot/master] update launcher graphics

2018-09-13 Thread n8fr8

commit 34331120b3f2507e9a74adfe9bdb8be1a49c4fea
Author: n8fr8 
Date:   Wed Sep 5 22:04:34 2018 -0400

update launcher graphics
---
 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml  |   5 +
 .../main/res/mipmap-anydpi-v26/ic_launcher_round.xml|   5 +
 app/src/main/res/mipmap-hdpi/ic_launcher.png| Bin 0 -> 2253 bytes
 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 2146 bytes
 app/src/main/res/mipmap-hdpi/ic_launcher_round.png  | Bin 0 -> 4325 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png| Bin 0 -> 1580 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 1376 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher_round.png  | Bin 0 -> 2723 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png   | Bin 0 -> 3071 bytes
 .../main/res/mipmap-xhdpi/ic_launcher_foreground.png| Bin 0 -> 3075 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6103 bytes
 app/src/main/res/mipmap-xxhdpi/ic_launcher.png  | Bin 0 -> 4682 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher_foreground.png   | Bin 0 -> 5112 bytes
 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png| Bin 0 -> 9447 bytes
 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 6541 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher_foreground.png  | Bin 0 -> 7372 bytes
 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png   | Bin 0 -> 13447 bytes
 app/src/main/res/values/ic_launcher_background.xml  |   4 
 18 files changed, 14 insertions(+)

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml 
b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index ..036d09bc
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+
+http://schemas.android.com/apk/res/android";>
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml 
b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index ..036d09bc
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+
+http://schemas.android.com/apk/res/android";>
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png 
b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index ..bfa1a8aa
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png 
b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index ..97a6f3b1
Binary files /dev/null and 
b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png 
b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index ..747bf3a7
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png 
differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png 
b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index ..fd6ee423
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png 
b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index ..69131a09
Binary files /dev/null and 
b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png 
b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index ..9462c6c9
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png 
differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png 
b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index ..ac7dc49e
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 
differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png 
b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index ..505a60aa
Binary files /dev/null and 
b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png 
b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index ..95a1e66d
Binary files /dev/null and 
b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 
b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index ..84b7fa9b
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 
differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png 
b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index ..99a2d160
Binary files /dev/null and 
b/app/src/main/res/mi

[tor-commits] [orbot/master] update to Tor 0.3.4.8

2018-09-13 Thread n8fr8

commit 6bc161b677a5f43b1d5dd96f90ed7ec260efd274
Author: n8fr8 
Date:   Thu Sep 13 12:55:43 2018 -0400

update to Tor 0.3.4.8
---
 orbotservice/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index c4729bd7..1c9cda0f 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -27,7 +27,7 @@ android {
 
 dependencies {
 implementation project(':jsocksAndroid')
-implementation 'org.torproject:tor-android-binary:0.3.4.7-rc'
+implementation 'org.torproject:tor-android-binary:0.3.4.8'
 implementation 'com.android.support:appcompat-v7:27.1.1'
 implementation 'com.jrummyapps:android-shell:1.0.1'
 implementation fileTree(dir: 'libs', include: ['.so'])



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

[tor-commits] [orbot/master] improve service checking for running Tor instance

2018-09-13 Thread n8fr8

commit 66cc8ad5499d66c88adca8703e89693261da2ae3
Author: n8fr8 
Date:   Thu Sep 13 12:55:50 2018 -0400

improve service checking for running Tor instance
---
 .../java/org/torproject/android/service/TorService.java | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorService.java 
b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index c7cc708e..d1558565 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -787,26 +787,35 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
  * The entire process for starting tor and related services is run from 
this method.
  */
 private void startTor() {
+
+String torProcId = null;
+
+try { if (conn != null) torProcId = conn.getInfo("process/pid"); }
+catch (Exception e){}
+
 // STATUS_STARTING is set in onCreate()
 if (mCurrentStatus == STATUS_STOPPING) {
 // these states should probably be handled better
 sendCallbackLogMessage("Ignoring start request, currently " + 
mCurrentStatus);
 return;
-} else if (mCurrentStatus == STATUS_ON) {
+} else if (mCurrentStatus == STATUS_ON && (torProcId != null)) {
 
 sendCallbackLogMessage("Ignoring start request, already started.");
 setTorNetworkEnabled (true);
 
 return;
 }
-
 
 try {

// make sure there are no stray daemons running
 // killAllDaemons();
-   
-   sendCallbackStatus(STATUS_STARTING);
+
+SharedPreferences prefs = 
TorServiceUtils.getSharedPrefs(getApplicationContext());
+String version = 
prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null);
+logNotice("checking binary version: " + version);
+
+sendCallbackStatus(STATUS_STARTING);
 
showToolbarNotification(getString(R.string.status_starting_up),NOTIFY_ID,R.drawable.ic_stat_tor);
sendCallbackLogMessage(getString(R.string.status_starting_up));
logNotice(getString(R.string.status_starting_up));

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

[tor-commits] [orbot/master] update launcher web graphic

2018-09-13 Thread n8fr8

commit 06c343c8f2f59289ce0360af7c19b19d4ec7808e
Author: n8fr8 
Date:   Wed Sep 5 22:04:46 2018 -0400

update launcher web graphic
---
 app/src/main/ic_launcher-web.png | Bin 0 -> 23371 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
new file mode 100644
index ..d28872f5
Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ



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

[tor-commits] [orbot/master] Clarify a German strings.xml translation

2018-09-13 Thread n8fr8

commit 27ee9ed3de0eeebb4af334a485f1ef1a5bbcb988
Author: av2k 
Date:   Tue Aug 14 00:22:54 2018 +0200

Clarify a German strings.xml translation

Use an understandable German translation for the "Tor auto-standby when 
offline" setting
---
 app/src/main/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml 
b/app/src/main/res/values-de/strings.xml
index c9b435da..cacdbd30 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -234,8 +234,8 @@
   Bandbreite:
   runter
   hoch
-  Kein Automatischer Netzwerk 
Ruhezustand
-  Versetze Tor in den Ruhezustand 
wenn kein Internet verfÃ¼gbar ist
+  Automatischer Ruhezustand
+  Tor pausieren wenn keine 
Netzwerkverbindung mÃ¶glich ist
   Sie haben zu einer Neuen Tor-IdentitÃ¤t 
gewechselt!
   Browser
   Nutze ChatSecure



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

[tor-commits] [orbot/master] no previous zipping further reduces apk size

2018-09-13 Thread n8fr8

commit edc07b09b4c15df531e4f9448da00527498eaf99
Author: Unpublished 
Date:   Fri May 18 11:56:26 2018 +0200

no previous zipping further reduces apk size

obfs4proxy.so and pdnsd.so must not be zipped with this
---
 BUILD  | 7 +++
 .../java/org/torproject/android/service/util/NativeLoader.java | 6 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/BUILD b/BUILD
index bbbeaa8f..8e9b9b33 100644
--- a/BUILD
+++ b/BUILD
@@ -23,10 +23,9 @@ You then need to run "ndk-build" from:

cd orbotservice/src/main
ndk-build
-   mkdir -p assets/armeabi
-   zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd
-   mkdir -p assets/x86
-   zip assets/x86/pdnsd.mp3 libs/x86/pdnsd
+   mv libs/armeabi/pdnsd libs/armeabi/pdnsd.so
+   mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so
+   mv libs/x86/pdnsd libs/x86/pdnsd.so
 
 This isn't enough though and we'll now sew up the binary into a small package
 that will handle basic Tor controlling features.
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java
 
b/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java
index d6a25436..3e910cce 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java
@@ -21,16 +21,14 @@ public class NativeLoader {
 
 
 ZipFile zipFile = null;
-ZipInputStream stream = null;
+InputStream stream = null;
 try {
 zipFile = new ZipFile(context.getApplicationInfo().sourceDir);
 ZipEntry entry = zipFile.getEntry("lib/" + folder + "/" + libName 
+ ".so");
 if (entry == null) {
 throw new Exception("Unable to find file in apk:" + "lib/" + 
folder + "/" + libName);
 }
-//the zip file entry is also zipped itself!
-stream = new ZipInputStream(zipFile.getInputStream(entry));
-stream.getNextEntry();
+stream = zipFile.getInputStream(entry);
 
 OutputStream out = new FileOutputStream(destLocalFile);
 byte[] buf = new byte[4096];



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

[tor-commits] [orbot/master] unused attribute in layout

2018-09-13 Thread n8fr8

commit 08d242e68c94dcf38c4835989b03789443439953
Author: lexi 
Date:   Sat May 19 15:35:11 2018 -0400

unused attribute in layout
---
 app/src/main/res/layout/content_bridge_wizard.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/content_bridge_wizard.xml 
b/app/src/main/res/layout/content_bridge_wizard.xml
index 244ba37d..a5b7995b 100644
--- a/app/src/main/res/layout/content_bridge_wizard.xml
+++ b/app/src/main/res/layout/content_bridge_wizard.xml
@@ -60,7 +60,6 @@
 android:layout_height="wrap_content"
 android:layout_margin="12dp"
 android:gravity="center"
-android:text="..."
 android:textColor="@color/bright_green"
 android:textSize="16sp"
 android:textStyle="bold" />



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

[tor-commits] [orbot/master] update version and constrains library

2018-09-13 Thread n8fr8

commit bd61739db05793c93ea345ea2de9277989a0c850
Author: n8fr8 
Date:   Wed Sep 5 22:04:09 2018 -0400

update version and constrains library
---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7fd095b1..be2c1830 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ android {
 minSdkVersion 16
 applicationId 'org.torproject.android'
 targetSdkVersion 27
-versionCode 16020041
+versionCode 16020043
 versionName '16.0.2-RC-1'
 archivesBaseName = "Orbot-$versionName"
 }
@@ -78,7 +78,7 @@ android {
 
 dependencies {
 implementation 'com.github.delight-im:Android-Languages:v1.0.1'
-implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 implementation project(':orbotservice')
 implementation 'com.android.support:design:27.1.1'
 implementation 'pl.bclogic:pulsator4droid:1.0.3'



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

[tor-commits] [orbot/master] update request new bridge dialog text

2018-09-13 Thread n8fr8

commit 3e03d226b8108bda18b1c14c4d7d48555767d0d5
Author: lexi 
Date:   Sat May 19 15:25:51 2018 -0400

update request new bridge dialog text
---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index a61dc01a..e1ba7f9b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -314,7 +314,7 @@
 
 If
 your mobile network actively blocks Tor, you can use a \'Bridge Server\' as an 
alternate way in. SELECT one of the options to configure and test...
 
-Bridge Mode
+Request New Bridge
 
 Email
 Web
@@ -327,7 +327,7 @@
 
 Send Email
 
-You
 can get a bridge address through email, the web or by scanning a bridge QR 
code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce 
you have an address, copy & paste it into the \"Bridges\" preference in 
Orbot\'s setting and restart.
+You
 can get a bridge address through email, the web or by scanning a bridge QR 
code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce 
you have an address, copy & paste it into the \"Bridges\" preference in 
Orbot\'s settings and restart.
 
 Install Orfox
 



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

[tor-commits] [orbot/master] Merge pull request #161 from bitmold/get-bridge-dialog-improvement

2018-09-13 Thread n8fr8

commit a608a964964506e52878ef55e5b500fd54af90fb
Merge: 7340e214 08d242e6
Author: Nathan Freitas 
Date:   Mon May 21 13:06:15 2018 -0400

Merge pull request #161 from bitmold/get-bridge-dialog-improvement

Get Bridge Dialog Improvements

 .../ui/onboarding/BridgeWizardActivity.java| 212 ++---
 app/src/main/res/layout/content_bridge_wizard.xml  |  70 +++
 app/src/main/res/layout/layout_diag.xml|  14 --
 app/src/main/res/values/strings.xml|   4 +-
 4 files changed, 92 insertions(+), 208 deletions(-)



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

[tor-commits] [orbot/master] Merge pull request #1 from av2k/av2k-patch-better-german-settings-translation

2018-09-13 Thread n8fr8

commit 5065a659d52419f6cef2aa857ac3d656ac5a0eb8
Merge: a608a964 27ee9ed3
Author: av2k 
Date:   Tue Aug 14 00:23:19 2018 +0200

Merge pull request #1 from 
av2k/av2k-patch-better-german-settings-translation

Clarify a German strings.xml translation

 app/src/main/res/values-de/strings.xml | 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] [orbot/master] torrc: remove deprecated DNSListenAddress and obsolete WarnUnsafeSocks

2018-09-13 Thread n8fr8

commit f74dea2489077d27b6024b727b6a25759475744a
Author: Unpublished 
Date:   Fri Aug 24 17:34:19 2018 +0200

torrc: remove deprecated DNSListenAddress and obsolete WarnUnsafeSocks
---
 .../src/main/java/org/torproject/android/service/TorService.java | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorService.java 
b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index f63eb255..c7cc708e 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -696,7 +696,6 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 extraLines.append("SOCKSPort 
").append(socksPortPref).append(isolate).append('\n');
 extraLines.append("SafeSocks 0").append('\n');
 extraLines.append("TestSocks 0").append('\n');
-extraLines.append("WarnUnsafeSocks 1").append('\n');
if (Prefs.openProxyOnAllInterfaces())
extraLines.append("SocksListenAddress 0.0.0.0").append('\n');
 
@@ -716,10 +715,8 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 String dnsPort = prefs.getString("pref_dnsport", 
TorServiceConstants.TOR_DNS_PORT_DEFAULT+"");
 
 extraLines.append("TransPort ").append(transPort).append('\n');
-   extraLines.append("DNSPort ").append(dnsPort).append("\n");
+   extraLines.append("DNSPort ").append(dnsPort).append('\n');

-   if (Prefs.useVpn())
-   extraLines.append("DNSListenAddress 0.0.0.0").append('\n');
 
 extraLines.append("VirtualAddrNetwork 10.192.0.0/10").append('\n');
 extraLines.append("AutomapHostsOnResolve 1").append('\n');



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

[tor-commits] [orbot/master] update tor to 0.3.4.7 RC

2018-09-13 Thread n8fr8

commit 31238af3a3e9097cf14a43a1e0376fd5066e8924
Author: n8fr8 
Date:   Wed Sep 5 22:03:37 2018 -0400

update tor to 0.3.4.7 RC
---
 orbotservice/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index aa35322f..c4729bd7 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -27,7 +27,7 @@ android {
 
 dependencies {
 implementation project(':jsocksAndroid')
-implementation 'org.torproject:tor-android-binary:0.3.3.5-rc-3'
+implementation 'org.torproject:tor-android-binary:0.3.4.7-rc'
 implementation 'com.android.support:appcompat-v7:27.1.1'
 implementation 'com.jrummyapps:android-shell:1.0.1'
 implementation fileTree(dir: 'libs', include: ['.so'])



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

[tor-commits] [orbot/master] Merge pull request #158 from Unpublished/patch

2018-09-13 Thread n8fr8

commit 7340e214a7bb298821afa73e4e272432a69e9024
Merge: 65bf70f2 edc07b09
Author: Nathan Freitas 
Date:   Mon May 21 13:03:00 2018 -0400

Merge pull request #158 from Unpublished/patch

fix proguard and stop zipping obfs4proxy and pdnsd

 BUILD | 7 +++
 app/build.gradle  | 4 ++--
 app/proguard-rules.txt| 8 
 .../java/org/torproject/android/service/util/NativeLoader.java| 6 ++
 4 files changed, 15 insertions(+), 10 deletions(-)



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

[tor-commits] [orbot/master] Merge pull request #168 from av2k/master

2018-09-13 Thread n8fr8

commit b0a499037363834670def7471f6dd5bd4cd1dda0
Merge: a608a964 5065a659
Author: Nathan Freitas 
Date:   Wed Sep 5 22:02:56 2018 -0400

Merge pull request #168 from av2k/master

Use a better German translation for a settings sentence

 app/src/main/res/values-de/strings.xml | 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] [orbot/master] update gradle tooling

2018-09-13 Thread n8fr8

commit 9a866aa08d3f881367871ea36fde5df522a5c79c
Author: n8fr8 
Date:   Wed Sep 5 22:04:02 2018 -0400

update gradle tooling
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 23efb02b..553079b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 google()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:3.1.2'
+classpath 'com.android.tools.build:gradle:3.1.4'
 }
 }
 



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

[tor-commits] [orbot/master] Only email clients are listed when you request a bridge over email

2018-09-13 Thread n8fr8

commit 44d088ba4c7dc280ea7883adf2daf8a4da526e09
Author: lexi 
Date:   Sat May 19 15:01:59 2018 -0400

Only email clients are listed when you request a bridge over email
---
 .../ui/onboarding/BridgeWizardActivity.java| 62 ++
 1 file changed, 16 insertions(+), 46 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index 1a0f20ca..da23a62a 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -10,8 +10,6 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
@@ -20,11 +18,9 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.RadioButton;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.torproject.android.R;
 import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.settings.LocaleHelper;
 
@@ -91,7 +87,7 @@ public class BridgeWizardActivity extends AppCompatActivity {
 btnNew.setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
-showGetBridgePrompt("");
+showGetBridgePrompt();
 }
 });
 
@@ -108,7 +104,7 @@ public class BridgeWizardActivity extends AppCompatActivity 
{
 @Override
 protected void attachBaseContext(Context base) {
 super.attachBaseContext(LocaleHelper.onAttach(base));
-}
+}g
 
 @Override
 public boolean onOptionsItemSelected(MenuItem item) {
@@ -122,71 +118,45 @@ public class BridgeWizardActivity extends 
AppCompatActivity {
 }
 
 
-private void showGetBridgePrompt (final String type)
-{
+private void showGetBridgePrompt() {
 LayoutInflater li = LayoutInflater.from(this);
 View view = li.inflate(R.layout.layout_diag, null);
 
-TextView versionName = (TextView)view.findViewById(R.id.diaglog);
+TextView versionName = view.findViewById(R.id.diaglog);
 
versionName.setText(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_);
 
 new AlertDialog.Builder(this)
 .setTitle(R.string.bridge_mode)
 .setView(view)
-.setNegativeButton(R.string.btn_cancel, new 
Dialog.OnClickListener()
-{
+.setNegativeButton(R.string.btn_cancel, new 
Dialog.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int which) {
 //do nothing
 }
 })
-.setNeutralButton(R.string.get_bridges_email, new 
Dialog.OnClickListener ()
-{
-
+.setNeutralButton(R.string.get_bridges_email, new 
Dialog.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int which) {
-
-
-sendGetBridgeEmail(type);
-
+sendGetBridgeEmail();
 }
 
-
 })
-.setPositiveButton(R.string.get_bridges_web, new 
Dialog.OnClickListener ()
-{
-
+.setPositiveButton(R.string.get_bridges_web, new 
Dialog.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int which) {
-
-openBrowser(OrbotConstants.URL_TOR_BRIDGES + 
type,true, null);
-
+openBrowser(OrbotConstants.URL_TOR_BRIDGES, true, 
null);
 }
-
-
 }).show();
 }
 
-private void sendGetBridgeEmail (String type)
+private void sendGetBridgeEmail()
 {
-Intent intent = new Intent(Intent.ACTION_SEND);
-intent.setType("message/rfc822");
-intent.putExtra(Intent.EXTRA_EMAIL  , new 
String[]{"brid...@torproject.org"});
-
-if (type != null)
-{
-intent.putExtra(Intent.EXTRA_SUBJECT, "get transport " + type);
-intent.putExtra(Intent.EXTRA_TEXT, "get transport " + type);
-
-}
-else
-{
-intent.putExtra(Intent.EXTRA_SUBJECT, "get bridges");
-intent.putExtra(Intent.EXTRA_TEXT, "get bridges");
-
-}
-
-

[tor-commits] [orbot/master] Formatted BridgeWizardActivity and layout; removed unnecessary code

2018-09-13 Thread n8fr8

commit be2d41171d25e23b545544a32c718baa5dfef40d
Author: lexi 
Date:   Sat May 19 15:16:23 2018 -0400

Formatted BridgeWizardActivity and layout; removed unnecessary code
---
 .../ui/onboarding/BridgeWizardActivity.java| 189 +++--
 app/src/main/res/layout/content_bridge_wizard.xml  |  71 
 2 files changed, 98 insertions(+), 162 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index 66ea8f60..e03a8d2d 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -5,8 +5,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -36,53 +34,48 @@ public class BridgeWizardActivity extends AppCompatActivity 
{
 protected void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
 setContentView(R.layout.activity_bridge_wizard);
-Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+Toolbar toolbar = findViewById(R.id.toolbar);
 setSupportActionBar(toolbar);
 getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-tvStatus = (TextView)findViewById(R.id.lbl_bridge_test_status);
+tvStatus = findViewById(R.id.lbl_bridge_test_status);
 tvStatus.setVisibility(View.GONE);
 
 setTitle(getString(R.string.bridges));
 
-RadioButton btnDirect = (RadioButton)
-findViewById(R.id.btnBridgesDirect);
+RadioButton btnDirect = findViewById(R.id.btnBridgesDirect);
 btnDirect.setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
 Prefs.setBridgesList("");
 Prefs.putBridgesEnabled(false);
 testBridgeConnection();
-
 }
 });
 
-RadioButton btnObfs4 = (RadioButton)findViewById(R.id.btnBridgesObfs4);
+RadioButton btnObfs4 = findViewById(R.id.btnBridgesObfs4);
 btnObfs4.setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
 Prefs.setBridgesList("obfs4");
 Prefs.putBridgesEnabled(true);
 testBridgeConnection();
-
 }
 });
 
 
-RadioButton btnMeek = (RadioButton)findViewById(R.id.btnBridgesMeek);
-
+RadioButton btnMeek = findViewById(R.id.btnBridgesMeek);
 btnMeek.setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
 Prefs.setBridgesList("meek");
 Prefs.putBridgesEnabled(true);
 testBridgeConnection();
-
 }
 });
 
 
-RadioButton btnNew = (RadioButton)findViewById(R.id.btnBridgesNew);
+RadioButton btnNew = findViewById(R.id.btnBridgesNew);
 btnNew.setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
@@ -97,7 +90,6 @@ public class BridgeWizardActivity extends AppCompatActivity {
 else if (Prefs.getBridgesList().equals("obfs4"))
 btnObfs4.setChecked(true);
 
-
 }
 
 @Override
@@ -107,8 +99,7 @@ public class BridgeWizardActivity extends AppCompatActivity {
 
 @Override
 public boolean onOptionsItemSelected(MenuItem item) {
-if (item.getItemId() == android.R.id.home)
-{
+if (item.getItemId() == android.R.id.home) {
 finish();
 return true;
 }
@@ -119,31 +110,30 @@ public class BridgeWizardActivity extends 
AppCompatActivity {
 
 private void showGetBridgePrompt() {
 new AlertDialog.Builder(this)
-.setTitle(R.string.bridge_mode)
-
.setMessage(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_)
-.setNegativeButton(R.string.btn_cancel, new 
Dialog.OnClickListener() {
-@Override
-public void onClick(DialogInterface dialog, int which) {
-//do nothing
-}
-})
-.setNeutralButton(R.string.get_bridges_email, new 
Dialog.OnClickListener() {
-@Override
-public void onClick(DialogInterface dialog, int which) {
-sendGetBridgeEmail();
-}
-
-})
-.setPositiveButton(R.string.get_bridges_web, new 
Dialog.OnClickListener() {
-

[tor-commits] [orbot/master] proguard: disable obfuscation

2018-09-13 Thread n8fr8

commit 749ca3ec8ce73c6809b38c1dc2b0c384be57773c
Author: Unpublished 
Date:   Wed Apr 4 17:41:53 2018 +0200

proguard: disable obfuscation

not needed since we are open source and reduces future incompatibilities

- keep logTun2Socks callback
---
 app/build.gradle   | 4 ++--
 app/proguard-rules.txt | 8 
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7fd095b1..6642226e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
 }
 buildTypes {
 release {
-minifyEnabled false
-shrinkResources false
+minifyEnabled true
+shrinkResources true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 
'proguard-rules.txt'
 }
 }
diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index bc4eb0c1..b1120f82 100644
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@@ -1,3 +1,11 @@
+-dontobfuscate
+# 
https://stackoverflow.com/questions/9651703/using-proguard-with-android-without-obfuscation
+-optimizations 
!code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
+
+-keep class org.torproject.android.service.vpn.Tun2Socks {
+void logTun2Socks(java.lang.String, java.lang.String, java.lang.String);
+}
+
 -keepattributes Signature
 -keepattributes Annotation
 -keep class okhttp3.** { *; }



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

[tor-commits] [orbot/master] We get a better material design dialog by not using a custom layout

2018-09-13 Thread n8fr8

commit 0b15ae5c12a6940b5d1817a37f55f4aebeecef88
Author: lexi 
Date:   Sat May 19 15:03:26 2018 -0400

We get a better material design dialog by not using a custom layout
---
 .../ui/onboarding/BridgeWizardActivity.java| 53 ++
 app/src/main/res/layout/layout_diag.xml| 14 --
 2 files changed, 23 insertions(+), 44 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index da23a62a..66ea8f60 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -13,7 +13,6 @@ import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.RadioButton;
@@ -104,7 +103,7 @@ public class BridgeWizardActivity extends AppCompatActivity 
{
 @Override
 protected void attachBaseContext(Context base) {
 super.attachBaseContext(LocaleHelper.onAttach(base));
-}g
+}
 
 @Override
 public boolean onOptionsItemSelected(MenuItem item) {
@@ -119,34 +118,28 @@ public class BridgeWizardActivity extends 
AppCompatActivity {
 
 
 private void showGetBridgePrompt() {
-LayoutInflater li = LayoutInflater.from(this);
-View view = li.inflate(R.layout.layout_diag, null);
-
-TextView versionName = view.findViewById(R.id.diaglog);
-
versionName.setText(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_);
-
 new AlertDialog.Builder(this)
-.setTitle(R.string.bridge_mode)
-.setView(view)
-.setNegativeButton(R.string.btn_cancel, new 
Dialog.OnClickListener() {
-@Override
-public void onClick(DialogInterface dialog, int which) {
-//do nothing
-}
-})
-.setNeutralButton(R.string.get_bridges_email, new 
Dialog.OnClickListener() {
-@Override
-public void onClick(DialogInterface dialog, int which) {
-sendGetBridgeEmail();
-}
-
-})
-.setPositiveButton(R.string.get_bridges_web, new 
Dialog.OnClickListener() {
-@Override
-public void onClick(DialogInterface dialog, int which) {
-openBrowser(OrbotConstants.URL_TOR_BRIDGES, true, 
null);
-}
-}).show();
+.setTitle(R.string.bridge_mode)
+
.setMessage(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_)
+.setNegativeButton(R.string.btn_cancel, new 
Dialog.OnClickListener() {
+@Override
+public void onClick(DialogInterface dialog, int which) {
+//do nothing
+}
+})
+.setNeutralButton(R.string.get_bridges_email, new 
Dialog.OnClickListener() {
+@Override
+public void onClick(DialogInterface dialog, int which) {
+sendGetBridgeEmail();
+}
+
+})
+.setPositiveButton(R.string.get_bridges_web, new 
Dialog.OnClickListener() {
+@Override
+public void onClick(DialogInterface dialog, int which) {
+openBrowser(OrbotConstants.URL_TOR_BRIDGES, true);
+}
+}).show();
 }
 
 private void sendGetBridgeEmail()
@@ -163,7 +156,7 @@ public class BridgeWizardActivity extends AppCompatActivity 
{
 /*
  * Launch the system activity for Uri viewing with the provided url
  */
-private void openBrowser(final String browserLaunchUrl,boolean 
forceExternal, String pkgId)
+private void openBrowser(final String browserLaunchUrl, boolean 
forceExternal)
 {
 startActivity(new 
Intent(Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)));
 }
diff --git a/app/src/main/res/layout/layout_diag.xml 
b/app/src/main/res/layout/layout_diag.xml
deleted file mode 100644
index 5b4ce215..
--- a/app/src/main/res/layout/layout_diag.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-http://schemas.android.com/apk/res/android";
-   android:orientation="vertical"
-   android:layout_width="match_parent" 
-   android:layout_height="match_parent">
-
-
\ No newline at end of file



___
tor-c

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

2018-09-13 Thread translation

commit 9f04b9cddea8aa98338a4a4b61d1069af2ba7364
Author: Translation commit bot 
Date:   Thu Sep 13 16:18:30 2018 +

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

diff --git a/es/torcheck.po b/es/torcheck.po
index 4ef3340bc..65c10be66 100644
--- a/es/torcheck.po
+++ b/es/torcheck.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-03-02 11:43+\n"
+"PO-Revision-Date: 2018-09-13 16:05+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -62,15 +62,15 @@ msgid ""
 msgstr "Si estÃ¡s intentando utilizar el cliente Tor, visita el https://www.torproject.org/\";>sitio web de Tor y especÃficamente 
las https://www.torproject.org/docs/faq#DoesntWork\";>instrucciones 
para configurar tu cliente Tor."
 
 msgid "Sorry, your query failed or an unexpected response was received."
-msgstr "Lo sentimos, su consulta fallÃ³ o se recibiÃ³ una respuesta 
inesperada."
+msgstr "Lo sentimos, tu consulta fallÃ³ o se recibiÃ³ una respuesta 
inesperada."
 
 msgid ""
 "A temporary service outage prevents us from determining if your source IP "
 "address is a https://www.torproject.org/\";>Tor node."
-msgstr "Un fallo temporal del servicio no nos permite determinar si su 
direcciÃ³n IP de origen es un nodo https://www.torproject.org/\";>Tor."
+msgstr "Un fallo temporal del servicio no nos permite determinar si tu 
direcciÃ³n IP de origen es un nodo https://www.torproject.org/\";>Tor."
 
 msgid "Your IP address appears to be: "
-msgstr "Su direcciÃ³n IP parece ser: "
+msgstr "Tu direcciÃ³n IP parece ser: "
 
 msgid "Are you using Tor?"
 msgstr "Â¿EstÃ¡s 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

2018-09-13 Thread translation

commit 4137c76cee8d79d0552191b645c67cf14016979e
Author: Translation commit bot 
Date:   Thu Sep 13 16:18:24 2018 +

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

diff --git a/es/torcheck.po b/es/torcheck.po
index 4ef3340bc..65c10be66 100644
--- a/es/torcheck.po
+++ b/es/torcheck.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-03-02 11:43+\n"
+"PO-Revision-Date: 2018-09-13 16:05+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -62,15 +62,15 @@ msgid ""
 msgstr "Si estÃ¡s intentando utilizar el cliente Tor, visita el https://www.torproject.org/\";>sitio web de Tor y especÃficamente 
las https://www.torproject.org/docs/faq#DoesntWork\";>instrucciones 
para configurar tu cliente Tor."
 
 msgid "Sorry, your query failed or an unexpected response was received."
-msgstr "Lo sentimos, su consulta fallÃ³ o se recibiÃ³ una respuesta 
inesperada."
+msgstr "Lo sentimos, tu consulta fallÃ³ o se recibiÃ³ una respuesta 
inesperada."
 
 msgid ""
 "A temporary service outage prevents us from determining if your source IP "
 "address is a https://www.torproject.org/\";>Tor node."
-msgstr "Un fallo temporal del servicio no nos permite determinar si su 
direcciÃ³n IP de origen es un nodo https://www.torproject.org/\";>Tor."
+msgstr "Un fallo temporal del servicio no nos permite determinar si tu 
direcciÃ³n IP de origen es un nodo https://www.torproject.org/\";>Tor."
 
 msgid "Your IP address appears to be: "
-msgstr "Su direcciÃ³n IP parece ser: "
+msgstr "Tu direcciÃ³n IP parece ser: "
 
 msgid "Are you using Tor?"
 msgstr "Â¿EstÃ¡s 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] hs-v3: Add changes file and man page for client authorization

2018-09-13 Thread nickm

commit e7ab20710c0961ba82b49628c3b76a5b78b81c68
Author: David Goulet 
Date:   Wed Sep 12 13:23:06 2018 -0400

hs-v3: Add changes file and man page for client authorization

Closes #27547

Signed-off-by: David Goulet 
---
 changes/ticket27547 |  7 +++
 doc/tor.1.txt   | 30 ++
 2 files changed, 37 insertions(+)

diff --git a/changes/ticket27547 b/changes/ticket27547
new file mode 100644
index 0..f60d4a482
--- /dev/null
+++ b/changes/ticket27547
@@ -0,0 +1,7 @@
+  o Major feature (hidden service v3):
+- Implement client authorization at the descriptor level. A new torrc
+  option was added to control this client side: ClientOnionAuthDir .
+  On the service side, if the "authorized_clients/" directory exists in
+  the onion service directory path, client configuration are read from the
+  files within. See the manpage for more details. Closes ticket 27547.
+  Patch done by Suphanat Chunhapanya (haxxpop).
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 869a8cedd..37f21742b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1087,6 +1087,16 @@ The following options are useful only for clients (that 
is, if
 services can be configured to require authorization using the
 **HiddenServiceAuthorizeClient** option.
 
+[[ClientOnionAuthDir]] **ClientOnionAuthDir** __path__::
+Path to the directory containing the hidden service authorization file. The
+files MUST have the suffix ".auth_private". Each file is for a single
+onion address and their format is:
+ +
+  :descriptor:x25519:
+ +
+The  MUST NOT have the ".onion" suffix. See the
+rend-spec-v3.txt Appendix G for more information.
+
 [[LongLivedPorts]] **LongLivedPorts** __PORTS__::
 A list of ports for services that tend to have long-running connections
 (e.g. chat and interactive shells). Circuits for streams that use these
@@ -2896,6 +2906,26 @@ The following options are used to configure a hidden 
service.
 including setting SOCKSPort to "0". Can not be changed while tor is
 running. (Default: 0)
 
+Client Authorization
+
+
+(Version 3 only)
+
+To configure client authorization on the service side, the
+"/authorized_clients/" needs to exists. Each file in that
+directory should be suffixed with ".auth" (the file name is irrelevant) and
+its content format MUST be:
+
+::
+
+The supported  are: "descriptor". The supported  are:
+"x25519". Each file MUST contain one line only. Any malformed file will be
+ignored.
+
+Note that once you've configured client authorization, anyone else with the
+address won't be able to access it from this point on. If no authorization is
+configured, the service will be accessible to all.
+
 TESTING NETWORK OPTIONS
 ---
 



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

2018-09-13 Thread nickm

commit db27a70c9450495974ad0f2f5ee8c4d7454293f8
Merge: d44eb16b2 e7ab20710
Author: Nick Mathewson 
Date:   Thu Sep 13 11:48:13 2018 -0400

Merge branch 'ticket27547_035_01_squashed'

 changes/ticket27547 |  7 +++
 doc/tor.1.txt   | 30 ++
 2 files changed, 37 insertions(+)

___
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 'bug27658_029' into maint-0.2.9

2018-09-13 Thread nickm

commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-09-13 Thread nickm

commit 7597340b32dd94f2109cddde63018bf5eb5bee2d
Merge: dc087f362 825342825
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-09-13 Thread nickm

commit 8253428253109dabc35861cbaab23a44a22eb24d
Merge: 4fa46fca8 9697c2da4
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.4] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-09-13 Thread nickm

commit 8253428253109dabc35861cbaab23a44a22eb24d
Merge: 4fa46fca8 9697c2da4
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-09-13 Thread nickm

commit 5e94c9384197f75b6007e3de1c833912fe8ecb6a
Merge: 04f210811 3ddfd5ff2
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-09-13 Thread nickm

commit 9ba12d1a1e938824cd499b65263fe159657df752
Merge: d96cef1ba c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-09-13 Thread nickm

commit 2b0d370788f9fccd7902f157497f2544f4ccc932
Merge: 0bef3a21c 9697c2da4
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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/master] Merge branch 'bug27658_029' into maint-0.2.9

2018-09-13 Thread nickm

commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.3] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-09-13 Thread nickm

commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-09-13 Thread nickm

commit 3ddfd5ff25b1319dee3a013c8dac02ff9121971e
Merge: f8d5fb42a 825342825
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.4] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-09-13 Thread nickm

commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 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.3] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm

commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



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

2018-09-13 Thread nickm

commit d44eb16b23829299f154e46984bf4be0d5036dea
Merge: 4b646e30d 3ddfd5ff2
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.4'

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

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

1 2 >

1 - 100 of 140 matches

Mail list logo