date:20190522

[tor-commits] [torbutton/master] Bug 30565: sync nocertdb with privatebrowsing.autostart at startup

2019-05-22 Thread gk

commit 6406662331d900d7218cccb82b3e6bd7065e04f4
Author: Alex Catarineu 
Date:   Wed May 22 13:21:53 2019 +0200

Bug 30565: sync nocertdb with privatebrowsing.autostart at startup
---
 src/chrome/content/torbutton.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index a7bd4f8c..53fe4fc9 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1826,6 +1826,9 @@ function torbutton_do_startup()
 // For charsets
 torbutton_update_fingerprinting_prefs();
 
+// Bug 30565: sync browser.privatebrowsing.autostart with 
security.nocertdb
+torbutton_update_disk_prefs();
+
 // #5758: Last ditch effort to keep Vanilla Torbutton users from 
totally
 // being pwnt.  This is a pretty darn ugly hack, too. But because of 
#5863,
 // we really don't care about preserving the user's values for this.

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

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

2019-05-22 Thread translation

commit d9593c537e1833eec4f957f036235453d15032b8
Author: Translation commit bot 
Date:   Thu May 23 06:45:58 2019 +

Update translations for https_everywhere
---
 ko/https-everywhere.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd
index 3c863e0a2..03af3af7a 100644
--- a/ko/https-everywhere.dtd
+++ b/ko/https-everywhere.dtd
@@ -13,8 +13,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -42,7 +42,7 @@
 
 
 
-
+
 
 
 

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

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

2019-05-22 Thread translation

commit 52209d2c6c643669379c106f2833c09ee90ecf42
Author: Translation commit bot 
Date:   Thu May 23 04:48:03 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+tr.po | 30 ++
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 651943e29..864dec162 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -3,8 +3,8 @@
 # Cenk YÄ±ldÄ±zlÄ± , 2019
 # ilkeryus , 2019
 # Emma Peel, 2019
-# Kaya Zeren , 2019
 # erinm, 2019
+# Kaya Zeren , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-21 15:00+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Kaya Zeren , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -296,6 +296,9 @@ msgid ""
 " Message to @get_tor with the words \"osx en\" in it (you don't need to "
 "follow the account)."
 msgstr ""
+"macOS Ã¼zerinde Ã§alÄ±Åacak Ä°ngilizce Tor Browser indirme 
baÄlantÄ±larÄ±nÄ± almak "
+"iÃ§in @get_tor adresine iÃ§inde \"osx en\" sÃ¶zcÃ¼kleri bulunan doÄrudan bir 
"
+"ileti gÃ¶nderin (hesabÄ± takip etmeniz gerekmez)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -1660,8 +1663,8 @@ msgid ""
 "You can do this by increasing Tor Browser's Security Settings in the shield "
 "menu."
 msgstr ""
-"Bu ayara Torbutton menÃ¼sÃ¼ndeki \"GÃ¼venlik DÃ¼zeyi AyarÄ±\" Ã¼zerine 
tÄ±klayarak "
-"eriÅebilirsiniz."
+"Bu ayara kalkan menÃ¼sÃ¼ndeki Tor Browser GÃ¼venlik DÃ¼zeyi AyarÄ± Ã¼zerine "
+"tÄ±klayarak eriÅebilirsiniz."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1685,8 +1688,8 @@ msgid ""
 "The Security Settings can be accessed by clicking the Shield icon next to "
 "the Tor Browser URL bar."
 msgstr ""
-"Adres Ã§ubuÄunun solundaki Torbutton simgesine tÄ±klayarak \"GÃ¼venlik 
DÃ¼zeyi "
-"AyarÄ±\" seÃ§eneÄine eriÅebilirsiniz."
+"GÃ¼venlik DÃ¼zeyi AyarÄ± seÃ§eneÄine, Tor Browser adres Ã§ubuÄunun 
yanÄ±ndaki "
+"kalkan simgesine tÄ±klayarak eriÅebilirsiniz."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1694,9 +1697,8 @@ msgid ""
 "To view and adjust your Security Settings, click the 'Advanced Security "
 "Settings...' button in the shield menu."
 msgstr ""
-"GÃ¼venlik DÃ¼zeyi AyarlarÄ±nÄ± gÃ¶rmek ve deÄiÅtirmek iÃ§in adres 
Ã§ubuÄunun "
-"solundaki Torbutton simgesine tÄ±klayarak \"GÃ¼venlik DÃ¼zeyi AyarÄ±\" "
-"seÃ§eneÄine eriÅebilirsiniz."
+"GÃ¼venlik DÃ¼zeyi AyarlarÄ±nÄ± gÃ¶rmek ve deÄiÅtirmek iÃ§in kalkan 
menÃ¼sÃ¼ndeki "
+"'GeliÅmiÅ GÃ¼venlik DÃ¼zeyi AyarlarÄ±' seÃ§eneÄine tÄ±klayÄ±n."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1735,7 +1737,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
 msgid "This may cause some sites to lose functionality."
-msgstr "Bu gÃ¼venlik dÃ¼zeyinde bazÄ± sitelerin iÅlevlerinde kayÄ±plar 
olabilir."
+msgstr "Bu gÃ¼venlik dÃ¼zeyinde bazÄ± sitelerin iÅlevleri dÃ¼zgÃ¼n 
Ã§alÄ±Åmayabilir."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1746,7 +1748,7 @@ msgid ""
 msgstr ""
 "HTTPS kullanmayan sitelerde JavaScript "
 "devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r. BazÄ± yazÄ± tipleri ve matematik simgeleri devre 
dÄ±ÅÄ± "
-"bÄ±rakÄ±lÄ±r. Ses ve gÃ¶rÃ¼ntÃ¼  (HTML5 ortamlarÄ±) tÄ±klayÄ±p 
oynatÄ±labilir."
+"bÄ±rakÄ±lÄ±r. Ses ve gÃ¶rÃ¼ntÃ¼  (HTML5 ortamlarÄ±) tÄ±klanÄ±p 
oynatÄ±labilir."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1771,7 +1773,7 @@ msgid ""
 msgstr ""
 "JavaScript varsayÄ±lan olarak tÃ¼m sitelerde devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r. 
BazÄ± yazÄ± "
 "tipleri ve matematik simgeleri devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r. Ses ve gÃ¶rÃ¼ntÃ¼  
(HTML5 "
-"ortamlarÄ±) tÄ±klayÄ±p oynatÄ±labilir."
+"ortamlarÄ±) tÄ±klanÄ±p oynatÄ±labilir."
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.title)
@@ -2280,6 +2282,10 @@ msgid ""
 "default location, however the folder will be named \"tor-browser_en-US\" if "
 "you are running the English Tor Browser."
 msgstr ""
+"1. Tor Browser klasÃ¶rÃ¼nÃ¼zÃ¼ bulun. VarsayÄ±lan klasÃ¶r Windows Ã¼zerinde "
+"MasaÃ¼stÃ¼; macOS Ã¼zerinde Uygulamalar klasÃ¶rÃ¼dÃ¼r. Linux Ã¼zerinde 
varsayÄ±lan "
+"konum yoktur, ancak kullandÄ±ÄÄ±nÄ±z Tor Browser Ä°ngilizce ise \"tor-"
+"browser_en-US\" klasÃ¶r adÄ± kullanÄ±lÄ±r."
 
 #: https//tb-manual.torproject.org/en-US/uninstalling/
 #: (content/uninstalling/contents+en-US.lrt

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

2019-05-22 Thread translation

commit a818673a60cbb43c5174dca5549947db82bd652e
Author: Translation commit bot 
Date:   Thu May 23 04:47:54 2019 +

Update translations for tbmanual-contentspot
---
 contents+tr.po | 30 ++
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 651943e29..864dec162 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -3,8 +3,8 @@
 # Cenk YÄ±ldÄ±zlÄ± , 2019
 # ilkeryus , 2019
 # Emma Peel, 2019
-# Kaya Zeren , 2019
 # erinm, 2019
+# Kaya Zeren , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-21 15:00+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Kaya Zeren , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -296,6 +296,9 @@ msgid ""
 " Message to @get_tor with the words \"osx en\" in it (you don't need to "
 "follow the account)."
 msgstr ""
+"macOS Ã¼zerinde Ã§alÄ±Åacak Ä°ngilizce Tor Browser indirme 
baÄlantÄ±larÄ±nÄ± almak "
+"iÃ§in @get_tor adresine iÃ§inde \"osx en\" sÃ¶zcÃ¼kleri bulunan doÄrudan bir 
"
+"ileti gÃ¶nderin (hesabÄ± takip etmeniz gerekmez)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -1660,8 +1663,8 @@ msgid ""
 "You can do this by increasing Tor Browser's Security Settings in the shield "
 "menu."
 msgstr ""
-"Bu ayara Torbutton menÃ¼sÃ¼ndeki \"GÃ¼venlik DÃ¼zeyi AyarÄ±\" Ã¼zerine 
tÄ±klayarak "
-"eriÅebilirsiniz."
+"Bu ayara kalkan menÃ¼sÃ¼ndeki Tor Browser GÃ¼venlik DÃ¼zeyi AyarÄ± Ã¼zerine "
+"tÄ±klayarak eriÅebilirsiniz."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1685,8 +1688,8 @@ msgid ""
 "The Security Settings can be accessed by clicking the Shield icon next to "
 "the Tor Browser URL bar."
 msgstr ""
-"Adres Ã§ubuÄunun solundaki Torbutton simgesine tÄ±klayarak \"GÃ¼venlik 
DÃ¼zeyi "
-"AyarÄ±\" seÃ§eneÄine eriÅebilirsiniz."
+"GÃ¼venlik DÃ¼zeyi AyarÄ± seÃ§eneÄine, Tor Browser adres Ã§ubuÄunun 
yanÄ±ndaki "
+"kalkan simgesine tÄ±klayarak eriÅebilirsiniz."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1694,9 +1697,8 @@ msgid ""
 "To view and adjust your Security Settings, click the 'Advanced Security "
 "Settings...' button in the shield menu."
 msgstr ""
-"GÃ¼venlik DÃ¼zeyi AyarlarÄ±nÄ± gÃ¶rmek ve deÄiÅtirmek iÃ§in adres 
Ã§ubuÄunun "
-"solundaki Torbutton simgesine tÄ±klayarak \"GÃ¼venlik DÃ¼zeyi AyarÄ±\" "
-"seÃ§eneÄine eriÅebilirsiniz."
+"GÃ¼venlik DÃ¼zeyi AyarlarÄ±nÄ± gÃ¶rmek ve deÄiÅtirmek iÃ§in kalkan 
menÃ¼sÃ¼ndeki "
+"'GeliÅmiÅ GÃ¼venlik DÃ¼zeyi AyarlarÄ±' seÃ§eneÄine tÄ±klayÄ±n."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1735,7 +1737,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
 msgid "This may cause some sites to lose functionality."
-msgstr "Bu gÃ¼venlik dÃ¼zeyinde bazÄ± sitelerin iÅlevlerinde kayÄ±plar 
olabilir."
+msgstr "Bu gÃ¼venlik dÃ¼zeyinde bazÄ± sitelerin iÅlevleri dÃ¼zgÃ¼n 
Ã§alÄ±Åmayabilir."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1746,7 +1748,7 @@ msgid ""
 msgstr ""
 "HTTPS kullanmayan sitelerde JavaScript "
 "devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r. BazÄ± yazÄ± tipleri ve matematik simgeleri devre 
dÄ±ÅÄ± "
-"bÄ±rakÄ±lÄ±r. Ses ve gÃ¶rÃ¼ntÃ¼  (HTML5 ortamlarÄ±) tÄ±klayÄ±p 
oynatÄ±labilir."
+"bÄ±rakÄ±lÄ±r. Ses ve gÃ¶rÃ¼ntÃ¼  (HTML5 ortamlarÄ±) tÄ±klanÄ±p 
oynatÄ±labilir."
 
 #: https//tb-manual.torproject.org/en-US/security-settings/
 #: (content/security-settings/contents+en-US.lrtopic.body)
@@ -1771,7 +1773,7 @@ msgid ""
 msgstr ""
 "JavaScript varsayÄ±lan olarak tÃ¼m sitelerde devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r. 
BazÄ± yazÄ± "
 "tipleri ve matematik simgeleri devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r. Ses ve gÃ¶rÃ¼ntÃ¼  
(HTML5 "
-"ortamlarÄ±) tÄ±klayÄ±p oynatÄ±labilir."
+"ortamlarÄ±) tÄ±klanÄ±p oynatÄ±labilir."
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.title)
@@ -2280,6 +2282,10 @@ msgid ""
 "default location, however the folder will be named \"tor-browser_en-US\" if "
 "you are running the English Tor Browser."
 msgstr ""
+"1. Tor Browser klasÃ¶rÃ¼nÃ¼zÃ¼ bulun. VarsayÄ±lan klasÃ¶r Windows Ã¼zerinde "
+"MasaÃ¼stÃ¼; macOS Ã¼zerinde Uygulamalar klasÃ¶rÃ¼dÃ¼r. Linux Ã¼zerinde 
varsayÄ±lan "
+"konum yoktur, ancak kullandÄ±ÄÄ±nÄ±z Tor Browser Ä°ngilizce ise \"tor-"
+"browser_en-US\" klasÃ¶r adÄ± kullanÄ±lÄ±r."
 
 #: https//tb-manual.torproject.org/en-US/uninstalling/
 #: (content/uninstalling/contents+en-US.lrtopic.body)

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

2019-05-22 Thread translation

commit f58380a2ef8d57c95272fc960cabccce14a358e7
Author: Translation commit bot 
Date:   Wed May 22 23:51:00 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 666ef0d3f..7f6bd1898 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -39,7 +39,7 @@ msgstr "MessagerieÂ Tor"
 #: https//support.torproject.org/tormobile/
 #: (content/tormobile/contents+en.lrtopic.title)
 msgid "Tor Mobile"
-msgstr "Tor Mobile"
+msgstr "Tor sur appareils mobiles"
 
 #: https//support.torproject.org/gettor/
 #: (content/gettor/contents+en.lrtopic.title)
@@ -2355,7 +2355,8 @@ msgid ""
 "Messenger](https://blog.torproject.org/sunsetting-tor-messenger)."
 msgstr ""
 "Non. AprÃ¨s onze versions bÃªta, nous avons cessÃ© le soutien de la 
[Messagerie"
-"Â Tor](https://blog.torproject.org/sunsetting-tor-messenger)."
+"Â Tor](https://blog.torproject.org/sunsetting-tor-messenger) (page en "
+"anglais)."
 
 #: https//support.torproject.org/tormessenger/tormessenger-1/
 #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description)
@@ -2371,7 +2372,7 @@ msgstr ""
 #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description)
 msgid "Do you? [Contact us](https://www.torproject.org/contact)."
 msgstr ""
-"Les possÃ©dez-vousâ? [Contactez-nous](https://www.torproject.org/contact)."
+"Les possÃ©dez-vousâ? 
[Contactez-nous](https://www.torproject.org/fr/contact)."
 
 #: https//support.torproject.org/tormobile/tormobile-1/
 #: (content/tormobile/tormobile-1/contents+en.lrquestion.title)
@@ -2421,7 +2422,7 @@ msgstr ""
 "Le projet Guardian maintient Tor (et dâautres applications de protection 
des"
 " donnÃ©es personnelles) sur Android. De plus amples renseignements se "
 "trouvent sur leÂ https://guardianproject.info/\";>site Web du "
-"ProjetÂ Guardian."
+"ProjetÂ Guardian (site en anglais)."
 
 #: https//support.torproject.org/tormobile/tormobile-3/
 #: (content/tormobile/tormobile-3/contents+en.lrquestion.title)
@@ -2436,7 +2437,7 @@ msgid ""
 "Project."
 msgstr ""
 "Nous recommandons une appli pour iOS appelÃ©e NavigateurÂ Onion, qui est Ã  "
-"code source ouvert, utilise le routage de Tor, et est dÃ©veloppÃ©e par "
+"code source ouvert, utilise le routage de Tor et est dÃ©veloppÃ©e par "
 "quelquâun qui collabore Ã©troitement avec le ProjetÂ Tor."
 
 #: https//support.torproject.org/tormobile/tormobile-3/
@@ -2470,8 +2471,8 @@ msgstr "Comment puis-je utiliser Tor sur Windows 
Phoneâ?"
 msgid ""
 "There is currently no supported method for running Tor on Windows Phone."
 msgstr ""
-"Il nâexiste actuellement aucun moyen pris en charge dâutiliser Tor sur "
-"Windows Phone."
+"Il nâexiste actuellement aucun moyen pris en charge pour faire utiliser Tor 
"
+"sur Windows Phone."
 
 #: https//support.torproject.org/tormobile/tormobile-5/
 #: (content/tormobile/tormobile-5/contents+en.lrquestion.title)
@@ -2487,7 +2488,7 @@ msgid ""
 msgstr ""
 "Nous travaillons actuellement sur le NavigateurÂ Tor pour Android, et vous "
 "pouvez [tester nos versions alpha](https://blog.torproject.org/new-alpha-";
-"release-tor-browser-android)."
+"release-tor-browser-android) (page en anglais)."
 
 #: https//support.torproject.org/tormobile/tormobile-5/
 #: (content/tormobile/tormobile-5/contents+en.lrquestion.description)
@@ -2498,7 +2499,7 @@ msgid ""
 msgstr ""
 "Veuillez surveiller la publication dâannonces futures et de plus de "
 "prÃ©cisions concernant ce projet sur notre https://blog.torproject.org\";>blogue."
+"href=\"https://blog.torproject.org\";>blogue (site en anglais)."
 
 #: https//support.torproject.org/gettor/gettor-1/
 #: (content/gettor/gettor-1/contents+en.lrquestion.title)
@@ -2564,9 +2565,9 @@ msgid ""
 msgstr ""
 "GetTor vous rÃ©pondra par un courriel qui contient des liens Ã  partir "
 "desquels vous pourrez tÃ©lÃ©charger le NavigateurÂ Tor, la signature "
-"cryptographique (nÃ©cessaire pour [vÃ©rifier le 
tÃ©lÃ©chargement](/tbb/how-to-"
-"verify-signature/)), lâempreinte de la clÃ© utilisÃ©e pour crÃ©er la 
signature,"
-" et la somme de contrÃ´le du paquet."
+"cryptographique (nÃ©cessaire pour [vÃ©rifier le 
tÃ©lÃ©chargement](/fr/tbb/how-"
+"to-verify-signature/)), lâempreinte de la clÃ© utilisÃ©e pour crÃ©er la "
+"signature et la somme de contrÃ´le du paquet."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-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] [translation/support-portal] Update translations for support-portal

2019-05-22 Thread translation

commit 68fa3d3623dfd119bc771650db139674e3d60db6
Author: Translation commit bot 
Date:   Wed May 22 23:50:51 2019 +

Update translations for support-portal
---
 contents+fr.po | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 666ef0d3f..7f6bd1898 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -39,7 +39,7 @@ msgstr "MessagerieÂ Tor"
 #: https//support.torproject.org/tormobile/
 #: (content/tormobile/contents+en.lrtopic.title)
 msgid "Tor Mobile"
-msgstr "Tor Mobile"
+msgstr "Tor sur appareils mobiles"
 
 #: https//support.torproject.org/gettor/
 #: (content/gettor/contents+en.lrtopic.title)
@@ -2355,7 +2355,8 @@ msgid ""
 "Messenger](https://blog.torproject.org/sunsetting-tor-messenger)."
 msgstr ""
 "Non. AprÃ¨s onze versions bÃªta, nous avons cessÃ© le soutien de la 
[Messagerie"
-"Â Tor](https://blog.torproject.org/sunsetting-tor-messenger)."
+"Â Tor](https://blog.torproject.org/sunsetting-tor-messenger) (page en "
+"anglais)."
 
 #: https//support.torproject.org/tormessenger/tormessenger-1/
 #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description)
@@ -2371,7 +2372,7 @@ msgstr ""
 #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description)
 msgid "Do you? [Contact us](https://www.torproject.org/contact)."
 msgstr ""
-"Les possÃ©dez-vousâ? [Contactez-nous](https://www.torproject.org/contact)."
+"Les possÃ©dez-vousâ? 
[Contactez-nous](https://www.torproject.org/fr/contact)."
 
 #: https//support.torproject.org/tormobile/tormobile-1/
 #: (content/tormobile/tormobile-1/contents+en.lrquestion.title)
@@ -2421,7 +2422,7 @@ msgstr ""
 "Le projet Guardian maintient Tor (et dâautres applications de protection 
des"
 " donnÃ©es personnelles) sur Android. De plus amples renseignements se "
 "trouvent sur leÂ https://guardianproject.info/\";>site Web du "
-"ProjetÂ Guardian."
+"ProjetÂ Guardian (site en anglais)."
 
 #: https//support.torproject.org/tormobile/tormobile-3/
 #: (content/tormobile/tormobile-3/contents+en.lrquestion.title)
@@ -2436,7 +2437,7 @@ msgid ""
 "Project."
 msgstr ""
 "Nous recommandons une appli pour iOS appelÃ©e NavigateurÂ Onion, qui est Ã  "
-"code source ouvert, utilise le routage de Tor, et est dÃ©veloppÃ©e par "
+"code source ouvert, utilise le routage de Tor et est dÃ©veloppÃ©e par "
 "quelquâun qui collabore Ã©troitement avec le ProjetÂ Tor."
 
 #: https//support.torproject.org/tormobile/tormobile-3/
@@ -2470,8 +2471,8 @@ msgstr "Comment puis-je utiliser Tor sur Windows 
Phoneâ?"
 msgid ""
 "There is currently no supported method for running Tor on Windows Phone."
 msgstr ""
-"Il nâexiste actuellement aucun moyen pris en charge dâutiliser Tor sur "
-"Windows Phone."
+"Il nâexiste actuellement aucun moyen pris en charge pour faire utiliser Tor 
"
+"sur Windows Phone."
 
 #: https//support.torproject.org/tormobile/tormobile-5/
 #: (content/tormobile/tormobile-5/contents+en.lrquestion.title)
@@ -2487,7 +2488,7 @@ msgid ""
 msgstr ""
 "Nous travaillons actuellement sur le NavigateurÂ Tor pour Android, et vous "
 "pouvez [tester nos versions alpha](https://blog.torproject.org/new-alpha-";
-"release-tor-browser-android)."
+"release-tor-browser-android) (page en anglais)."
 
 #: https//support.torproject.org/tormobile/tormobile-5/
 #: (content/tormobile/tormobile-5/contents+en.lrquestion.description)
@@ -2498,7 +2499,7 @@ msgid ""
 msgstr ""
 "Veuillez surveiller la publication dâannonces futures et de plus de "
 "prÃ©cisions concernant ce projet sur notre https://blog.torproject.org\";>blogue."
+"href=\"https://blog.torproject.org\";>blogue (site en anglais)."
 
 #: https//support.torproject.org/gettor/gettor-1/
 #: (content/gettor/gettor-1/contents+en.lrquestion.title)
@@ -2564,9 +2565,9 @@ msgid ""
 msgstr ""
 "GetTor vous rÃ©pondra par un courriel qui contient des liens Ã  partir "
 "desquels vous pourrez tÃ©lÃ©charger le NavigateurÂ Tor, la signature "
-"cryptographique (nÃ©cessaire pour [vÃ©rifier le 
tÃ©lÃ©chargement](/tbb/how-to-"
-"verify-signature/)), lâempreinte de la clÃ© utilisÃ©e pour crÃ©er la 
signature,"
-" et la somme de contrÃ´le du paquet."
+"cryptographique (nÃ©cessaire pour [vÃ©rifier le 
tÃ©lÃ©chargement](/fr/tbb/how-"
+"to-verify-signature/)), lâempreinte de la clÃ© utilisÃ©e pour crÃ©er la "
+"signature et la somme de contrÃ´le du paquet."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-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] [translation/support-portal_completed] Update translations for support-portal_completed

2019-05-22 Thread translation

commit 67567188f3c0dca8032985d2a97ad9a81b63a550
Author: Translation commit bot 
Date:   Wed May 22 22:21:01 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 9f65d5f38..666ef0d3f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -174,7 +174,7 @@ msgid ""
 "manual.torproject.org/circumvention/)."
 msgstr ""
 "Pour plus de prÃ©cisions, veuillez consulter la rubrique sur la "
-"[censure](https://tb-manual.torproject.org/fr/circumvention//) du [guide "
+"[censure](https://tb-manual.torproject.org/fr/circumvention/) du [guide "
 "dâutilisation du NavigateurÂ Tor](https://tb-manual.torproject.org/fr)."
 
 #: https//support.torproject.org/faq/faq-3/
@@ -959,8 +959,8 @@ msgid ""
 "piece of software that can easily compromise your privacy or serve you "
 "malware."
 msgstr ""
-"Nous ne pensons pas quâil est sÃ©curitaire dâutiliser Flash dans 
nâimporte "
-"quel navigateur. Câest un logiciel trÃ¨s mal sÃ©curisÃ© qui peut aisÃ©ment "
+"Nous pensons quâil est dangereux dâutiliser Flash dans nâimporte quel "
+"navigateur. Câest un logiciel trÃ¨s mal sÃ©curisÃ© qui peut aisÃ©ment "
 "compromettre votre vie privÃ©e et vos donnÃ©es personnelles ou vous exposer Ã 
 "
 "des programmes malveillants."
 
@@ -2039,7 +2039,8 @@ msgid ""
 "about the design of Tor Browser."
 msgstr ""
 "https://www.torproject.org/projects/torbrowser/design/\";>En "
-"apprendre davantage sur la conception du NavigateurÂ Tor."
+"apprendre davantage sur la conception du NavigateurÂ Tor (site en "
+"anglais)."
 
 #: https//support.torproject.org/tbb/tbb-40/
 #: (content/tbb/tbb-40/contents+en.lrquestion.title)
@@ -2118,8 +2119,8 @@ msgid ""
 msgstr ""
 "Le NavigateurÂ Tor est dÃ©veloppÃ© Ã  partir de https://www.mozilla.org/en-US/firefox/organizations/\";>Firefox "
-"ESR et il est donc possible que des erreurs concernant Firefox "
-"surviennent."
+"ESR (page en anglais) et il est donc possible que des erreurs "
+"concernant Firefox surviennent."
 
 #: https//support.torproject.org/tbb/tbb-42/
 #: (content/tbb/tbb-42/contents+en.lrquestion.description)
@@ -2143,8 +2144,8 @@ msgstr ""
 "Si vous utilisez un antivirus, veuillez consulter http://support.torproject.org/fr/#tbb-10\";>Mon antivirus ou ma "
 "protection contre les programmes malveillants mâempÃªche dâaccÃ©der au "
-"NavigateurÂ Tor.. Il nâest pas rare que les logiciels antivirus 
ou"
-" antiprogrammes malveillants provoquent ce genre de problÃ¨me."
+"NavigateurÂ Tor. Il nâest pas rare que les logiciels antivirus 
ou "
+"antiprogrammes malveillants provoquent ce genre de problÃ¨me."
 
 #: https//support.torproject.org/tbb/tbb-5/
 #: (content/tbb/tbb-5/contents+en.lrquestion.title)
@@ -2180,9 +2181,9 @@ msgid ""
 "browser, because you may accidentally use the other browser for something "
 "you intended to do using Tor."
 msgstr ""
-"Soyez prudent en basculant entre Tor et un navigateur moins sÃ©curitaire, car"
-" vous pourriez accidentellement utiliser lâautre navigateur pour quelque "
-"chose que vous pensiez faire en utilisant Tor."
+"Soyez prudent en basculant entre Tor et un navigateur moins sÃ»r, car vous "
+"pourriez accidentellement utiliser lâautre navigateur pour quelque chose 
que"
+" vous pensiez faire en utilisant Tor."
 
 #: https//support.torproject.org/tbb/tbb-6/
 #: (content/tbb/tbb-6/contents+en.lrquestion.title)
@@ -2316,7 +2317,7 @@ msgid ""
 "href=\"/#onionservices-3\">I cannot reach X.onion!"
 msgstr ""
 "Si vous ne pouvez pas vous connecter Ã  un service onion, veuillez consulter "
-"Â«Â Je ne peux pas accÃ©der Ã  X.onionâ!Â 
Â»"
+"Â«Â Je ne peux pas accÃ©der Ã  
X.onionâÂ Â»."
 
 #: https//support.torproject.org/tbb/tbb-9/
 #: (content/tbb/tbb-9/contents+en.lrquestion.title)
@@ -3928,8 +3929,8 @@ msgstr ""
 "journalistes et leurs sources avec https://securedrop.org/\";>SecureDrop ou avec https://onionshare.org/\";>OnionShare, des mises Ã  jour de "
-"logiciels elles aussi plus sÃ»res, et des faÃ§ons plus sÃ©curitaires 
dâaccÃ©der "
-"Ã  des sites populaires tels que comme https://www.facebook.com/notes/protect-the-graph/making-connections-";
 "to-facebook-more-secure/1526085754298237/\">Facebook."
 

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

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

2019-05-22 Thread translation

commit 980f6e3887e8d3165037780fd2a8a08692a8fbb8
Author: Translation commit bot 
Date:   Wed May 22 22:20:54 2019 +

Update translations for support-portal
---
 contents+fr.po | 29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 9f65d5f38..666ef0d3f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -174,7 +174,7 @@ msgid ""
 "manual.torproject.org/circumvention/)."
 msgstr ""
 "Pour plus de prÃ©cisions, veuillez consulter la rubrique sur la "
-"[censure](https://tb-manual.torproject.org/fr/circumvention//) du [guide "
+"[censure](https://tb-manual.torproject.org/fr/circumvention/) du [guide "
 "dâutilisation du NavigateurÂ Tor](https://tb-manual.torproject.org/fr)."
 
 #: https//support.torproject.org/faq/faq-3/
@@ -959,8 +959,8 @@ msgid ""
 "piece of software that can easily compromise your privacy or serve you "
 "malware."
 msgstr ""
-"Nous ne pensons pas quâil est sÃ©curitaire dâutiliser Flash dans 
nâimporte "
-"quel navigateur. Câest un logiciel trÃ¨s mal sÃ©curisÃ© qui peut aisÃ©ment "
+"Nous pensons quâil est dangereux dâutiliser Flash dans nâimporte quel "
+"navigateur. Câest un logiciel trÃ¨s mal sÃ©curisÃ© qui peut aisÃ©ment "
 "compromettre votre vie privÃ©e et vos donnÃ©es personnelles ou vous exposer Ã 
 "
 "des programmes malveillants."
 
@@ -2039,7 +2039,8 @@ msgid ""
 "about the design of Tor Browser."
 msgstr ""
 "https://www.torproject.org/projects/torbrowser/design/\";>En "
-"apprendre davantage sur la conception du NavigateurÂ Tor."
+"apprendre davantage sur la conception du NavigateurÂ Tor (site en "
+"anglais)."
 
 #: https//support.torproject.org/tbb/tbb-40/
 #: (content/tbb/tbb-40/contents+en.lrquestion.title)
@@ -2118,8 +2119,8 @@ msgid ""
 msgstr ""
 "Le NavigateurÂ Tor est dÃ©veloppÃ© Ã  partir de https://www.mozilla.org/en-US/firefox/organizations/\";>Firefox "
-"ESR et il est donc possible que des erreurs concernant Firefox "
-"surviennent."
+"ESR (page en anglais) et il est donc possible que des erreurs "
+"concernant Firefox surviennent."
 
 #: https//support.torproject.org/tbb/tbb-42/
 #: (content/tbb/tbb-42/contents+en.lrquestion.description)
@@ -2143,8 +2144,8 @@ msgstr ""
 "Si vous utilisez un antivirus, veuillez consulter http://support.torproject.org/fr/#tbb-10\";>Mon antivirus ou ma "
 "protection contre les programmes malveillants mâempÃªche dâaccÃ©der au "
-"NavigateurÂ Tor.. Il nâest pas rare que les logiciels antivirus 
ou"
-" antiprogrammes malveillants provoquent ce genre de problÃ¨me."
+"NavigateurÂ Tor. Il nâest pas rare que les logiciels antivirus 
ou "
+"antiprogrammes malveillants provoquent ce genre de problÃ¨me."
 
 #: https//support.torproject.org/tbb/tbb-5/
 #: (content/tbb/tbb-5/contents+en.lrquestion.title)
@@ -2180,9 +2181,9 @@ msgid ""
 "browser, because you may accidentally use the other browser for something "
 "you intended to do using Tor."
 msgstr ""
-"Soyez prudent en basculant entre Tor et un navigateur moins sÃ©curitaire, car"
-" vous pourriez accidentellement utiliser lâautre navigateur pour quelque "
-"chose que vous pensiez faire en utilisant Tor."
+"Soyez prudent en basculant entre Tor et un navigateur moins sÃ»r, car vous "
+"pourriez accidentellement utiliser lâautre navigateur pour quelque chose 
que"
+" vous pensiez faire en utilisant Tor."
 
 #: https//support.torproject.org/tbb/tbb-6/
 #: (content/tbb/tbb-6/contents+en.lrquestion.title)
@@ -2316,7 +2317,7 @@ msgid ""
 "href=\"/#onionservices-3\">I cannot reach X.onion!"
 msgstr ""
 "Si vous ne pouvez pas vous connecter Ã  un service onion, veuillez consulter "
-"Â«Â Je ne peux pas accÃ©der Ã  X.onionâ!Â 
Â»"
+"Â«Â Je ne peux pas accÃ©der Ã  
X.onionâÂ Â»."
 
 #: https//support.torproject.org/tbb/tbb-9/
 #: (content/tbb/tbb-9/contents+en.lrquestion.title)
@@ -3928,8 +3929,8 @@ msgstr ""
 "journalistes et leurs sources avec https://securedrop.org/\";>SecureDrop ou avec https://onionshare.org/\";>OnionShare, des mises Ã  jour de "
-"logiciels elles aussi plus sÃ»res, et des faÃ§ons plus sÃ©curitaires 
dâaccÃ©der "
-"Ã  des sites populaires tels que comme https://www.facebook.com/notes/protect-the-graph/making-connections-";
 "to-facebook-more-secure/1526085754298237/\">Facebook."
 

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

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

2019-05-22 Thread translation

commit b1e3a6491c52daa2c6881e758e4dfb520f4efac0
Author: Translation commit bot 
Date:   Wed May 22 22:17:47 2019 +

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

diff --git a/he/torbrowser_strings.dtd b/he/torbrowser_strings.dtd
index da5f60da5..b25feea01 100644
--- a/he/torbrowser_strings.dtd
+++ b/he/torbrowser_strings.dtd
@@ -56,4 +56,4 @@
 
 
 
-
+

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

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

2019-05-22 Thread translation

commit 1b81c648da94b03f481a8279fa910625e63266e7
Author: Translation commit bot 
Date:   Wed May 22 22:17:41 2019 +

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

diff --git a/he/torbrowser_strings.dtd b/he/torbrowser_strings.dtd
index da5f60da5..b25feea01 100644
--- a/he/torbrowser_strings.dtd
+++ b/he/torbrowser_strings.dtd
@@ -56,4 +56,4 @@
 
 
 
-
+

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

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

2019-05-22 Thread translation

commit 8be90f60466dcbb3223dd2845e3eb906320b9d74
Author: Translation commit bot 
Date:   Wed May 22 21:50:56 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 3caf53687..9f65d5f38 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1910,8 +1910,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
 msgid "I need Tor Browser in a language that's not English."
-msgstr ""
-"Jâai besoin du NavigateurÂ Tor dans une langue qui nâest pas le 
franÃ§ais."
+msgstr "Jâai besoin du NavigateurÂ Tor dans une langue autre que le 
franÃ§ais."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/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] [translation/support-portal] Update translations for support-portal

2019-05-22 Thread translation

commit 47982402c5d4827b960bb4707cf002e71bd15548
Author: Translation commit bot 
Date:   Wed May 22 21:50:49 2019 +

Update translations for support-portal
---
 contents+fr.po | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 3caf53687..9f65d5f38 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1910,8 +1910,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
 msgid "I need Tor Browser in a language that's not English."
-msgstr ""
-"Jâai besoin du NavigateurÂ Tor dans une langue qui nâest pas le 
franÃ§ais."
+msgstr "Jâai besoin du NavigateurÂ Tor dans une langue autre que le 
franÃ§ais."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/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] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-05-22 Thread translation

commit 79489ee0db6c57fe917d5dbd9fc204ea125700fd
Author: Translation commit bot 
Date:   Wed May 22 21:47:50 2019 +

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

diff --git a/contents+pl.po b/contents+pl.po
index cf5c5bfb5..77659aba1 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -2,9 +2,9 @@
 # Dawid Job , 2019
 # Emma Peel, 2019
 # Waldemar Stoczkowski, 2019
-# Dawid Potocki , 2019
 # erinm, 2019
 # Filip , 2019
+# Dawid Potocki , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-21 15:00+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Filip , 2019\n"
+"Last-Translator: Dawid Potocki , 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -299,6 +299,9 @@ msgid ""
 " Message to @get_tor with the words \"osx en\" in it (you don't need to "
 "follow the account)."
 msgstr ""
+"Aby uzyskaÄ linki do pobrania Tor Browser w jÄzyku polskim dla macOS, 
wyÅlij"
+" bezpoÅredniÄ wiadomoÅÄ do @get_tor ze sÅowami \"osx pl\" w nim (nie 
musisz "
+"ÅledziÄ konta)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -510,6 +513,9 @@ msgid ""
 "Then, select 'Provide a bridge I know' and enter each bridge address on a "
 "separate line."
 msgstr ""
+"W oknie Ustawienia Sieci Tor, wybierz 'Tor jest cenzurowany w moim kraju'. "
+"NastÄpnie wybierz 'Wybierz most ktÃ³ry znam' i wpisz adres kaÅ¼dego mostu w "
+"osobnej linii."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)

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

[tor-commits] [webwml/master] Bump this version, in case it matters.

2019-05-22 Thread nickm

commit e29e6e7a092a15da58448b4a57e0a494fc44e8af
Author: Nick Mathewson 
Date:   Wed May 22 17:32:52 2019 -0400

Bump this version, in case it matters.

("Is this thing on?")
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dc4b3f8c..c9f0cf73 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.4.0.5
-export DEVTAG=tor-0.4.0.5
+export DEVTAG=tor-0.4.1.1-alpha
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index 67c1884d..2d587717 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.4.0.5
-0.4.0.5
+0.4.1.1-alpha
 
 maint-8.0
 

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

[tor-commits] [tpo/master] Tor 0.4.1.1-alpha is released.

2019-05-22 Thread nickm

commit 4ae5f6848a3e831ed00a644ebd3d40d88199d9d9
Author: Nick Mathewson 
Date:   Wed May 22 17:32:07 2019 -0400

Tor 0.4.1.1-alpha is released.
---
 databags/versions.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index 2f94891..88dc298 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -11,4 +11,4 @@ release_date = 2019-05-22
 version = 0.4.0.5
 
 [tor-alpha]
-version = 0.4.0.5
+version = 0.4.1.1-alpha

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

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

2019-05-22 Thread translation

commit bee78d11256ef7c2c06e29fdcf0ebd3e01957bdc
Author: Translation commit bot 
Date:   Wed May 22 21:20:52 2019 +

Update translations for tpo-web_completed
---
 contents+pl.po | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/contents+pl.po b/contents+pl.po
index 910e59bb7..090362cad 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -7,8 +7,8 @@
 # wigatesi, 2019
 # Filip , 2019
 # Emma Peel, 2019
-# Dawid Potocki , 2019
 # Waldemar Stoczkowski, 2019
+# Dawid Potocki , 2019
 # 
 msgid ""
 msgstr ""
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-21 18:11+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Waldemar Stoczkowski, 2019\n"
+"Last-Translator: Dawid Potocki , 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -510,6 +510,10 @@ msgid ""
 "goal is to continue diversifying our funding. To inquire about sponsorship, "
 "please email giving(at)torproject.org."
 msgstr ""
+"Posiadanie zrÃ³Å¼nicowanej bazy uÅ¼ytkownikÃ³w oznacza, Å¼e mamy rÃ³wnieÅ¼ 
rÃ³Å¼ne "
+"ÅºrÃ³dÅa dofinansowania. Naszym celem jest dalsza dywersyfikacja 
finansowania."
+" Aby zapytaÄ o sponsoring, prosimy o wysÅanie wiadomoÅci email na adres: "
+"giving(maÅpa)torproject.org."
 
 #: https//www.torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrreports.body)
@@ -528,6 +532,11 @@ msgid ""
 "work with a diverse group of bright and passionate folks committed to "
 "fostering internet freedom worldwide."
 msgstr ""
+"Zawsze szukamy wiÄcej wspaniaÅych ludzi, do doÅÄczenia do naszego 
zespoÅu. "
+"DoÅÄcz do nas w naszym biurze w Seattle lub pracuj zdalnie z dowolnego "
+"miejsca na Åwiecie. BÄdziesz pracowaÄ z rÃ³Å¼norodnÄ grupÄ 
bÅyskotliwych i "
+"peÅnych pasji ludzi zaangaÅ¼owanych w promowanie wolnoÅci w Internecie na "
+"caÅym Åwiecie."
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)

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

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

2019-05-22 Thread translation

commit c626212e15dee2b6a06ec69a1140d4e9a914e122
Author: Translation commit bot 
Date:   Wed May 22 21:20:46 2019 +

Update translations for tpo-web
---
 contents+pl.po | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/contents+pl.po b/contents+pl.po
index 910e59bb7..090362cad 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -7,8 +7,8 @@
 # wigatesi, 2019
 # Filip , 2019
 # Emma Peel, 2019
-# Dawid Potocki , 2019
 # Waldemar Stoczkowski, 2019
+# Dawid Potocki , 2019
 # 
 msgid ""
 msgstr ""
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-21 18:11+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Waldemar Stoczkowski, 2019\n"
+"Last-Translator: Dawid Potocki , 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -510,6 +510,10 @@ msgid ""
 "goal is to continue diversifying our funding. To inquire about sponsorship, "
 "please email giving(at)torproject.org."
 msgstr ""
+"Posiadanie zrÃ³Å¼nicowanej bazy uÅ¼ytkownikÃ³w oznacza, Å¼e mamy rÃ³wnieÅ¼ 
rÃ³Å¼ne "
+"ÅºrÃ³dÅa dofinansowania. Naszym celem jest dalsza dywersyfikacja 
finansowania."
+" Aby zapytaÄ o sponsoring, prosimy o wysÅanie wiadomoÅci email na adres: "
+"giving(maÅpa)torproject.org."
 
 #: https//www.torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrreports.body)
@@ -528,6 +532,11 @@ msgid ""
 "work with a diverse group of bright and passionate folks committed to "
 "fostering internet freedom worldwide."
 msgstr ""
+"Zawsze szukamy wiÄcej wspaniaÅych ludzi, do doÅÄczenia do naszego 
zespoÅu. "
+"DoÅÄcz do nas w naszym biurze w Seattle lub pracuj zdalnie z dowolnego "
+"miejsca na Åwiecie. BÄdziesz pracowaÄ z rÃ³Å¼norodnÄ grupÄ 
bÅyskotliwych i "
+"peÅnych pasji ludzi zaangaÅ¼owanych w promowanie wolnoÅci w Internecie na "
+"caÅym Åwiecie."
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)

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

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

2019-05-22 Thread translation

commit 24f2ec269d25e3f75507a1e008c819534c0e3724
Author: Translation commit bot 
Date:   Wed May 22 19:51:12 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 4b06c89b8..3caf53687 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1668,7 +1668,7 @@ msgid ""
 "Other open tabs and windows from the same website will use the new circuit "
 "as well once they are reloaded."
 msgstr ""
-"Les autres onglets et fenÃªtres ouverts du mÃªme site Web utiliseront aussi 
le"
+"Les autres fenÃªtres et onglets ouverts du mÃªme site Web utiliseront aussi 
le"
 " nouveau circuit une fois quâils seront rechargÃ©s."
 
 #: https//support.torproject.org/tbb/tbb-29/
@@ -1775,7 +1775,7 @@ msgid ""
 "it would load in another browser, this type of behavior can be dangerous and"
 " anonymity-breaking."
 msgstr ""
-"Cela signifie que parfois un site Web se chargerait dans le NavigateurÂ Tor "
+"Cela signifie que parfois un site Web se chargerait dans le NavigateurÂ Tor, "
 "et parfois il se chargerait dans un autre navigateur. Ce genre de "
 "comportement peut Ãªtre dangereux et compromettre lâanonymat."
 

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

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

2019-05-22 Thread translation

commit 19a5d2153c730afa8f8c28e4252aa89ae8b4bf92
Author: Translation commit bot 
Date:   Wed May 22 19:51:03 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 4b06c89b8..3caf53687 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1668,7 +1668,7 @@ msgid ""
 "Other open tabs and windows from the same website will use the new circuit "
 "as well once they are reloaded."
 msgstr ""
-"Les autres onglets et fenÃªtres ouverts du mÃªme site Web utiliseront aussi 
le"
+"Les autres fenÃªtres et onglets ouverts du mÃªme site Web utiliseront aussi 
le"
 " nouveau circuit une fois quâils seront rechargÃ©s."
 
 #: https//support.torproject.org/tbb/tbb-29/
@@ -1775,7 +1775,7 @@ msgid ""
 "it would load in another browser, this type of behavior can be dangerous and"
 " anonymity-breaking."
 msgstr ""
-"Cela signifie que parfois un site Web se chargerait dans le NavigateurÂ Tor "
+"Cela signifie que parfois un site Web se chargerait dans le NavigateurÂ Tor, "
 "et parfois il se chargerait dans un autre navigateur. Ce genre de "
 "comportement peut Ãªtre dangereux et compromettre lâanonymat."
 

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

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

2019-05-22 Thread translation

commit bc57ac6f9c2136cae1a01ebbcb1e679c8c5039b9
Author: Translation commit bot 
Date:   Wed May 22 19:20:56 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index ac1960619..4b06c89b8 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1625,8 +1625,8 @@ msgid ""
 "Tor Browser will warn you that all activity and downloads will be stopped, "
 "so take this into account before clicking \"New Identity\"."
 msgstr ""
-"Le NavigateurÂ Tor vous avertira que tous activitÃ©s et tÃ©lÃ©chargements 
seront"
-" arrÃªtÃ©s, prenez-le donc en compte avant de cliquer sur Â«Â Nouvelle 
IdentitÃ©Â "
+"Le NavigateurÂ Tor vous avertira que tous tÃ©lÃ©chargements et activitÃ© 
seront "
+"arrÃªtÃ©s, prenez-le donc en compte avant de cliquer sur Â«Â Nouvelle 
IdentitÃ©Â "
 "Â»."
 
 #: https//support.torproject.org/tbb/tbb-29/

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

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

2019-05-22 Thread translation

commit cc5940f49aa41a1c67f6825ca14360e7762a3fa7
Author: Translation commit bot 
Date:   Wed May 22 19:20:48 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index ac1960619..4b06c89b8 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1625,8 +1625,8 @@ msgid ""
 "Tor Browser will warn you that all activity and downloads will be stopped, "
 "so take this into account before clicking \"New Identity\"."
 msgstr ""
-"Le NavigateurÂ Tor vous avertira que tous activitÃ©s et tÃ©lÃ©chargements 
seront"
-" arrÃªtÃ©s, prenez-le donc en compte avant de cliquer sur Â«Â Nouvelle 
IdentitÃ©Â "
+"Le NavigateurÂ Tor vous avertira que tous tÃ©lÃ©chargements et activitÃ© 
seront "
+"arrÃªtÃ©s, prenez-le donc en compte avant de cliquer sur Â«Â Nouvelle 
IdentitÃ©Â "
 "Â»."
 
 #: https//support.torproject.org/tbb/tbb-29/

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

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

2019-05-22 Thread translation

commit b5d867bead483a3ee1021adf69d3d1ff27738970
Author: Translation commit bot 
Date:   Wed May 22 19:20:28 2019 +

Update translations for tpo-web_completed
---
 contents+fr.po | 9 +
 1 file changed, 9 insertions(+)

diff --git a/contents+fr.po b/contents+fr.po
index fd6d204d9..c47c8701c 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -521,6 +521,10 @@ msgid ""
 "goal is to continue diversifying our funding. To inquire about sponsorship, "
 "please email giving(at)torproject.org."
 msgstr ""
+"La diversitÃ© de notre parc dâutilisateurs entraÃ®ne la diversitÃ© de nos "
+"sources de financement. Notre objectif est de poursuivre la diversification "
+"de notre financement. Pour toute question sur le mÃ©cÃ©nat, veuillez envoyer "
+"un courriel Ã  lâadresse giving(Ã )torproject.org."
 
 #: https//www.torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrreports.body)
@@ -540,6 +544,11 @@ msgid ""
 "work with a diverse group of bright and passionate folks committed to "
 "fostering internet freedom worldwide."
 msgstr ""
+"Nous sommes toujours Ã  la recherche de personnes brillantes qui voudraient "
+"se joindre Ã  notre Ã©quipe. Joignez-vous Ã  nous dans notre bureau de 
Seattle "
+"ou tÃ©lÃ©travaillez oÃ¹ que vous soyez. Vous collaborerez avec un groupe 
variÃ© "
+"de personnes talentueuses et passionnÃ©es engagÃ©es Ã  favoriser la libertÃ© "
+"dâInternet dans le monde entier."
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)

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

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

2019-05-22 Thread translation

commit 1e6e736b76fcb3b1a3deca5c2c2567b87b45ffb6
Author: Translation commit bot 
Date:   Wed May 22 19:20:22 2019 +

Update translations for tpo-web
---
 contents+fr.po | 9 +
 1 file changed, 9 insertions(+)

diff --git a/contents+fr.po b/contents+fr.po
index fd6d204d9..c47c8701c 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -521,6 +521,10 @@ msgid ""
 "goal is to continue diversifying our funding. To inquire about sponsorship, "
 "please email giving(at)torproject.org."
 msgstr ""
+"La diversitÃ© de notre parc dâutilisateurs entraÃ®ne la diversitÃ© de nos "
+"sources de financement. Notre objectif est de poursuivre la diversification "
+"de notre financement. Pour toute question sur le mÃ©cÃ©nat, veuillez envoyer "
+"un courriel Ã  lâadresse giving(Ã )torproject.org."
 
 #: https//www.torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrreports.body)
@@ -540,6 +544,11 @@ msgid ""
 "work with a diverse group of bright and passionate folks committed to "
 "fostering internet freedom worldwide."
 msgstr ""
+"Nous sommes toujours Ã  la recherche de personnes brillantes qui voudraient "
+"se joindre Ã  notre Ã©quipe. Joignez-vous Ã  nous dans notre bureau de 
Seattle "
+"ou tÃ©lÃ©travaillez oÃ¹ que vous soyez. Vous collaborerez avec un groupe 
variÃ© "
+"de personnes talentueuses et passionnÃ©es engagÃ©es Ã  favoriser la libertÃ© "
+"dâInternet dans le monde entier."
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)

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

[tor-commits] [tor/master] circuitpadding tests: Use tt_i64_op() to compare int64_t values

2019-05-22 Thread nickm

commit fa410162a3309dba31661f7f22c95bbdc3af66a5
Author: Nick Mathewson 
Date:   Wed May 22 15:19:24 2019 -0400

circuitpadding tests: Use tt_i64_op() to compare int64_t values

Bug not in any released Tor.
---
 src/test/test_circuitpadding.c | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c
index ca6543843..1ac2bd676 100644
--- a/src/test/test_circuitpadding.c
+++ b/src/test/test_circuitpadding.c
@@ -1852,21 +1852,21 @@ test_circuitpadding_state_length(void *arg)
   circpad_machine_runtime_t *mi = client_side->padding_info[0];
 
   circpad_cell_event_padding_sent(client_side);
-  tt_int_op(mi->state_length, OP_EQ, 12);
+  tt_i64_op(mi->state_length, OP_EQ, 12);
   tt_ptr_op(mi->histogram, OP_EQ, NULL);
 
   /* Verify that non-padding does not change our state length */
   circpad_cell_event_nonpadding_sent(client_side);
-  tt_int_op(mi->state_length, OP_EQ, 12);
+  tt_i64_op(mi->state_length, OP_EQ, 12);
 
   /* verify that sending padding changes our state length */
   for (uint64_t i = mi->state_length-1; i > 0; i--) {
 circpad_send_padding_cell_for_callback(mi);
-tt_int_op(mi->state_length, OP_EQ, i);
+tt_i64_op(mi->state_length, OP_EQ, i);
   }
   circpad_send_padding_cell_for_callback(mi);
 
-  tt_int_op(mi->state_length, OP_EQ, -1);
+  tt_i64_op(mi->state_length, OP_EQ, -1);
   tt_int_op(mi->current_state, OP_EQ, CIRCPAD_STATE_END);
 
   /* Restart machine */
@@ -1876,16 +1876,16 @@ test_circuitpadding_state_length(void *arg)
   client_machine->states[CIRCPAD_STATE_BURST].length_includes_nonpadding = 1;
 
   circpad_cell_event_padding_sent(client_side);
-  tt_int_op(mi->state_length, OP_EQ, 12);
+  tt_i64_op(mi->state_length, OP_EQ, 12);
 
   /* Verify that non-padding does change our state length now */
   for (uint64_t i = mi->state_length-1; i > 0; i--) {
 circpad_cell_event_nonpadding_sent(client_side);
-tt_int_op(mi->state_length, OP_EQ, i);
+tt_i64_op(mi->state_length, OP_EQ, i);
   }
 
   circpad_cell_event_nonpadding_sent(client_side);
-  tt_int_op(mi->state_length, OP_EQ, -1);
+  tt_i64_op(mi->state_length, OP_EQ, -1);
   tt_int_op(mi->current_state, OP_EQ, CIRCPAD_STATE_END);
 
   /* Now, just test token removal when we send padding */
@@ -1895,7 +1895,7 @@ test_circuitpadding_state_length(void *arg)
   /* Restart machine */
   mi->current_state = CIRCPAD_STATE_START;
   circpad_cell_event_padding_sent(client_side);
-  tt_int_op(mi->state_length, OP_EQ, 12);
+  tt_i64_op(mi->state_length, OP_EQ, 12);
   tt_ptr_op(mi->histogram, OP_NE, NULL);
   tt_int_op(mi->chosen_bin, OP_EQ, 2);
 
@@ -1907,7 +1907,7 @@ test_circuitpadding_state_length(void *arg)
 tt_int_op(mi->histogram[2], OP_EQ, i);
   }
 
-  tt_int_op(mi->state_length, OP_EQ, 7);
+  tt_i64_op(mi->state_length, OP_EQ, 7);
   tt_int_op(mi->histogram[2], OP_EQ, 1);
 
   circpad_send_padding_cell_for_callback(mi);
@@ -3009,15 +3009,15 @@ helper_test_hs_machines(bool test_intro_circs)
   if (test_intro_circs) {
 /* on the client side, we don't send any padding so
  * state length is not set */
-tt_int_op(client_machine_runtime->state_length, OP_EQ, -1);
+tt_i64_op(client_machine_runtime->state_length, OP_EQ, -1);
 /* relay side has state limits. check them */
-tt_int_op(relay_machine_runtime->state_length, OP_GE,
+tt_i64_op(relay_machine_runtime->state_length, OP_GE,
   INTRO_MACHINE_MINIMUM_PADDING);
-tt_int_op(relay_machine_runtime->state_length, OP_LT,
+tt_i64_op(relay_machine_runtime->state_length, OP_LT,
   INTRO_MACHINE_MAXIMUM_PADDING);
   } else {
-tt_int_op(client_machine_runtime->state_length, OP_EQ, 1);
-tt_int_op(relay_machine_runtime->state_length, OP_EQ, 1);
+tt_i64_op(client_machine_runtime->state_length, OP_EQ, 1);
+tt_i64_op(relay_machine_runtime->state_length, OP_EQ, 1);
   }
 
   if (test_intro_circs) {

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

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

2019-05-22 Thread translation

commit 4d12845cec4d3d75d8d1de4edeba8351b8d6abfe
Author: Translation commit bot 
Date:   Wed May 22 18:51:19 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 90e8b9d11..ac1960619 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4218,7 +4218,7 @@ msgstr "## C"
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### CAPTCHA"
-msgstr "### CAPTCHA"
+msgstr "### Captcha"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/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] [translation/support-portal] Update translations for support-portal

2019-05-22 Thread translation

commit 0aaa5bb13fb9ef305962806735ae17431ab55637
Author: Translation commit bot 
Date:   Wed May 22 18:50:49 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 90e8b9d11..ac1960619 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4218,7 +4218,7 @@ msgstr "## C"
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### CAPTCHA"
-msgstr "### CAPTCHA"
+msgstr "### Captcha"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/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] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2019-05-22 Thread translation

commit 6a50fed9a56c4bd21833d5c69970eb787564ed47
Author: Translation commit bot 
Date:   Wed May 22 18:50:04 2019 +

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

diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties
index 59514c160..3392080be 100644
--- a/fr/torlauncher.properties
+++ b/fr/torlauncher.properties
@@ -35,7 +35,7 @@ torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine)
 torlauncher.request_a_bridge=Demander un pontâ¦
 torlauncher.request_a_new_bridge=Demander un nouveau pontâ¦
 torlauncher.contacting_bridgedb=Connexion Ã  BridgeDB. Veuillez patienter.
-torlauncher.captcha_prompt=RÃ©soudre le CAPTCHA pour demander un pont.
+torlauncher.captcha_prompt=RÃ©soudre le captcha pour demander un pont.
 torlauncher.bad_captcha_solution=La solution est erronÃ©e. Veuillez ressayer.
 torlauncher.unable_to_get_bridge=Impossible dâobtenir un pont de 
BridgeDB.\n\n%S
 torlauncher.no_meek=Ce navigateur nâest pas configurÃ© pour meek, qui est 
nÃ©cessaire pour obtenir des ponts.

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

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

2019-05-22 Thread translation

commit bce6110c40cce5b15fdd462b37044aa6d3fcc86b
Author: Translation commit bot 
Date:   Wed May 22 18:49:57 2019 +

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

diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties
index 59514c160..3392080be 100644
--- a/fr/torlauncher.properties
+++ b/fr/torlauncher.properties
@@ -35,7 +35,7 @@ torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine)
 torlauncher.request_a_bridge=Demander un pontâ¦
 torlauncher.request_a_new_bridge=Demander un nouveau pontâ¦
 torlauncher.contacting_bridgedb=Connexion Ã  BridgeDB. Veuillez patienter.
-torlauncher.captcha_prompt=RÃ©soudre le CAPTCHA pour demander un pont.
+torlauncher.captcha_prompt=RÃ©soudre le captcha pour demander un pont.
 torlauncher.bad_captcha_solution=La solution est erronÃ©e. Veuillez ressayer.
 torlauncher.unable_to_get_bridge=Impossible dâobtenir un pont de 
BridgeDB.\n\n%S
 torlauncher.no_meek=Ce navigateur nâest pas configurÃ© pour meek, qui est 
nÃ©cessaire pour obtenir des ponts.

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

[tor-commits] [torspec/master] prop303: Run reindex.py to index it

2019-05-22 Thread dgoulet

commit 4c63907c9206c1361cffa60bf48e1ce83597dd8b
Author: David Goulet 
Date:   Wed May 22 14:46:43 2019 -0400

prop303: Run reindex.py to index it

Signed-off-by: David Goulet 
---
 proposals/000-index.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 5982230..c83a6fd 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -223,6 +223,7 @@ Proposals by number:
 300  Walking Onions: Scaling and Saving Bandwidth [DRAFT]
 301  Don't include package fingerprints in consensus documents [ACCEPTED]
 302  Hiding onion service clients using padding [ACCEPTED]
+303  When and how to remove support for protocol versions [DRAFT]
 
 
 Proposals by status:
@@ -232,6 +233,7 @@ Proposals by status:
273  Exit relay pinning for web services [for n/a]
294  TLS 1.3 Migration
300  Walking Onions: Scaling and Saving Bandwidth
+   303  When and how to remove support for protocol versions
  NEEDS-REVISION:
212  Increase Acceptable Consensus Age [for 0.2.4.x+]
219  Support for full DNS and DNSSEC resolution in Tor [for 0.2.5.x]

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

[tor-commits] [newsletter/master] Add may newsletter

2019-05-22 Thread hiro

commit c6262148a4553ef9b04ff2c38aad31698ec1c570
Author: hiro 
Date:   Wed May 22 20:00:47 2019 +0200

Add may newsletter
---
 .../contents.lr| 158 +
 .../text/contents.lr   |  87 
 2 files changed, 245 insertions(+)

diff --git 
a/content/archive/tor-browser-stable-android-mozilla-research-season-docs-events/contents.lr
 
b/content/archive/tor-browser-stable-android-mozilla-research-season-docs-events/contents.lr
new file mode 100644
index 000..f63d8bb
--- /dev/null
+++ 
b/content/archive/tor-browser-stable-android-mozilla-research-season-docs-events/contents.lr
@@ -0,0 +1,158 @@
+_model: post
+---
+_template: newsletter.html
+---
+author: st...@torproject.org
+---
+pub_date: 2019-05-22
+---
+title: Tor Browser is Stable on Android, Mozilla Research, Season of Docs, 
Events
+---
+html_body:
+
+
+   
+   
+   
+   
+   
+   
+   https://newsletter.torproject.org";>https://blog.torproject.org/sites/default/files/inline-images/tor-news-logo-560.png";
 style="width: 250px; height: 75px;" />
+   
+   
+   
+   
+   
+   
+   
+   
+   

+   

+   

+   

+   
Tor Browser is Stable on Android
+
+   
https://blog.torproject.org/new-release-tor-browser-85";>https://blog.torproject.org/sites/default/files/styles/full_width/public/image/lead%20image%20%402x_0.png?itok=_H_NqtrI";
 style="width: 640px; height: 312px;" />
+
+   
Since we released the https://blog.torproject.org/new-alpha-release-tor-browser-android";>first 
alpha version of Tor Browser for Android in September, we've been hard 
at work making sure we can provide the protections users already enjoying on 
desktop to the Android platform. Mobile browsing is https://www.theguardian.com/technology/2016/nov/02/mobile-web-browsing-desktop-smartphones-tablets";>increasing
 around the world, and in some parts, it is commonly the only way people access 
the internet. In these same areas, there is often heavy surveillance and 
censorship online, so we made it a priority to reach these users with a mobile 
Tor Browser release. The stable version of Tor Browser for Android is now 
available for download from https://play.google.com/store/apps/details?id=org.torproject.torbrowser";>Google
 Play, https://www.f-droid.org/";>F-Droid, and https://torproject.org";>our website.
+
+   
We made sure there are no proxy bypasses, that first-party 
isolation is enabled to protect you from cross-site tracking, and that most of 
the fingerprinting defenses are working. While there are still https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=merge_ready&status=needs_information&status=needs_review&status=needs_revision&status=new&status=reopened&keywords=~tbb-parity&order=priority";>feature
 gaps between the desktop and Android Tor Browser, we are confident that 
Tor Browser for Android provides essentially the same protections that can be 
found on desktop platforms. These protections are unmatched by any 
other browser.
+
+   
https://blog.torproject.org/new-release-tor-browser-85";>https://blog.torproject.org/sites/default/files/inline-images/tba_0.png"; 
style="width: 640px; height: 411px;" />
+
+   
The latest version of Tor Browser across all platforms also 
features UX and branding improvements in line with developments begun last year 
with the release of https://blog.torproject.org/new-release-tor-browser-85";>Tor Browser 
8.
+
+

[tor-commits] [tor/master] More 0.4.1.1-alpha hangelogs edits

2019-05-22 Thread nickm

commit c93ea09d2983c512b6c7688580fd797d60d7d173
Author: Nick Mathewson 
Date:   Wed May 22 13:57:34 2019 -0400

More 0.4.1.1-alpha hangelogs edits

(credit to seborn here)
---
 ChangeLog | 68 +++
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f70ce42a7..cda4c11e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,11 +32,11 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   o Major features (flow control):
 - Implement authenticated SENDMEs as detailed in proposal 289. A
   SENDME cell now includes the digest of the traffic that it
-  acknowledges, so that once end point receives the SENDME, it can
-  confirm the other side's knowledge of the previous cells that were
-  sent, and prevent certain types of denial-of-service attacks. This
-  behavior is controlled by two new consensus parameters: see the
-  proposal for more details. Fixes ticket 26288.
+  acknowledges, so that once an end point receives the SENDME, it
+  can confirm the other side's knowledge of the previous cells that
+  were sent, and prevent certain types of denial-of-service attacks.
+  This behavior is controlled by two new consensus parameters: see
+  the proposal for more details. Fixes ticket 26288.
 
   o Major features (performance):
 - Our node selection algorithm now excludes nodes in linear time.
@@ -54,12 +54,12 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   Implements tickets 29023 and 29536.
 
   o Major bugfixes (onion service v3):
-- Fix an unreachable bug in which an introduction point would could
-  try to send an INTRODUCE_ACK with a status code that Trunnel would
-  refuse to encode, leading the relay to assert(). We've
-  consolidated the ABI values into trunnel now. Fixes bug 30454;
-  bugfix on 0.3.0.1-alpha.
-- Client can now handle unknown status codes from a INTRODUCE_ACK
+- Fix an unreachable bug in which an introduction point could try to
+  send an INTRODUCE_ACK with a status code that Trunnel would refuse
+  to encode, leading the relay to assert(). We've consolidated the
+  ABI values into Trunnel now. Fixes bug 30454; bugfix
+  on 0.3.0.1-alpha.
+- Clients can now handle unknown status codes from INTRODUCE_ACK
   cells. (The NACK behavior will stay the same.) This will allow us
   to extend status codes in the future without breaking the normal
   client behavior. Fixes another part of bug 30454; bugfix
@@ -89,7 +89,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   o Minor features (controller):
 - Add onion service version 3 support to the HSFETCH command.
   Previously, only version 2 onion services were supported. Closes
-  ticket 25417. Patch by Neel Chauhan
+  ticket 25417. Patch by Neel Chauhan.
 
   o Minor features (debugging):
 - Introduce tor_assertf() and tor_assertf_nonfatal() to enable
@@ -109,7 +109,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   cases. Closes ticket 29542.
 
   o Minor features (developer tools):
-- Tor's "practracker" test script nows check for files and functions
+- Tor's "practracker" test script now checks for files and functions
   that seem too long and complicated. Existing overlong functions
   and files are accepted for now, but should eventually be
   refactored. Closes ticket 29221.
@@ -132,7 +132,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   o Minor features (IPv6, v3 onion services):
 - Make v3 onion services put IPv6 addresses in service descriptors.
   Before this change, service descriptors only contained IPv4
-  addressesd. Implements 26992.
+  addresses. Implements 26992.
 
   o Minor features (modularity):
 - The "--disable-module-dirauth" compile-time option now disables
@@ -146,7 +146,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   o Minor features (testing):
 - Tor's unit test code now contains helper functions to replace the
   PRNG with a deterministic or reproducible version for testing.
-  Previously, various tests did implemented this in various ways.
+  Previously, various tests implemented this in various ways.
   Implements ticket 29732.
 - We now have a script, cov-test-determinism.sh, to identify places
   where our unit test coverage has become nondeterministic. Closes
@@ -159,12 +159,12 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   about to dump their status to a file. Previously, they set bridges
   as running in response to a GETINFO command, but those shouldn't
   modify data structures. Fixes bug 24490; bugfix on 0.2.0.13-alpha.
-  Patch by Neel Chauhan
+  Patch by Neel Chauhan.
 
   o Minor bugfixes (channel padding statistics):
 - Channel padding write totals and padding-enabled totals are now
   counted properly in relay extrainfo descriptors. Fixes bug 29231;

[tor-commits] [gettor/master] Fixing differences between language codes and locales

2019-05-22 Thread hiro

commit 1089ebf1cd3af9ab83bd3fa64cca981b53a7b2c0
Author: hiro 
Date:   Wed May 22 19:44:19 2019 +0200

Fixing differences between language codes and locales
---
 gettor/services/email/sendmail.py | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gettor/services/email/sendmail.py 
b/gettor/services/email/sendmail.py
index 28d9b2d..52b50f5 100644
--- a/gettor/services/email/sendmail.py
+++ b/gettor/services/email/sendmail.py
@@ -157,30 +157,34 @@ class Sendmail(object):
 
 for request in link_requests:
 id = request[0]
-date = request[4]
+date = request[5]
 platform = request[2]
 language = request[3]
 
 if not language:
 language = 'en'
 
+locales = { 'en': 'en-US',
+'es': 'es-ES',
+'pt': 'pt-BR'}
 strings.load_strings(language)
+locale = locales[language]
 
 log.info("Getting links for {}.".format(platform))
 links = yield self.conn.get_links(
-platform=platform, language=language, status="ACTIVE"
+platform=platform, language=locale, status="ACTIVE"
 )
 
 # build message
 link_msg = None
 for link in links:
-provider = link[4]
-version = link[3]
-arch = link[2]
+provider = link[5]
+version = link[4]
+arch = link[3]
 url = link[0]
 
-link_str = "Tor Browser {} for {}-{} ({}): {}".format(
-version, platform, arch, provider, url
+link_str = "Tor Browser {} for {}-{}-{} ({}): 
{}".format(
+version, platform, locale, arch, provider, url
 )
 
 if link_msg:

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

[tor-commits] [gettor/master] Load default locale

2019-05-22 Thread hiro

commit 08bfed35889ad59fe99b4a5646e229439ad976ce
Author: hiro 
Date:   Wed May 22 19:27:17 2019 +0200

Load default locale
---
 gettor/services/email/sendmail.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/gettor/services/email/sendmail.py 
b/gettor/services/email/sendmail.py
index a350909..28d9b2d 100644
--- a/gettor/services/email/sendmail.py
+++ b/gettor/services/email/sendmail.py
@@ -160,6 +160,10 @@ class Sendmail(object):
 date = request[4]
 platform = request[2]
 language = request[3]
+
+if not language:
+language = 'en'
+
 strings.load_strings(language)
 
 log.info("Getting links for {}.".format(platform))

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

[tor-commits] [gettor/master] Fix load locales

2019-05-22 Thread hiro

commit 80673c53a72dd310d14ac5c5c10fc10c96f8275d
Author: hiro 
Date:   Wed May 22 19:22:51 2019 +0200

Fix load locales
---
 gettor/utils/strings.py | 12 +++-
 tests/test_locales.py   |  4 
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gettor/utils/strings.py b/gettor/utils/strings.py
index 6b3a1d7..1538fe4 100644
--- a/gettor/utils/strings.py
+++ b/gettor/utils/strings.py
@@ -92,22 +92,24 @@ def get_locales():
 locales = json.load(f)
 return locales
 
-def load_strings(current_locale='en'):
+def load_strings(current_locale):
 """
 Loads translated strings and fallback to English
 if the translation does not exist.
 """
 global strings, translations
 
+
 # Load all translations
 translations = {}
 available_locales = get_locales()
 
-for locale in available_locales:
+if current_locale not in available_locales:
+current_locale = "en"
 
-filename = get_resource_path("{}.json".format(locale), 
'../share/locale')
-with open(filename, encoding='utf-8') as f:
-translations[locale] = json.load(f)
+filename = get_resource_path("{}.json".format(current_locale), 
'../share/locale')
+with open(filename, encoding='utf-8') as f:
+translations[current_locale] = json.load(f)
 
 strings = {}
 for s in translations[current_locale]:
diff --git a/tests/test_locales.py b/tests/test_locales.py
index cc43485..39cdac5 100644
--- a/tests/test_locales.py
+++ b/tests/test_locales.py
@@ -25,6 +25,10 @@ class EmailServiceTests(unittest.TestCase):
 conftests.strings.load_strings("en")
 self.assertEqual(conftests.strings._("smtp_mirrors_subject"), 
"[GetTor] Mirrors")
 
+def test_load_default_strings(self):
+conftests.strings.load_strings(None)
+self.assertEqual(conftests.strings._("smtp_mirrors_subject"), 
"[GetTor] Mirrors")
+
 def test_load_es_strings(self):
 conftests.strings.load_strings("es")
 self.assertEqual(conftests.strings._("smtp_help_subject"), "[GetTor] 
Ayuda")

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

[tor-commits] [gettor/master] Assign default locale

2019-05-22 Thread hiro

commit a80ed49f437b03aacc7be4f23da3dd9b9e469b55
Author: hiro 
Date:   Wed May 22 19:18:25 2019 +0200

Assign default locale
---
 gettor/utils/strings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gettor/utils/strings.py b/gettor/utils/strings.py
index 2c7488c..6b3a1d7 100644
--- a/gettor/utils/strings.py
+++ b/gettor/utils/strings.py
@@ -92,7 +92,7 @@ def get_locales():
 locales = json.load(f)
 return locales
 
-def load_strings(current_locale):
+def load_strings(current_locale='en'):
 """
 Loads translated strings and fallback to English
 if the translation does not exist.
@@ -112,7 +112,7 @@ def load_strings(current_locale):
 strings = {}
 for s in translations[current_locale]:
 strings[s] = translations[current_locale][s]
-
+
 
 
 def translated(k):

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

[tor-commits] [gettor/master] Update locales and tests

2019-05-22 Thread hiro

commit d43b45aff04a86f40fb3e7feab604ab7942ca588
Author: hiro 
Date:   Wed May 22 19:14:48 2019 +0200

Update locales and tests
---
 gettor/parse/email.py   |  2 +-
 gettor/utils/strings.py | 13 -
 share/locale/es.json|  2 +-
 tests/conftests.py  |  1 +
 tests/test_locales.py   | 33 +
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/gettor/parse/email.py b/gettor/parse/email.py
index 6518946..7a88f70 100644
--- a/gettor/parse/email.py
+++ b/gettor/parse/email.py
@@ -154,7 +154,7 @@ class EmailParser(object):
 request["command"] = "help"
 break
 
-if not request["command"] and not request["language"]:
+if not request["command"] or not request["language"]:
 for word in re.split(r"\s+", msg_str.strip()):
 if word.lower() in languages:
 request["language"] = word.lower()
diff --git a/gettor/utils/strings.py b/gettor/utils/strings.py
index 5231dc7..2c7488c 100644
--- a/gettor/utils/strings.py
+++ b/gettor/utils/strings.py
@@ -85,7 +85,7 @@ def get_locales():
 """
 Get available_locales
 """
-
+
 filename = get_resource_path("available_locales.json", '../share/locale')
 locales = {}
 with open(filename, encoding='utf-8') as f:
@@ -109,15 +109,10 @@ def load_strings(current_locale):
 with open(filename, encoding='utf-8') as f:
 translations[locale] = json.load(f)
 
-# Build strings
-default_locale = 'en'
-
 strings = {}
-for s in translations[default_locale]:
-if s in translations[current_locale] and 
translations[current_locale][s] != "":
-strings[s] = translations[current_locale][s]
-else:
-strings[s] = translations[default_locale][s]
+for s in translations[current_locale]:
+strings[s] = translations[current_locale][s]
+
 
 
 def translated(k):
diff --git a/share/locale/es.json b/share/locale/es.json
index 3006c7c..f424b33 100644
--- a/share/locale/es.json
+++ b/share/locale/es.json
@@ -7,7 +7,7 @@
   "help_config": "Custom config file location (optional)",
   "smtp_links_subject": "[GetTor] Links for your request",
   "smtp_mirrors_subject": "[GetTor] Mirrors",
-  "smtp_help_subject": "[GetTor] Help",
+  "smtp_help_subject": "[GetTor] Ayuda",
   "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale",
   "smtp_unsupported_locale_msg": "The locale you requested '{}' is not 
supported.",
   "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only 
one of the links below to download the bundle. If a link does not work for you, 
try the next one.\n\n{}\n\n \n--\nGetTor",
diff --git a/tests/conftests.py b/tests/conftests.py
index 206b2f4..eaf1098 100644
--- a/tests/conftests.py
+++ b/tests/conftests.py
@@ -3,5 +3,6 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 from gettor.utils import options
+from gettor.utils import strings
 from gettor.services.email import sendmail
 from gettor.parse.email import EmailParser, AddressError, DKIMError
diff --git a/tests/test_locales.py b/tests/test_locales.py
new file mode 100644
index 000..cc43485
--- /dev/null
+++ b/tests/test_locales.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+import pytest
+from twisted.trial import unittest
+from twisted.internet import defer, reactor
+from twisted.internet import task
+
+from . import conftests
+
+class EmailServiceTests(unittest.TestCase):
+
+# Fail any tests which take longer than 15 seconds.
+timeout = 15
+def setUp(self):
+self.settings = conftests.options.parse_settings()
+self.locales = conftests.strings.get_locales()
+
+
+def tearDown(self):
+print("tearDown()")
+
+def test_get_available_locales(self):
+self.assertEqual({"en": "English", "es": "EspaÃ±ol", "pt": "PortuguÃªs 
Brasil"}, self.locales)
+
+def test_load_en_strings(self):
+conftests.strings.load_strings("en")
+self.assertEqual(conftests.strings._("smtp_mirrors_subject"), 
"[GetTor] Mirrors")
+
+def test_load_es_strings(self):
+conftests.strings.load_strings("es")
+self.assertEqual(conftests.strings._("smtp_help_subject"), "[GetTor] 
Ayuda")
+
+if __name__ == "__main__":
+unittest.main()

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

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

2019-05-22 Thread translation

commit 3d3c54174e587a2aeda20cecaf1e83a68626214f
Author: Translation commit bot 
Date:   Wed May 22 16:47:48 2019 +

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

diff --git a/fr/torbrowser_strings.dtd b/fr/torbrowser_strings.dtd
index 41eae78cc..153469d97 100644
--- a/fr/torbrowser_strings.dtd
+++ b/fr/torbrowser_strings.dtd
@@ -56,4 +56,4 @@
 
 
 
-
+

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

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

2019-05-22 Thread translation

commit 66fd59b7c79e765491c8bcf05b0f43f5d1fdc11a
Author: Translation commit bot 
Date:   Wed May 22 16:47:40 2019 +

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

diff --git a/fr/torbrowser_strings.dtd b/fr/torbrowser_strings.dtd
index 41eae78cc..153469d97 100644
--- a/fr/torbrowser_strings.dtd
+++ b/fr/torbrowser_strings.dtd
@@ -56,4 +56,4 @@
 
 
 
-
+

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

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

2019-05-22 Thread translation

commit c08a9982d10baf85f31e173e8eff16e23aff5f9c
Author: Translation commit bot 
Date:   Wed May 22 16:20:10 2019 +

Update translations for tor-launcher-properties
---
 ar/torlauncher.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/torlauncher.properties b/ar/torlauncher.properties
index 8f405cf17..b1e5c60ea 100644
--- a/ar/torlauncher.properties
+++ b/ar/torlauncher.properties
@@ -58,7 +58,7 @@ torlauncher.bootstrapStatus.conn_done_pt=ÙØªÙ 
Ø§ÙØ¥ØªØµØ§Ù ÙØ¹ Ø¬ÙØ³ÙØ±
 torlauncher.bootstrapStatus.conn_proxy=ÙØªÙ Ø§ÙØªÙØ§ØµÙ ÙØ¹ Ø§ÙÙÙÙÙ
 torlauncher.bootstrapStatus.conn_done_proxy=ÙØªÙ Ø§ÙØªÙØ§ØµÙ ÙØ¹ 
Ø§ÙÙÙÙÙ
 torlauncher.bootstrapStatus.conn=ÙØªÙ Ø§ÙØ¥ØªØµØ§Ù Ø¨ÙØ±ØÙ ØªÙØ±
-torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay
+torlauncher.bootstrapStatus.conn_done=ÙØªØµÙ Ø¨ÙÙØ±ØÙÙ ØªÙØ±
 torlauncher.bootstrapStatus.handshake=ÙØªÙ Ø§ÙØªÙØ§ÙØ¶ ÙØ¹ ÙØ±ØÙ 
ØªÙØ±
 torlauncher.bootstrapStatus.handshake_done=ØªÙ Ø¥ÙØªÙØ§Ø¡ Ø§ÙØªÙØ§ÙØ¶ Ù
Ø¹ ÙØ±ØÙ ØªÙØ±
 torlauncher.bootstrapStatus.onehop_create=ÙÙØ´Ø¦ Ø§ØªØµØ§ÙØ§ ÙØ´ÙØ±Ø§ 
Ø¨Ø§ÙØ¯ÙÙÙ
@@ -73,7 +73,7 @@ torlauncher.bootstrapStatus.ap_conn_done_pt=Ø¨ÙØ§Ø¡ 
Ø¯Ø§Ø±Ø§Øª : ÙØªÙ Ø§ÙØ¥
 torlauncher.bootstrapStatus.ap_conn_proxy=Ø¨ÙØ§Ø¡ Ø¯Ø§Ø±Ø§Øª : ÙØªÙ 
Ø§ÙØªÙØ§ØµÙ ÙØ¹ Ø§ÙÙÙÙÙ
 torlauncher.bootstrapStatus.ap_conn_done_proxy=Ø¨ÙØ§Ø¡ Ø¯Ø§Ø±Ø§Øª : ÙØªÙ 
Ø§ÙØªÙØ§ØµÙ ÙØ¹ Ø§ÙÙÙÙÙ 
 torlauncher.bootstrapStatus.ap_conn=Ø¨ÙØ§Ø¡ Ø¯Ø§Ø±Ø§Øª : ÙØªÙ 
Ø§ÙØ¥ØªØµØ§Ù Ø¨ÙØ±ØÙ ØªÙØ± 
-torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor 
relay
+torlauncher.bootstrapStatus.ap_conn_done=Ø¨ÙØ§Ø¡ Ø§ÙØ¯Ø§Ø±Ø§Øª : ÙØªØµÙ 
Ø¨ÙÙØ±ØÙÙ ØªÙØ± 
 torlauncher.bootstrapStatus.ap_handshake= Ø¨ÙØ§Ø¡ Ø¯Ø§Ø±Ø§Øª : ÙØªÙ 
Ø§ÙØªÙØ§ÙØ¶ ÙØ¹ ÙØ±ØÙ ØªÙØ±
 torlauncher.bootstrapStatus.ap_handshake_done= Ø¨ÙØ§Ø¡ Ø¯Ø§Ø±Ø§Øª : ØªÙ 
Ø¥ÙØªÙØ§Ø¡ Ø§ÙØªÙØ§ÙØ¶ ÙØ¹ ÙØ±ØÙ ØªÙØ± 
 torlauncher.bootstrapStatus.circuit_create= Ø¨ÙØ§Ø¡ Ø¯Ø§Ø±Ø§Øª : ÙÙØ´Ø¦ 
Ø¯Ø§Ø¦Ø±Ø© ØªÙØ± 

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

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

2019-05-22 Thread translation

commit d85e23f0b194205903ddbf506273552039a84dae
Author: Translation commit bot 
Date:   Wed May 22 16:20:16 2019 +

Update translations for tor-launcher-properties_completed
---
 ar/torlauncher.properties | 94 +++
 1 file changed, 94 insertions(+)

diff --git a/ar/torlauncher.properties b/ar/torlauncher.properties
new file mode 100644
index 0..b1e5c60ea
--- /dev/null
+++ b/ar/torlauncher.properties
@@ -0,0 +1,94 @@
+### Copyright (c) 2016, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+torlauncher.error_title=ÙÙØ´ØºÙ ØªÙØ±
+
+torlauncher.tor_exited_during_startup=ØªÙÙÙ ØªÙØ± Ø£Ø«ÙØ§Ø¡ Ø¨Ø¯Ø¡ 
ØªØ´ØºÙÙÙ. ÙØ¯ ÙÙÙÙ ÙØ°Ø§ Ø¨Ø³Ø¨Ø¨ Ø®Ø·Ø£ ÙÙ ÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª 
ØªÙØ±Ø Ø£Ù ÙØ´ÙÙØ© ÙÙ ØªÙØ± ÙÙØ³Ù Ø£Ù  Ø¨Ø±ÙØ§ÙØ¬ Ø¢Ø®Ø± Ø¹ÙÙ 
ÙØ¸Ø§ÙÙØ Ø£Ù Ø¨Ø³Ø¨Ø¨ ÙØ´ÙÙØ© ÙÙ Ø¹ØªØ§Ø¯ Ø¬ÙØ§Ø²Ù. Ø¨Ø¯ÙÙ 
Ø¥ØµÙØ§Ø Ø§ÙÙØ´ÙÙØ© Ø§ÙØÙÙÙÙØ© ÙØ¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙÙ ØªÙØ± ÙÙ 
ÙØ¹ÙÙ ÙØªØµÙØ ØªÙØ±.
+torlauncher.tor_exited=ØªÙÙÙ ØªÙØ± Ø£Ø«ÙØ§Ø¡ Ø¨Ø¯Ø¡ ØªØ´ØºÙÙÙ. ÙØ¯ 
ÙÙÙÙ ÙØ°Ø§ Ø¨Ø³Ø¨Ø¨ Ø®Ø·Ø£ ÙÙ ÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙØ±Ø Ø£Ù Ù
Ø´ÙÙØ© ÙÙ ØªÙØ± ÙÙØ³Ù Ø£Ù Ø¨Ø±ÙØ§ÙØ¬ Ø¢Ø®Ø± Ø¹ÙÙ ÙØ¸Ø§ÙÙØ Ø£Ù 
Ø¨Ø³Ø¨Ø¨ ÙØ´ÙÙØ© ÙÙ Ø¹ØªØ§Ø¯ Ø¬ÙØ§Ø²Ù. Ø¨Ø¯ÙÙ Ø¥ØµÙØ§Ø Ø§ÙÙ
Ø´ÙÙØ© Ø§ÙØÙÙÙÙØ© ÙØ¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙÙ ØªÙØ± ÙÙ ÙØ¹ÙÙ Ù
ØªØµÙØ ØªÙØ±. Ø¥Ø°Ø§ Ø§Ø³ØªÙØ±Øª Ø§ÙÙØ´ÙÙØ©Ø ÙØ±Ø¬Ù Ø¥Ø±Ø³Ø§Ù 
ÙØ³Ø®Ø© ÙÙ Ø³Ø¬Ù ØªÙØ± Ø¥ÙÙ ÙØ±ÙÙ Ø§ÙØ¯Ø¹Ù.
+torlauncher.tor_exited2=Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙÙ ØªÙØ± ÙØ§ ÙØºÙÙ Ø£ÙØ³ÙØ© 
Ø§ÙÙØªØµÙØ.
+torlauncher.tor_controlconn_failed=ØªØ¹Ø°Ø± Ø§ÙØ§ØªØµØ§Ù Ø¨ÙÙÙØ° 
Ø§ÙØªØÙÙ Ø§ÙØ®Ø§Øµ Ø¨ØªÙØ±.
+torlauncher.tor_failed_to_start=ØªÙØ± ÙØ´Ù ÙÙ Ø¨Ø¯Ø¡ Ø§ÙØªØ´ØºÙÙ.
+torlauncher.tor_control_failed=ØªØ¹Ø°Ø± Ø§ÙØªØÙÙ ÙÙ ØªÙØ±.
+torlauncher.tor_bootstrap_failed=ÙØ´Ù ØªÙØ± ÙÙ Ø¥ÙØ´Ø§Ø¡ Ø§ØªØµØ§Ù 
Ø¨Ø´Ø¨ÙØ© ØªÙØ±.
+torlauncher.tor_bootstrap_failed_details=%1$S  ÙØ´Ù(%2$S).
+
+torlauncher.unable_to_start_tor=ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ Ø¨Ø¯Ø¡ ØªØ´ØºÙÙ 
ØªÙØ±.\n\n%S
+torlauncher.tor_missing=Ø§ÙÙÙÙ Ø§ÙØªÙÙÙØ°Ù ÙØªÙØ± ÙÙÙÙØ¯.
+torlauncher.torrc_missing=ÙÙÙ torrc ØºÙØ± ÙÙØ¬ÙØ¯ ÙØªØ¹Ø°ÙØ± 
Ø¥ÙØ´Ø§Ø¤Ù. 
+torlauncher.datadir_missing=Ø¯ÙÙÙ Ø¨ÙØ§ÙØ§Øª ØªÙØ± ØºÙØ± ÙÙØ¬ÙØ¯ 
ÙØªØ¹Ø°ÙØ± Ø¥ÙØ´Ø§Ø¤Ù.
+torlauncher.password_hash_missing=ÙØ´Ù ÙÙ Ø§ÙØØµÙÙ Ø¹ÙÙ ÙÙÙØ© 
Ø§ÙÙØ±ÙØ± Ø§ÙÙØ¬Ø²Ø£Ø©.
+
+torlauncher.failed_to_get_settings=ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ Ø¬ÙØ¨ 
Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙØ±.\n\n%S
+torlauncher.failed_to_save_settings=ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ ØÙØ¸ 
Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙØ±.\n\n%S
+torlauncher.ensure_tor_is_running=Ø§ÙØ±Ø¬Ø§Ø¡ Ø§ÙØªØ£ÙØ¯ Ø£Ù ØªÙØ± ÙØ¹Ù
Ù.
+
+torlauncher.error_proxy_addr_missing=ÙÙ Ø§ÙØ¶Ø±ÙØ±Ù ØªØØ¯ÙØ¯ ÙÙ ÙÙ 
Ø¹ÙÙØ§Ù Ø§ÙØ§ÙØªØ±ÙØª IP Ø£Ù Ø¹ÙÙØ§Ù ÙØ³ØªØ¶ÙÙ ÙØ§ØØ¯ Ù Ù
ÙÙØ° ÙØ°ÙÙ ÙØªÙÙØ¦Ø© ØªÙØ± ÙØ£Ø³ØªØ®Ø¯Ø§Ù Ø¨Ø±ÙÙØ³Ù ØØªÙ 
ÙØ³ØªØ·ÙØ¹ Ø§ÙÙØµÙÙ Ø¥ÙÙ Ø´Ø¨ÙØ© Ø§ÙØ§ÙØªØ±ÙØª. 
+torlauncher.error_proxy_type_missing=ÙÙ Ø§ÙØ¶Ø±ÙØ±Ù ØªØØ¯ÙØ¯ ÙÙØ¹ 
Ø§ÙØ¨Ø±ÙÙØ³Ù.
+torlauncher.error_bridges_missing=ÙÙ Ø§ÙØ¶Ø±ÙØ±Ù ØªØØ¯ÙØ¯ Ø¬Ø³Ø± 
ÙØ§ØØ¯ Ø£Ù Ø£ÙØ«Ø±.
+torlauncher.error_default_bridges_type_missing=ÙØ¬Ø¨ Ø¹ÙÙÙ ØªØØ¯ÙØ¯ 
ÙÙØ¹ Ø§ÙØ¬Ø³ÙØ± Ø§ÙÙÙØ¯ÙØ© ÙØ¹ Ø§ÙÙØªØµÙØ.
+torlauncher.error_bridgedb_bridges_missing=ÙÙØ±Ø¬Ù Ø·ÙØ¨ Ø¬Ø³Ø±.
+torlauncher.error_bridge_bad_default_type=ÙØ°Ø§ Ø§ÙÙÙØ¹ ØºÙØ± ÙØªÙÙØ± 
Ø¨Ø¯Ø§Ø®Ù Ø§ÙØ¬Ø³ÙØ± Ø§ÙÙÙØ¯ÙØ© ÙØ¹ Ø§ÙÙØªØµÙØ. Ø§ÙØ±Ø¬Ø§Ø¡ 
ØªØ¹Ø¯ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ.
+
+torlauncher.bridge_suffix.meek-amazon=(ÙØ¹ÙÙ ÙÙ Ø§ÙØµÙÙ)
+torlauncher.bridge_suffix.meek-azure=(ÙØ¹ÙÙ ÙÙ Ø§ÙØµÙÙ)
+
+torlauncher.request_a_bridge=Ø§Ø·ÙØ¨ Ø¬Ø³Ø±Ø§â¦
+torlauncher.request_a_new_bridge=Ø§Ø·ÙØ¨ Ø¬Ø³Ø±Ø§ Ø¬Ø¯ÙØ¯Ø§â¦
+torlauncher.contacting_bridgedb=ÙØªØµÙ Ø¨ÙØ§Ø¹Ø¯Ø© Ø¨ÙØ§ÙØ§Øª 
Ø§ÙØ¬Ø³ÙØ± BridgeDB. ÙÙØ±Ø¬Ù Ø§ÙØ§ÙØªØ¸Ø§Ø±.
+torlauncher.captcha_prompt=ØÙ ÙØ§Ø¨Ø§ØªØ´Ø§ ÙØ·ÙØ¨ Ø¬Ø³Ø±.
+torlauncher.bad_captcha_solution=Ø§ÙØÙ ÙÙØ³ Ø³ÙÙÙÙØ§. ÙÙØ±Ø¬Ù 
Ø¥Ø¹Ø§Ø¯Ø© Ø§ÙÙØØ§ÙÙØ©.
+torlauncher.unable_to_get_bridge=ØªØ¹Ø°ÙØ± Ø¬ÙØ¨ Ø¬Ø³Ø± ÙÙ ÙØ§Ø¹Ø¯Ø© 
Ø¨ÙØ§ÙØ§Øª Ø§ÙØ¬Ø³ÙØ± BridgeDB.\n\n%S
+torlauncher.no_meek=ÙÙØ³ Ø§ÙÙØªØµÙØ ÙØ¹Ø¯ÙØ§ ÙÙØ³ØªØ®Ø¯Ù meekØ 
ÙÙÙ Ø£Ø³Ø§Ø³Ù ÙÙØØµÙÙ Ø¹ÙÙ Ø§ÙØ¬Ø³ÙØ±.
+torlauncher.no_bridges_available=Ø§ÙÙØ¹Ø°Ø±Ø©. ÙØ§ ØªØªÙÙØ± Ø£ÙØ© 
Ø¬Ø³ÙØ± ØØ§ÙÙØ§.
+
+torlauncher.connect=Ø§ØªØµÙ
+torlauncher.restart_tor=Ø£Ø¹ÙØ¯ ØªØ´ØºÙÙ ØªÙØ±
+torlauncher.quit=Ø¥ÙÙØ§Ø¡
+torlauncher.quit_win=Ø®Ø±ÙØ¬
+torlauncher.done=ØªÙ
+
+torlauncher.forAssistance=ÙÙÙØ³Ø§Ø¹Ø¯Ø©, Ø§ØªØµÙ Ø¨Ù %S
+torlauncher.forAssistance2=ÙÙÙÙØ³Ø§Ø¹Ø¯Ø©, ÙÙÙ Ø¨Ø²ÙØ§Ø±Ø© S%
+
+torlauncher.copiedNLogMessages=ØªÙ Ø§ÙÙØ³Ø®. %S ÙÙ Ø±Ø³Ø§Ø¦Ù Ø³Ø¬Ù 
ØªÙØ± Ø¬Ø§ÙØ²Ø© ÙÙØµÙÙØ§ ÙÙ ÙØØ±Ø± ÙØµÙØµ Ø£Ù Ø±Ø³Ø§ÙØ© Ø¨Ø±ÙØ

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

2019-05-22 Thread translation

commit 5cf891fa6444759ffb4da741e09adaf9ac3c13f3
Author: Translation commit bot 
Date:   Wed May 22 16:19:45 2019 +

Update translations for torbutton-securitylevelproperties
---
 ar/securitylevel.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/securitylevel.properties b/ar/securitylevel.properties
index 482e6ca94..3ddca80ae 100644
--- a/ar/securitylevel.properties
+++ b/ar/securitylevel.properties
@@ -2,7 +2,7 @@ securityLevel.securityLevel = ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù
 securityLevel.customWarning = ÙØ®ØµØµ
 securityLevel.overview = Disable certain web features that can be used to 
attack your security and anonymity.
 securityLevel.standard.level = Ø¹Ø§Ø¯Ù
-securityLevel.standard.tooltip = Security Level : Standard
+securityLevel.standard.tooltip = ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù: ÙÙØ§Ø³Ù
 securityLevel.standard.summary = ÙÙ Ø®ØµØ§Ø¦Øµ ÙØªØµÙØ ØªÙØ± ÙÙ
ÙØ§ÙØ¹ Ø§ÙÙØ¨ ÙÙØ¹ÙØ©
 securityLevel.safer.level = Ø¢ÙÙÙ
 securityLevel.safer.tooltip = ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù: Ø¢ÙÙ

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

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

2019-05-22 Thread translation

commit 417ad24791ce15da5e0ddcf609ed09a7ccf1cadb
Author: Translation commit bot 
Date:   Wed May 22 16:19:33 2019 +

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

diff --git a/ar/browserOnboarding.properties b/ar/browserOnboarding.properties
index 5754cc991..996d081ca 100644
--- a/ar/browserOnboarding.properties
+++ b/ar/browserOnboarding.properties
@@ -47,7 +47,7 @@ onboarding.tour-tor-update.prefix-new=Ø¬Ø¯ÙØ¯
 onboarding.tour-tor-update.prefix-updated=ØªØØ¯ÙØ«
 
 onboarding.tour-tor-toolbar=Ø´Ø±ÙØ· Ø§ÙØ£Ø¯ÙØ§Øª
-onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout
+onboarding.tour-tor-toolbar-update-8.5.title=ÙØ³Ù Ø´Ø±ÙØ· Ø§ÙØ£Ø¯ÙØ§Øª
 onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser 
toolbar layout. We moved the Torbutton icon after the URL bar, and we added a 
security level icon next to it.
 onboarding.tour-tor-toolbar-update-8.5.next-button=Ø§ÙØ§ÙØªÙØ§Ù Ø¥ÙÙ 
Ø§ÙØ£ÙØ§Ù
 

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

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

2019-05-22 Thread translation

commit e9c56cbb9ae6eb9112e59b73db44c78acb111f3a
Author: Translation commit bot 
Date:   Wed May 22 16:17:42 2019 +

Update translations for tba-torbrowserstringsdtd
---
 ar/torbrowser_strings.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/torbrowser_strings.dtd b/ar/torbrowser_strings.dtd
index c65047424..549e7037d 100644
--- a/ar/torbrowser_strings.dtd
+++ b/ar/torbrowser_strings.dtd
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 

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

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

2019-05-22 Thread translation

commit 7d857962083722caa831883e81ff77e737933bf8
Author: Translation commit bot 
Date:   Wed May 22 16:15:57 2019 +

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

diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd
index 622728296..cc7c3cc1c 100644
--- a/ar/https-everywhere.dtd
+++ b/ar/https-everywhere.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [gettor/master] Add updates for db connections

2019-05-22 Thread hiro

commit 3726d31b4ec2fb51006b1bca9c78ad76443d2d97
Author: hiro 
Date:   Wed May 22 18:09:10 2019 +0200

Add updates for db connections
---
 gettor/utils/db.py  | 8 
 tests/test_email_service.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gettor/utils/db.py b/gettor/utils/db.py
index 8d65f45..73610ed 100644
--- a/gettor/utils/db.py
+++ b/gettor/utils/db.py
@@ -45,7 +45,7 @@ class SQLite3(object):
"""
Perform a new request to the database
"""
-   query = "INSERT INTO requests VALUES(?, ?, ?, ?, ?, ?)"
+   query = "INSERT INTO requests VALUES(?, ?, ?, ?, ?, ?, ?)"
 
return self.dbpool.runQuery(
query, (id, command, platform, language, service, date, 
status)
@@ -96,11 +96,11 @@ class SQLite3(object):
query, (now_str,platform, command, service, now_str)

).addCallback(self.query_callback).addErrback(self.query_errback)
 
-   def get_links(self, platform, status):
+   def get_links(self, platform, language, status):
"""
Get links from the database per platform
"""
-   query = "SELECT * FROM links WHERE platform=? AND status=?"
+   query = "SELECT * FROM links WHERE platform=? AND language=? 
AND status=?"
return self.dbpool.runQuery(
-   query, (platform, status)
+   query, (platform, language, status)

).addCallback(self.query_callback).addErrback(self.query_errback)
diff --git a/tests/test_email_service.py b/tests/test_email_service.py
index a4a7405..9abef57 100644
--- a/tests/test_email_service.py
+++ b/tests/test_email_service.py
@@ -27,7 +27,7 @@ class EmailServiceTests(unittest.TestCase):
 
 def test_language_email_parser(self):
 ep = conftests.EmailParser(self.settings, "get...@torproject.org")
-request = ep.parse("From: \"silvia [hiro]\" \n 
Subject: osx en\r\n Reply-To: h...@torproject.org \nTo: get...@torproject.org\n 
osx English")
+request = ep.parse("From: \"silvia [hiro]\" \n 
Subject: \r\n Reply-To: h...@torproject.org \nTo: get...@torproject.org\n osx 
en")
 self.assertEqual(request["command"], "links")
 self.assertEqual(request["platform"], "osx")
 self.assertEqual(request["language"], "en")

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

[tor-commits] [tor/master] Bump to 0.4.1.1-alpha

2019-05-22 Thread nickm

commit 3a7ed8bc5f2cd1b6665510fcebf9c57829608e81
Author: Nick Mathewson 
Date:   Wed May 22 11:56:02 2019 -0400

Bump to 0.4.1.1-alpha
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e65e960d7..9460ae637 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.0-alpha-dev])
+AC_INIT([tor],[0.4.1.1-alpha])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-02-19"], # for 0.4.1.0-alpha-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-22"], # for 0.4.1.1-alpha
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 419b5aa58..7694a4d37 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.0-alpha-dev"
+!define VERSION "0.4.1.1-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 892531ceb..5cf0b1eb0 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.0-alpha-dev"
+#define VERSION "0.4.1.1-alpha"
 
 
 



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

[tor-commits] [tor/master] Fold last entry into changelog

2019-05-22 Thread nickm

commit fa57b6cfb0bfd0287530f04f7476d279d9f70006
Author: Nick Mathewson 
Date:   Wed May 22 12:00:20 2019 -0400

Fold last entry into changelog
---
 ChangeLog   | 14 +-
 changes/ticket30454 | 10 --
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3562bf6a..f70ce42a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.1.1-alpha - 2019-05-??
+Changes in version 0.4.1.1-alpha - 2019-05-22
   This is the first alpha in the 0.4.1.x series. It introduces
   lightweight circuit padding to make some onion-service circuits harder
   to distinguish, includes a new "authenticated SENDME" feature to make
@@ -53,6 +53,18 @@ Changes in version 0.4.1.1-alpha - 2019-05-??
   strong, we are only using it when necessary for performance.
   Implements tickets 29023 and 29536.
 
+  o Major bugfixes (onion service v3):
+- Fix an unreachable bug in which an introduction point would could
+  try to send an INTRODUCE_ACK with a status code that Trunnel would
+  refuse to encode, leading the relay to assert(). We've
+  consolidated the ABI values into trunnel now. Fixes bug 30454;
+  bugfix on 0.3.0.1-alpha.
+- Client can now handle unknown status codes from a INTRODUCE_ACK
+  cells. (The NACK behavior will stay the same.) This will allow us
+  to extend status codes in the future without breaking the normal
+  client behavior. Fixes another part of bug 30454; bugfix
+  on 0.3.0.1-alpha.
+
   o Minor features (circuit padding):
 - We now use a fast PRNG when scheduling circuit padding. Part of
   ticket 28636.
diff --git a/changes/ticket30454 b/changes/ticket30454
deleted file mode 100644
index 77c45d0fe..0
--- a/changes/ticket30454
+++ /dev/null
@@ -1,10 +0,0 @@
-  o Major bugfixes (hidden service v3):
-- An intro point could try to send an INTRODUCE_ACK with a status code
-  that it wasn't able to encode leading to a hard assert() of the relay.
-  Fortunately, that specific code path can not be reached thus this issue
-  can't be triggered. We've consolidated the ABI values into trunnel now.
-  Fixes bug 30454; bugfix on 0.3.0.1-alpha.
-- HSv3 client will now be able to properly handle unknown status code from
-  a INTRODUCE_ACK cell (nack) even if they do not know it. The NACK
-  behavior will stay the same. This will allow us to extend status code if
-  we want in the future without breaking the normal client behavior.

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

[tor-commits] [gettor/master] Update to add links to db script

2019-05-22 Thread hiro

commit a63fd0f05972e590d67f09a499d02882462f37a2
Author: hiro 
Date:   Wed May 22 17:56:44 2019 +0200

Update to add links to db script
---
 scripts/add_lins_to_db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/add_lins_to_db b/scripts/add_lins_to_db
index ba0ce67..c06153f 100755
--- a/scripts/add_lins_to_db
+++ b/scripts/add_lins_to_db
@@ -94,7 +94,7 @@ def main():
   """
   c.execute("DROP TABLE IF EXISTS links")
   c.execute(
-  "CREATE TABLE links(link TEXT, platform TEXT, arch TEXT,"
+  "CREATE TABLE links(link TEXT, platform TEXT, language TEXT, 
arch TEXT,"
   " version TEXT, provider TEXT, status TEXT)"
   )
   for k in keys:

___
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 'dgoulet/ticket30454_035_01'

2019-05-22 Thread nickm

commit 24c2502070b695c047fa7ebd87ac436a98e0bb51
Merge: e6b862e6a 245dccb77
Author: Nick Mathewson 
Date:   Wed May 22 11:50:46 2019 -0400

Merge remote-tracking branch 'dgoulet/ticket30454_035_01'

 changes/ticket30454| 10 
 src/feature/hs/hs_cell.c   | 16 +++--
 src/feature/hs/hs_cell.h   | 13 --
 src/feature/hs/hs_client.c | 18 +++---
 src/feature/hs/hs_intropoint.c | 27 +++--
 src/feature/hs/hs_intropoint.h | 15 
 src/test/test_hs_cell.c|  2 +-
 src/test/test_hs_intropoint.c  |  4 ++--
 src/trunnel/hs/cell_introduce1.c   | 44 +-
 src/trunnel/hs/cell_introduce1.h   |  7 ++
 src/trunnel/hs/cell_introduce1.trunnel | 21 +---
 11 files changed, 87 insertions(+), 90 deletions(-)

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

[tor-commits] [tor/master] hs: Remove hs_intro_auth_key_type_t enum

2019-05-22 Thread nickm

commit 79cfe2ddd7c030e679104588c7e4842c2ff6b239
Author: David Goulet 
Date:   Thu May 9 13:09:44 2019 -0400

hs: Remove hs_intro_auth_key_type_t enum

Like the previous commit about the INTRODUCE_ACK status code, change all 
auth
key type to use the one defined in the trunnel file.

Standardize the use of these auth type to a common ABI.

Part of #30454

Signed-off-by: David Goulet 
---
 src/or/hs_cell.c   |  5 +++--
 src/or/hs_intropoint.c | 10 +-
 src/or/hs_intropoint.h |  7 ---
 src/test/test_hs_cell.c|  2 +-
 src/test/test_hs_intropoint.c  |  4 ++--
 src/trunnel/hs/cell_introduce1.c   | 13 +++--
 src/trunnel/hs/cell_introduce1.h   |  3 +++
 src/trunnel/hs/cell_introduce1.trunnel |  9 -
 8 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c
index ba80653a7..7bbefe8fd 100644
--- a/src/or/hs_cell.c
+++ b/src/or/hs_cell.c
@@ -441,7 +441,8 @@ introduce1_set_auth_key(trn_cell_introduce1_t *cell,
   tor_assert(cell);
   tor_assert(data);
   /* There is only one possible type for a non legacy cell. */
-  trn_cell_introduce1_set_auth_key_type(cell, HS_INTRO_AUTH_KEY_TYPE_ED25519);
+  trn_cell_introduce1_set_auth_key_type(cell,
+   TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519);
   trn_cell_introduce1_set_auth_key_len(cell, ED25519_PUBKEY_LEN);
   trn_cell_introduce1_setlen_auth_key(cell, ED25519_PUBKEY_LEN);
   memcpy(trn_cell_introduce1_getarray_auth_key(cell),
@@ -514,7 +515,7 @@ hs_cell_build_establish_intro(const char *circ_nonce,
 
   /* Set AUTH_KEY_TYPE: 2 means ed25519 */
   trn_cell_establish_intro_set_auth_key_type(cell,
- HS_INTRO_AUTH_KEY_TYPE_ED25519);
+TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519);
 
   /* Set AUTH_KEY and AUTH_KEY_LEN field. Must also set byte-length of
* AUTH_KEY to match */
diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c
index 472e4afe9..a12a3210c 100644
--- a/src/or/hs_intropoint.c
+++ b/src/or/hs_intropoint.c
@@ -75,7 +75,7 @@ verify_establish_intro_cell(const trn_cell_establish_intro_t 
*cell,
   /* We only reach this function if the first byte of the cell is 0x02 which
* means that auth_key_type is of ed25519 type, hence this check should
* always pass. See hs_intro_received_establish_intro().  */
-  if (BUG(cell->auth_key_type != HS_INTRO_AUTH_KEY_TYPE_ED25519)) {
+  if (BUG(cell->auth_key_type != TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519)) {
 return -1;
   }
 
@@ -315,10 +315,10 @@ hs_intro_received_establish_intro(or_circuit_t *circ, 
const uint8_t *request,
* ESTABLISH_INTRO and pass it to the appropriate cell handler */
   const uint8_t first_byte = request[0];
   switch (first_byte) {
-case HS_INTRO_AUTH_KEY_TYPE_LEGACY0:
-case HS_INTRO_AUTH_KEY_TYPE_LEGACY1:
+case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY0:
+case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY1:
   return rend_mid_establish_intro_legacy(circ, request, request_len);
-case HS_INTRO_AUTH_KEY_TYPE_ED25519:
+case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519:
   return handle_establish_intro(circ, request, request_len);
 default:
   log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
@@ -396,7 +396,7 @@ validate_introduce1_parsed_cell(const trn_cell_introduce1_t 
*cell)
   /* The auth key of an INTRODUCE1 should be of type ed25519 thus leading to a
* known fixed length as well. */
   if (trn_cell_introduce1_get_auth_key_type(cell) !=
-  HS_INTRO_AUTH_KEY_TYPE_ED25519) {
+  TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Rejecting invalid INTRODUCE1 cell auth key type. "
"Responding with NACK.");
diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h
index 1c2cc564a..1891bffac 100644
--- a/src/or/hs_intropoint.h
+++ b/src/or/hs_intropoint.h
@@ -12,13 +12,6 @@
 #include "crypto_curve25519.h"
 #include "torcert.h"
 
-/* Authentication key type in an ESTABLISH_INTRO cell. */
-typedef enum {
-  HS_INTRO_AUTH_KEY_TYPE_LEGACY0 = 0x00,
-  HS_INTRO_AUTH_KEY_TYPE_LEGACY1 = 0x01,
-  HS_INTRO_AUTH_KEY_TYPE_ED25519 = 0x02,
-} hs_intro_auth_key_type_t;
-
 /* Object containing introduction point common data between the service and
  * the client side. */
 typedef struct hs_intropoint_t {
diff --git a/src/test/test_hs_cell.c b/src/test/test_hs_cell.c
index 8e15184c2..f754068a0 100644
--- a/src/test/test_hs_cell.c
+++ b/src/test/test_hs_cell.c
@@ -50,7 +50,7 @@ test_gen_establish_intro_cell(void *arg)
   /* Check the contents of the cell */
   {
 /* First byte is the auth key type: make sure its correct */
-tt_int_op(buf[0], OP_EQ, HS_INTRO_AUTH_KEY_TYPE_ED25519);
+tt_int_op(buf[0], OP_EQ, TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519);
 /* Next two bytes is auth key len */
 tt_int_op(ntohs(get_uint16(

[tor-commits] [tor/master] trunnel: Remove INTRODUCE1 status code IN statement

2019-05-22 Thread nickm

commit 7d3e904a27ac714c33f9b1e14b4d1d18d4042147
Author: David Goulet 
Date:   Wed May 15 15:27:27 2019 -0400

trunnel: Remove INTRODUCE1 status code IN statement

We want to support parsing a cell with unknown status code so we are forward
compatible.

Part of #30454

Signed-off-by: David Goulet 
---
 src/trunnel/hs/cell_introduce1.c   | 18 +++---
 src/trunnel/hs/cell_introduce1.trunnel |  4 +---
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/trunnel/hs/cell_introduce1.c b/src/trunnel/hs/cell_introduce1.c
index 1fdb95453..cebfa2867 100644
--- a/src/trunnel/hs/cell_introduce1.c
+++ b/src/trunnel/hs/cell_introduce1.c
@@ -520,7 +520,6 @@ trn_cell_introduce_ack_new(void)
   trn_cell_introduce_ack_t *val = trunnel_calloc(1, 
sizeof(trn_cell_introduce_ack_t));
   if (NULL == val)
 return NULL;
-  val->status = TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT;
   return val;
 }
 
@@ -552,10 +551,6 @@ trn_cell_introduce_ack_get_status(const 
trn_cell_introduce_ack_t *inp)
 int
 trn_cell_introduce_ack_set_status(trn_cell_introduce_ack_t *inp, uint16_t val)
 {
-  if (! ((val == TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT || val == 
TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS || val == 
TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID))) {
- TRUNNEL_SET_ERROR_CODE(inp);
- return -1;
-  }
   inp->status = val;
   return 0;
 }
@@ -589,8 +584,6 @@ trn_cell_introduce_ack_check(const trn_cell_introduce_ack_t 
*obj)
 return "Object was NULL";
   if (obj->trunnel_error_code_)
 return "A set function failed on this object";
-  if (! (obj->status == TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT || obj->status 
== TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS || obj->status == 
TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID))
-return "Integer out of bounds";
   {
 const char *msg;
 if (NULL != (msg = trn_cell_extension_check(obj->extensions)))
@@ -608,7 +601,7 @@ trn_cell_introduce_ack_encoded_len(const 
trn_cell_introduce_ack_t *obj)
  return -1;
 
 
-  /* Length of u16 status IN [TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT, 
TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS, TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID] */
+  /* Length of u16 status */
   result += 2;
 
   /* Length of struct trn_cell_extension extensions */
@@ -640,7 +633,7 @@ trn_cell_introduce_ack_encode(uint8_t *output, const size_t 
avail, const trn_cel
   trunnel_assert(encoded_len >= 0);
 #endif
 
-  /* Encode u16 status IN [TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT, 
TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS, TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID] */
+  /* Encode u16 status */
   trunnel_assert(written <= avail);
   if (avail - written < 2)
 goto truncated;
@@ -689,12 +682,10 @@ 
trn_cell_introduce_ack_parse_into(trn_cell_introduce_ack_t *obj, const uint8_t *
   ssize_t result = 0;
   (void)result;
 
-  /* Parse u16 status IN [TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT, 
TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS, TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID] */
+  /* Parse u16 status */
   CHECK_REMAINING(2, truncated);
   obj->status = trunnel_ntohs(trunnel_get_uint16(ptr));
   remaining -= 2; ptr += 2;
-  if (! (obj->status == TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT || obj->status 
== TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS || obj->status == 
TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID))
-goto fail;
 
   /* Parse struct trn_cell_extension extensions */
   result = trn_cell_extension_parse(&obj->extensions, ptr, remaining);
@@ -710,9 +701,6 @@ trn_cell_introduce_ack_parse_into(trn_cell_introduce_ack_t 
*obj, const uint8_t *
  relay_fail:
   trunnel_assert(result < 0);
   return result;
- fail:
-  result = -1;
-  return result;
 }
 
 ssize_t
diff --git a/src/trunnel/hs/cell_introduce1.trunnel 
b/src/trunnel/hs/cell_introduce1.trunnel
index 69da2c113..bbb091d2b 100644
--- a/src/trunnel/hs/cell_introduce1.trunnel
+++ b/src/trunnel/hs/cell_introduce1.trunnel
@@ -44,9 +44,7 @@ struct trn_cell_introduce1 {
 /* INTRODUCE_ACK payload. See details in section 3.2.2. */
 struct trn_cell_introduce_ack {
   /* Status of introduction. */
-  u16 status IN [TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS,
- TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID,
- TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT];
+  u16 status;
 
   /* Extension(s). Reserved fields. */
   struct trn_cell_extension extensions;



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

[tor-commits] [tor/master] hs: Get rid of duplicate hs_cell_introd_ack_status_t

2019-05-22 Thread nickm

commit dcc1d8d15bf11ca1c4e2760bbc47d5fa3df3814d
Author: David Goulet 
Date:   Thu May 9 13:01:15 2019 -0400

hs: Get rid of duplicate hs_cell_introd_ack_status_t

This enum was the exact same as hs_intro_ack_status_t that was removed at 
the
previous commit. It was used client side when parsing the INTRODUCE_ACK 
cell.

Now, the entire code dealing with the INTRODUCE_ACK cell (both sending and
receiving) have been modified to all use the same ABI defined in the trunnel
introduce1 file.

Finally, the client will default to the normal behavior when receiving an
unknown NACK status code which is to note down that we've failed and 
re-extend
to the next intro point. This way, unknown status code won't trigger a
different behavior client side.

Part of #30454.

Signed-off-by: David Goulet 
---
 src/or/hs_cell.c   |  4 ++--
 src/or/hs_cell.h   |  8 
 src/or/hs_client.c | 18 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c
index 03273a44f..ba80653a7 100644
--- a/src/or/hs_cell.c
+++ b/src/or/hs_cell.c
@@ -881,9 +881,9 @@ hs_cell_parse_introduce_ack(const uint8_t *payload, size_t 
payload_len)
* do a special case. */
   if (payload_len <= 1) {
 if (payload_len == 0) {
-  ret = HS_CELL_INTRO_ACK_SUCCESS;
+  ret = TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS;
 } else {
-  ret = HS_CELL_INTRO_ACK_FAILURE;
+  ret = TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID;
 }
 goto end;
   }
diff --git a/src/or/hs_cell.h b/src/or/hs_cell.h
index 958dde4ff..ed4af3c5a 100644
--- a/src/or/hs_cell.h
+++ b/src/or/hs_cell.h
@@ -16,14 +16,6 @@
  * 3.2.2 of the specification). Below this value, the cell must be padded. */
 #define HS_CELL_INTRODUCE1_MIN_SIZE 246
 
-/* Status code of an INTRODUCE_ACK cell. */
-typedef enum {
-  HS_CELL_INTRO_ACK_SUCCESS = 0x, /* Cell relayed to service. */
-  HS_CELL_INTRO_ACK_FAILURE = 0x0001, /* Service ID not recognized */
-  HS_CELL_INTRO_ACK_BADFMT  = 0x0002, /* Bad message format */
-  HS_CELL_INTRO_ACK_NORELAY = 0x0003, /* Can't relay cell to service */
-} hs_cell_introd_ack_status_t;
-
 /* Onion key type found in the INTRODUCE1 cell. */
 typedef enum {
   HS_CELL_ONION_KEY_TYPE_NTOR = 1,
diff --git a/src/or/hs_client.c b/src/or/hs_client.c
index 8ecefc120..7d44952e4 100644
--- a/src/or/hs_client.c
+++ b/src/or/hs_client.c
@@ -35,6 +35,8 @@
 #include "router.h"
 #include "routerset.h"
 
+#include "trunnel/hs/cell_introduce1.h"
+
 /* Return a human-readable string for the client fetch status code. */
 static const char *
 fetch_status_to_string(hs_client_fetch_status_t status)
@@ -1018,23 +1020,21 @@ handle_introduce_ack(origin_circuit_t *circ, const 
uint8_t *payload,
 
   status = hs_cell_parse_introduce_ack(payload, payload_len);
   switch (status) {
-  case HS_CELL_INTRO_ACK_SUCCESS:
+  case TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS:
 ret = 0;
 handle_introduce_ack_success(circ);
 goto end;
-  case HS_CELL_INTRO_ACK_FAILURE:
-  case HS_CELL_INTRO_ACK_BADFMT:
-  case HS_CELL_INTRO_ACK_NORELAY:
+  case TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID:
+  case TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT:
+  /* It is possible that the intro point can send us an unknown status code
+   * for the NACK that we do not know about like a new code for instance.
+   * Just fallthrough so we can note down the NACK and re-extend. */
+  default:
 handle_introduce_ack_bad(circ, status);
 /* We are going to see if we have to close the circuits (IP and RP) or we
  * can re-extend to a new intro point. */
 ret = close_or_reextend_intro_circ(circ);
 break;
-  default:
-log_info(LD_PROTOCOL, "Unknown INTRODUCE_ACK status code %u from %s",
-status,
-safe_str_client(extend_info_describe(circ->build_state->chosen_exit)));
-break;
   }
 
  end:



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

[tor-commits] [tor/master] hs: Remove hs_cell_onion_key_type_t enum

2019-05-22 Thread nickm

commit 56908c6f1c63d32bef7011c811976e24156f17d3
Author: David Goulet 
Date:   Wed May 15 15:30:29 2019 -0400

hs: Remove hs_cell_onion_key_type_t enum

Unify this with the trunnel ABI so we don't duplicate.

Part of #30454

Signed-off-by: David Goulet 
---
 src/or/hs_cell.c   |  7 ---
 src/or/hs_cell.h   |  5 -
 src/trunnel/hs/cell_introduce1.c   | 14 +++---
 src/trunnel/hs/cell_introduce1.h   |  1 +
 src/trunnel/hs/cell_introduce1.trunnel |  5 -
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c
index 7bbefe8fd..7b7e9379c 100644
--- a/src/or/hs_cell.c
+++ b/src/or/hs_cell.c
@@ -160,11 +160,12 @@ parse_introduce2_encrypted(const uint8_t *decrypted_data,
   }
 
   if (trn_cell_introduce_encrypted_get_onion_key_type(enc_cell) !=
-  HS_CELL_ONION_KEY_TYPE_NTOR) {
+  TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR) {
 log_info(LD_REND, "INTRODUCE2 onion key type is invalid. Got %u but "
   "expected %u on circuit %u for service %s",
  trn_cell_introduce_encrypted_get_onion_key_type(enc_cell),
- HS_CELL_ONION_KEY_TYPE_NTOR, TO_CIRCUIT(circ)->n_circ_id,
+ TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR,
+ TO_CIRCUIT(circ)->n_circ_id,
  safe_str_client(service->onion_address));
 goto err;
   }
@@ -257,7 +258,7 @@ 
introduce1_set_encrypted_onion_key(trn_cell_introduce_encrypted_t *cell,
   tor_assert(onion_pk);
   /* There is only one possible key type for a non legacy cell. */
   trn_cell_introduce_encrypted_set_onion_key_type(cell,
-  HS_CELL_ONION_KEY_TYPE_NTOR);
+   TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR);
   trn_cell_introduce_encrypted_set_onion_key_len(cell, CURVE25519_PUBKEY_LEN);
   trn_cell_introduce_encrypted_setlen_onion_key(cell, CURVE25519_PUBKEY_LEN);
   memcpy(trn_cell_introduce_encrypted_getarray_onion_key(cell), onion_pk,
diff --git a/src/or/hs_cell.h b/src/or/hs_cell.h
index ed4af3c5a..49b29a43b 100644
--- a/src/or/hs_cell.h
+++ b/src/or/hs_cell.h
@@ -16,11 +16,6 @@
  * 3.2.2 of the specification). Below this value, the cell must be padded. */
 #define HS_CELL_INTRODUCE1_MIN_SIZE 246
 
-/* Onion key type found in the INTRODUCE1 cell. */
-typedef enum {
-  HS_CELL_ONION_KEY_TYPE_NTOR = 1,
-} hs_cell_onion_key_type_t;
-
 /* This data structure contains data that we need to build an INTRODUCE1 cell
  * used by the INTRODUCE1 build function. */
 typedef struct hs_cell_introduce1_data_t {
diff --git a/src/trunnel/hs/cell_introduce1.c b/src/trunnel/hs/cell_introduce1.c
index cebfa2867..53b3d299f 100644
--- a/src/trunnel/hs/cell_introduce1.c
+++ b/src/trunnel/hs/cell_introduce1.c
@@ -723,7 +723,7 @@ trn_cell_introduce_encrypted_new(void)
   trn_cell_introduce_encrypted_t *val = trunnel_calloc(1, 
sizeof(trn_cell_introduce_encrypted_t));
   if (NULL == val)
 return NULL;
-  val->onion_key_type = 1;
+  val->onion_key_type = TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR;
   return val;
 }
 
@@ -827,7 +827,7 @@ trn_cell_introduce_encrypted_get_onion_key_type(const 
trn_cell_introduce_encrypt
 int
 trn_cell_introduce_encrypted_set_onion_key_type(trn_cell_introduce_encrypted_t 
*inp, uint8_t val)
 {
-  if (! ((val == 1))) {
+  if (! ((val == TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR))) {
  TRUNNEL_SET_ERROR_CODE(inp);
  return -1;
   }
@@ -1069,7 +1069,7 @@ trn_cell_introduce_encrypted_check(const 
trn_cell_introduce_encrypted_t *obj)
 if (NULL != (msg = trn_cell_extension_check(obj->extensions)))
   return msg;
   }
-  if (! (obj->onion_key_type == 1))
+  if (! (obj->onion_key_type == TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR))
 return "Integer out of bounds";
   if (TRUNNEL_DYNARRAY_LEN(&obj->onion_key) != obj->onion_key_len)
 return "Length mismatch for onion_key";
@@ -1102,7 +1102,7 @@ trn_cell_introduce_encrypted_encoded_len(const 
trn_cell_introduce_encrypted_t *o
   /* Length of struct trn_cell_extension extensions */
   result += trn_cell_extension_encoded_len(obj->extensions);
 
-  /* Length of u8 onion_key_type IN [1] */
+  /* Length of u8 onion_key_type IN [TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR] */
   result += 1;
 
   /* Length of u16 onion_key_len */
@@ -1166,7 +1166,7 @@ trn_cell_introduce_encrypted_encode(uint8_t *output, 
const size_t avail, const t
 goto fail; /* XXX !*/
   written += result; ptr += result;
 
-  /* Encode u8 onion_key_type IN [1] */
+  /* Encode u8 onion_key_type IN [TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR] */
   trunnel_assert(written <= avail);
   if (avail - written < 1)
 goto truncated;
@@ -1270,11 +1270,11 @@ 
trn_cell_introduce_encrypted_parse_into(trn_cell_introduce_encrypted_t *obj, con
   trunnel_assert((size_t)result <= remaining);
   remaining -= result; ptr += result;
 
-  /* Parse u8 onion_key_type IN [1] */
+  /* Parse u8 onion_key_type IN [TRUNNEL_HS

[tor-commits] [tor/master] hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY

2019-05-22 Thread nickm

commit cbcc570ff4a8e03fc08bfd020d6b4c7365d4d137
Author: David Goulet 
Date:   Thu May 9 12:45:17 2019 -0400

hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY

The INTRODUCE1 trunnel definition file doesn't support that value so it can
not be used else it leads to an assert on the intro point side if ever 
tried.

Fortunately, it was impossible to reach that code path.

Part of #30454

Signed-off-by: David Goulet 
---
 src/or/hs_intropoint.c | 5 +++--
 src/or/hs_intropoint.h | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c
index ee79109ca..e0ab27bd3 100644
--- a/src/or/hs_intropoint.c
+++ b/src/or/hs_intropoint.c
@@ -483,8 +483,9 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t 
*request,
RELAY_COMMAND_INTRODUCE2,
(char *) request, request_len, NULL)) {
 log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service.");
-/* Inform the client that we can't relay the cell. */
-status = HS_INTRO_ACK_STATUS_CANT_RELAY;
+/* Inform the client that we can't relay the cell. Use the unknown ID
+ * status code since it means that we do not know the service. */
+status = HS_INTRO_ACK_STATUS_UNKNOWN_ID;
 goto send_ack;
   }
 
diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h
index 749d1530e..014f9339a 100644
--- a/src/or/hs_intropoint.h
+++ b/src/or/hs_intropoint.h
@@ -24,7 +24,6 @@ typedef enum {
   HS_INTRO_ACK_STATUS_SUCCESS= 0x,
   HS_INTRO_ACK_STATUS_UNKNOWN_ID = 0x0001,
   HS_INTRO_ACK_STATUS_BAD_FORMAT = 0x0002,
-  HS_INTRO_ACK_STATUS_CANT_RELAY = 0x0003,
 } hs_intro_ack_status_t;
 
 /* Object containing introduction point common data between the service and



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

[tor-commits] [tor/master] hs: Define INTRODUCE_ACK status code in trunnel

2019-05-22 Thread nickm

commit 590d97bc1065bdb93c70695c91de9c548ef802af
Author: David Goulet 
Date:   Thu May 9 12:55:52 2019 -0400

hs: Define INTRODUCE_ACK status code in trunnel

Remove the hs_intro_ack_status_t enum and move the value into trunnel. Only
use these values from now on in the intro point code.

Interestingly enough, the client side also re-define these values in 
hs_cell.h
with the hs_cell_introd_ack_status_t enum. Next commit will fix that and 
force
to use the trunnel ABI.

Part of #30454

Signed-off-by: David Goulet 
---
 src/or/hs_intropoint.c | 16 
 src/or/hs_intropoint.h |  7 ---
 src/trunnel/hs/cell_introduce1.c   | 13 +++--
 src/trunnel/hs/cell_introduce1.h   |  3 +++
 src/trunnel/hs/cell_introduce1.trunnel |  9 -
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c
index e0ab27bd3..472e4afe9 100644
--- a/src/or/hs_intropoint.c
+++ b/src/or/hs_intropoint.c
@@ -336,7 +336,7 @@ hs_intro_received_establish_intro(or_circuit_t *circ, const 
uint8_t *request,
  * Return 0 on success else a negative value on error which will close the
  * circuit. */
 static int
-send_introduce_ack_cell(or_circuit_t *circ, hs_intro_ack_status_t status)
+send_introduce_ack_cell(or_circuit_t *circ, uint16_t status)
 {
   int ret = -1;
   uint8_t *encoded_cell = NULL;
@@ -433,7 +433,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t 
*request,
   int ret = -1;
   or_circuit_t *service_circ;
   trn_cell_introduce1_t *parsed_cell;
-  hs_intro_ack_status_t status = HS_INTRO_ACK_STATUS_SUCCESS;
+  uint16_t status = TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS;
 
   tor_assert(client_circ);
   tor_assert(request);
@@ -448,14 +448,14 @@ handle_introduce1(or_circuit_t *client_circ, const 
uint8_t *request,
"Rejecting %s INTRODUCE1 cell. Responding with NACK.",
cell_size == -1 ? "invalid" : "truncated");
 /* Inform client that the INTRODUCE1 has a bad format. */
-status = HS_INTRO_ACK_STATUS_BAD_FORMAT;
+status = TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT;
 goto send_ack;
   }
 
   /* Once parsed validate the cell format. */
   if (validate_introduce1_parsed_cell(parsed_cell) < 0) {
 /* Inform client that the INTRODUCE1 has bad format. */
-status = HS_INTRO_ACK_STATUS_BAD_FORMAT;
+status = TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT;
 goto send_ack;
   }
 
@@ -472,7 +472,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t 
*request,
 "Responding with NACK.",
safe_str(b64_key), client_circ->p_circ_id);
   /* Inform the client that we don't know the requested service ID. */
-  status = HS_INTRO_ACK_STATUS_UNKNOWN_ID;
+  status = TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID;
   goto send_ack;
 }
   }
@@ -485,12 +485,12 @@ handle_introduce1(or_circuit_t *client_circ, const 
uint8_t *request,
 log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service.");
 /* Inform the client that we can't relay the cell. Use the unknown ID
  * status code since it means that we do not know the service. */
-status = HS_INTRO_ACK_STATUS_UNKNOWN_ID;
+status = TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID;
 goto send_ack;
   }
 
   /* Success! Send an INTRODUCE_ACK success status onto the client circuit. */
-  status = HS_INTRO_ACK_STATUS_SUCCESS;
+  status = TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS;
   ret = 0;
 
  send_ack:
@@ -501,7 +501,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t 
*request,
 /* Circuit has been closed on failure of transmission. */
 goto done;
   }
-  if (status != HS_INTRO_ACK_STATUS_SUCCESS) {
+  if (status != TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS) {
 /* We just sent a NACK that is a non success status code so close the
  * circuit because it's not useful to keep it open. Remember, a client can
  * only send one INTRODUCE1 cell on a circuit. */
diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h
index 014f9339a..1c2cc564a 100644
--- a/src/or/hs_intropoint.h
+++ b/src/or/hs_intropoint.h
@@ -19,13 +19,6 @@ typedef enum {
   HS_INTRO_AUTH_KEY_TYPE_ED25519 = 0x02,
 } hs_intro_auth_key_type_t;
 
-/* INTRODUCE_ACK status code. */
-typedef enum {
-  HS_INTRO_ACK_STATUS_SUCCESS= 0x,
-  HS_INTRO_ACK_STATUS_UNKNOWN_ID = 0x0001,
-  HS_INTRO_ACK_STATUS_BAD_FORMAT = 0x0002,
-} hs_intro_ack_status_t;
-
 /* Object containing introduction point common data between the service and
  * the client side. */
 typedef struct hs_intropoint_t {
diff --git a/src/trunnel/hs/cell_introduce1.c b/src/trunnel/hs/cell_introduce1.c
index 358b355cd..b93add64c 100644
--- a/src/trunnel/hs/cell_introduce1.c
+++ b/src/trunnel/hs/cell_introduce1.c
@@ -519,6 +519,7 @@ trn_cell_introduce_ack_new(void)
   trn_cell_introduce_ack_t *val = trunnel_calloc(1, 
sizeof(trn_cell_introduce_ack_t));
   if (NULL == val)

[tor-commits] [tor/master] hs: Add changes file for #30454

2019-05-22 Thread nickm

commit 9f52b875184098aef91bfdebcfd272a60b3b879e
Author: David Goulet 
Date:   Thu May 9 13:23:14 2019 -0400

hs: Add changes file for #30454

Signed-off-by: David Goulet 
---
 changes/ticket30454 | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/changes/ticket30454 b/changes/ticket30454
new file mode 100644
index 0..77c45d0fe
--- /dev/null
+++ b/changes/ticket30454
@@ -0,0 +1,10 @@
+  o Major bugfixes (hidden service v3):
+- An intro point could try to send an INTRODUCE_ACK with a status code
+  that it wasn't able to encode leading to a hard assert() of the relay.
+  Fortunately, that specific code path can not be reached thus this issue
+  can't be triggered. We've consolidated the ABI values into trunnel now.
+  Fixes bug 30454; bugfix on 0.3.0.1-alpha.
+- HSv3 client will now be able to properly handle unknown status code from
+  a INTRODUCE_ACK cell (nack) even if they do not know it. The NACK
+  behavior will stay the same. This will allow us to extend status code if
+  we want in the future without breaking the normal client behavior.



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

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

2019-05-22 Thread translation

commit 57303a112b04c6f96ec6cc82770172f9b980a670
Author: Translation commit bot 
Date:   Wed May 22 15:50:53 2019 +

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

diff --git a/ar/ar.po b/ar/ar.po
index acd093d07..600705105 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ButterflyOfFire ButterflyOfFire, 2019
 # ButterflyOfFire, 2018
 # Emma Peel, 2018
 # Isho Antar , 2018
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-29 12:08+0200\n"
-"PO-Revision-Date: 2019-04-29 19:07+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-05-22 15:45+\n"
+"Last-Translator: ButterflyOfFire ButterflyOfFire\n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -230,7 +231,7 @@ msgstr ""
 
 #: ../data/whisperback.desktop.in.h:2
 msgid "Send feedback via encrypted e-mail"
-msgstr ""
+msgstr "Ø£Ø±Ø³Ù Ø¢Ø±Ø§Ø¦Ù Ø¹Ø¨Ø± Ø¨Ø±ÙØ¯ ÙØ´ÙØ±"
 
 #: ../data/whisperback.desktop.in.h:3
 msgid "feedback;bug;report;tails;error;"

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

[tor-commits] [tor/master] sendme: Validate v1 SENDMEs on both client and exit side

2019-05-22 Thread nickm

commit 69e0d5bfc7d52f223d686bcd87f629f01b03561a
Author: David Goulet 
Date:   Tue May 7 09:19:41 2019 -0400

sendme: Validate v1 SENDMEs on both client and exit side

The validation of the SENDME cell is now done as the very first thing when
receiving it for both client and exit. On failure to validate, the circuit 
is
closed as detailed in the specification.

Part of #30428

Signed-off-by: David Goulet 
---
 src/core/or/sendme.c  | 17 -
 src/test/test_relaycell.c |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index 586d4d0ae..baa57f4f2 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -204,10 +204,10 @@ sendme_is_valid(const circuit_t *circ, const uint8_t 
*cell_payload,
 
   /* Valid cell. */
   sendme_cell_free(cell);
-  return 1;
+  return true;
  invalid:
   sendme_cell_free(cell);
-  return 0;
+  return false;
 }
 
 /* Build and encode a version 1 SENDME cell into payload, which must be at
@@ -424,6 +424,12 @@ sendme_process_circuit_level(crypt_path_t *layer_hint,
   tor_assert(circ);
   tor_assert(cell_payload);
 
+  /* Validate the SENDME cell. Depending on the version, different validation
+   * can be done. An invalid SENDME requires us to close the circuit. */
+  if (!sendme_is_valid(circ, cell_payload, cell_payload_len)) {
+return -END_CIRC_REASON_TORPROTOCOL;
+  }
+
   /* If we are the origin of the circuit, we are the Client so we use the
* layer hint (the Exit hop) for the package window tracking. */
   if (CIRCUIT_IS_ORIGIN(circ)) {
@@ -448,13 +454,6 @@ sendme_process_circuit_level(crypt_path_t *layer_hint,
  * are rate limited. */
 circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), cell_payload_len);
   } else {
-/* Validate the SENDME cell. Depending on the version, different
- * validation can be done. An invalid SENDME requires us to close the
- * circuit. It is only done if we are the Exit of the circuit. */
-if (!sendme_is_valid(circ, cell_payload, cell_payload_len)) {
-  return -END_CIRC_REASON_TORPROTOCOL;
-}
-
 /* We aren't the origin of this circuit so we are the Exit and thus we
  * track the package window with the circuit object. */
 if ((circ->package_window + CIRCWINDOW_INCREMENT) >
diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c
index 062358351..d6372d395 100644
--- a/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@ -812,7 +812,7 @@ test_circbw_relay(void *arg)
   ASSERT_UNCOUNTED_BW();
 
   /* Sendme on circuit with non-full window: counted */
-  PACK_CELL(0, RELAY_COMMAND_SENDME, "Data1234");
+  PACK_CELL(0, RELAY_COMMAND_SENDME, "");
   circ->cpath->package_window = 900;
   connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn,
  circ->cpath);



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

[tor-commits] [tor/master] sendme: Add non fatal asserts for extra safety

2019-05-22 Thread nickm

commit 0cad83bea4019b3c448756d718f5b65718e81f6e
Author: David Goulet 
Date:   Wed May 22 11:05:36 2019 -0400

sendme: Add non fatal asserts for extra safety

Two non fatal asserts are added in this commit. First one is to see if the
SENDME digest list kept on the circuit for validation ever grows bigger than
the maximum number of expected SENDME on a circuit (currently 10).

The second one is to know if we ever send more than one SENDME at a time on 
a
circuit. In theory, we shouldn't but if we ever do, the v1 implementation
wouldn't work because we only keep one single cell digest (the previous cell
to the SENDME) on the circuit/cpath. Thus, sending two SENDME consecutively
will lead to a mismatch on the other side because the same cell digest would
be use and thus the circuit would collapse.

Finally, add an extra debug log in case we emit a v0 which also includes the
consensus emit version in that case.

Part of #30428

Signed-off-by: David Goulet 
---
 src/core/or/sendme.c | 16 
 1 file changed, 16 insertions(+)

diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index bfbb65e85..98ed63994 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -64,6 +64,13 @@ pop_first_cell_digest(const circuit_t *circ)
 return NULL;
   }
 
+  /* More cell digest than the SENDME window is never suppose to happen. The
+   * cell should have been rejected before reaching this point due to its
+   * package_window down to 0 leading to a circuit close. Scream loudly but
+   * still pop the element so we don't memory leak. */
+  tor_assert_nonfatal(smartlist_len(circ->sendme_last_digests) <=
+  CIRCWINDOW_START_MAX / CIRCWINDOW_INCREMENT);
+
   circ_digest = smartlist_get(circ->sendme_last_digests, 0);
   smartlist_del_keeporder(circ->sendme_last_digests, 0);
   return circ_digest;
@@ -290,6 +297,8 @@ send_circuit_level_sendme(circuit_t *circ, crypt_path_t 
*layer_hint,
   default:
 /* Unknown version, fallback to version 0 meaning no payload. */
 payload_len = 0;
+log_debug(LD_PROTOCOL, "Emitting SENDME version 0 cell. "
+   "Consensus emit version is %d", emit_version);
 break;
   }
 
@@ -408,6 +417,7 @@ sendme_connection_edge_consider_sending(edge_connection_t 
*conn)
 void
 sendme_circuit_consider_sending(circuit_t *circ, crypt_path_t *layer_hint)
 {
+  bool sent_one_sendme = false;
   const uint8_t *digest;
 
   while ((layer_hint ? layer_hint->deliver_window : circ->deliver_window) <=
@@ -423,6 +433,12 @@ sendme_circuit_consider_sending(circuit_t *circ, 
crypt_path_t *layer_hint)
 if (send_circuit_level_sendme(circ, layer_hint, digest) < 0) {
   return; /* The circuit's closed, don't continue */
 }
+/* Current implementation is not suppose to send multiple SENDME at once
+ * because this means we would use the same relay crypto digest for each
+ * SENDME leading to a mismatch on the other side and the circuit to
+ * collapse. Scream loudly if it ever happens so we can address it. */
+tor_assert_nonfatal(!sent_one_sendme);
+sent_one_sendme = true;
   }
 }
 



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

[tor-commits] [tor/master] sendme: Never fallback to v0 if unknown version

2019-05-22 Thread nickm

commit 44265dd6716887b997bb03d2db1641efd7ae9c19
Author: David Goulet 
Date:   Tue May 7 09:44:10 2019 -0400

sendme: Never fallback to v0 if unknown version

There was a missing cell version check against our max supported version. In
other words, we do not fallback to v0 anymore in case we do know the SENDME
version.

We can either handle it or not, never fallback to the unauthenticated 
version
in order to avoid gaming the authenticated logic.

Add a unit tests making sure we properly test that and also test that we can
always handle the default emit and accepted versions.

Fixes #30428

Signed-off-by: David Goulet 
---
 src/core/or/sendme.c   | 52 +-
 src/core/or/sendme.h   | 16 +++-
 src/test/test_sendme.c | 33 ++--
 3 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index baa57f4f2..80d6b7d16 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -25,20 +25,6 @@
 #include "lib/ctime/di_ops.h"
 #include "trunnel/sendme.h"
 
-/* The maximum supported version. Above that value, the cell can't be
- * recognized as a valid SENDME. */
-#define SENDME_MAX_SUPPORTED_VERSION 1
-
-/* The cell version constants for when emitting a cell. */
-#define SENDME_EMIT_MIN_VERSION_DEFAULT 0
-#define SENDME_EMIT_MIN_VERSION_MIN 0
-#define SENDME_EMIT_MIN_VERSION_MAX UINT8_MAX
-
-/* The cell version constants for when accepting a cell. */
-#define SENDME_ACCEPT_MIN_VERSION_DEFAULT 0
-#define SENDME_ACCEPT_MIN_VERSION_MIN 0
-#define SENDME_ACCEPT_MIN_VERSION_MAX UINT8_MAX
-
 /* Return the minimum version given by the consensus (if any) that should be
  * used when emitting a SENDME cell. */
 STATIC int
@@ -123,30 +109,41 @@ cell_v1_is_valid(const sendme_cell_t *cell, const 
circuit_t *circ)
 /* Return true iff the given cell version can be handled or if the minimum
  * accepted version from the consensus is known to us. */
 STATIC bool
-cell_version_is_valid(uint8_t cell_version)
+cell_version_can_be_handled(uint8_t cell_version)
 {
   int accept_version = get_accept_min_version();
 
-  /* Can we handle this version? */
+  /* We will first check if the consensus minimum accepted version can be
+   * handled by us and if not, regardless of the cell version we got, we can't
+   * continue. */
   if (accept_version > SENDME_MAX_SUPPORTED_VERSION) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Unable to accept SENDME version %u (from consensus). "
-   "We only support <= %d. Probably your tor is too old?",
-   accept_version, cell_version);
+   "We only support <= %u. Probably your tor is too old?",
+   accept_version, SENDME_MAX_SUPPORTED_VERSION);
 goto invalid;
   }
 
-  /* We only accept a SENDME cell from what the consensus tells us. */
+  /* Then, is this version below the accepted version from the consensus? If
+   * yes, we must not handle it. */
   if (cell_version < accept_version) {
-log_info(LD_PROTOCOL, "Unacceptable SENDME version %d. Only "
+log_info(LD_PROTOCOL, "Unacceptable SENDME version %u. Only "
   "accepting %u (from consensus). Closing circuit.",
  cell_version, accept_version);
 goto invalid;
   }
 
-  return 1;
+  /* Is this cell version supported by us? */
+  if (cell_version > SENDME_MAX_SUPPORTED_VERSION) {
+log_info(LD_PROTOCOL, "SENDME cell version %u is not supported by us. "
+  "We only support <= %u",
+ cell_version, SENDME_MAX_SUPPORTED_VERSION);
+goto invalid;
+  }
+
+  return true;
  invalid:
-  return 0;
+  return false;
 }
 
 /* Return true iff the encoded SENDME cell in cell_payload of length
@@ -183,7 +180,7 @@ sendme_is_valid(const circuit_t *circ, const uint8_t 
*cell_payload,
   }
 
   /* Validate that we can handle this cell version. */
-  if (!cell_version_is_valid(cell_version)) {
+  if (!cell_version_can_be_handled(cell_version)) {
 goto invalid;
   }
 
@@ -195,10 +192,13 @@ sendme_is_valid(const circuit_t *circ, const uint8_t 
*cell_payload,
 }
 break;
   case 0x00:
-/* Fallthrough. Version 0, there is no work to be done on the payload so
- * it is necessarily valid if we pass the version validation. */
+/* Version 0, there is no work to be done on the payload so it is
+ * necessarily valid if we pass the version validation. */
+break;
   default:
-/* Unknown version means we can't handle it so fallback to version 0. */
+log_warn(LD_PROTOCOL, "Unknown SENDME cell version %d received.",
+ cell_version);
+tor_assert_nonfatal_unreached();
 break;
   }
 
diff --git a/src/core/or/sendme.h b/src/core/or/sendme.h
index 2fb73f76d..a71891996 100644
--- a/src/core/or/sendme.h
+++ b/src/core/or/sendme.h
@@ -45,6 +45,20 @@ bool sendme_circuit_cell_is_next(int window);
 /* Private sect

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

2019-05-22 Thread translation

commit 4e31efa3002aafe1a5eb0674b784bbb5693a6e40
Author: Translation commit bot 
Date:   Wed May 22 15:50:04 2019 +

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

diff --git a/ar/torcheck.po b/ar/torcheck.po
index 18385d0d3..7d202adf6 100644
--- a/ar/torcheck.po
+++ b/ar/torcheck.po
@@ -3,6 +3,7 @@
 # 
 # Translators:
 # Asim Jaweesh , 2014
+# ButterflyOfFire ButterflyOfFire, 2019
 # ButterflyOfFire, 2018
 # Emma Peel, 2019
 # guessous.uni , 2014
@@ -18,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-04-09 06:39+\n"
-"Last-Translator: Emma Peel\n"
+"PO-Revision-Date: 2019-05-22 15:44+\n"
+"Last-Translator: ButterflyOfFire ButterflyOfFire\n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -103,4 +104,4 @@ msgid "Stay Anonymous"
 msgstr "Ø§ÙØ¨ÙØ§Ø¡ ÙØ¬ÙÙÙ Ø§ÙÙÙÙØ©"
 
 msgid "Relay Search"
-msgstr ""
+msgstr "Ø§ÙØ¨ØØ« Ø¹Ù ÙØ±ØÙÙ"

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

2019-05-22 Thread nickm

commit e6b862e6a8bf690571f192efc66f06ed5cb4696d
Merge: 21b051d1c 0cad83bea
Author: Nick Mathewson 
Date:   Wed May 22 11:48:43 2019 -0400

Merge branch 'ticket30428_041_02_squashed'

 scripts/maint/practracker/exceptions.txt |   4 +-
 src/core/crypto/relay_crypto.c   |  31 ++--
 src/core/crypto/relay_crypto.h   |   5 +-
 src/core/or/circuit_st.h |   9 +-
 src/core/or/crypt_path.c |  18 +-
 src/core/or/crypt_path.h |   3 +
 src/core/or/relay.c  |   6 +-
 src/core/or/sendme.c | 289 +--
 src/core/or/sendme.h |  27 ++-
 src/test/test_relaycell.c|   7 +-
 src/test/test_sendme.c   |  65 ---
 11 files changed, 311 insertions(+), 153 deletions(-)

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

[tor-commits] [tor/master] sendme: Always pop last SENDME digest from circuit

2019-05-22 Thread nickm

commit 5479ffabf8ec1a3c63e9f237c6696c4ef0b74a55
Author: David Goulet 
Date:   Wed May 22 10:37:27 2019 -0400

sendme: Always pop last SENDME digest from circuit

We must not accumulate digests on the circuit if the other end point is 
using
another SENDME version that is not using those digests like v0.

This commit makes it that we always pop the digest regardless of the 
version.

Part of #30428

Signed-off-by: David Goulet 
---
 src/core/or/sendme.c  | 70 +--
 src/test/test_relaycell.c |  5 
 src/test/test_sendme.c|  4 +++
 3 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index d914ba5e2..bfbb65e85 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -47,47 +47,46 @@ get_accept_min_version(void)
  SENDME_ACCEPT_MIN_VERSION_MAX);
 }
 
-/* Return true iff the given cell digest matches the first digest in the
- * circuit sendme list. */
-static bool
-v1_digest_matches(const circuit_t *circ, const uint8_t *cell_digest)
+/* Pop the first cell digset on the given circuit from the SENDME last digests
+ * list. NULL is returned if the list is uninitialized or empty.
+ *
+ * The caller gets ownership of the returned digest thus is responsible for
+ * freeing the memory. */
+static uint8_t *
+pop_first_cell_digest(const circuit_t *circ)
 {
-  bool ret = false;
-  uint8_t *circ_digest = NULL;
+  uint8_t *circ_digest;
 
   tor_assert(circ);
-  tor_assert(cell_digest);
 
-  /* We shouldn't have received a SENDME if we have no digests. Log at
-   * protocol warning because it can be tricked by sending many SENDMEs
-   * without prior data cell. */
   if (circ->sendme_last_digests == NULL ||
   smartlist_len(circ->sendme_last_digests) == 0) {
-log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
-   "We received a SENDME but we have no cell digests to match. "
-   "Closing circuit.");
-goto no_match;
+return NULL;
   }
 
-  /* Pop the first element that was added (FIFO) and compare it. */
   circ_digest = smartlist_get(circ->sendme_last_digests, 0);
   smartlist_del_keeporder(circ->sendme_last_digests, 0);
+  return circ_digest;
+}
+
+/* Return true iff the given cell digest matches the first digest in the
+ * circuit sendme list. */
+static bool
+v1_digest_matches(const uint8_t *circ_digest, const uint8_t *cell_digest)
+{
+  tor_assert(circ_digest);
+  tor_assert(cell_digest);
 
   /* Compare the digest with the one in the SENDME. This cell is invalid
* without a perfect match. */
   if (tor_memneq(circ_digest, cell_digest, TRUNNEL_SENDME_V1_DIGEST_LEN)) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"SENDME v1 cell digest do not match.");
-goto no_match;
+return false;
   }
-  /* Digests matches! */
-  ret = true;
 
- no_match:
-  /* This digest was popped from the circuit list. Regardless of what happens,
-   * we have no more use for it. */
-  tor_free(circ_digest);
-  return ret;
+  /* Digests matches! */
+  return true;
 }
 
 /* Return true iff the given decoded SENDME version 1 cell is valid and
@@ -97,13 +96,13 @@ v1_digest_matches(const circuit_t *circ, const uint8_t 
*cell_digest)
  * cell we saw which tells us that the other side has in fact seen that cell.
  * See proposal 289 for more details. */
 static bool
-cell_v1_is_valid(const sendme_cell_t *cell, const circuit_t *circ)
+cell_v1_is_valid(const sendme_cell_t *cell, const uint8_t *circ_digest)
 {
   tor_assert(cell);
-  tor_assert(circ);
+  tor_assert(circ_digest);
 
   const uint8_t *cell_digest = sendme_cell_getconstarray_data_v1_digest(cell);
-  return v1_digest_matches(circ, cell_digest);
+  return v1_digest_matches(circ_digest, cell_digest);
 }
 
 /* Return true iff the given cell version can be handled or if the minimum
@@ -160,6 +159,7 @@ sendme_is_valid(const circuit_t *circ, const uint8_t 
*cell_payload,
 size_t cell_payload_len)
 {
   uint8_t cell_version;
+  uint8_t *circ_digest = NULL;
   sendme_cell_t *cell = NULL;
 
   tor_assert(circ);
@@ -184,10 +184,24 @@ sendme_is_valid(const circuit_t *circ, const uint8_t 
*cell_payload,
 goto invalid;
   }
 
+  /* Pop the first element that was added (FIFO). We do that regardless of the
+   * version so we don't accumulate on the circuit if v0 is used by the other
+   * end point. */
+  circ_digest = pop_first_cell_digest(circ);
+  if (circ_digest == NULL) {
+/* We shouldn't have received a SENDME if we have no digests. Log at
+ * protocol warning because it can be tricked by sending many SENDMEs
+ * without prior data cell. */
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "We received a SENDME but we have no cell digests to match. "
+   "Closing circuit.");
+goto invalid;
+  }
+
   /* Validate depending on the version now. */
   switch (cell_version) {
   case 0x01:
-if (!cell_v1_is_valid(cell, circ)) {
+

[tor-commits] [tor/master] sendme: Clarify how sendme_circuit_cell_is_next() works

2019-05-22 Thread nickm

commit 482c4972b996fc7b1a3a8cc13f93c8ecc8748590
Author: David Goulet 
Date:   Tue May 21 15:19:30 2019 -0400

sendme: Clarify how sendme_circuit_cell_is_next() works

Commit 4ef8470fa5480d3b was actually reverted before because in the end we
needed to do this minus 1 check on the window.

This commit clarifies that in the code, takes the useful comment changes 
from
4ef8470fa5480d3b and makes sendme_circuit_cell_is_next() private since it
behaves in a very specific way that one external caller might expect.

Part of #30428.

Signed-off-by: David Goulet 
---
 src/core/or/circuit_st.h |  9 -
 src/core/or/sendme.c | 30 ++
 src/core/or/sendme.h |  3 ---
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/core/or/circuit_st.h b/src/core/or/circuit_st.h
index a68547ecb..499bf93d6 100644
--- a/src/core/or/circuit_st.h
+++ b/src/core/or/circuit_st.h
@@ -115,12 +115,11 @@ struct circuit_t {
* list can not contain more than 10 digests of DIGEST_LEN bytes (20).
*
* At position i in the list, the digest corresponds to the
-   * ((CIRCWINDOW_INCREMENT * i) - 1)-nth cell received since we expect the
-   * (CIRCWINDOW_INCREMENT * i)-nth cell to be the SENDME and thus containing
-   * the previous cell digest.
+   * (CIRCWINDOW_INCREMENT * i)-nth cell received since we expect a SENDME to
+   * be received containing that cell digest.
*
-   * For example, position 2 (starting at 0) means that we've received 299
-   * cells and the 299th cell digest is kept at index 2.
+   * For example, position 2 (starting at 0) means that we've received 300
+   * cells so the 300th cell digest is kept at index 2.
*
* At maximum, this list contains 200 bytes plus the smartlist overhead. */
   smartlist_t *sendme_last_digests;
diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index eba7c37cd..d914ba5e2 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -312,15 +312,29 @@ record_cell_digest_on_circ(circuit_t *circ, const uint8_t 
*sendme_digest)
  * We are able to know that because the package or deliver window value minus
  * one cell (the possible SENDME cell) should be a multiple of the increment
  * window value. */
-bool
-sendme_circuit_cell_is_next(int window)
+static bool
+circuit_sendme_cell_is_next(int window)
 {
-  /* Is this the last cell before a SENDME? The idea is that if the package or
-   * deliver window reaches a multiple of the increment, after this cell, we
-   * should expect a SENDME. */
+  /* At the start of the window, no SENDME will be expected. */
+  if (window == CIRCWINDOW_START) {
+return false;
+  }
+
+  /* Are we at the limit of the increment and if not, we don't expect next
+   * cell is a SENDME.
+   *
+   * We test against the window minus 1 because when we are looking if the
+   * next cell is a SENDME, the window (either package or deliver) hasn't been
+   * decremented just yet so when this is called, we are currently processing
+   * the "window - 1" cell.
+   *
+   * This function is used when recording a cell digest and this is done quite
+   * low in the stack when decrypting or encrypting a cell. The window is only
+   * updated once the cell is actually put in the outbuf. */
   if (((window - 1) % CIRCWINDOW_INCREMENT) != 0) {
 return false;
   }
+
   /* Next cell is expected to be a SENDME. */
   return true;
 }
@@ -596,7 +610,7 @@ sendme_record_cell_digest_on_circ(circuit_t *circ, 
crypt_path_t *cpath)
   /* Is this the last cell before a SENDME? The idea is that if the
* package_window reaches a multiple of the increment, after this cell, we
* should expect a SENDME. */
-  if (!sendme_circuit_cell_is_next(package_window)) {
+  if (!circuit_sendme_cell_is_next(package_window)) {
 return;
   }
 
@@ -621,7 +635,7 @@ sendme_record_received_cell_digest(circuit_t *circ, 
crypt_path_t *cpath)
   tor_assert(circ);
 
   /* Only record if the next cell is expected to be a SENDME. */
-  if (!sendme_circuit_cell_is_next(cpath ? cpath->deliver_window :
+  if (!circuit_sendme_cell_is_next(cpath ? cpath->deliver_window :
circ->deliver_window)) {
 return;
   }
@@ -644,7 +658,7 @@ sendme_record_sending_cell_digest(circuit_t *circ, 
crypt_path_t *cpath)
   tor_assert(circ);
 
   /* Only record if the next cell is expected to be a SENDME. */
-  if (!sendme_circuit_cell_is_next(cpath ? cpath->package_window:
+  if (!circuit_sendme_cell_is_next(cpath ? cpath->package_window :
circ->package_window)) {
 goto end;
   }
diff --git a/src/core/or/sendme.h b/src/core/or/sendme.h
index 847fcdd67..cdbdf55ac 100644
--- a/src/core/or/sendme.h
+++ b/src/core/or/sendme.h
@@ -40,9 +40,6 @@ void sendme_record_cell_digest_on_circ(circuit_t *circ, 
crypt_path_t *cpath);
 void sendme_record_received_cell_digest(circuit_t *circ, crypt_path_t *cpath);
 void sendme_record

[tor-commits] [tor/master] sendme: Properly record SENDMEs on both edges

2019-05-22 Thread nickm

commit 3835a3acf57426f692a787e7729de929b40dc62e
Author: David Goulet 
Date:   Wed May 15 10:16:05 2019 -0400

sendme: Properly record SENDMEs on both edges

Turns out that we were only recording the "b_digest" but to have
bidirectionnal authenticated SENDMEs, we need to use the "f_digest" in the
forward cell situation.

Because of the cpath refactoring, this commit plays with the crypt_path_ and
relay_crypto_t API a little bit in order to respect the abstractions.

Previously, we would record the cell digest as the SENDME digest in the
decrypt cell function but to avoid code duplication (both directions needs 
to
record), we now do that right after iff the cell is recognized (at the 
edge).
It is now done in circuit_receive_relay_cell() instead.

We now also record the cell digest as the SENDME digest in both relay cell
encryption functions since they are split depending on the direction.
relay_encrypt_cell_outbound() and relay_encrypt_cell_inbound() need to
consider recording the cell digest depending on their direction (f vs b
digest).

Fixes #30428

Signed-off-by: David Goulet 
---
 scripts/maint/practracker/exceptions.txt |  2 +-
 src/core/crypto/relay_crypto.c   | 31 +---
 src/core/crypto/relay_crypto.h   |  5 ++-
 src/core/or/crypt_path.c | 18 +-
 src/core/or/crypt_path.h |  3 ++
 src/core/or/relay.c  |  4 +++
 src/core/or/sendme.c | 61 ++--
 src/core/or/sendme.h |  5 +--
 8 files changed, 93 insertions(+), 36 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index a83bb62bb..2671f723b 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -121,7 +121,7 @@ problem file-size /src/core/or/policies.c 3249
 problem function-size /src/core/or/policies.c:policy_summarize() 107
 problem function-size /src/core/or/protover.c:protover_all_supported() 117
 problem file-size /src/core/or/relay.c 3173
-problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 123
+problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 127
 problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 116
 problem function-size 
/src/core/or/relay.c:connection_ap_process_end_not_open() 194
 problem function-size 
/src/core/or/relay.c:connection_edge_process_relay_cell_not_open() 139
diff --git a/src/core/crypto/relay_crypto.c b/src/core/crypto/relay_crypto.c
index 74cccd222..8a285131a 100644
--- a/src/core/crypto/relay_crypto.c
+++ b/src/core/crypto/relay_crypto.c
@@ -100,12 +100,22 @@ relay_crypto_get_sendme_digest(relay_crypto_t *crypto)
   return crypto->sendme_digest;
 }
 
-/** Record the b_digest from crypto and put it in the sendme_digest. */
+/** Record the cell digest, indicated by is_foward_digest or not, as the
+ * SENDME cell digest. */
 void
-relay_crypto_record_sendme_digest(relay_crypto_t *crypto)
+relay_crypto_record_sendme_digest(relay_crypto_t *crypto,
+  bool is_foward_digest)
 {
+  struct crypto_digest_t *digest;
+
   tor_assert(crypto);
-  crypto_digest_get_digest(crypto->b_digest, (char *) crypto->sendme_digest,
+
+  digest = crypto->b_digest;
+  if (is_foward_digest) {
+digest = crypto->f_digest;
+  }
+
+  crypto_digest_get_digest(digest, (char *) crypto->sendme_digest,
sizeof(crypto->sendme_digest));
 }
 
@@ -161,11 +171,6 @@ relay_decrypt_cell(circuit_t *circ, cell_t *cell,
   if (relay_digest_matches(cpath_get_incoming_digest(thishop), cell)) {
 *recognized = 1;
 *layer_hint = thishop;
-/* This cell is for us. Keep a record of this cell because we will
- * use it in the next SENDME cell. */
-if (sendme_circuit_cell_is_next(thishop->deliver_window)) {
-  cpath_sendme_circuit_record_inbound_cell(thishop);
-}
 return 0;
   }
 }
@@ -213,6 +218,9 @@ relay_encrypt_cell_outbound(cell_t *cell,
   crypt_path_t *thishop; /* counter for repeated crypts */
   cpath_set_cell_forward_digest(layer_hint, cell);
 
+  /* Record cell digest as the SENDME digest if need be. */
+  sendme_record_sending_cell_digest(TO_CIRCUIT(circ), layer_hint);
+
   thishop = layer_hint;
   /* moving from farthest to nearest hop */
   do {
@@ -237,11 +245,8 @@ relay_encrypt_cell_inbound(cell_t *cell,
 {
   relay_set_digest(or_circ->crypto.b_digest, cell);
 
-  /* We are about to send this cell outbound on the circuit. Keep a record of
-   * this cell if we are expecting that the next cell is a SENDME. */
-  if (sendme_circuit_cell_is_next(TO_CIRCUIT(or_circ)->package_window)) {
-sendme_circuit_record_outbound_cell(or_circ);
-  }
+  /* Record cell digest as the SE

[tor-commits] [tor/master] sendme: Record cell digest on both client and exit

2019-05-22 Thread nickm

commit 59b9eecc19877f38b2c9d8b4f7964c6e9875f4c0
Author: David Goulet 
Date:   Tue May 7 09:16:39 2019 -0400

sendme: Record cell digest on both client and exit

It turns out that only the exit side is validating the authenticated SENDME 
v1
logic and never the client side. Which means that if a client ever uploaded
data towards an exit, the authenticated SENDME logic wouldn't apply.

For this to work, we have to record the cell digest client side as well 
which
introduced a new function that supports both type of edges.

This also removes a test that is not valid anymore which was that we didn't
allow cell recording on an origin circuit (client).

Part of #30428

Signed-off-by: David Goulet 
---
 scripts/maint/practracker/exceptions.txt |  2 +-
 src/core/or/relay.c  |  2 +-
 src/core/or/sendme.c | 49 +++-
 src/core/or/sendme.h |  3 +-
 src/test/test_sendme.c   | 28 +-
 5 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index cba3ddc1b..a83bb62bb 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -122,7 +122,7 @@ problem function-size 
/src/core/or/policies.c:policy_summarize() 107
 problem function-size /src/core/or/protover.c:protover_all_supported() 117
 problem file-size /src/core/or/relay.c 3173
 problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 123
-problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 112
+problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 116
 problem function-size 
/src/core/or/relay.c:connection_ap_process_end_not_open() 194
 problem function-size 
/src/core/or/relay.c:connection_edge_process_relay_cell_not_open() 139
 problem function-size 
/src/core/or/relay.c:connection_edge_process_relay_cell() 520
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index 8b3a1be18..91236e5fe 100644
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -701,7 +701,7 @@ relay_send_command_from_edge_,(streamid_t stream_id, 
circuit_t *circ,
* we need to. This call needs to be after the circuit_package_relay_cell()
* because the cell digest is set within that function. */
   if (relay_command == RELAY_COMMAND_DATA) {
-sendme_record_cell_digest(circ);
+sendme_record_cell_digest_on_circ(circ, cpath_layer);
   }
 
   return 0;
diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index e7c65d99e..586d4d0ae 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -287,6 +287,21 @@ send_circuit_level_sendme(circuit_t *circ, crypt_path_t 
*layer_hint,
   return 0;
 }
 
+/* Record the cell digest only if the next cell is expected to be a SENDME. */
+static void
+record_cell_digest_on_circ(circuit_t *circ, const uint8_t *sendme_digest)
+{
+  tor_assert(circ);
+  tor_assert(sendme_digest);
+
+  /* Add the digest to the last seen list in the circuit. */
+  if (circ->sendme_last_digests == NULL) {
+circ->sendme_last_digests = smartlist_new();
+  }
+  smartlist_add(circ->sendme_last_digests,
+tor_memdup(sendme_digest, DIGEST_LEN));
+}
+
 /*
  * Public API
  */
@@ -571,31 +586,37 @@ sendme_note_stream_data_packaged(edge_connection_t *conn)
   return --conn->package_window;
 }
 
-/* Note the cell digest in the circuit sendme last digests FIFO if applicable.
- * It is safe to pass a circuit that isn't meant to track those digests. */
+/* Record the cell digest into the circuit sendme digest list depending on
+ * which edge we are. The digest is recorded only if we expect the next cell
+ * that we will receive is a SENDME so we can match the digest. */
 void
-sendme_record_cell_digest(circuit_t *circ)
+sendme_record_cell_digest_on_circ(circuit_t *circ, crypt_path_t *cpath)
 {
-  const uint8_t *digest;
+  int package_window;
+  uint8_t *sendme_digest;
 
   tor_assert(circ);
 
-  /* We only keep the cell digest if we are the Exit on that circuit and if
-   * this cell is the last one before the client should send a SENDME. */
-  if (CIRCUIT_IS_ORIGIN(circ)) {
-return;
+  package_window = circ->package_window;
+  if (cpath) {
+package_window = cpath->package_window;
   }
+
   /* Is this the last cell before a SENDME? The idea is that if the
* package_window reaches a multiple of the increment, after this cell, we
* should expect a SENDME. */
-  if (!sendme_circuit_cell_is_next(circ->package_window)) {
+  if (!sendme_circuit_cell_is_next(package_window)) {
 return;
   }
 
-  /* Add the digest to the last seen list in the circuit. */
-  digest = relay_crypto_get_sendme_digest(&TO_OR_CIRCUIT(circ)->crypto);
-  if (circ->sendme_last_digests == NULL) {
-circ->sendme_last_digests = smartlist_new();
+  /* Getting the digest is expensive so we only do it once

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

2019-05-22 Thread translation

commit 11246d338b0006348ab1cd492e88d996a140630b
Author: Translation commit bot 
Date:   Wed May 22 15:49:51 2019 +

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

diff --git a/ar/securitylevel.properties b/ar/securitylevel.properties
index a1abde200..482e6ca94 100644
--- a/ar/securitylevel.properties
+++ b/ar/securitylevel.properties
@@ -5,13 +5,13 @@ securityLevel.standard.level = Ø¹Ø§Ø¯Ù
 securityLevel.standard.tooltip = Security Level : Standard
 securityLevel.standard.summary = ÙÙ Ø®ØµØ§Ø¦Øµ ÙØªØµÙØ ØªÙØ± ÙÙ
ÙØ§ÙØ¹ Ø§ÙÙØ¨ ÙÙØ¹ÙØ©
 securityLevel.safer.level = Ø¢ÙÙÙ
-securityLevel.safer.tooltip = Security Level : Safer
+securityLevel.safer.tooltip = ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù: Ø¢ÙÙ
 securityLevel.safer.summary = ÙØ¹Ø·Ù ÙÙÙØ²Ø§Øª ÙÙØ§ÙØ¹ Ø§ÙÙØ¨ 
Ø§ÙØªÙ Ø¹Ø§Ø¯Ø© ÙØ§ ØªÙÙÙ Ø®Ø·ÙØ±Ø©. ÙØªØ³Ø¨Ø¨ ÙÙ ØªØ¹Ø·Ù Ø®ØµØ§Ø¦Øµ 
Ø¨Ø¹Ø¶ Ø§ÙÙÙØ§ÙØ¹.
 securityLevel.safer.description1 = ØªØ¹Ø·Ù Ø¬Ø§ÙØ§ Ø³ÙØ±Ø¨Øª  Ø¹ÙÙ Ø§ÙÙ
ÙØ§ÙØ¹ Ø§ÙØªÙ ÙØ§ ØªØ³ØªØ®Ø¯Ù HTTPS
 securityLevel.safer.description2 = ØªØ¹Ø·ÙÙ Ø¨Ø¹Ø¶ Ø§ÙØ®Ø·ÙØ· ÙØ§ÙØ±Ù
ÙØ² Ø§ÙØ±ÙØ§Ø¶ÙØ©.
 securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL 
are click-to-play.
 securityLevel.safest.level = Ø§ÙØ£ÙØ«Ø± Ø£ÙÙØ§
-securityLevel.safest.tooltip = Security Level : Safest
+securityLevel.safest.tooltip = ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù: Ø§ÙØ£ÙØ«Ø± Ø£ÙØ§ÙØ§
 securityLevel.safest.summary = Ø§Ø³ÙØ ÙÙØ· Ø¨Ø§ÙØ®ØµØ§Ø¦Øµ Ø§ÙÙ
Ø·ÙÙØ¨Ø© ÙÙÙÙØ§ÙØ¹ ØºÙØ± Ø§ÙØ¯ÙÙØ§ÙÙÙÙØ© ÙØ§ÙØ®Ø¯ÙØ§Øª 
Ø§ÙØ£Ø³Ø§Ø³ÙØ©. ØªØ¤Ø«Ø± ÙØ°Ù Ø§ÙØªØºÙÙØ±Ø§Øª Ø¹ÙÙ Ø§ÙØµÙØ± 
ÙØ§ÙÙØ³Ø§Ø¦Ø· ÙØ§ÙÙØµÙØµ Ø§ÙØ¨Ø±ÙØ¬ÙØ©.
 securityLevel.safest.description1 = ØªØ¹Ø·Ù Ø¬Ø§ÙØ§ Ø³ÙØ±Ø¨Øª ÙØ¨Ø¯Ø¦ÙØ§ 
Ø¹ÙÙ Ø¬ÙÙØ¹ Ø§ÙÙÙØ§ÙØ¹.
 securityLevel.safest.description2 = ØªØ¹Ø·ÙÙ Ø¨Ø¹Ø¶ Ø§ÙØ®Ø·ÙØ· 
ÙØ§ÙØ£ÙÙÙÙØ§Øª ÙØ§ÙØ±ÙÙØ² Ø§ÙØ±ÙØ§Ø¶ÙØ© ÙØ§ÙØµÙØ±.

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

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

2019-05-22 Thread translation

commit b14f4136dc7cdb34b439f44062c6342b5016d062
Author: Translation commit bot 
Date:   Wed May 22 15:49:40 2019 +

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

diff --git a/ar/browserOnboarding.properties b/ar/browserOnboarding.properties
index 7a5f3cf0d..5754cc991 100644
--- a/ar/browserOnboarding.properties
+++ b/ar/browserOnboarding.properties
@@ -5,7 +5,7 @@
 onboarding.tour-tor-welcome=ÙØ±ØØ¨Ø§Ù
 onboarding.tour-tor-welcome.title=Ø§ÙØª ÙØ³ØªØ¹Ø¯.
 onboarding.tour-tor-welcome.description=ÙØªØµÙØ ØªÙØ± (Tor Browser) 
ÙÙÙØ± Ø§Ø¹ÙÙ ÙØ¹Ø§ÙÙØ± Ø§ÙØ®ØµÙØµÙÙ Ù Ø§ï»·ÙØ§Ù Ø§Ø«ÙØ§Ø¡ 
ØªØµÙØÙ ÙÙÙÙØ¨. Ø§ÙØª Ø§ï»·Ù ÙØÙÙ ÙÙ Ø§ÙØªØªØ¨Ø¹ , Ø§ÙÙ
Ø±Ø§ÙØ¨Ù, Ù Ø§ÙØØ¬Ø¨. ÙØ°Ø§ Ø§ÙÙØ¤ÙÙ Ø§ÙØ³Ø±ÙØ¹ Ø³ÙØ¹Ø±Ø¶ ÙÙ 
ÙÙÙ ÙØªÙ Ø°ÙÙ.
-onboarding.tour-tor-welcome.next-button=Go to Privacy
+onboarding.tour-tor-welcome.next-button=Ø§ÙØ§ÙØªÙØ§Ù Ø¥ÙÙ 
Ø§ÙØ®ØµÙØµÙØ©
 
 onboarding.tour-tor-privacy=Ø§ÙØ®ØµÙØµÙØ©
 onboarding.tour-tor-privacy.title=Ø§ÙÙØªÙØµØµÙÙ Ù Ø§ÙÙÙØ§Ø³Ø¹Ø© 
Ø§ï»¹ÙØªØ±ÙØª
@@ -21,7 +21,7 @@ onboarding.tour-tor-circuit-display=Ø¹Ø±Ø¶ Ø§ÙØ¯Ø§Ø¦Ø±Ø©
 onboarding.tour-tor-circuit-display.title=Ø´Ø§ÙØ¯ ÙØ³Ø§Ø±Ù
 onboarding.tour-tor-circuit-display.description=ÙÙÙ ÙØ¬Ø§Ù ØªÙÙÙ 
Ø¨Ø²ÙØ§Ø±ØªÙØ ÙØªÙ ØªØ±ØÙÙ ØØ±ÙØ© Ø§ÙÙØ±ÙØ± Ø§ÙØ®Ø§ØµØ© Ø¨Ù 
ÙØªØ´ÙÙØ±ÙØ§ ÙÙ Ø¯Ø§Ø¦Ø±Ø© Ø¹Ø¨Ø± Ø«ÙØ§Ø«Ø© ÙØ±ØÙØ§Øª Tor ØÙÙ 
Ø§ÙØ¹Ø§ÙÙ. ÙØ§ ÙØ¹Ø±Ù Ø£Ù ÙÙÙØ¹ Ø¹ÙÙ Ø§ÙÙÙØ¨ Ø§ÙÙÙØ§Ù 
Ø§ÙØ°Ù ØªØªØµÙ ÙÙÙ. ÙÙÙÙÙ Ø·ÙØ¨ Ø¯Ø§Ø¦Ø±Ø© Ø¬Ø¯ÙØ¯Ø© Ø¨Ø§ÙÙÙØ± 
ÙÙÙ "Ø¯Ø§Ø¦Ø±Ø© Ø¬Ø¯ÙØ¯Ø© ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹" Ø¹ÙÙ Ø´Ø§Ø´Ø© Ø¹Ø±Ø¶ 
Ø§ÙØ¯ÙØ§Ø¦Ø± ÙØ¯ÙÙØ§.
 onboarding.tour-tor-circuit-display.button=Ø±Ø¤ÙØ© Ø§ÙÙØ³Ø§Ø± Ø§ÙØ®Ø§Øµ 
Ø¨Ù
-onboarding.tour-tor-circuit-display.next-button=Go to Security
+onboarding.tour-tor-circuit-display.next-button=Ø§ÙØ§ÙØªÙØ§Ù Ø¥ÙÙ 
Ø§ÙØ£ÙØ§Ù
 
 onboarding.tour-tor-security=Ø§ÙØ£ÙØ§Ù
 onboarding.tour-tor-security.title=Ø§Ø®ØªØ± ÙØ¯Ù Ø®Ø¨Ø±ØªÙ
@@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences=ÙØµØ§Ø¦Ø 
Ø§ÙØªØ¬Ø±Ø¨Ø©
 onboarding.tour-tor-expect-differences.title=ØªÙÙØ¹ Ø¨Ø¹Ø¶ Ø§ÙØªØºÙØ±Ø§Øª
 onboarding.tour-tor-expect-differences.description=ÙØ¹ Ø¬ÙÙØ¹ ÙÙØ²Ø§Øª 
Ø§ÙØ£ÙØ§Ù ÙØ§ÙØ®ØµÙØµÙØ© Ø§ÙØªÙ ÙÙÙØ±ÙØ§ TorØ ÙØ¯ ØªÙÙÙ 
ØªØ¬Ø±Ø¨ØªÙ Ø£Ø«ÙØ§Ø¡ ØªØµÙØ Ø§ÙØ¥ÙØªØ±ÙØª ÙØ®ØªÙÙØ© Ø¨Ø¹Ø¶ 
Ø§ÙØ´ÙØ¡. ÙØ¯ ØªÙÙÙ Ø§ÙØ£Ø´ÙØ§Ø¡ Ø£Ø¨Ø·Ø£ ÙÙÙÙØ§ÙØ ÙØ§Ø¹ØªÙ
Ø§Ø¯ÙØ§ Ø¹ÙÙ ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§ÙØ ÙØ¯ ÙØ§ ØªØ¹ÙÙ Ø¨Ø¹Ø¶ 
Ø§ÙØ¹ÙØ§ØµØ± Ø£Ù ÙØªÙ ØªØÙÙÙÙØ§. ÙØ¯ ÙÙØ·ÙØ¨ ÙÙÙ Ø£ÙØ¶ÙØ§ 
Ø¥Ø«Ø¨Ø§Øª Ø£ÙÙ Ø¥ÙØ³Ø§Ù ÙÙÙØ³ Ø±ÙØ¨ÙØª.
 onboarding.tour-tor-expect-differences.button=Ø§ÙØ¸Ø± 'Ø§ÙØ£Ø³Ø¦ÙØ© Ø§ÙÙ
ØªÙØ±Ø±Ø©'
-onboarding.tour-tor-expect-differences.next-button=Go to Onion Services
+onboarding.tour-tor-expect-differences.next-button=Ø§ÙØ§ÙØªÙØ§Ù Ø¥ÙÙ 
Ø®Ø¯ÙØ§Øª Ø§ÙØ¨ØµÙØ©
 
 onboarding.tour-tor-onion-services=Ø®Ø¯ÙØ§Øª Ø§ÙØ¨ØµÙØ© (Onion)
 onboarding.tour-tor-onion-services.title=ÙÙ ÙØÙÙØ§ Ø¨Ø´ÙÙ Ø§Ø¶Ø§ÙÙ
@@ -42,14 +42,14 @@ onboarding.tour-tor-onion-services.description=Ø®Ø¯ÙØ§Øª 
Ø§ÙØ¨ØµÙ ÙÙ Ø§ÙÙ
 onboarding.tour-tor-onion-services.button=ÙÙ Ø¨Ø²ÙØ§Ø±Ø© Ø¨ØµÙØ©
 onboarding.tour-tor-onion-services.next-button=Ø§ÙØªÙØ§Ø¡
 
-onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S
+onboarding.overlay-icon-tooltip-updated2=ÙÙØ§Ø·ÙØ§Ø¹ Ø¹ÙÙ ÙØ§ 
Ø§ÙØ¬Ø¯ÙØ¯\nÙÙ %S
 onboarding.tour-tor-update.prefix-new=Ø¬Ø¯ÙØ¯
 onboarding.tour-tor-update.prefix-updated=ØªØØ¯ÙØ«
 
-onboarding.tour-tor-toolbar=Toolbar
+onboarding.tour-tor-toolbar=Ø´Ø±ÙØ· Ø§ÙØ£Ø¯ÙØ§Øª
 onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout
 onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser 
toolbar layout. We moved the Torbutton icon after the URL bar, and we added a 
security level icon next to it.
-onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security
+onboarding.tour-tor-toolbar-update-8.5.next-button=Ø§ÙØ§ÙØªÙØ§Ù Ø¥ÙÙ 
Ø§ÙØ£ÙØ§Ù
 
 onboarding.tour-tor-security-update-8.5.title=Security level experience
 onboarding.tour-tor-security-update-8.5.description=We improved how you see 
and set your security level. We replaced the security slider with a toolbar 
icon that makes your current level visible at all times. Click it to view 
details about your current level or to change your security settings.

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

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

2019-05-22 Thread translation

commit c1806b74d37abc4c0878463f2f8accf6bc40889b
Author: Translation commit bot 
Date:   Wed May 22 15:47:45 2019 +

Update translations for tba-torbrowserstringsdtd
---
 ar/torbrowser_strings.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ar/torbrowser_strings.dtd b/ar/torbrowser_strings.dtd
index 4fbd64c3a..c65047424 100644
--- a/ar/torbrowser_strings.dtd
+++ b/ar/torbrowser_strings.dtd
@@ -24,23 +24,23 @@
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
-
+
 
 
 
@@ -54,6 +54,6 @@
 
 
 
-
+
 
 

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

[tor-commits] [gettor/master] Fix typo in script

2019-05-22 Thread hiro

commit 9a1dfc44af1e7bbacc9c804f5764046af2420519
Author: hiro 
Date:   Wed May 22 17:46:53 2019 +0200

Fix typo in script
---
 scripts/add_lins_to_db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/add_lins_to_db b/scripts/add_lins_to_db
index b979498..ba0ce67 100755
--- a/scripts/add_lins_to_db
+++ b/scripts/add_lins_to_db
@@ -103,7 +103,7 @@ def main():
   release_link = releases.get(k).replace("en-US", l)
   c.execute(
 "INSERT INTO links(link, platform, language, arch, 
version, provider, status)"
-"VALUES ('%s', '%s', '64', '%s', '%s', 'ACTIVE')" 
%(providers.get(p) + release_link, k, version, p))
+"VALUES ('%s', '%s', '%s', '64', '%s', '%s', 
'ACTIVE')" %(providers.get(p) + release_link, k, l, version, p))
 
 
 if __name__ == "__main__":

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

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

2019-05-22 Thread translation

commit f8851bdb5355a4439a678da9826ac77a0136144b
Author: Translation commit bot 
Date:   Wed May 22 15:46:43 2019 +

Update translations for tails-misc_completed
---
 fr.po | 37 +++--
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/fr.po b/fr.po
index 4ee4b42ae..2cf374777 100644
--- a/fr.po
+++ b/fr.po
@@ -30,9 +30,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-18 08:53+0200\n"
-"PO-Revision-Date: 2019-05-19 08:58+\n"
-"Last-Translator: Curtis Baltimore \n"
+"POT-Creation-Date: 2019-05-18 19:31+0200\n"
+"PO-Revision-Date: 2019-05-22 15:35+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -663,6 +663,11 @@ msgstr "Aucun conteneur de fichiers nâa Ã©tÃ© ajoutÃ©"
 msgid "No VeraCrypt devices detected"
 msgstr "Aucun pÃ©riphÃ©rique VeraCrypt nâa Ã©tÃ© dÃ©tectÃ©"
 
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:40
+#: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
+msgid "Unlock VeraCrypt Volumes"
+msgstr "DÃ©verrouillage des volumes VeraCrypt"
+
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
 msgid "Container already added"
 msgstr "Le conteneur a dÃ©jÃ  Ã©tÃ© ajoutÃ©"
@@ -746,10 +751,6 @@ msgstr "Naviguer sur le Web sans anonymat"
 msgid "Unsafe Web Browser"
 msgstr "Navigateur Web non sÃ©curisÃ©"
 
-#: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
-msgid "Unlock VeraCrypt Volumes"
-msgstr "DÃ©verrouillage des volumes VeraCrypt"
-
 #: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
 msgid "Mount VeraCrypt encrypted file containers and devices"
 msgstr "Monter des conteneurs de fichiers et des pÃ©riphÃ©riques chiffrÃ©s 
avec VeraCrypt"
@@ -782,33 +783,41 @@ msgid ""
 " ($(command_line))"
 msgstr "Lâauthentification est exigÃ©e pour supprimer un paquet de vos 
logiciels supplÃ©mentaires ($(command_line))"
 
-#: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:61
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Conteneurs de fichiers"
 
-#: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:80
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:80
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:86
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:86
 msgid "Add a file container"
 msgstr "Ajouter un conteneur de fichiers"
 
-#: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:103
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:103
 msgid "Partitions and Drives"
 msgstr "Partitions et disques"
 
-#: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:121
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:121
 msgid ""
 "This application is not affiliated with or endorsed by the VeraCrypt project"
 " or IDRIX."
 msgstr "Cette application nâest ni affiliÃ©e avec le projet VeraCrypt ou 
IDRIX ni sanctionnÃ©e par ces derniers."
 
-#: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:38
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
+msgid "_Open"
+msgstr "_Ouvrir"
+
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
 msgstr "Verrouiller ce volume"
 
-#: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:61
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
+msgid "_Unlock"
+msgstr "_DÃ©verrouiller"
+
+#: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
 msgstr "DÃ©tacher ce volume"
 

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

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

2019-05-22 Thread translation

commit c5c6e7fa2cf3f35b405f9acbff34fb29df8c4e8e
Author: Translation commit bot 
Date:   Wed May 22 15:46:36 2019 +

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

diff --git a/fr.po b/fr.po
index 32dbc5c44..2cf374777 100644
--- a/fr.po
+++ b/fr.po
@@ -31,8 +31,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-19 13:21+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-05-22 15:35+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -807,7 +807,7 @@ msgstr "Cette application nâest ni affiliÃ©e avec le 
projet VeraCrypt ou IDRIX
 
 #: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Ouvrir"
 
 #: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -815,7 +815,7 @@ msgstr "Verrouiller ce volume"
 
 #: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_DÃ©verrouiller"
 
 #: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"

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

[tor-commits] [gettor/master] Update db scripts and updates

2019-05-22 Thread hiro

commit bef9ab4e44e7c3f4d9239712089014649799327f
Author: hiro 
Date:   Wed May 22 17:40:23 2019 +0200

Update db scripts and updates
---
 gettor/parse/email.py |  1 +
 gettor/services/email/sendmail.py |  2 +-
 gettor/utils/db.py|  4 ++--
 scripts/add_lins_to_db|  2 +-
 scripts/create_db | 16 
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/gettor/parse/email.py b/gettor/parse/email.py
index d79a375..6518946 100644
--- a/gettor/parse/email.py
+++ b/gettor/parse/email.py
@@ -209,6 +209,7 @@ class EmailParser(object):
 id=request['id'],
 command=request['command'],
 platform=request['platform'],
+language=request['language'],
 service=request['service'],
 date=now_str,
 status="ONHOLD",
diff --git a/gettor/services/email/sendmail.py 
b/gettor/services/email/sendmail.py
index f18b335..a350909 100644
--- a/gettor/services/email/sendmail.py
+++ b/gettor/services/email/sendmail.py
@@ -164,7 +164,7 @@ class Sendmail(object):
 
 log.info("Getting links for {}.".format(platform))
 links = yield self.conn.get_links(
-platform=platform, status="ACTIVE"
+platform=platform, language=language, status="ACTIVE"
 )
 
 # build message
diff --git a/gettor/utils/db.py b/gettor/utils/db.py
index 99ae081..8d65f45 100644
--- a/gettor/utils/db.py
+++ b/gettor/utils/db.py
@@ -41,14 +41,14 @@ class SQLite3(object):
log.msg("Database error: {}".format(error))
return None
 
-   def new_request(self, id, command, service, platform, date, status):
+   def new_request(self, id, command, service, platform, language, date, 
status):
"""
Perform a new request to the database
"""
query = "INSERT INTO requests VALUES(?, ?, ?, ?, ?, ?)"
 
return self.dbpool.runQuery(
-   query, (id, command, platform, service, date, status)
+   query, (id, command, platform, language, service, date, 
status)

).addCallback(self.query_callback).addErrback(self.query_errback)
 
def get_requests(self, status, command, service):
diff --git a/scripts/add_lins_to_db b/scripts/add_lins_to_db
index e8e89f2..b979498 100755
--- a/scripts/add_lins_to_db
+++ b/scripts/add_lins_to_db
@@ -102,7 +102,7 @@ def main():
   for l in languages:
   release_link = releases.get(k).replace("en-US", l)
   c.execute(
-"INSERT INTO links(link, platform, arch, version, 
provider, status)"
+"INSERT INTO links(link, platform, language, arch, 
version, provider, status)"
 "VALUES ('%s', '%s', '64', '%s', '%s', 'ACTIVE')" 
%(providers.get(p) + release_link, k, version, p))
 
 
diff --git a/scripts/create_db b/scripts/create_db
index d332c27..7f8cc11 100755
--- a/scripts/create_db
+++ b/scripts/create_db
@@ -83,15 +83,15 @@ def main():
 c.execute("DROP TABLE IF EXISTS stats")
 c.execute(
 "CREATE TABLE requests(id TEXT, command TEXT, platform TEXT,"
-" service TEXT, date TEXT, status TEXT)"
+" language TEXT, service TEXT, date TEXT, status TEXT)"
 )
 c.execute(
-"CREATE TABLE links(link TEXT, platform TEXT, arch TEXT,"
-" version TEXT, provider TEXT, status TEXT)"
+"CREATE TABLE links(link TEXT, platform TEXT, language TEXT,"
+" arch TEXT, version TEXT, provider TEXT, status TEXT)"
 )
 c.execute(
-"CREATE TABLE stats(num_requests NUMBER, platform TEXT, "
-"command TEXT, service TEXT, date TEXT)"
+"CREATE TABLE stats(num_requests NUMBER, platform TEXT,"
+" language TEXT, command TEXT, service TEXT, date TEXT)"
 )
 print("Database {} created.".format(abs_filename))
 elif args.clear:
@@ -116,17 +116,17 @@ def main():
 c.execute("DROP TABLE IF EXISTS stats")
 c.execute(
 "CREATE TABLE requests(id TEXT, command TEXT, "
-"platform TEXT, service TEXT, date TEXT, status TEXT,"
+"platform TEXT, language TEXT, service TEXT, date 
TEXT, status TEXT,"
 "PRIMARY KEY(id, date))"
 )
 c.execute(
-"CREATE TABLE links(link TEXT, platform TEXT, "
+"CREATE TABLE links(link TEXT, platform TEXT, language 
TEXT,"
 "arch TEXT, version TE

[tor-commits] [gettor/master] Update email strings

2019-05-22 Thread hiro

commit f298d62476bf2995c3c448dfa402e906e9665184
Author: hiro 
Date:   Wed May 22 14:58:36 2019 +0200

Update email strings
---
 share/locale/en.json | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/share/locale/en.json b/share/locale/en.json
index 2b735c0..3006c7c 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -1,8 +1,8 @@
 {
-  "links_body": "You requested Tor Browser for {}.\n \nYou will need only one 
of the links below to download the bundle. If a link does not work for you, try 
the next one.\n \n{}\n \n \n--\nGetTor",
+  "links_body": "You requested Tor Browser for {}.\n\nYou will need only one 
of the links below to download the bundle. If a link does not work for you, try 
the next one.\n\n{}\n\n \n--\nGetTor",
   "links_subject": "[GetTor] Links for your request",
-  "help_body": "GetTor Help Test. Please be kind.",
-  "help_subject": "GetTor Help Email Test",
+  "help_body": "This is how you can request a tor browser bundle link.\n\n 
Send an email to: get...@torproject.org\n\nIn the body of the email only write: 
 .\n\nWe only support windows, osx and linux as 
operating systems.\n\nAt the moment please only use en as language.\n\n",
+  "help_subject": "[GetTor] Help Email",
   "help_debug": "Log application errors to stdout",
   "help_config": "Custom config file location (optional)",
   "smtp_links_subject": "[GetTor] Links for your request",
@@ -10,7 +10,7 @@
   "smtp_help_subject": "[GetTor] Help",
   "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale",
   "smtp_unsupported_locale_msg": "The locale you requested '{}' is not 
supported.",
-  "smtp_vlinks_msg": "You requested Tor Browser for {}.\n \nYou will need only 
one of the links below to download the bundle. If a link does not work for you, 
try the next one.\n \n{}\n \n \n--\nGetTor",
-  "smtp_mirrors_msg": "Hi! this is the GetTor robot.\n \nThank you for your 
request. Attached to this email you will find\nan updated list of mirrors of 
Tor Project's website.",
-  "smtp_help_msg": "Hi! This is the GetTor robot. I am here to help you 
download the\nlatest version of Tor Browser.\n \nPlease reply to this message 
with one of the options below:\n \nwindows\nlinux\nosx\nmirrors\n \nI will then 
send you the download instructions.\n \nIf you are unsure, just send a blank 
reply to this message."
+  "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only 
one of the links below to download the bundle. If a link does not work for you, 
try the next one.\n\n{}\n\n \n--\nGetTor",
+  "smtp_mirrors_msg": "Hi! this is the GetTor robot.\n\nThank you for your 
request. Attached to this email you will find\nan updated list of mirrors of 
Tor Project's website.",
+  "smtp_help_msg": "Hi! This is the GetTor robot. I am here to help you 
download the\nlatest version of Tor Browser.\n\nPlease reply to this message 
with one of the options below:\n\nwindows\nlinux\nosx\nmirrors\n\nI will then 
send you the download instructions.\n\nIf you are unsure, just send a blank 
reply to this message."
 }



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

[tor-commits] [gettor/master] Use locales

2019-05-22 Thread hiro

commit ae37e31253e9a1f0a41ff2758b10616b7e436e16
Author: hiro 
Date:   Wed May 22 17:22:35 2019 +0200

Use locales
---
 gettor.conf.json|  1 +
 gettor/parse/email.py   | 10 +++---
 gettor/services/email/sendmail.py   |  9 +++--
 gettor/utils/settings.py|  1 +
 scripts/add_lins_to_db  | 14 +-
 share/locale/available_locales.json |  4 +++-
 share/locale/es.json| 16 
 share/locale/pt.json| 16 
 tests/conftests.py  |  1 +
 tests/test_email_service.py | 11 +++
 10 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/gettor.conf.json b/gettor.conf.json
index b3f331d..6a9b420 100644
--- a/gettor.conf.json
+++ b/gettor.conf.json
@@ -1,5 +1,6 @@
 {
   "platforms": ["linux", "osx", "windows"],
+  "languages": ["en", "es", "pt"],
   "dbname": "/srv/gettor.torproject.org/home/gettor/gettor.db",
   "email_parser_logfile": 
"/srv/gettor.torproject.org/home/gettor/log/email_parser.log",
   "email_requests_limit": 5,
diff --git a/gettor/parse/email.py b/gettor/parse/email.py
index 06a149b..d79a375 100644
--- a/gettor/parse/email.py
+++ b/gettor/parse/email.py
@@ -73,6 +73,7 @@ class EmailParser(object):
 """
 
 platforms = self.settings.get("platforms")
+languages = self.settings.get("languages")
 log.msg("Building email message from string.", system="email parser")
 msg = message_from_string(msg_str)
 
@@ -137,26 +138,29 @@ class EmailParser(object):
 "id": norm_addr,
 "command": None,
 "platform": None,
+"language": None,
 "service": "email"
 }
 
 if subject:
 subject = subject.group(1)
 for word in re.split(r"\s+", subject.strip()):
+if word.lower() in languages:
+request["language"] = word.lower()
 if word.lower() in platforms:
 request["command"] = "links"
 request["platform"] = word.lower()
-break
 if word.lower() == "help":
 request["command"] = "help"
 break
 
-if not request["command"]:
+if not request["command"] and not request["language"]:
 for word in re.split(r"\s+", msg_str.strip()):
+if word.lower() in languages:
+request["language"] = word.lower()
 if word.lower() in platforms:
 request["command"] = "links"
 request["platform"] = word.lower()
-break
 if word.lower() == "help":
 request["command"] = "help"
 break
diff --git a/gettor/services/email/sendmail.py 
b/gettor/services/email/sendmail.py
index bce20da..f18b335 100644
--- a/gettor/services/email/sendmail.py
+++ b/gettor/services/email/sendmail.py
@@ -117,13 +117,8 @@ class Sendmail(object):
 status="ONHOLD", command="links", service="email"
 )
 
-"""
-Load strings for translations
-"""
-# for now just english
-strings.load_strings("en")
-
 if help_requests:
+strings.load_strings("en")
 try:
 log.info("Got new help request.")
 
@@ -164,6 +159,8 @@ class Sendmail(object):
 id = request[0]
 date = request[4]
 platform = request[2]
+language = request[3]
+strings.load_strings(language)
 
 log.info("Getting links for {}.".format(platform))
 links = yield self.conn.get_links(
diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py
index b301117..922cfe9 100644
--- a/gettor/utils/settings.py
+++ b/gettor/utils/settings.py
@@ -59,6 +59,7 @@ class Settings(object):
 else:
 self._settings = {
   "platforms": ["linux", "osx", "windows"],
+  "languages": ["en", "es", "pt"],
   "dbname": "/srv/gettor.torproject.org/home/gettor/gettor.db",
   "email_parser_logfile": 
"/srv/gettor.torproject.org/home/gettor/log/email_parser.log",
   "email_requests_limit": 5,
diff --git a/scripts/add_lins_to_db b/scripts/add_lins_to_db
index 55fe127..e8e89f2 100755
--- a/scripts/add_lins_to_db
+++ b/scripts/add_lins_to_db
@@ -77,9 +77,11 @@ def main():
 "linux": "_en-US.tar.xz"
   }
 
-  keys = {'osx', 'windows', 'linux'}
-  releases = {k: "".join(dic.get(k, version) for dic in (prefixes, versions, 
suffixes))  for k in keys}
+  keys = ['osx', 'windows', 'linux']
+
+  languages = ['en-US', 'es-ES', 'pt-BR']
 
+  releases = {k: "".join(dic.get(k, version) for dic in (prefixes, versions, 
suffixes))  for k in keys}
 
   if not abs_filename:
   print("Missing database fi

[tor-commits] [gettor/master] Update add_links_to_db script

2019-05-22 Thread hiro

commit d630e7a62e8207b0266535b3de0d15cfe9177595
Author: hiro 
Date:   Wed May 22 15:13:28 2019 +0200

Update add_links_to_db script
---
 scripts/add_lins_to_db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/add_lins_to_db b/scripts/add_lins_to_db
index 3b194af..55fe127 100755
--- a/scripts/add_lins_to_db
+++ b/scripts/add_lins_to_db
@@ -55,7 +55,7 @@ def main():
 
   webFile = 
request.urlopen("https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions/";)
   versions = webFile.read().decode('utf-8').translate({ord(c): None for c in 
'[]\n" '})
-  version = versions.split(",")[4]
+  version = versions.split(",")[0]
 
   providers = {
 "gitlab": "https://gitlab.com/thetorproject/gettorbrowser/raw/releases/";,



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

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

2019-05-22 Thread translation

commit d838843a5d0a9c353b55c40f1f0a004d21a0551c
Author: Translation commit bot 
Date:   Wed May 22 15:19:49 2019 +

Update translations for torbutton-securitylevelproperties
---
 sw/securitylevel.properties | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sw/securitylevel.properties b/sw/securitylevel.properties
index 1b941b5c7..f41a3061f 100644
--- a/sw/securitylevel.properties
+++ b/sw/securitylevel.properties
@@ -1,11 +1,11 @@
-securityLevel.securityLevel = Security Level
-securityLevel.customWarning = Custom
-securityLevel.overview = Disable certain web features that can be used to 
attack your security and anonymity.
-securityLevel.standard.level = Standard
-securityLevel.standard.tooltip = Security Level : Standard
-securityLevel.standard.summary = All Tor Browser and website features are 
enabled.
-securityLevel.safer.level = Safer
-securityLevel.safer.tooltip = Security Level : Safer
+securityLevel.securityLevel = Ngazi ya Usalama
+securityLevel.customWarning = Desturi
+securityLevel.overview = Kuzuia baadhi ya vipengele vya tovuti ambayo inaweza 
kutumika kushambulia usalama na kutojulikana kwako.
+securityLevel.standard.level = Kiwango
+securityLevel.standard.tooltip = Ngazi ya usalama : Kiwango
+securityLevel.standard.summary = Kivinjari cha Tor chote na vipengele vya 
tovuti vimewezeshwa.
+securityLevel.safer.level = Salama
+securityLevel.safer.tooltip = Ngazi ya usalama : Salama
 securityLevel.safer.summary = Disables website features that are often 
dangerous, causing some sites to lose functionality.
 securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites.
 securityLevel.safer.description2 = Some fonts and math symbols are disabled.

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

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

2019-05-22 Thread translation

commit 82bbf3b7b2762f7923e04351a1075581378a62d4
Author: Translation commit bot 
Date:   Wed May 22 15:19:08 2019 +

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

diff --git a/sw/torbutton.dtd b/sw/torbutton.dtd
index 71cd9a4b3..3df16436f 100644
--- a/sw/torbutton.dtd
+++ b/sw/torbutton.dtd
@@ -21,11 +21,11 @@
 
 
 
-
+
 
-
-
-
+
+
+
 
 
 

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

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

2019-05-22 Thread translation

commit f7c3fc9d383b738e5236c13b11ea89e859c092fd
Author: Translation commit bot 
Date:   Wed May 22 15:17:33 2019 +

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

diff --git a/sw/sw.po b/sw/sw.po
index e0c41096b..18c5aa279 100644
--- a/sw/sw.po
+++ b/sw/sw.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2019-03-17 09:03+0100\n"
-"PO-Revision-Date: 2019-04-04 13:20+\n"
+"PO-Revision-Date: 2019-05-22 14:51+\n"
 "Last-Translator: Zaituni Njovu \n"
 "Language-Team: Swahili 
(http://www.transifex.com/otf/torproject/language/sw/)\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +96,7 @@ msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Setting.pm:113
 msgid "Custom"
-msgstr ""
+msgstr "Desturi"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:55
 msgid "Personal Data"

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

[tor-commits] [tor/master] Edit changelog entries for clarity and conciseness

2019-05-22 Thread nickm

commit 21b051d1cbf5d60ccbeaf24925c4ff446d493523
Author: Nick Mathewson 
Date:   Wed May 22 11:06:37 2019 -0400

Edit changelog entries for clarity and conciseness
---
 ChangeLog | 331 --
 1 file changed, 151 insertions(+), 180 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4335a28c6..b3562bf6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,19 +5,16 @@ Changes in version 0.4.1.1-alpha - 2019-05-??
   certain denial-of-service attacks more difficult, and improves
   performance in several areas.
 
-  o Code simplification and refactoring (circuit padding):
-
   o Major features (circuit padding):
-- Onion service clients will now add padding cells to the initial
-  portions of their INTRODUCE and RENDEZVOUS circuits, to make those
-  circuits' traffic patterns look more like general purpose Exit
-  traffic. The overhead for this is 2 extra cells in each direction
-  for RENDEZVOUS circuits, and 1 extra upstream cell and 10
-  downstream cells for INTRODUCE circuits. This will only be enabled
-  if the circuit's middle node supports this feature, too. (Clients
-  may specify fixed middle nodes with the MiddleNodes torrc
-  directive, and may force-disable this feature with the
-  CircuitPadding torrc directive). Closes ticket 28634.
+- Onion service clients now add padding cells at the start of their
+  INTRODUCE and RENDEZVOUS circuits, to make those circuits' traffic
+  look more like general purpose Exit traffic. The overhead for this
+  is 2 extra cells in each direction for RENDEZVOUS circuits, and 1
+  extra upstream cell and 10 downstream cells for INTRODUCE
+  circuits. This feature is only enabled when also supported by the
+  circuit's middle node. (Clients may specify fixed middle nodes
+  with the MiddleNodes option, and may force-disable this feature
+  with the CircuitPadding torrc.) Closes ticket 28634.
 
   o Major features (code organization):
 - Tor now includes a generic publish-subscribe message-passing
@@ -29,20 +26,22 @@ Changes in version 0.4.1.1-alpha - 2019-05-??
   o Major features (controller protocol):
 - Controller commands are now parsed using a generalized parsing
   subsystem. Previously, each controller command was responsible for
-  parsing its own input. Closes ticket 30091.
+  parsing its own input, which led to strange inconsistencies.
+  Closes ticket 30091.
 
   o Major features (flow control):
-- Implement authenticated SENDMEs detailed in proposal 289. A SENDME
-  cell now includes the digest of the last cell received so once the
-  end point receives the SENDME, it can confirm the other side's
-  knowledge of the previous cells that were sent. This behavior is
-  controlled by two new consensus parameters, see proposal for more
-  details. Fixes ticket 26288.
+- Implement authenticated SENDMEs as detailed in proposal 289. A
+  SENDME cell now includes the digest of the traffic that it
+  acknowledges, so that once end point receives the SENDME, it can
+  confirm the other side's knowledge of the previous cells that were
+  sent, and prevent certain types of denial-of-service attacks. This
+  behavior is controlled by two new consensus parameters: see the
+  proposal for more details. Fixes ticket 26288.
 
   o Major features (performance):
-- Update our node selection algorithm to exclude nodes in linear
-  time. Previously, the algorithm was quadratic, which could slow
-  down heavily used onion services. Closes ticket 30307.
+- Our node selection algorithm now excludes nodes in linear time.
+  Previously, the algorithm was quadratic, which could slow down
+  heavily used onion services. Closes ticket 30307.
 
   o Major features (performance, RNG):
 - Tor now constructs a fast secure pseudorandom number generator for
@@ -51,64 +50,64 @@ Changes in version 0.4.1.1-alpha - 2019-05-??
   libottery and the (newer) OpenBSD arc4random() code. It
   outperforms OpenSSL 1.1.1a's CSPRNG by roughly a factor of 100 for
   small outputs. Although we believe it to be cryptographically
-  strong, we are only using it when necessary for reasonable
-  performance. Implements tickets 29023 and 29536.
+  strong, we are only using it when necessary for performance.
+  Implements tickets 29023 and 29536.
 
   o Minor features (circuit padding):
-- We now use a fast RNG when scheduling circuit padding. Part of
+- We now use a fast PRNG when scheduling circuit padding. Part of
   ticket 28636.
 - Allow the padding machine designer to pick the edges of their
   histogram instead of trying to compute them automatically using an
   exponential formula. Resolves some undefined behavior in the case
   of small histograms and allows greater flexibility on machine
   design. Closes ticket 2

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

2019-05-22 Thread translation

commit c164282de92c8d3776ed0deada57fb6dd63d4530
Author: Translation commit bot 
Date:   Wed May 22 14:49:54 2019 +

Update translations for torcheck
---
 sw/torcheck.po | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/sw/torcheck.po b/sw/torcheck.po
index 5538e656b..ced358991 100644
--- a/sw/torcheck.po
+++ b/sw/torcheck.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-04-09 01:51+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-05-22 14:42+\n"
+"Last-Translator: Zaituni Njovu \n"
 "Language-Team: Swahili 
(http://www.transifex.com/otf/torproject/language/sw/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,21 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Congratulations. This browser is configured to use Tor."
-msgstr ""
+msgstr "Hongera.  Kivinjari hiki kimewekwa kutumia Tor."
 
 msgid ""
 "Please refer to the https://www.torproject.org/\";>Tor website "
 "for further information about using Tor safely.  You are now free to browse "
 "the Internet anonymously."
-msgstr ""
+msgstr "Tafadhali rejeakwa 1  tovuti ya Tor  1  kwa taarifa zaidi kuhusu 
kutumia Tor kwa usalama.  Sasa upo huru kuvinjari internet bila kujulikana."
 
 msgid "There is a security update available for Tor Browser."
-msgstr ""
+msgstr "Sasisho mpya inapatikana kwa kivinjari cha Tor."
 
 msgid ""
 "https://www.torproject.org/download/\";>Click here to go to the "
 "download page"
-msgstr ""
+msgstr "1  gusa hapa kwenda kwenye ukurasa uliopakuliwa  1 "
 
 msgid "Sorry. You are not using Tor."
 msgstr "Samahai hautumii Tor."
@@ -42,54 +42,54 @@ msgid ""
 "href=\"https://www.torproject.org/\";>Tor website and specifically the https://support.torproject.org/#faq\";>frequently asked "
 "questions."
-msgstr ""
+msgstr "Kama unajaribu kutumia mteja wa Tor, tafadhali rejea kwa 1 tovuti ya 
Tor 1 na maalum kwa 2  maswali yanayoulizwa mara kwa mara 2 ."
 
 msgid "Sorry, your query failed or an unexpected response was received."
-msgstr ""
+msgstr "Samahani, swala lako limeshindwa au yalipokelewa majibu 
yasiyotarajiwa."
 
 msgid "Your IP address appears to be: "
 msgstr "Anuani yako ya ID inaonekana kuwa:"
 
 msgid "This page is also available in the following languages:"
-msgstr ""
+msgstr "Ukurasa huu pia unapatikana katika lugha zifuatazo:"
 
 msgid "For more information about this exit relay, see:"
-msgstr ""
+msgstr "Kwa taarifa zaidi kuhusu hii kutoka relay, ona:"
 
 msgid ""
 "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
 "development, and education of online anonymity and privacy."
-msgstr ""
+msgstr "Mradi wa Tor ni US 501(c) isiyo na faida kujitolea utafiti, maendeleo, 
na elimu ya kwenye mtandao bila kujulikana na faragha."
 
 msgid "Learn More »"
-msgstr ""
+msgstr "Soma zaidi & raquo;"
 
 msgid "Go"
-msgstr ""
+msgstr "Nenda"
 
 msgid "Donate to Support Tor"
-msgstr ""
+msgstr "Changia kusaidia Tor"
 
 msgid "Tor Q&A Site"
-msgstr ""
+msgstr "Eneo la Tor Maswali & Majibu "
 
 msgid "Volunteer"
-msgstr ""
+msgstr "Kujitolea"
 
 msgid "JavaScript is enabled."
-msgstr ""
+msgstr "JavaScript imewezeshwa."
 
 msgid "JavaScript is disabled."
-msgstr ""
+msgstr "JavaScript imezuiwa."
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr ""
+msgstr "Hata hivyo, Haionekani kuwa kivinjari cha Tor."
 
 msgid "Run a Relay"
-msgstr ""
+msgstr "Kimbia a Relay"
 
 msgid "Stay Anonymous"
-msgstr ""
+msgstr "Kuwa isiyojulikana"
 
 msgid "Relay Search"
-msgstr ""
+msgstr "Tafuta Relay"

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

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

2019-05-22 Thread translation

commit 00e5f42b4662fcb9b97bb337a825c26f7d4f2194
Author: Translation commit bot 
Date:   Wed May 22 14:50:00 2019 +

Update translations for torcheck_completed
---
 sw/torcheck.po | 95 ++
 1 file changed, 95 insertions(+)

diff --git a/sw/torcheck.po b/sw/torcheck.po
new file mode 100644
index 0..ced358991
--- /dev/null
+++ b/sw/torcheck.po
@@ -0,0 +1,95 @@
+# TorCheck gettext template
+# Copyright (C) 2008-2013 The Tor Project, Inc
+# 
+# Translators:
+# Zaituni Njovu , 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"POT-Creation-Date: 2012-02-16 20:28+PDT\n"
+"PO-Revision-Date: 2019-05-22 14:42+\n"
+"Last-Translator: Zaituni Njovu \n"
+"Language-Team: Swahili 
(http://www.transifex.com/otf/torproject/language/sw/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+"Language: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Congratulations. This browser is configured to use Tor."
+msgstr "Hongera.  Kivinjari hiki kimewekwa kutumia Tor."
+
+msgid ""
+"Please refer to the https://www.torproject.org/\";>Tor website "
+"for further information about using Tor safely.  You are now free to browse "
+"the Internet anonymously."
+msgstr "Tafadhali rejeakwa 1  tovuti ya Tor  1  kwa taarifa zaidi kuhusu 
kutumia Tor kwa usalama.  Sasa upo huru kuvinjari internet bila kujulikana."
+
+msgid "There is a security update available for Tor Browser."
+msgstr "Sasisho mpya inapatikana kwa kivinjari cha Tor."
+
+msgid ""
+"https://www.torproject.org/download/\";>Click here to go to the "
+"download page"
+msgstr "1  gusa hapa kwenda kwenye ukurasa uliopakuliwa  1 "
+
+msgid "Sorry. You are not using Tor."
+msgstr "Samahai hautumii Tor."
+
+msgid ""
+"If you are attempting to use a Tor client, please refer to the https://www.torproject.org/\";>Tor website and specifically the https://support.torproject.org/#faq\";>frequently asked "
+"questions."
+msgstr "Kama unajaribu kutumia mteja wa Tor, tafadhali rejea kwa 1 tovuti ya 
Tor 1 na maalum kwa 2  maswali yanayoulizwa mara kwa mara 2 ."
+
+msgid "Sorry, your query failed or an unexpected response was received."
+msgstr "Samahani, swala lako limeshindwa au yalipokelewa majibu 
yasiyotarajiwa."
+
+msgid "Your IP address appears to be: "
+msgstr "Anuani yako ya ID inaonekana kuwa:"
+
+msgid "This page is also available in the following languages:"
+msgstr "Ukurasa huu pia unapatikana katika lugha zifuatazo:"
+
+msgid "For more information about this exit relay, see:"
+msgstr "Kwa taarifa zaidi kuhusu hii kutoka relay, ona:"
+
+msgid ""
+"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
+"development, and education of online anonymity and privacy."
+msgstr "Mradi wa Tor ni US 501(c) isiyo na faida kujitolea utafiti, maendeleo, 
na elimu ya kwenye mtandao bila kujulikana na faragha."
+
+msgid "Learn More »"
+msgstr "Soma zaidi & raquo;"
+
+msgid "Go"
+msgstr "Nenda"
+
+msgid "Donate to Support Tor"
+msgstr "Changia kusaidia Tor"
+
+msgid "Tor Q&A Site"
+msgstr "Eneo la Tor Maswali & Majibu "
+
+msgid "Volunteer"
+msgstr "Kujitolea"
+
+msgid "JavaScript is enabled."
+msgstr "JavaScript imewezeshwa."
+
+msgid "JavaScript is disabled."
+msgstr "JavaScript imezuiwa."
+
+msgid "However, it does not appear to be Tor Browser."
+msgstr "Hata hivyo, Haionekani kuwa kivinjari cha Tor."
+
+msgid "Run a Relay"
+msgstr "Kimbia a Relay"
+
+msgid "Stay Anonymous"
+msgstr "Kuwa isiyojulikana"
+
+msgid "Relay Search"
+msgstr "Tafuta Relay"

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

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

2019-05-22 Thread translation

commit fa946908d28ef130f1f37d3ed5ad81351ff83f47
Author: Translation commit bot 
Date:   Wed May 22 14:45:46 2019 +

Update translations for exoneratorproperties
---
 sw/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sw/exonerator.properties b/sw/exonerator.properties
index 3dbcdb127..318e48cfe 100644
--- a/sw/exonerator.properties
+++ b/sw/exonerator.properties
@@ -49,5 +49,5 @@ footer.abouttor.body.link2=contact The Tor Project, Inc.
 footer.aboutexonerator.heading=About ExoneraTor
 footer.aboutexonerator.body=The ExoneraTor service maintains a database of IP 
addresses that have been part of the Tor network.  It answers the question 
whether there was a Tor relay running on a given IP address on a given 
date.  ExoneraTor may store more than one IP address per relay if relays 
use a different IP address for exiting to the Internet than for registering in 
the Tor network, and it stores whether a relay permitted transit of Tor traffic 
to the open Internet at that time.
 footer.language.name=English
-footer.language.text=This page is also available in the following languages:
+footer.language.text=Ukurasa huu pia unapatikana katika lugha zifuatazo:
 

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

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

2019-05-22 Thread translation

commit e56a50d659ea1e704ebc8c4533cff3bdac965e6c
Author: Translation commit bot 
Date:   Wed May 22 13:47:41 2019 +

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

diff --git a/ru/torbrowser_strings.dtd b/ru/torbrowser_strings.dtd
index 04e8e4f54..b65cce378 100644
--- a/ru/torbrowser_strings.dtd
+++ b/ru/torbrowser_strings.dtd
@@ -56,4 +56,4 @@
 
 
 
-
+

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

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

2019-05-22 Thread translation

commit 129a119d2533057973f93b58e05bdc4ad6445191
Author: Translation commit bot 
Date:   Wed May 22 13:47:47 2019 +

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

diff --git a/ru/torbrowser_strings.dtd b/ru/torbrowser_strings.dtd
index 04e8e4f54..b65cce378 100644
--- a/ru/torbrowser_strings.dtd
+++ b/ru/torbrowser_strings.dtd
@@ -56,4 +56,4 @@
 
 
 
-
+

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

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

2019-05-22 Thread translation

commit f4436260f83822918b57628c0647684ab134288d
Author: Translation commit bot 
Date:   Wed May 22 13:20:44 2019 +

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

diff --git a/pt_PT/torlauncher.properties b/pt_PT/torlauncher.properties
index d010d6cbe..cea69f118 100644
--- a/pt_PT/torlauncher.properties
+++ b/pt_PT/torlauncher.properties
@@ -44,7 +44,7 @@ torlauncher.no_bridges_available=De momento, nÃ£o estÃ£o 
disponÃveis pontes. De
 torlauncher.connect=Ligar
 torlauncher.restart_tor=Reiniciar o Tor
 torlauncher.quit=Sair
-torlauncher.quit_win=Sair
+torlauncher.quit_win=Fechar
 torlauncher.done=ConcluÃdo
 
 torlauncher.forAssistance=Para assistÃªncia, contacte %S

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

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

2019-05-22 Thread translation

commit ef246ccec0d6e63a8badcac1ddcea5e16f6f77d0
Author: Translation commit bot 
Date:   Wed May 22 13:21:16 2019 +

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

diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po
index 0e5adfa73..284e11ce6 100644
--- a/pt_PT/pt_PT.po
+++ b/pt_PT/pt_PT.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-29 12:08+0200\n"
-"PO-Revision-Date: 2019-05-22 12:48+\n"
+"PO-Revision-Date: 2019-05-22 13:14+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"

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

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

2019-05-22 Thread translation

commit 7371da43401ef955abb67f7ce1d7c316fed10298
Author: Translation commit bot 
Date:   Wed May 22 13:21:22 2019 +

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

diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po
index 0e5adfa73..284e11ce6 100644
--- a/pt_PT/pt_PT.po
+++ b/pt_PT/pt_PT.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-29 12:08+0200\n"
-"PO-Revision-Date: 2019-05-22 12:48+\n"
+"PO-Revision-Date: 2019-05-22 13:14+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"

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

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

2019-05-22 Thread translation

commit f1769740d7013d71a784f6bcae20b5e89d9b583c
Author: Translation commit bot 
Date:   Wed May 22 13:20:38 2019 +

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

diff --git a/pt_PT/torlauncher.properties b/pt_PT/torlauncher.properties
index d010d6cbe..cea69f118 100644
--- a/pt_PT/torlauncher.properties
+++ b/pt_PT/torlauncher.properties
@@ -44,7 +44,7 @@ torlauncher.no_bridges_available=De momento, nÃ£o estÃ£o 
disponÃveis pontes. De
 torlauncher.connect=Ligar
 torlauncher.restart_tor=Reiniciar o Tor
 torlauncher.quit=Sair
-torlauncher.quit_win=Sair
+torlauncher.quit_win=Fechar
 torlauncher.done=ConcluÃdo
 
 torlauncher.forAssistance=Para assistÃªncia, contacte %S

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

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

2019-05-22 Thread translation

commit b05b0a4dcc72c647c28dfb82e8e787867c2acb0b
Author: Translation commit bot 
Date:   Wed May 22 13:19:30 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 pt-PT/torbutton.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt-PT/torbutton.properties b/pt-PT/torbutton.properties
index a42365063..d3a8c5194 100644
--- a/pt-PT/torbutton.properties
+++ b/pt-PT/torbutton.properties
@@ -14,14 +14,14 @@ torbutton.panel.tooltip.enabled = Clique para desativar o 
Tor
 torbutton.panel.label.disabled = Tor Desativado
 torbutton.panel.label.enabled = Tor Ativado
 extensions.torbut...@torproject.org.description = O Torbutton proporciona um 
botÃ£o para configurar as definiÃ§Ãµes do Tor, e para limpar facilmente e 
rapidamente os dados de navegaÃ§Ã£o privados.
-torbutton.popup.external.title = Descarregar um tipo de ficheiro externo?
+torbutton.popup.external.title = Transferir um tipo de ficheiro externo?
 torbutton.popup.external.app = O Tor Browser nÃ£o consegue mostrar este 
ficheiro. PoderÃ¡ ter que o abrir com outra aplicaÃ§Ã£o.\n\n
 torbutton.popup.external.note = Alguns tipos de ficheiros podem fazer com que 
as aplicaÃ§Ãµes liguem Ã  Internet sem utilizar o Tor.\n\n
 torbutton.popup.external.suggest = Para sua seguranÃ§a, sÃ³ deverÃ¡ abrir os 
ficheiros transferidos enquanto estiver desligado da Internet, ou utilizar um 
CD Live do Tor, como o Tails.\n
-torbutton.popup.launch = Descarregar ficheiro
+torbutton.popup.launch = Transferir ficheiro
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = A partir de agora, transferir automaticamente os 
ficheiros
-torbutton.popup.no_newnym = O Torbutton nÃ£o pode, em seguranÃ§a, fornecer-lhe 
uma nova identidade. NÃ£o tem acesso Ã  porta de controle Tor.\n\nEstÃ¡ a usar 
o Tor Browser Bundle?
+torbutton.popup.no_newnym = O Torbutton nÃ£o pode fornecer-lhe uma nova 
identidade em seguranÃ§a. Este nÃ£o tem acesso Ã  'Porta de Controlo' do 
Tor.\n\nEstÃ¡ a usar o Tor Browser Bundle?
 torbutton.security_settings.menu.title = ConfiguraÃ§Ãµes de SeguranÃ§a
 torbutton.title.prompt_torbrowser = InformaÃ§Ã£o Importante do Torbutton
 torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma 
diferente: jÃ¡ nÃ£o pode desligÃ¡-lo.\n\nNÃ³s efetuÃ¡mos esta alteraÃ§Ã£o 
porque nÃ£o Ã© seguro utilizar o Torbutton num navegador que tambÃ©m Ã© 
utilizado para a navegaÃ§Ã£o sem o Tor. Existiam demasiados erros que nÃ³s nÃ£o 
conseguirÃamos corrigir de outra forma.\n\nSe pretender continuar a utilizar o 
Firefox normalmente, deverÃ¡ desinstalar o Torbutton e transferir o Pacote do 
Tor Browser. As propriedades de privacidade do Tor Browser tambÃ©m sÃ£o 
superiores Ã quelas do Firefox normal, mesmo quando este Ã© utilizado com o 
Torbutton.\n\nPara remover o Torbutton, vÃ¡ a Ferramentas->Extras->ExtensÃµes e 
depois clique no botÃ£o 'Remover' junto ao Torbutton.

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

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

2019-05-22 Thread translation

commit 090fd97dd56490d8b8bd8df85d267c907de6277f
Author: Translation commit bot 
Date:   Wed May 22 13:19:17 2019 +

Update translations for torbutton-branddtd_completed
---
 pt-PT/brand.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt-PT/brand.dtd b/pt-PT/brand.dtd
index 912e89881..163525991 100644
--- a/pt-PT/brand.dtd
+++ b/pt-PT/brand.dtd
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 

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

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

2019-05-22 Thread translation

commit 60defa9e5b7f79f3225241fd69bc45bfee69a03c
Author: Translation commit bot 
Date:   Wed May 22 13:19:23 2019 +

Update translations for torbutton-torbuttonproperties
---
 pt-PT/torbutton.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt-PT/torbutton.properties b/pt-PT/torbutton.properties
index a42365063..d3a8c5194 100644
--- a/pt-PT/torbutton.properties
+++ b/pt-PT/torbutton.properties
@@ -14,14 +14,14 @@ torbutton.panel.tooltip.enabled = Clique para desativar o 
Tor
 torbutton.panel.label.disabled = Tor Desativado
 torbutton.panel.label.enabled = Tor Ativado
 extensions.torbut...@torproject.org.description = O Torbutton proporciona um 
botÃ£o para configurar as definiÃ§Ãµes do Tor, e para limpar facilmente e 
rapidamente os dados de navegaÃ§Ã£o privados.
-torbutton.popup.external.title = Descarregar um tipo de ficheiro externo?
+torbutton.popup.external.title = Transferir um tipo de ficheiro externo?
 torbutton.popup.external.app = O Tor Browser nÃ£o consegue mostrar este 
ficheiro. PoderÃ¡ ter que o abrir com outra aplicaÃ§Ã£o.\n\n
 torbutton.popup.external.note = Alguns tipos de ficheiros podem fazer com que 
as aplicaÃ§Ãµes liguem Ã  Internet sem utilizar o Tor.\n\n
 torbutton.popup.external.suggest = Para sua seguranÃ§a, sÃ³ deverÃ¡ abrir os 
ficheiros transferidos enquanto estiver desligado da Internet, ou utilizar um 
CD Live do Tor, como o Tails.\n
-torbutton.popup.launch = Descarregar ficheiro
+torbutton.popup.launch = Transferir ficheiro
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = A partir de agora, transferir automaticamente os 
ficheiros
-torbutton.popup.no_newnym = O Torbutton nÃ£o pode, em seguranÃ§a, fornecer-lhe 
uma nova identidade. NÃ£o tem acesso Ã  porta de controle Tor.\n\nEstÃ¡ a usar 
o Tor Browser Bundle?
+torbutton.popup.no_newnym = O Torbutton nÃ£o pode fornecer-lhe uma nova 
identidade em seguranÃ§a. Este nÃ£o tem acesso Ã  'Porta de Controlo' do 
Tor.\n\nEstÃ¡ a usar o Tor Browser Bundle?
 torbutton.security_settings.menu.title = ConfiguraÃ§Ãµes de SeguranÃ§a
 torbutton.title.prompt_torbrowser = InformaÃ§Ã£o Importante do Torbutton
 torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma 
diferente: jÃ¡ nÃ£o pode desligÃ¡-lo.\n\nNÃ³s efetuÃ¡mos esta alteraÃ§Ã£o 
porque nÃ£o Ã© seguro utilizar o Torbutton num navegador que tambÃ©m Ã© 
utilizado para a navegaÃ§Ã£o sem o Tor. Existiam demasiados erros que nÃ³s nÃ£o 
conseguirÃamos corrigir de outra forma.\n\nSe pretender continuar a utilizar o 
Firefox normalmente, deverÃ¡ desinstalar o Torbutton e transferir o Pacote do 
Tor Browser. As propriedades de privacidade do Tor Browser tambÃ©m sÃ£o 
superiores Ã quelas do Firefox normal, mesmo quando este Ã© utilizado com o 
Torbutton.\n\nPara remover o Torbutton, vÃ¡ a Ferramentas->Extras->ExtensÃµes e 
depois clique no botÃ£o 'Remover' junto ao Torbutton.

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

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

2019-05-22 Thread translation

commit d351581b6649821bf80a992fc3ae859e7a15941c
Author: Translation commit bot 
Date:   Wed May 22 13:19:10 2019 +

Update translations for torbutton-branddtd
---
 pt-PT/brand.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt-PT/brand.dtd b/pt-PT/brand.dtd
index 912e89881..163525991 100644
--- a/pt-PT/brand.dtd
+++ b/pt-PT/brand.dtd
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 

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

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

2019-05-22 Thread translation

commit 965276a0708646d343565f37f6c50e85f871d65f
Author: Translation commit bot 
Date:   Wed May 22 13:19:04 2019 +

Update translations for torbutton-brandproperties_completed
---
 pt-PT/brand.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt-PT/brand.properties b/pt-PT/brand.properties
index 0cc33ad3e..f370194a1 100644
--- a/pt-PT/brand.properties
+++ b/pt-PT/brand.properties
@@ -11,6 +11,6 @@ homePageSingleStartMain=PÃ¡gina Inicial do Firefox, uma 
pÃ¡gina inicial rÃ¡pida
 homePageImport=Importar a sua pÃ¡gina inicial de %S
 
 homePageMigrationPageTitle=SeleÃ§Ã£o da PÃ¡gina Inicial
-homePageMigrationDescription=Selecione a pÃ¡gina inicial que deseja usar:
+homePageMigrationDescription=Por favor, selecione a pÃ¡gina inicial que deseja 
usar:
 
 syncBrandShortName=Sincronizar

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

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

2019-05-22 Thread translation

commit 925db3eec8f902dfd9c1ddcbb932cafe1acc26dd
Author: Translation commit bot 
Date:   Wed May 22 13:18:57 2019 +

Update translations for torbutton-brandproperties
---
 pt-PT/brand.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt-PT/brand.properties b/pt-PT/brand.properties
index 0cc33ad3e..f370194a1 100644
--- a/pt-PT/brand.properties
+++ b/pt-PT/brand.properties
@@ -11,6 +11,6 @@ homePageSingleStartMain=PÃ¡gina Inicial do Firefox, uma 
pÃ¡gina inicial rÃ¡pida
 homePageImport=Importar a sua pÃ¡gina inicial de %S
 
 homePageMigrationPageTitle=SeleÃ§Ã£o da PÃ¡gina Inicial
-homePageMigrationDescription=Selecione a pÃ¡gina inicial que deseja usar:
+homePageMigrationDescription=Por favor, selecione a pÃ¡gina inicial que deseja 
usar:
 
 syncBrandShortName=Sincronizar

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

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

2019-05-22 Thread translation

commit cf557f50c805cdaa35bda993bcc52323ce5d18ba
Author: Translation commit bot 
Date:   Wed May 22 13:18:43 2019 +

Update translations for torbirdy
---
 pt_PT/torbirdy.dtd| 4 ++--
 pt_PT/torbirdy.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_PT/torbirdy.dtd b/pt_PT/torbirdy.dtd
index 5fa39d5be..890b06309 100644
--- a/pt_PT/torbirdy.dtd
+++ b/pt_PT/torbirdy.dtd
@@ -19,11 +19,11 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
diff --git a/pt_PT/torbirdy.properties b/pt_PT/torbirdy.properties
index 522e756fd..5b16e8424 100644
--- a/pt_PT/torbirdy.properties
+++ b/pt_PT/torbirdy.properties
@@ -1,6 +1,6 @@
 torbirdy.name=TorBirdy
 
-torbirdy.enabled.tor=TorBirdy Ativado:Tor
+torbirdy.enabled.tor=TorBirdy ativado:Tor
 torbirdy.enabled.jondo=TorBirdy ativado:JonDo
 torbirdy.enabled.custom=TorBirdy ativado:Proxy Personalizado
 torbirdy.enabled.torification=TorBirdy ativado:TorificaÃ§Ã£o Transparente
@@ -12,4 +12,4 @@ torbirdy.email.prompt=O TorBirdy desativou o assistente de 
configuraÃ§Ã£o autom
 
 torbirdy.email.advanced=Por favor, note que NÃO Ã© recomendado que altere as 
configuraÃ§Ãµes avanÃ§adas do TorBirdy.\n\nDeve continuar apenas se tiver a 
certeza do que estÃ¡ a fazer.
 torbirdy.email.advanced.nextwarning=Mostrar este aviso na prÃ³xima vez
-torbirdy.email.advanced.title=ConfiguraÃ§Ãµes AvanÃ§adas do TorBirdy
+torbirdy.email.advanced.title=DefiniÃ§Ãµes AvanÃ§adas do TorBirdy

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

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

2019-05-22 Thread translation

commit 2d443396484f34c7dcaf4fd6a4ecb74cba6a9b6f
Author: Translation commit bot 
Date:   Wed May 22 13:18:50 2019 +

Update translations for torbirdy_completed
---
 pt_PT/torbirdy.dtd| 4 ++--
 pt_PT/torbirdy.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_PT/torbirdy.dtd b/pt_PT/torbirdy.dtd
index 5fa39d5be..890b06309 100644
--- a/pt_PT/torbirdy.dtd
+++ b/pt_PT/torbirdy.dtd
@@ -19,11 +19,11 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
diff --git a/pt_PT/torbirdy.properties b/pt_PT/torbirdy.properties
index 522e756fd..5b16e8424 100644
--- a/pt_PT/torbirdy.properties
+++ b/pt_PT/torbirdy.properties
@@ -1,6 +1,6 @@
 torbirdy.name=TorBirdy
 
-torbirdy.enabled.tor=TorBirdy Ativado:Tor
+torbirdy.enabled.tor=TorBirdy ativado:Tor
 torbirdy.enabled.jondo=TorBirdy ativado:JonDo
 torbirdy.enabled.custom=TorBirdy ativado:Proxy Personalizado
 torbirdy.enabled.torification=TorBirdy ativado:TorificaÃ§Ã£o Transparente
@@ -12,4 +12,4 @@ torbirdy.email.prompt=O TorBirdy desativou o assistente de 
configuraÃ§Ã£o autom
 
 torbirdy.email.advanced=Por favor, note que NÃO Ã© recomendado que altere as 
configuraÃ§Ãµes avanÃ§adas do TorBirdy.\n\nDeve continuar apenas se tiver a 
certeza do que estÃ¡ a fazer.
 torbirdy.email.advanced.nextwarning=Mostrar este aviso na prÃ³xima vez
-torbirdy.email.advanced.title=ConfiguraÃ§Ãµes AvanÃ§adas do TorBirdy
+torbirdy.email.advanced.title=DefiniÃ§Ãµes AvanÃ§adas do TorBirdy

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

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

2019-05-22 Thread translation

commit 391eff5005bacc88892b13f42f023edb0436018e
Author: Translation commit bot 
Date:   Wed May 22 13:17:55 2019 +

Update translations for tails-persistence-setup_completed
---
 pt_PT/pt_PT.po | 85 +-
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po
index b2da938d5..0892f335e 100644
--- a/pt_PT/pt_PT.po
+++ b/pt_PT/pt_PT.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MS , 2018
+# Manuela Silva , 2019
+# Manuela Silva , 2018
 # Rui , 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-11-01 12:21+0100\n"
-"PO-Revision-Date: 2019-01-23 17:12+\n"
-"Last-Translator: Rui \n"
+"POT-Creation-Date: 2019-03-17 09:03+0100\n"
+"PO-Revision-Date: 2019-05-22 13:02+\n"
+"Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +88,7 @@ msgstr "O dispositivo %s nÃ£o foi criado com o Instalador do 
Tails."
 
 #: ../lib/Tails/Persistence/Setup.pm:688
 msgid "Persistence wizard - Finished"
-msgstr "Assistente do volume persistente - Terminou"
+msgstr "Assistente do volume permanente - Terminou"
 
 #: ../lib/Tails/Persistence/Setup.pm:691
 msgid ""
@@ -100,102 +101,102 @@ msgstr "Quaisquer alteraÃ§Ãµes efetuadas sÃ³ serÃ£o 
aplicadas depois de reinicia
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:56
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:55
 msgid "Personal Data"
-msgstr "Dados pessoais"
+msgstr "Dados Pessoais"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:58
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:57
 msgid "Keep files stored in the `Persistent' directory"
-msgstr "Mantenha os ficheiros guardados no diretÃ³rio 'Persistent'"
+msgstr "Mantenha os ficheiros guardados na diretoria 'Persistent'"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:71
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "Browser Bookmarks"
 msgstr "Marcadores do Navegador"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:73
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:72
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Favoritos guardados no Tor Browser"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:86
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Network Connections"
 msgstr "LigaÃ§Ãµes de Rede"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:88
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Configuration of network devices and connections"
 msgstr "ConfiguraÃ§Ã£o dos dispositivos e ligaÃ§Ãµes da rede"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:101
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Additional Software"
 msgstr "Programas Adicionais"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:103
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Software installed when starting Tails"
 msgstr "Software instalado quando iniciar o Tails"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:121
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Printers"
 msgstr "Impressoras"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:123
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:122
 msgid "Printers configuration"
 msgstr "ConfiguraÃ§Ã£o de impressoras"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:136
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "E-mails do Thunderbird, feeds, e configuraÃ§Ãµes"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:151
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:153
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "GnuPG keyrings and configuration"
 msgstr "ConfiguraÃ§Ã£o e gestor de chaves GnuPG"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:166
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "Bitcoin Client"
 msgstr "Bitcoin - Cliente"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:168
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "ConfiguraÃ§Ã£o e carteira bitcoin Electrum"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:181
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../lib/Tails/Persistence/Configuration/Pres

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

2019-05-22 Thread translation

commit 5d36663b53a47c109c1ba0aa62268b764fffcb64
Author: Translation commit bot 
Date:   Wed May 22 13:17:48 2019 +

Update translations for tails-persistence-setup
---
 pt_PT/pt_PT.po | 85 +-
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po
index b2da938d5..0892f335e 100644
--- a/pt_PT/pt_PT.po
+++ b/pt_PT/pt_PT.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MS , 2018
+# Manuela Silva , 2019
+# Manuela Silva , 2018
 # Rui , 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-11-01 12:21+0100\n"
-"PO-Revision-Date: 2019-01-23 17:12+\n"
-"Last-Translator: Rui \n"
+"POT-Creation-Date: 2019-03-17 09:03+0100\n"
+"PO-Revision-Date: 2019-05-22 13:02+\n"
+"Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +88,7 @@ msgstr "O dispositivo %s nÃ£o foi criado com o Instalador do 
Tails."
 
 #: ../lib/Tails/Persistence/Setup.pm:688
 msgid "Persistence wizard - Finished"
-msgstr "Assistente do volume persistente - Terminou"
+msgstr "Assistente do volume permanente - Terminou"
 
 #: ../lib/Tails/Persistence/Setup.pm:691
 msgid ""
@@ -100,102 +101,102 @@ msgstr "Quaisquer alteraÃ§Ãµes efetuadas sÃ³ serÃ£o 
aplicadas depois de reinicia
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:56
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:55
 msgid "Personal Data"
-msgstr "Dados pessoais"
+msgstr "Dados Pessoais"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:58
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:57
 msgid "Keep files stored in the `Persistent' directory"
-msgstr "Mantenha os ficheiros guardados no diretÃ³rio 'Persistent'"
+msgstr "Mantenha os ficheiros guardados na diretoria 'Persistent'"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:71
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "Browser Bookmarks"
 msgstr "Marcadores do Navegador"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:73
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:72
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Favoritos guardados no Tor Browser"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:86
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Network Connections"
 msgstr "LigaÃ§Ãµes de Rede"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:88
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Configuration of network devices and connections"
 msgstr "ConfiguraÃ§Ã£o dos dispositivos e ligaÃ§Ãµes da rede"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:101
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Additional Software"
 msgstr "Programas Adicionais"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:103
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Software installed when starting Tails"
 msgstr "Software instalado quando iniciar o Tails"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:121
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Printers"
 msgstr "Impressoras"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:123
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:122
 msgid "Printers configuration"
 msgstr "ConfiguraÃ§Ã£o de impressoras"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:136
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "E-mails do Thunderbird, feeds, e configuraÃ§Ãµes"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:151
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:153
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "GnuPG keyrings and configuration"
 msgstr "ConfiguraÃ§Ã£o e gestor de chaves GnuPG"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:166
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "Bitcoin Client"
 msgstr "Bitcoin - Cliente"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:168
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "ConfiguraÃ§Ã£o e carteira bitcoin Electrum"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:181
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:183

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

2019-05-22 Thread translation

commit 42d8696c831b0d736f6e38f8bc71f74a2c25834b
Author: Translation commit bot 
Date:   Wed May 22 13:17:27 2019 +

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

diff --git a/pt_PT/openpgp-applet.pot b/pt_PT/openpgp-applet.pot
index 279d81cea..f19fbc30d 100644
--- a/pt_PT/openpgp-applet.pot
+++ b/pt_PT/openpgp-applet.pot
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the OpenPGP_Applet 
package.
 # 
 # Translators:
-# MS , 2018
-# MS , 2019
+# Manuela Silva , 2018
+# Manuela Silva , 2019
 # Rui , 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2019-05-03 11:02+\n"
-"Last-Translator: MS \n"
+"PO-Revision-Date: 2019-05-22 13:14+\n"
+"Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese (Portugal) 
(http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

1 2 >

1 - 100 of 147 matches

Mail list logo