date:20181024

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

2018-10-24 Thread translation

commit aeb85f2aa3973be278e8dee6484a6d6c60c21e48
Author: Translation commit bot 
Date:   Thu Oct 25 01:45:25 2018 +

Update translations for donatepages-messagespot
---
 locale/zh_CN/LC_MESSAGES/messages.po | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po 
b/locale/zh_CN/LC_MESSAGES/messages.po
index b6d319e39..51090219f 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -822,10 +822,13 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq.html.en\;>This Tor Project "
 "FAQ has answers to all those questions, and more."
 msgstr ""
+"https://www.torproject.org/docs/faq.html.en\;>è¿ä¸ª Tor Project 
çFAQ"
+" å°±åçäºææè¿äºæé®ï¼è¿è¯´äºæ´å¤ã"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:163
 msgid "Does the Tor software work?"
-msgstr ""
+msgstr "Tor è½èµ·ä½ç¨åï¼"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:167
 msgid ""
@@ -833,12 +836,14 @@ msgid ""
 "does a better job of keeping you safely anonymous than other options such as"
 " VPNs, proxychains, or browser \"private browsing\" modes."
 msgstr ""
+"æä»¬ç¸ä¿¡ Tor 
æ¯å½ä»æå¥½ä¸å¯ç¨çè§£å³æ¹æ¡ï¼æä»¬ä¹ç¥éå®æ¯å
¶å®æ¹æ³æ¯å¦ VPNs, proxychains, "
+"ææµè§å¨çâéç§æ¨¡å¼âé½æ´å¥½å°è®©ä½ å¿åå°ä¸ç½ã"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:169
 msgid ""
 "We know that both the Russian government and the NSA have tried in the past "
 "to crack Tor, and failed."
-msgstr ""
+msgstr "æä»¬ç¥éä¿ç½æ¯æ¿åºå ç¾å½å½å®¶å®å¨å±é½å°è¯è¿æ»å 
Torï¼ä½é½å¤±è´¥äºã"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:171
 msgid ""
@@ -849,6 +854,9 @@ msgid ""
 "book Data and Goliath, security expert Bruce Schneier wrote \"The current "
 "best tool to protect your anonymity when browsing the web is Tor.\""
 msgstr ""
+"çµååå¨åºéä¼è¯´ Tor æä¾äº https://www.eff.org/deeplinks/2014/07/7-things-you-should-know-about-;
+"tor\">ç°ä»æå¼ºæçå¿åè½¯ä»¶ä¹ä¸ãå®å¨ä¸å®¶ Bruce 
Schneierä¹å¨ä»çä¹¦ãæ°æ®å"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:177
 msgid "Is what Tor does legal? Can I get in trouble for using it?"

___
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

2018-10-24 Thread translation

commit 9f318843fae58ecde8a44d4b174e70c33edfee23
Author: Translation commit bot 
Date:   Thu Oct 25 00:18:58 2018 +

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

diff --git a/hr/torlauncher.properties b/hr/torlauncher.properties
index 835dd1ff2..142408358 100644
--- a/hr/torlauncher.properties
+++ b/hr/torlauncher.properties
@@ -42,7 +42,7 @@ torlauncher.no_meek=This browser is not configured for meek, 
which is needed to
 torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
 
 torlauncher.connect=PoveÅ¾i se
-torlauncher.restart_tor=Restart Tor
+torlauncher.restart_tor=Ponovno pokreni Tor
 torlauncher.quit=Izlaz
 torlauncher.quit_win=Izlaz
 torlauncher.done=Gotovo

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

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

2018-10-24 Thread translation

commit dc3fcbb5dca94861e25fd7729a0ae9cfba60d33c
Author: Translation commit bot 
Date:   Thu Oct 25 00:19:08 2018 +

Update translations for tor-launcher-network-settings
---
 hr/network-settings.dtd | 70 -
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/hr/network-settings.dtd b/hr/network-settings.dtd
index 35f514483..6783163ae 100644
--- a/hr/network-settings.dtd
+++ b/hr/network-settings.dtd
@@ -1,60 +1,60 @@
 
 
 
-
+
 
 
-
-
+
+
 
 
 
-
-
-
+
+
+
 
 
 
 
-
-
-
+
+
+
 
 
-
+
 
-
+
 
-
-
-
+
+
+
 
-
-
+
+
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

___
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

2018-10-24 Thread translation

commit 58724e39b8eb61a9b65d94724a7baf3680fc6908
Author: Translation commit bot 
Date:   Thu Oct 25 00:16:10 2018 +

Update translations for tails-misc
---
 hr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr.po b/hr.po
index aa718b5c7..0ccdb02a2 100644
--- a/hr.po
+++ b/hr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-24 02:12+\n"
+"PO-Revision-Date: 2018-10-24 23:53+\n"
 "Last-Translator: Karlo Prikratki \n"
 "Language-Team: Croatian 
(http://www.transifex.com/otf/torproject/language/hr/)\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-network-settings] Update translations for tor-launcher-network-settings

2018-10-24 Thread translation

commit 6a361ef929804d09d44ad0b8e57ed0b0b991fdeb
Author: Translation commit bot 
Date:   Wed Oct 24 23:49:10 2018 +

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

diff --git a/hr/network-settings.dtd b/hr/network-settings.dtd
index 1c89cc2bd..35f514483 100644
--- a/hr/network-settings.dtd
+++ b/hr/network-settings.dtd
@@ -1,6 +1,6 @@
-
+
 
-
+
 
 
 

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

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

2018-10-24 Thread translation

commit 3829efc081de475f232ad904b19c3234eb08c9ff
Author: Translation commit bot 
Date:   Wed Oct 24 23:47:46 2018 +

Update translations for torbirdy_completed
---
 hr/torbirdy.properties | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/hr/torbirdy.properties b/hr/torbirdy.properties
new file mode 100644
index 0..da8954999
--- /dev/null
+++ b/hr/torbirdy.properties
@@ -0,0 +1,15 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy omoguÄen: Tor
+torbirdy.enabled.jondo=TorBirdy omoguÄen: JonDo
+torbirdy.enabled.custom=TorBirdy omoguÄen: PrilagoÄeni proxy
+torbirdy.enabled.torification=TorBirdy omoguÄen: Prozirna torifikacija
+torbirdy.enabled.whonix=TorBirdy omoguÄen: Whonix
+torbirdy.disabled=TorBirdy: OnemoguÄen!
+torbirdy.enabled=TorBirdy: OmoguÄen
+
+torbirdy.email.prompt=TorBirdy je onemoguÄio Thunderbird-ovog Äarobnjaka za 
automatsko podeÅ¡avanje kako bi zaÅ¡titio VaÅ¡u anonimnost.\n\nPreporuÄene 
sigurnosne postavke za %S su postavljene.\n\nSada moÅ¾ete ruÄno podesiti 
ostale postavke raÄuna.
+
+torbirdy.email.advanced=Imajte na umu da mijenjanje naprednih postavka 
TorBirdy-a NIJE preporuÄeno.\n\nNastavite jedino ako znate Å¡to radite.
+torbirdy.email.advanced.nextwarning=PrikaÅ¾i ovo upozorenje sljedeÄi put
+torbirdy.email.advanced.title=Napredne postavke TorBirdy-a

___
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

2018-10-24 Thread translation

commit c7ad60566d17eacf16eafe5d5b5a439e2fe9a1d1
Author: Translation commit bot 
Date:   Wed Oct 24 23:47:39 2018 +

Update translations for torbirdy
---
 hr/torbirdy.properties | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hr/torbirdy.properties b/hr/torbirdy.properties
index 0bc5db689..a202de3a9 100644
--- a/hr/torbirdy.properties
+++ b/hr/torbirdy.properties
@@ -1,15 +1,15 @@
 torbirdy.name=TorBirdy
 
-torbirdy.enabled.tor=TorBirdy Enabled:Tor
-torbirdy.enabled.jondo=TorBirdy Enabled:JonDo
-torbirdy.enabled.custom=TorBirdy Enabled:Custom Proxy
-torbirdy.enabled.torification=TorBirdy Enabled:Transparent Torification
-torbirdy.enabled.whonix=TorBirdy Enabled:Whonix
-torbirdy.disabled=TorBirdy:Disabled!
-torbirdy.enabled=TorBirdy:Enabled
+torbirdy.enabled.tor=TorBirdy omoguÄen: Tor
+torbirdy.enabled.jondo=TorBirdy omoguÄen: JonDo
+torbirdy.enabled.custom=TorBirdy omoguÄen: PrilagoÄeni proxy
+torbirdy.enabled.torification=TorBirdy omoguÄen: Prozirna torifikacija
+torbirdy.enabled.whonix=TorBirdy omoguÄen: Whonix
+torbirdy.disabled=TorBirdy: OnemoguÄen!
+torbirdy.enabled=TorBirdy: OmoguÄen
 
 torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration 
wizard to protect your anonymity.\n\nThe recommended security settings for %S 
have been set.\n\nYou can now configure the other account settings manually.
 
-torbirdy.email.advanced=Please note that changing the advanced settings of 
TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of 
what you are doing.
-torbirdy.email.advanced.nextwarning=Show this warning next time
-torbirdy.email.advanced.title=TorBirdy Advanced Settings
+torbirdy.email.advanced=Imajte na umu da mijenjanje naprednih postavka 
TorBirdy-a NIJE preporuÄeno.\n\nNastavite jedino ako znate Å¡to radite.
+torbirdy.email.advanced.nextwarning=PrikaÅ¾i ovo upozorenje sljedeÄi put
+torbirdy.email.advanced.title=Napredne postavke TorBirdy-a

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

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

2018-10-24 Thread translation

commit be98423bc85a1b6683937bcd23416788cfe256fb
Author: Translation commit bot 
Date:   Wed Oct 24 23:45:39 2018 +

Update translations for https_everywhere
---
 hr/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr/https-everywhere.dtd b/hr/https-everywhere.dtd
index d84a7c152..7c9673ed1 100644
--- a/hr/https-everywhere.dtd
+++ b/hr/https-everywhere.dtd
@@ -33,8 +33,8 @@
 
 
 
-
-
+
+
 
 
 

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

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

2018-10-24 Thread translation

commit 5eaea11ac687811302bb29b344fff85226bbea87
Author: Translation commit bot 
Date:   Wed Oct 24 23:45:49 2018 +

Update translations for https_everywhere_completed
---
 hr/https-everywhere.dtd | 54 +
 1 file changed, 54 insertions(+)

diff --git a/hr/https-everywhere.dtd b/hr/https-everywhere.dtd
new file mode 100644
index 0..7c9673ed1
--- /dev/null
+++ b/hr/https-everywhere.dtd
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2018-10-24 Thread translation

commit edb2666d8fb1f8a2433a50eed4afe08fd49441f7
Author: Translation commit bot 
Date:   Wed Oct 24 22:15:39 2018 +

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

diff --git a/hr/https-everywhere.dtd b/hr/https-everywhere.dtd
index 2fd9d7167..d84a7c152 100644
--- a/hr/https-everywhere.dtd
+++ b/hr/https-everywhere.dtd
@@ -31,17 +31,17 @@
 
 
 
-
+
 
 
 
 
 
-
-
+
+
 
-
-
+
+
 
 
 

___
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

2018-10-24 Thread translation

commit e62dfe6d5f2888f5228c4242f90a9040d0113711
Author: Translation commit bot 
Date:   Wed Oct 24 21:48:53 2018 +

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

diff --git a/fr/browserOnboarding.properties b/fr/browserOnboarding.properties
index ad6ca0388..8fe3650a8 100644
--- a/fr/browserOnboarding.properties
+++ b/fr/browserOnboarding.properties
@@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Les circuits sont 
composÃ©s de relais a
 onboarding.tor-circuit-display.diagram.title=Affichage des circuits
 onboarding.tor-circuit-display.diagram.msg=Ce diagramme affiche les relais qui 
composent le circuit de ce site Web. Pour empÃªcher de relier lâactivitÃ© 
dâun site Ã  lâautre, chaque site Web obtient un circuit diffÃ©rent.
 
-onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin d'un nouveau 
circuitâ?
+onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin dâun 
nouveau circuitâ?
 onboarding.tor-circuit-display.new-circuit.msg=Si vous nâarrivez pas Ã  vous 
connecter au site Web que vous essayez de visiter ou sâil ne se charge pas 
correctement, vous pouvez alors utiliser ce bouton pour recharger le site avec 
un nouveau circuit.

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

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

2018-10-24 Thread translation

commit d7a02d1ed636c5161f1b0c96375654bc9e48b2e9
Author: Translation commit bot 
Date:   Wed Oct 24 21:48:58 2018 +

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

diff --git a/fr/browserOnboarding.properties b/fr/browserOnboarding.properties
index ad6ca0388..8fe3650a8 100644
--- a/fr/browserOnboarding.properties
+++ b/fr/browserOnboarding.properties
@@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Les circuits sont 
composÃ©s de relais a
 onboarding.tor-circuit-display.diagram.title=Affichage des circuits
 onboarding.tor-circuit-display.diagram.msg=Ce diagramme affiche les relais qui 
composent le circuit de ce site Web. Pour empÃªcher de relier lâactivitÃ© 
dâun site Ã  lâautre, chaque site Web obtient un circuit diffÃ©rent.
 
-onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin d'un nouveau 
circuitâ?
+onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin dâun 
nouveau circuitâ?
 onboarding.tor-circuit-display.new-circuit.msg=Si vous nâarrivez pas Ã  vous 
connecter au site Web que vous essayez de visiter ou sâil ne se charge pas 
correctement, vous pouvez alors utiliser ce bouton pour recharger le site avec 
un nouveau circuit.

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-10-24 Thread translation

commit 3da6aa76682191b63aef0e4920d9cde99c3316ff
Author: Translation commit bot 
Date:   Wed Oct 24 21:47:52 2018 +

Update translations for tor-browser-manual
---
 fr/fr.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fr/fr.po b/fr/fr.po
index 284c3b4b8..2a3a8a511 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -1067,9 +1067,9 @@ msgid ""
 "entered the onion address correctly: even a small mistake will stop Tor "
 "Browser from being able to reach the site."
 msgstr ""
-"Si vous ne pouvez pas accÃ©der a service onion que vous avez besoin, assurer "
-"vous que vous avez entrer  l'adresse onion correctement: mÃªme une petite "
-"erreur peut arrÃªter Navigateur Tor de pouvoir accÃ©der au site."
+"Si vous ne pouvez pas atteindre le service onion dont vous avez besoin, "
+"assurez-vous dâavoir correctement saisi lâadresse onionÂ : mÃªme une 
petite "
+"erreur empÃªchera le Navigateur Tor dâatteindre le site."
 
 #: onionsites.page:64
 msgid ""
@@ -1158,10 +1158,10 @@ msgid ""
 "JavaScript (and other scripts) that runs on individual web pages, or block "
 "it entirely."
 msgstr ""
-"Le Navigateur Tor compte un greffon (add-on) appeler NoScript, accessible "
-"grÃ¢ce a l'icÃ´ne \"S\" au haut a gauche de votre fenÃªtre. NoScript vous "
-"permet de controller le JavaScript (et d'autres scripts) qui opÃ¨re sur vos "
-"pages web personnel, ou le bloquer totalement. "
+"Le Navigateur Tor comprend un module complÃ©mentaire appelÃ© NoScript, "
+"accessible grÃ¢ce Ã  lâicÃ´ne Â«Â SÂ Â» en haut Ã  gauche de la fenÃªtre. 
NoScript "
+"vous permet de contrÃ´ler le JavaScript (et autres scripts) exÃ©cutÃ© par les 
"
+"diffÃ©rentes pages Web, ou de le bloquer complÃ¨tement. "
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to

___
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

2018-10-24 Thread translation

commit 37468426b4d38d77dcd5fc99d18d824157efd244
Author: Translation commit bot 
Date:   Wed Oct 24 21:47:11 2018 +

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

diff --git a/fr/fr.po b/fr/fr.po
index 553df318b..a30cd68f6 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # bassmax, 2014
-# Alex , 2014
+# Alex , 2014
 # AO , 2018
 # arpalord , 2013
 # AO , 2017-2018
@@ -25,8 +25,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-10-04 00:26+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2018-10-24 21:22+\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"
@@ -98,7 +98,7 @@ msgstr "Le pÃ©riphÃ©rique %s est un lecteur optique."
 #: ../lib/Tails/Persistence/Setup.pm:444
 #, perl-format
 msgid "Device %s was not created using Tails Installer."
-msgstr "Le pÃ©riphÃ©rique %s nâa pas Ã©tÃ© crÃ©Ã© en utilisant le programme 
dâinstallation Tails."
+msgstr "Le pÃ©riphÃ©rique %s nâa pas Ã©tÃ© crÃ©Ã© en utilisant le programme 
dâinstallation de Tails."
 
 #: ../lib/Tails/Persistence/Setup.pm:688
 msgid "Persistence wizard - Finished"

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

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

2018-10-24 Thread translation

commit db200124220a17dd4c7e75df78c213ea62d59847
Author: Translation commit bot 
Date:   Wed Oct 24 21:46:28 2018 +

Update translations for tails-iuk_completed
---
 fr.po | 105 +-
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/fr.po b/fr.po
index 0e40ca716..e9c8bf3d2 100644
--- a/fr.po
+++ b/fr.po
@@ -4,11 +4,12 @@
 # 
 # Translators:
 # bassmax, 2013
-# Alex , 2014
+# Alex , 2014
 # tneskovic , 2014
+# AO , 2018
 # Emmanuel Simond , 2014
-# French language coordinator , 2017-2018
-# French language coordinator , 2016
+# AO , 2017-2018
+# AO , 2016
 # Gwennole Hangard , 2015
 # monsieurtino , 2014
 # phil beau , 2016
@@ -17,14 +18,14 @@
 # Thomas Chauchefoin , 2016
 # Towinet, 2013-2014
 # Owen, 2015
-# French language coordinator , 2015
+# AO , 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-01 21:30+0100\n"
-"PO-Revision-Date: 2018-03-01 18:51+\n"
-"Last-Translator: French language coordinator \n"
+"POT-Creation-Date: 2018-08-16 11:16+0200\n"
+"PO-Revision-Date: 2018-10-24 21:22+\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"
@@ -32,18 +33,18 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
-#: ../lib/Tails/IUK/Frontend.pm:697
+#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:523
+#: ../lib/Tails/IUK/Frontend.pm:696
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
 msgstr "Pour obtenir les informations de dÃ©bogage, exÃ©cuter la commande 
suivante : sudo tails-debugging-info"
 
-#: ../lib/Tails/IUK/Frontend.pm:217
+#: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
 msgstr "Erreur de vÃ©rification des mises Ã  niveau"
 
-#: ../lib/Tails/IUK/Frontend.pm:220
+#: ../lib/Tails/IUK/Frontend.pm:219
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -52,64 +53,64 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr "Impossible de dÃ©terminer si une mise Ã  niveau est proposÃ©e sur 
notre site Web.\n\nVÃ©rifiez votre connexion rÃ©seau et redÃ©marrez Tails 
pour ressayer de mettre Ã  niveau.\n\nSi le problÃ¨me persiste, allez Ã  
file:///usr/share/doc/tails/website/doc/upgrade/error/check.fr.html"
 
-#: ../lib/Tails/IUK/Frontend.pm:235
+#: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
 msgstr "aucune mise Ã  niveau automatique nâest proposÃ©e sur notre site Web 
pour cette version"
 
-#: ../lib/Tails/IUK/Frontend.pm:241
+#: ../lib/Tails/IUK/Frontend.pm:240
 msgid "your device was not created using Tails Installer"
-msgstr "votre dispositif nâa pas Ã©tÃ© crÃ©Ã© en utilisant le programme 
dâinstallation Tails"
+msgstr "votre dispositif nâa pas Ã©tÃ© crÃ©Ã© en utilisant le programme 
dâinstallation de Tails"
 
-#: ../lib/Tails/IUK/Frontend.pm:246
+#: ../lib/Tails/IUK/Frontend.pm:245
 msgid "Tails was started from a DVD or a read-only device"
 msgstr "Tails a Ã©tÃ© dÃ©marrÃ© Ã  partir dâun DVD or dâun dispositif en 
lecture seule"
 
-#: ../lib/Tails/IUK/Frontend.pm:251
+#: ../lib/Tails/IUK/Frontend.pm:250
 msgid "there is not enough free space on the Tails system partition"
 msgstr "il nây a pas assez dâespace libre sur la partition systÃ¨me de 
Tails"
 
-#: ../lib/Tails/IUK/Frontend.pm:256
+#: ../lib/Tails/IUK/Frontend.pm:255
 msgid "not enough memory is available on this system"
 msgstr "il nây a pas assez de mÃ©moire libre sur ce systÃ¨me"
 
-#: ../lib/Tails/IUK/Frontend.pm:262
+#: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr "Il nây a aucune explication pour la raison Â«Â %{reason}sÂ Â»."
 
-#: ../lib/Tails/IUK/Frontend.pm:282
+#: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"
 msgstr "Le systÃ¨me est Ã  jour"
 
-#: ../lib/Tails/IUK/Frontend.pm:287
+#: ../lib/Tails/IUK/Frontend.pm:286
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr "Cette version de Tails est obsolÃ¨te et peut poser des problÃ¨mes de 
sÃ©curitÃ©."
 
-#: ../lib/Tails/IUK/Frontend.pm:319
+#: ../lib/Tails/IUK/Frontend.pm:318
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
 msgstr "La mise Ã  niveau incrÃ©mentale proposÃ©e exige %{space_needed}s 
dâespace libre sur la partition systÃ¨me de Tails, mais il nây en a que 
%{free_space}s."
 
-#:

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

2018-10-24 Thread translation

commit be0f05ac258e14b910b4cdde348b2d137f237012
Author: Translation commit bot 
Date:   Wed Oct 24 21:46:12 2018 +

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

diff --git a/fr.po b/fr.po
index 6bf2f2bc0..e0a5f7dd4 100644
--- a/fr.po
+++ b/fr.po
@@ -30,7 +30,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-24 21:15+\n"
+"PO-Revision-Date: 2018-10-24 21:32+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -254,7 +254,7 @@ msgstr "Vous pourriez installer {packages} automatiquement 
lors du dÃ©marrage de
 msgid ""
 "To do so, you need to run Tails from a USB stick installed using Tails "
 "Installer."
-msgstr "Pour ce faire, vous devez exÃ©cuter Tails Ã  partir dâune clÃ© USB 
installÃ©e avec le programme dâinstallationÂ Tails."
+msgstr "Pour ce faire, vous devez exÃ©cuter Tails Ã  partir dâune clÃ© USB 
installÃ©e avec le programme dâinstallation de Tails."
 
 #. Translators: Don't translate {packages}, it's a placeholder and will be
 #. replaced.
@@ -347,7 +347,7 @@ msgid ""
 "To do so, install some software using Synaptic "
 "Package Manager or APT on the "
 "command line."
-msgstr "Pour ce faire, installez des logiciels grÃ¢ce au Gestionnaire de Paquets Synaptic ou Ã  APT sur la la ligne de commande."
+msgstr "Pour ce faire, installez des logiciels grÃ¢ce au Gestionnaire de Paquets Synaptic ou Ã  APT sur la ligne de commande."
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:188
 msgid ""
@@ -355,24 +355,24 @@ msgid ""
 "some software using Synaptic Package "
 "Manager or APT on the command "
 "line."
-msgstr ""
+msgstr "Pour ce faire, dÃ©verrouilez votre espace de stockage persistant lors 
du dÃ©marrage de Tails et installez des logiciels grÃ¢ce au Gestionnaire de Paquets Synaptic ou Ã  APT sur la ligne de commande."
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:198
 msgid ""
 "To do so, create a persistent storage and install some software using Synaptic Package Manager or APT on the command line."
-msgstr ""
+msgstr "Pour ce faire, crÃ©ez un espace de stockage et installez des logiciels 
grÃ¢ce au Gestionnaire de Paquets Synaptic ou 
Ã  APT sur la ligne de commande."
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:206
 msgid ""
 "To do so, install Tails on a USB stick using Tails Installer and create a persistent storage."
-msgstr ""
+msgstr "Pour ce faire, installez Tails sur une clÃ© USB grÃ¢ce au programme dâinstallation de Tails et en 
crÃ©ant un espace de stockage persistant."
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:253
 msgid "[package not available]"
-msgstr ""
+msgstr "[package not available]"
 
 #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52
 msgid "Synchronizing the system's clock"
@@ -390,11 +390,11 @@ msgstr "Ãchec de synchronisation de lâhorlogeâ!"
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
-msgstr "Cette version de Tails a des problÃ¨mes de sÃ©curitÃ© connus :"
+msgstr "Cette version de Tails est touchÃ©e par des problÃ¨mes de sÃ©curitÃ© 
connusÂ :"
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:134
 msgid "Known security issues"
-msgstr "Les problÃ¨mes de sÃ©curitÃ© connus"
+msgstr "ProblÃ¨mes de sÃ©curitÃ© connus"
 
 #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
 #, sh-format
@@ -455,7 +455,7 @@ msgstr "Â«Â Il nây a pas assez de mÃ©moire libre pour 
vÃ©rifier les mises 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
-msgstr "erreur :"
+msgstr "erreurÂ :"
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
@@ -464,7 +464,7 @@ msgstr "Erreur"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71
 msgid "Warning: virtual machine detected!"
-msgstr "Avertissement : une machine virtuelle a Ã©tÃ© dÃ©tectÃ©eâ!"
+msgstr "Avertissement : Une machine virtuelle a Ã©tÃ© dÃ©tectÃ©eâ!"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:73
 msgid ""
@@ -474,7 +474,7 @@ msgstr "Le systÃ¨me dâexploitation hÃ´te et le logiciel 
de virtualisation peuv
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:76
 msgid "Warning: non-free virtual machine detected!"
-msgstr "AvertissementÂ : une machine virtuelle non libre a Ã©tÃ© 
dÃ©tectÃ©eâ!"
+msgstr "AvertissementÂ : Une machine virtuelle non libre a

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

2018-10-24 Thread translation

commit 5b058286515c30687db5d26c95686a1b0302bd70
Author: Translation commit bot 
Date:   Wed Oct 24 21:46:22 2018 +

Update translations for tails-iuk
---
 fr.po | 105 +-
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/fr.po b/fr.po
index 0e40ca716..e9c8bf3d2 100644
--- a/fr.po
+++ b/fr.po
@@ -4,11 +4,12 @@
 # 
 # Translators:
 # bassmax, 2013
-# Alex , 2014
+# Alex , 2014
 # tneskovic , 2014
+# AO , 2018
 # Emmanuel Simond , 2014
-# French language coordinator , 2017-2018
-# French language coordinator , 2016
+# AO , 2017-2018
+# AO , 2016
 # Gwennole Hangard , 2015
 # monsieurtino , 2014
 # phil beau , 2016
@@ -17,14 +18,14 @@
 # Thomas Chauchefoin , 2016
 # Towinet, 2013-2014
 # Owen, 2015
-# French language coordinator , 2015
+# AO , 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-01 21:30+0100\n"
-"PO-Revision-Date: 2018-03-01 18:51+\n"
-"Last-Translator: French language coordinator \n"
+"POT-Creation-Date: 2018-08-16 11:16+0200\n"
+"PO-Revision-Date: 2018-10-24 21:22+\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"
@@ -32,18 +33,18 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
-#: ../lib/Tails/IUK/Frontend.pm:697
+#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:523
+#: ../lib/Tails/IUK/Frontend.pm:696
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
 msgstr "Pour obtenir les informations de dÃ©bogage, exÃ©cuter la commande 
suivante : sudo tails-debugging-info"
 
-#: ../lib/Tails/IUK/Frontend.pm:217
+#: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"
 msgstr "Erreur de vÃ©rification des mises Ã  niveau"
 
-#: ../lib/Tails/IUK/Frontend.pm:220
+#: ../lib/Tails/IUK/Frontend.pm:219
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -52,64 +53,64 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr "Impossible de dÃ©terminer si une mise Ã  niveau est proposÃ©e sur 
notre site Web.\n\nVÃ©rifiez votre connexion rÃ©seau et redÃ©marrez Tails 
pour ressayer de mettre Ã  niveau.\n\nSi le problÃ¨me persiste, allez Ã  
file:///usr/share/doc/tails/website/doc/upgrade/error/check.fr.html"
 
-#: ../lib/Tails/IUK/Frontend.pm:235
+#: ../lib/Tails/IUK/Frontend.pm:234
 msgid "no automatic upgrade is available from our website for this version"
 msgstr "aucune mise Ã  niveau automatique nâest proposÃ©e sur notre site Web 
pour cette version"
 
-#: ../lib/Tails/IUK/Frontend.pm:241
+#: ../lib/Tails/IUK/Frontend.pm:240
 msgid "your device was not created using Tails Installer"
-msgstr "votre dispositif nâa pas Ã©tÃ© crÃ©Ã© en utilisant le programme 
dâinstallation Tails"
+msgstr "votre dispositif nâa pas Ã©tÃ© crÃ©Ã© en utilisant le programme 
dâinstallation de Tails"
 
-#: ../lib/Tails/IUK/Frontend.pm:246
+#: ../lib/Tails/IUK/Frontend.pm:245
 msgid "Tails was started from a DVD or a read-only device"
 msgstr "Tails a Ã©tÃ© dÃ©marrÃ© Ã  partir dâun DVD or dâun dispositif en 
lecture seule"
 
-#: ../lib/Tails/IUK/Frontend.pm:251
+#: ../lib/Tails/IUK/Frontend.pm:250
 msgid "there is not enough free space on the Tails system partition"
 msgstr "il nây a pas assez dâespace libre sur la partition systÃ¨me de 
Tails"
 
-#: ../lib/Tails/IUK/Frontend.pm:256
+#: ../lib/Tails/IUK/Frontend.pm:255
 msgid "not enough memory is available on this system"
 msgstr "il nây a pas assez de mÃ©moire libre sur ce systÃ¨me"
 
-#: ../lib/Tails/IUK/Frontend.pm:262
+#: ../lib/Tails/IUK/Frontend.pm:261
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr "Il nây a aucune explication pour la raison Â«Â %{reason}sÂ Â»."
 
-#: ../lib/Tails/IUK/Frontend.pm:282
+#: ../lib/Tails/IUK/Frontend.pm:281
 msgid "The system is up-to-date"
 msgstr "Le systÃ¨me est Ã  jour"
 
-#: ../lib/Tails/IUK/Frontend.pm:287
+#: ../lib/Tails/IUK/Frontend.pm:286
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr "Cette version de Tails est obsolÃ¨te et peut poser des problÃ¨mes de 
sÃ©curitÃ©."
 
-#: ../lib/Tails/IUK/Frontend.pm:319
+#: ../lib/Tails/IUK/Frontend.pm:318
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
 msgstr "La mise Ã  niveau incrÃ©mentale proposÃ©e exige %{space_needed}s 
dâespace libre sur la partition systÃ¨me de Tails, mais il nây en a que 
%{free_space}s."
 
-#:

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

2018-10-24 Thread translation

commit 9dedf6d9cef516e67536f54139786d41980937cb
Author: Translation commit bot 
Date:   Wed Oct 24 21:47:06 2018 +

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

diff --git a/fr/fr.po b/fr/fr.po
index 553df318b..a30cd68f6 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # bassmax, 2014
-# Alex , 2014
+# Alex , 2014
 # AO , 2018
 # arpalord , 2013
 # AO , 2017-2018
@@ -25,8 +25,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-10-04 00:26+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2018-10-24 21:22+\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"
@@ -98,7 +98,7 @@ msgstr "Le pÃ©riphÃ©rique %s est un lecteur optique."
 #: ../lib/Tails/Persistence/Setup.pm:444
 #, perl-format
 msgid "Device %s was not created using Tails Installer."
-msgstr "Le pÃ©riphÃ©rique %s nâa pas Ã©tÃ© crÃ©Ã© en utilisant le programme 
dâinstallation Tails."
+msgstr "Le pÃ©riphÃ©rique %s nâa pas Ã©tÃ© crÃ©Ã© en utilisant le programme 
dâinstallation de Tails."
 
 #: ../lib/Tails/Persistence/Setup.pm:688
 msgid "Persistence wizard - Finished"

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

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

2018-10-24 Thread translation

commit 181a912fe47b083e69c01d09909a4c75d11ba2bd
Author: Translation commit bot 
Date:   Wed Oct 24 21:45:58 2018 +

Update translations for liveusb-creator_completed
---
 fr/fr.po | 88 
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/fr/fr.po b/fr/fr.po
index 6a8adb6f7..7c0b4443c 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-18 21:32+\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-10-24 21:22+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -97,198 +97,198 @@ msgstr "Impossible de copier %(infile)s vers %(outfile)s 
: %(message)s"
 msgid "Removing existing Live OS"
 msgstr "Suppression du SE autonome existant"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "chmod impossible %(file)s : %(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "Impossible dâenlever le fichier du SE autonome prÃ©cÃ©dent : 
%(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "Impossible dâenlever le rÃ©pertoire du SE autonome prÃ©cÃ©dent : 
%(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "Le pÃ©riphÃ©rique %s est introuvable"
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Impossible dâÃ©crire sur %(device)s, passage Ã  lâÃ©tape suivante."
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Certaines partitions du pÃ©riphÃ©rique cible %(device)s sont montÃ©es. 
Elles seront dÃ©montÃ©es avant de dÃ©marrer le processus dâinstallation."
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Le systÃ¨me de fichiers est inconnu. Il est possible quâil faille 
reformater votre pÃ©riphÃ©rique."
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "SystÃ¨me de fichiers non pris en charge : %s"
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Exception GLib inconnue en tentant de monter le pÃ©riphÃ©rique : 
%(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Impossible de monter le pÃ©riphÃ©rique : %(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "Aucun point de montage nâa Ã©tÃ© trouvÃ©"
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Saisie de unmount_device pour Â«Â %(device)sÂ Â»"
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "DÃ©montage des systÃ¨mes de fichiers montÃ©s sur Â«Â %(device)sÂ Â»"
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "DÃ©montage de Â«Â %(udi)sÂ Â» sur Â«Â %(device)sÂ Â»"
 
-#: ../tails_installer/creator.py:851
+#: ../tails_installer/creator.py:853
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Le montage %s existe aprÃ¨s dÃ©montage"
 
-#: ../tails_installer/creator.py:864
+#: ../tails_installer/creator.py:866
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitionnement du pÃ©riphÃ©rique %(device)s"
 
-#: ../tails_installer/creator.py:993
+#: ../tails_installer/creator.py:995
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Le pÃ©riphÃ©rique Â«Â %(device)sÂ Â»

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

2018-10-24 Thread translation

commit 567d946752ab690a8728965f3113e9c007046f30
Author: Translation commit bot 
Date:   Wed Oct 24 21:45:53 2018 +

Update translations for liveusb-creator
---
 fr/fr.po | 88 
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/fr/fr.po b/fr/fr.po
index 6a8adb6f7..7c0b4443c 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-18 21:32+\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-10-24 21:22+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -97,198 +97,198 @@ msgstr "Impossible de copier %(infile)s vers %(outfile)s 
: %(message)s"
 msgid "Removing existing Live OS"
 msgstr "Suppression du SE autonome existant"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "chmod impossible %(file)s : %(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "Impossible dâenlever le fichier du SE autonome prÃ©cÃ©dent : 
%(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "Impossible dâenlever le rÃ©pertoire du SE autonome prÃ©cÃ©dent : 
%(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "Le pÃ©riphÃ©rique %s est introuvable"
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Impossible dâÃ©crire sur %(device)s, passage Ã  lâÃ©tape suivante."
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Certaines partitions du pÃ©riphÃ©rique cible %(device)s sont montÃ©es. 
Elles seront dÃ©montÃ©es avant de dÃ©marrer le processus dâinstallation."
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Le systÃ¨me de fichiers est inconnu. Il est possible quâil faille 
reformater votre pÃ©riphÃ©rique."
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "SystÃ¨me de fichiers non pris en charge : %s"
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Exception GLib inconnue en tentant de monter le pÃ©riphÃ©rique : 
%(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Impossible de monter le pÃ©riphÃ©rique : %(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "Aucun point de montage nâa Ã©tÃ© trouvÃ©"
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Saisie de unmount_device pour Â«Â %(device)sÂ Â»"
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "DÃ©montage des systÃ¨mes de fichiers montÃ©s sur Â«Â %(device)sÂ Â»"
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "DÃ©montage de Â«Â %(udi)sÂ Â» sur Â«Â %(device)sÂ Â»"
 
-#: ../tails_installer/creator.py:851
+#: ../tails_installer/creator.py:853
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Le montage %s existe aprÃ¨s dÃ©montage"
 
-#: ../tails_installer/creator.py:864
+#: ../tails_installer/creator.py:866
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitionnement du pÃ©riphÃ©rique %(device)s"
 
-#: ../tails_installer/creator.py:993
+#: ../tails_installer/creator.py:995
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Le pÃ©riphÃ©rique Â«Â %(device)sÂ Â» nâest pas

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

2018-10-24 Thread translation

commit fd3aea19094f25c0aada96a49fee313855e5d7f5
Author: Translation commit bot 
Date:   Wed Oct 24 21:45:40 2018 +

Update translations for https_everywhere
---
 hr/https-everywhere.dtd | 36 ++--
 hr/ssl-observatory.dtd  |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/hr/https-everywhere.dtd b/hr/https-everywhere.dtd
index 16597fb9b..2fd9d7167 100644
--- a/hr/https-everywhere.dtd
+++ b/hr/https-everywhere.dtd
@@ -1,36 +1,36 @@
 
 
-
+
 
-
+
 
 
 
-
+
 
-
+
 
 
 
-
+
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
 
-
-
-
+
+
+
 
 
-
+
 
 
 
diff --git a/hr/ssl-observatory.dtd b/hr/ssl-observatory.dtd
index e47ed5bd1..bd58a4136 100644
--- a/hr/ssl-observatory.dtd
+++ b/hr/ssl-observatory.dtd
@@ -86,7 +86,7 @@ looked at.  Mouseover the options for further details:">
 
 
 
-
+
 
 
 

___
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

2018-10-24 Thread translation

commit 137fa1a605d2bb5cf56ce38d043a97c93592acef
Author: Translation commit bot 
Date:   Wed Oct 24 21:16:07 2018 +

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

diff --git a/fr.po b/fr.po
index dbdc16f67..6bf2f2bc0 100644
--- a/fr.po
+++ b/fr.po
@@ -30,8 +30,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-24 20:00+\n"
-"Last-Translator: Emma Peel\n"
+"PO-Revision-Date: 2018-10-24 21:15+\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"
@@ -82,7 +82,7 @@ msgid ""
 "To add more, install some software using Synaptic Package Manager or APT on the command line."
-msgstr "Pour en ajouter dâautres, installez des logiciels en utilisant le Gestionnaire de paquets Synaptic ou APT sur la ligne de commande."
+msgstr "Pour en ajouter dâautres, installez des logiciels grÃ¢ce au Gestionnaire de paquets Synaptic ou Ã  APT sur la ligne de commande."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151
 msgid "_Create persistent storage"
@@ -261,7 +261,7 @@ msgstr "Pour ce faire, vous devez exÃ©cuter Tails Ã  partir 
dâune clÃ© USB ins
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:351
 #, python-brace-format
 msgid "Remove {packages} from your additional software?"
-msgstr "Supprimer {packages} de vos logiciels supplÃ©mentairesâ? "
+msgstr "Supprimer {packages} de vos logiciels supplÃ©mentairesâ?"
 
 #. Translators: Don't translate {packages}, it's a placeholder and will be
 #. replaced.
@@ -340,14 +340,14 @@ msgstr "Ãchec de lecture de la configuration du logiciel 
supplÃ©mentaire"
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
 #, python-brace-format
 msgid "Stop installing {package} automatically"
-msgstr ""
+msgstr "ArrÃªter dâinstaller {package} automatiquement"
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:179
 msgid ""
 "To do so, install some software using Synaptic "
 "Package Manager or APT on the "
 "command line."
-msgstr "Pour en ajouter, installez des logiciels en utilisant le Gestionnaire de Paquets Synaptic ou APT Ã  partir de la ligne de commande."
+msgstr "Pour ce faire, installez des logiciels grÃ¢ce au Gestionnaire de Paquets Synaptic ou Ã  APT sur la la ligne de commande."
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:188
 msgid ""

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

[tor-commits] [stem/master] Note Serge avoidance in the changelog

2018-10-24 Thread atagar

commit 673ed88c0073c01e0a41fa8560e1871a2d7fef6a
Author: Damian Johnson 
Date:   Wed Oct 24 14:08:51 2018 -0700

Note Serge avoidance in the changelog

Initially I thought to myself 'meh, doing this for DocTor so no need for a
changelog entry' but as I thought about it more I realized this actually is
somewhat impactful for users since using Serge causes unrelability in
stem.descriptor.remote.
---
 docs/change_log.rst | 4 
 1 file changed, 4 insertions(+)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index f47ec984..e2b9401c 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -49,6 +49,10 @@ The following are only available within Stem's `git 
repository
 
   * Controller events could fail to be delivered in a timely fashion 
(:trac:`27173`)
 
+ * **Descriptors**
+
+  * Don't download from Serge, a bridge authority that frequently timeout
+
 .. _version_1.7:
 
 Version 1.7 (October 7th, 2018)

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

[tor-commits] [stem/master] Avoid downloading descriptors from Serge

2018-10-24 Thread atagar

commit 98e1db3a2cc57c1a73adcd28001906f6c271bdfd
Author: Damian Johnson 
Date:   Wed Oct 24 14:05:24 2018 -0700

Avoid downloading descriptors from Serge

Like Bifroest before it, Serge is a bridge authority and frequently times 
out
when asked to serve descriptors. Avoiding it, both so descriptor downloading
works better and so I stop getting so many timeout notifications from 
DocTor.
---
 stem/descriptor/remote.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index dbae3cdf..f1171697 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -297,6 +297,10 @@ class Query(object):
  Avoid downloading from Bifroest. This is the bridge authority so it
  doesn't vote in the consensus, and apparently times out frequently.
 
+  .. versionchanged:: 1.8.0
+ Serge has replaced Bifroest as our bridge authority. Avoiding descriptor
+ downloads from it instead.
+
   :var str resource: resource being fetched, such as '/tor/server/all'
   :var str descriptor_type: type of descriptors being fetched (for options see
 :func:`~stem.descriptor.__init__.parse_file`), this is guessed from the
@@ -497,7 +501,7 @@ class Query(object):
 """
 
 if use_authority or not self.endpoints:
-  picked = random.choice([auth for auth in 
stem.directory.Authority.from_cache().values() if auth.nickname not in 
('tor26', 'Bifroest')])
+  picked = random.choice([auth for auth in 
stem.directory.Authority.from_cache().values() if auth.nickname not in 
('tor26', 'Serge')])
   return stem.DirPort(picked.address, picked.dir_port)
 else:
   return random.choice(self.endpoints)

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

[tor-commits] [stem/master] Drop vague note about set_process_name FreeBSD issue

2018-10-24 Thread atagar

commit 035432d31234096d41adfac0411e165b90653a3a
Author: Damian Johnson 
Date:   Fri Oct 19 12:02:51 2018 -0700

Drop vague note about set_process_name FreeBSD issue

The user disappeared before figuring out what was up and I haven't heard
anything since. As such this note is too vague to really be useful to users.
---
 stem/util/system.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/stem/util/system.py b/stem/util/system.py
index 3c03bc46..17eeb61d 100644
--- a/stem/util/system.py
+++ b/stem/util/system.py
@@ -1408,8 +1408,6 @@ def set_process_name(process_name):
   Renames our current process from "python " to a custom name. This is
   best-effort, not necessarily working on all platforms.
 
-  **Note:** This might have issues on FreeBSD (:trac:`9804`).
-
   :param str process_name: new name for our process
   """
 



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

[tor-commits] [stem/master] Ensure _emit_event() helper mocks time.time()

2018-10-24 Thread atagar

commit 94837b90d058a16e56b091a25889c03c8746c18d
Author: Damian Johnson 
Date:   Wed Oct 24 13:15:28 2018 -0700

Ensure _emit_event() helper mocks time.time()

Nothing actually changed. Just moving our time.time() mocks into the
_emit_event() helper since that mock's always needed for tests that
send events.
---
 test/unit/control/controller.py | 32 +++-
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py
index ed00385d..ed72fbe8 100644
--- a/test/unit/control/controller.py
+++ b/test/unit/control/controller.py
@@ -669,7 +669,6 @@ class TestControl(unittest.TestCase):
 
 self.assertRaises(InvalidRequest, self.controller.add_event_listener, 
Mock(), EventType.SIGNAL)
 
-  @patch('time.time', Mock(return_value = TEST_TIMESTAMP))
   def test_events_get_received(self):
 """
 Trigger an event, checking that our listeners get notified.
@@ -683,7 +682,6 @@ class TestControl(unittest.TestCase):
 self._emit_event(BW_EVENT)
 self.bw_listener.assert_called_once_with(BW_EVENT)
 
-  @patch('time.time', Mock(return_value = TEST_TIMESTAMP))
   def test_event_listing_with_error(self):
 """
 Raise an exception in an event listener to confirm it doesn't break our
@@ -700,7 +698,6 @@ class TestControl(unittest.TestCase):
 self._emit_event(BW_EVENT)
 self.bw_listener.assert_called_once_with(BW_EVENT)
 
-  @patch('time.time', Mock(return_value = TEST_TIMESTAMP))
   def test_event_listing_with_malformed_event(self):
 """
 Attempt to parse a malformed event emitted from Tor. It's important this
@@ -857,17 +854,18 @@ class TestControl(unittest.TestCase):
 #  processed asynchronously, so the only way to endsure it's done
 #  with its work is to join on the thread.
 
-with patch('stem.control.Controller.is_alive') as is_alive_mock:
-  is_alive_mock.return_value = True
-  self.controller._launch_threads()
-
-  try:
-# Converting an event back into an uncast ControlMessage, then feeding 
it
-# into our controller's event queue.
-
-uncast_event = ControlMessage.from_str(event.raw_content())
-self.controller._event_queue.put(uncast_event)
-self.controller._event_notice.set()
-  finally:
-is_alive_mock.return_value = False
-self.controller._close()
+with patch('time.time', Mock(return_value = TEST_TIMESTAMP)):
+  with patch('stem.control.Controller.is_alive') as is_alive_mock:
+is_alive_mock.return_value = True
+self.controller._launch_threads()
+
+try:
+  # Converting an event back into an uncast ControlMessage, then 
feeding it
+  # into our controller's event queue.
+
+  uncast_event = ControlMessage.from_str(event.raw_content())
+  self.controller._event_queue.put(uncast_event)
+  self.controller._event_notice.set()
+finally:
+  is_alive_mock.return_value = False
+  self.controller._close()



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

[tor-commits] [stem/master] Integration test race when multiple tor processes are running

2018-10-24 Thread atagar

commit 165c75ba21184b4fe865e7a30ce2d69012836a26
Author: Damian Johnson 
Date:   Wed Oct 24 12:40:38 2018 -0700

Integration test race when multiple tor processes are running

Our flakiest integration tests on Jenkins tend to be our system tests...

  ==
  FAIL: test_pid_by_name_ps_linux
  --
  Traceback (most recent call last):
File "/srv/jenkins-workspace/workspace/stem-tor-ci/test/require.py", 
line 58, in wrapped
  return func(self, *args, **kwargs)
File "/srv/jenkins-workspace/workspace/stem-tor-ci/test/require.py", 
line 58, in wrapped
  return func(self, *args, **kwargs)
File "/srv/jenkins-workspace/workspace/stem-tor-ci/test/require.py", 
line 58, in wrapped
  return func(self, *args, **kwargs)
File 
"/srv/jenkins-workspace/workspace/stem-tor-ci/test/integ/util/system.py", line 
211, in test_pid_by_name_ps_linux
  self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd))
  AssertionError: 31963 != None

  --

These tests skip themselves if multiple tor processes are running, *but* 
they
fail in this fashion if a tor process spawns *during* the test.

To reduce the chances of this the tests now check for additional tor 
processes
both before *and* after the test. In theory an error could still occure if a
tor process both starts *and* stops in the middle of a test but I'm unsure 
if
this will really happen in practice. Lets see. If these assertion errors
continue to show up I might simply move them under a special target.
---
 test/integ/util/system.py | 21 -
 test/require.py   |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/test/integ/util/system.py b/test/integ/util/system.py
index cc6f9eda..06202bfa 100644
--- a/test/integ/util/system.py
+++ b/test/integ/util/system.py
@@ -65,13 +65,32 @@ def _has_port():
   return test.runner.Torrc.PORT in test.runner.get_runner().get_options()
 
 
-require_single_tor_instance = test.require.needs(_is_single_tor_running, 
'multiple tor instances')
 require_control_port = test.require.needs(_has_port, 'test instance has no 
port')
 require_linux = test.require.needs(_is_linux, 'linux only')
 require_bsd = test.require.needs(stem.util.system.is_bsd, 'bsd only')
 require_path = test.require.needs(lambda: 'PATH' in os.environ, 'requires 
PATH')
 
 
+def require_single_tor_instance(func):
+  # Checking both before and after the test to see if we're running only a
+  # single tor instance. We do both to narrow the possability of the test
+  # failing due to a race.
+
+  def wrapped(self, *args, **kwargs):
+if _is_single_tor_running():
+  try:
+return func(self, *args, **kwargs)
+  except:
+if _is_single_tor_running():
+  raise
+else:
+  self.skipTest('(multiple tor instances)')
+else:
+  self.skipTest('(multiple tor instances)')
+
+  return wrapped
+
+
 class TestSystem(unittest.TestCase):
   def test_daemon_task_when_successful(self):
 """
diff --git a/test/require.py b/test/require.py
index 598576bf..25a7ae12 100644
--- a/test/require.py
+++ b/test/require.py
@@ -49,7 +49,7 @@ def only_run_once(func):
 
 def needs(condition, message):
   """
-  Skips teh test unless the conditional evaluates to 'true'.
+  Skips the test unless the conditional evaluates to 'true'.
   """
 
   def decorator(func):



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

[tor-commits] [stem/master] Inconsistent unit test failures in control.controller

2018-10-24 Thread atagar

commit 5bd8a10632e3602e03b4ad2ac8829c57585c4fd6
Author: Damian Johnson 
Date:   Wed Oct 24 13:31:55 2018 -0700

Inconsistent unit test failures in control.controller

On occasion our unit tests that emit then listen for controller events fail
with...

  ==
  FAIL: test_events_get_received
  --
  Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1305, in 
patched
  return func(*args, **keywargs)
File 
"/srv/jenkins-workspace/workspace/stem-tor-ci/test/unit/control/controller.py", 
line 684, in test_events_get_received
  self.bw_listener.assert_called_once_with(BW_EVENT)
File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 947, in 
assert_called_once_with
  raise AssertionError(msg)
  AssertionError: Expected 'mock' to be called once. Called 0 times.

  --

The specific test varies, but it should always be one of our emit_event()
callers. This has caused nine jenkins test failures in the last three months
(so pretty noisy). Dave ran into this too...

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

I can't reliably (or even frequently) reproduce this locally but I think I 
know
what's going on...

  * emit_event() adds an event to the queue via put(). This is a blocking 
call
so we can be assured the event's in there.

  * emit_event() then calls set() on the event_notice condition so the
Controller's event thread will process the event.

  * The controller's event thread calls get_nowait() on its event queue. 
This
*ususally* gets the event we just inserted, but since this is 
get_nowait()
rather than get() it's non-blocking, and may raise a queue.Empty 
instead.

  * When queue.Empty gets thrown we once again wait on the event_notice
condition.

  * emit_event() then calls close() on its Controller which joins and
terminates its threads. The close() method calls set() on event_noice to
give it a *second* opportunity to get the event.

  * Once again, because we use get_nowait() there's a small chance we'll 
raise
queue.Empty without processing the event.

  * The event thread then terminates with the enqueued event never being
processed.

  * Finally, we get the assertion failure above.

This is actually a real bug that can cause Controller users to be highly
delayed or never receive an event. For instance...

  * Tor emits an event.

  * Our reader thread enqueues the event and calls set() on the condition to
notify the event thread.

  * For the reasons mentioned above it fails to do so.

  * Because we use wait() without a timeout our event thread then resumes
blocking, causing the event to not get another chance to be delivered 
until
a second event comes along.

This sucks, and is pretty easy to remediate. Rather than waiting 
indefinitely
we should instead have our event thread periodically check re-check its own
queue for undelivered messages (picked 50 ms as a decent sounding balance
between responsiveness and load). Our test's emit_event() in turn now blocks
until the event is delivered.

Needless to say this is a long song and dance so quite possible I'm in the
wrong on something but this seems, both in theory and practice thus far, to 
be
a good step forward.
---
 docs/change_log.rst | 4 
 stem/control.py | 3 ++-
 test/unit/control/controller.py | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 9230350c..f47ec984 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -45,6 +45,10 @@ Unreleased
 The following are only available within Stem's `git repository
 `_.
 
+ * **Controller**
+
+  * Controller events could fail to be delivered in a timely fashion 
(:trac:`27173`)
+
 .. _version_1.7:
 
 Version 1.7 (October 7th, 2018)
diff --git a/stem/control.py b/stem/control.py
index 2e893788..68873d76 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -966,6 +966,7 @@ class BaseController(object):
   try:
 event_message = self._event_queue.get_nowait()
 self._handle_event(event_message)
+self._event_queue.task_done()
 
 # Attempt to finish processing enqueued events when our controller 
closes
 
@@ -978,7 +979,7 @@ class BaseController(object):
 if not self.is_alive():
   break
 
-self._event_notice.wait()
+self._event_notice.wait(0.05)
 self._event_notice.clear()
 
 
diff --git

[tor-commits] [stem/master] Note that set_process_name can raise IOErrors

2018-10-24 Thread atagar

commit 4f993e79ff1acc9e565b190be97f9a30a066fcc3
Author: Damian Johnson 
Date:   Fri Oct 19 12:05:12 2018 -0700

Note that set_process_name can raise IOErrors

Oops, the code explicitly raises these when unable to do so but our docs 
didn't
mention it.
---
 stem/util/system.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/stem/util/system.py b/stem/util/system.py
index 17eeb61d..2d52b022 100644
--- a/stem/util/system.py
+++ b/stem/util/system.py
@@ -1409,6 +1409,8 @@ def set_process_name(process_name):
   best-effort, not necessarily working on all platforms.
 
   :param str process_name: new name for our process
+
+  :raises: **IOError** if the process cannot be renamed
   """
 
   # This is mostly based on...



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

[tor-commits] [stem/master] Stem development version tag

2018-10-24 Thread atagar

commit 7e3a2e9ccb2fca2eddf426340f6a95b554b834e2
Author: Damian Johnson 
Date:   Mon Oct 8 10:51:43 2018 -0700

Stem development version tag

As always, flagging our git codebase with a '-dev' version suffix.
---
 stem/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stem/__init__.py b/stem/__init__.py
index 9a9aec59..771266fb 100644
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@ -488,7 +488,7 @@ Library for working with the tor process.
 import stem.util
 import stem.util.enum
 
-__version__ = '1.7.0'
+__version__ = '1.7.0-dev'
 __author__ = 'Damian Johnson'
 __contact__ = 'ata...@torproject.org'
 __url__ = 'https://stem.torproject.org/'



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

[tor-commits] [stem/master] Note python interpreter in test output

2018-10-24 Thread atagar

commit 7cd58724f0a3ad8bcbdb7c6f7a11522df8dafb5d
Author: Damian Johnson 
Date:   Mon Oct 8 10:56:08 2018 -0700

Note python interpreter in test output

Our test output notes our python version but not the intterpreter type. This
caused Pypy for instance to look like CPython 2.7. Intercluding the 
interpreter
in the version string if it isn't CPython.
---
 test/task.py | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/task.py b/test/task.py
index d1c1d6c7..a763e710 100644
--- a/test/task.py
+++ b/test/task.py
@@ -75,6 +75,13 @@ def _check_tor_version(tor_path):
   return str(test.tor_version(tor_path)).split()[0]
 
 
+def _check_python_version():
+  interpreter = platform.python_implementation()
+  version = platform.python_version()
+
+  return version if interpreter == 'CPython' else '%s (%s)' % (interpreter, 
version)
+
+
 def _check_platform_version():
   if platform.system() == 'Windows':
 extra = platform.release()
@@ -271,7 +278,7 @@ class StaticCheckTask(Task):
 
 STEM_VERSION = Task('stem version', lambda: stem.__version__)
 TOR_VERSION = Task('tor version', _check_tor_version)
-PYTHON_VERSION = Task('python version', lambda: platform.python_version())
+PYTHON_VERSION = Task('python version', _check_python_version)
 PLATFORM_VERSION = Task('operating system version', _check_platform_version)
 CRYPTO_VERSION = ModuleVersion('cryptography version', 'cryptography', 
stem.prereq.is_crypto_available)
 PYNACL_VERSION = ModuleVersion('pynacl version', 'nacl', 
stem.prereq._is_pynacl_available)



___
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

2018-10-24 Thread translation

commit 28fa2e0ca4d54b092244c639d5e078988d4540b7
Author: Translation commit bot 
Date:   Wed Oct 24 20:16:03 2018 +

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

diff --git a/fr.po b/fr.po
index dc2acb4da..dbdc16f67 100644
--- a/fr.po
+++ b/fr.po
@@ -11,6 +11,7 @@
 # Athorcis, 2015
 # Domiho Zannou , 2018
 # Emmanuel Simond , 2014
+# Emma Peel, 2018
 # AO , 2017-2018
 # AO , 2016-2017
 # Gwennole Hangard , 2015
@@ -29,8 +30,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-24 14:20+\n"
-"Last-Translator: AO \n"
+"PO-Revision-Date: 2018-10-24 20:00+\n"
+"Last-Translator: Emma Peel\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"
@@ -346,7 +347,7 @@ msgid ""
 "To do so, install some software using Synaptic "
 "Package Manager or APT on the "
 "command line."
-msgstr ""
+msgstr "Pour en ajouter, installez des logiciels en utilisant le Gestionnaire de Paquets Synaptic ou APT Ã  partir de la ligne de commande."
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:188
 msgid ""

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

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

2018-10-24 Thread translation

commit 7a9db3b06534b53d95b410896963d6b1c0ee9a1a
Author: Translation commit bot 
Date:   Wed Oct 24 18:15:32 2018 +

Update translations for donatepages-messagespot_completed
---
 locale/es_AR/LC_MESSAGES/messages.po | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/locale/es_AR/LC_MESSAGES/messages.po 
b/locale/es_AR/LC_MESSAGES/messages.po
index 1d36f4c9b..50c08cbc2 100644
--- a/locale/es_AR/LC_MESSAGES/messages.po
+++ b/locale/es_AR/LC_MESSAGES/messages.po
@@ -1,11 +1,11 @@
 # Translators:
 # erinm, 2018
+# JoaquÃn Serna, 2018
 # Zuhualime Akoochimoya, 2018
 # Emma Peel, 2018
-# JoaquÃn Serna, 2018
 msgid ""
 msgstr ""
-"Last-Translator: JoaquÃn Serna, 2018\n"
+"Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -195,7 +195,7 @@ msgstr "ClÃ¡sico"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:55
 msgid "European"
-msgstr "Europeos"
+msgstr "Europeo"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:65
 msgid "Size"
@@ -207,7 +207,7 @@ msgstr "ElegÃ talle"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:73
 msgid "S"
-msgstr "G"
+msgstr "S"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:77
 msgid "M"
@@ -317,7 +317,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:166
 msgid "sticker Pack"
-msgstr "Paquete de autoadhesivos"
+msgstr "Paquete de stickers autoadhesivos"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:173
 msgid ""
@@ -336,7 +336,7 @@ msgid ""
 "Get our limited edition Tor: Powering Digital Resistance or Open Observatory"
 " of Network Interference (OONI) t-shirt."
 msgstr ""
-"TenÃ© nuestra remera Tor de ediciÃ³n limitada: Potenciando la Resistencia "
+"ObtenÃ© nuestra remera de Tor ediciÃ³n limitada: Potenciando la Resistencia "
 "Digital u Observatorio Abierto de Interferencia en la Red (OONI)."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:198
@@ -360,8 +360,8 @@ msgid ""
 "t-shirt."
 msgstr ""
 "Nuestra remera Tor: Potenciando la Resistencia Digital u Observatorio "
-"Abierto de Interferencia en la Red (OONI), mÃ¡s una Tor en el CorazÃ³n de la "
-"Libertad en Internet."
+"Abierto de Interferencia en la Red (OONI), mÃ¡s una remera de Tor en el "
+"CorazÃ³n de la Libertad en Internet."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:243
 msgid "sweatshirt"

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

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

2018-10-24 Thread translation

commit b633a19580295c0afc5f6874cd57fb3d293e59a4
Author: Translation commit bot 
Date:   Wed Oct 24 18:15:25 2018 +

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

diff --git a/locale/es_AR/LC_MESSAGES/messages.po 
b/locale/es_AR/LC_MESSAGES/messages.po
index 1d36f4c9b..50c08cbc2 100644
--- a/locale/es_AR/LC_MESSAGES/messages.po
+++ b/locale/es_AR/LC_MESSAGES/messages.po
@@ -1,11 +1,11 @@
 # Translators:
 # erinm, 2018
+# JoaquÃn Serna, 2018
 # Zuhualime Akoochimoya, 2018
 # Emma Peel, 2018
-# JoaquÃn Serna, 2018
 msgid ""
 msgstr ""
-"Last-Translator: JoaquÃn Serna, 2018\n"
+"Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -195,7 +195,7 @@ msgstr "ClÃ¡sico"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:55
 msgid "European"
-msgstr "Europeos"
+msgstr "Europeo"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:65
 msgid "Size"
@@ -207,7 +207,7 @@ msgstr "ElegÃ talle"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:73
 msgid "S"
-msgstr "G"
+msgstr "S"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:77
 msgid "M"
@@ -317,7 +317,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:166
 msgid "sticker Pack"
-msgstr "Paquete de autoadhesivos"
+msgstr "Paquete de stickers autoadhesivos"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:173
 msgid ""
@@ -336,7 +336,7 @@ msgid ""
 "Get our limited edition Tor: Powering Digital Resistance or Open Observatory"
 " of Network Interference (OONI) t-shirt."
 msgstr ""
-"TenÃ© nuestra remera Tor de ediciÃ³n limitada: Potenciando la Resistencia "
+"ObtenÃ© nuestra remera de Tor ediciÃ³n limitada: Potenciando la Resistencia "
 "Digital u Observatorio Abierto de Interferencia en la Red (OONI)."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:198
@@ -360,8 +360,8 @@ msgid ""
 "t-shirt."
 msgstr ""
 "Nuestra remera Tor: Potenciando la Resistencia Digital u Observatorio "
-"Abierto de Interferencia en la Red (OONI), mÃ¡s una Tor en el CorazÃ³n de la "
-"Libertad en Internet."
+"Abierto de Interferencia en la Red (OONI), mÃ¡s una remera de Tor en el "
+"CorazÃ³n de la Libertad en Internet."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:243
 msgid "sweatshirt"

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

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

2018-10-24 Thread translation

commit 9d9a2ac12a87d83902e407d011e26dd42e9a0923
Author: Translation commit bot 
Date:   Wed Oct 24 17:45:37 2018 +

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

diff --git a/locale/es_AR/LC_MESSAGES/messages.po 
b/locale/es_AR/LC_MESSAGES/messages.po
index 18f714724..1d36f4c9b 100644
--- a/locale/es_AR/LC_MESSAGES/messages.po
+++ b/locale/es_AR/LC_MESSAGES/messages.po
@@ -2,9 +2,10 @@
 # erinm, 2018
 # Zuhualime Akoochimoya, 2018
 # Emma Peel, 2018
+# JoaquÃn Serna, 2018
 msgid ""
 msgstr ""
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: JoaquÃn Serna, 2018\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -70,9 +71,9 @@ msgid ""
 "and/or mailing address, as well as any other information you provide."
 msgstr ""
 "Cuando donÃ¡s al Proyecto Tor, dependiendo de quÃ© mecanismo uses, podrÃamos 
"
-"saber tu nombre, el monto que donaste, tu direcciÃ³n electrÃ³nica, nÃºmero de 
"
-"telÃ©fono y/o domicilio postal, como asÃ tambiÃ©n cualquier otra 
informaciÃ³n "
-"que proveas."
+"saber tu nombre, el monto que donaste, tu direcciÃ³n de correo electronico, "
+"nÃºmero de telÃ©fono y/o domicilio postal, como asÃ tambiÃ©n cualquier otra "
+"informaciÃ³n que proveas."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:76
 msgid ""
@@ -96,8 +97,8 @@ msgid ""
 "If you have provided your email address, we will email you once to thank you"
 " and give you a receipt."
 msgstr ""
-"Si has provisto tu direcciÃ³n electrÃ³nica, te enviaremos un correo por esa "
-"vÃa por Ãºnica vez para agradecerte y darte un recibo."
+"Si has provisto tu direcciÃ³n de correo electronico, te enviaremos un correo "
+"por esa vÃa por Ãºnica vez para agradecerte y darte un recibo."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:85
 msgid ""
@@ -134,8 +135,8 @@ msgstr "Nunca te identificaremos como donante pÃºblicamente 
sin tu permiso."
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:96
 msgid "We do not publish, sell, trade, or rent any information about you."
 msgstr ""
-"No publicamos, vendemos, trocamos, o alquilamos ninguna informaciÃ³n acerca "
-"tuyo."
+"No publicamos, vendemos, intercambiamos, o alquilamos ninguna informaciÃ³n "
+"acerca tuyo."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:98
 msgid ""
@@ -166,7 +167,7 @@ msgstr ""
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:114
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:655
 msgid "Back to Donate Page"
-msgstr "Vuelta a la PÃ¡gina de DonaciÃ³n"
+msgstr "Volver a la pÃ¡gina de donaciÃ³n"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:29
 msgid ""

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

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

2018-10-24 Thread translation

commit 3ee107e602f90723a91bcbbfd7c9f5e562323f6a
Author: Translation commit bot 
Date:   Wed Oct 24 17:45:30 2018 +

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

diff --git a/locale/es_AR/LC_MESSAGES/messages.po 
b/locale/es_AR/LC_MESSAGES/messages.po
index 18f714724..1d36f4c9b 100644
--- a/locale/es_AR/LC_MESSAGES/messages.po
+++ b/locale/es_AR/LC_MESSAGES/messages.po
@@ -2,9 +2,10 @@
 # erinm, 2018
 # Zuhualime Akoochimoya, 2018
 # Emma Peel, 2018
+# JoaquÃn Serna, 2018
 msgid ""
 msgstr ""
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: JoaquÃn Serna, 2018\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -70,9 +71,9 @@ msgid ""
 "and/or mailing address, as well as any other information you provide."
 msgstr ""
 "Cuando donÃ¡s al Proyecto Tor, dependiendo de quÃ© mecanismo uses, podrÃamos 
"
-"saber tu nombre, el monto que donaste, tu direcciÃ³n electrÃ³nica, nÃºmero de 
"
-"telÃ©fono y/o domicilio postal, como asÃ tambiÃ©n cualquier otra 
informaciÃ³n "
-"que proveas."
+"saber tu nombre, el monto que donaste, tu direcciÃ³n de correo electronico, "
+"nÃºmero de telÃ©fono y/o domicilio postal, como asÃ tambiÃ©n cualquier otra "
+"informaciÃ³n que proveas."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:76
 msgid ""
@@ -96,8 +97,8 @@ msgid ""
 "If you have provided your email address, we will email you once to thank you"
 " and give you a receipt."
 msgstr ""
-"Si has provisto tu direcciÃ³n electrÃ³nica, te enviaremos un correo por esa "
-"vÃa por Ãºnica vez para agradecerte y darte un recibo."
+"Si has provisto tu direcciÃ³n de correo electronico, te enviaremos un correo "
+"por esa vÃa por Ãºnica vez para agradecerte y darte un recibo."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:85
 msgid ""
@@ -134,8 +135,8 @@ msgstr "Nunca te identificaremos como donante pÃºblicamente 
sin tu permiso."
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:96
 msgid "We do not publish, sell, trade, or rent any information about you."
 msgstr ""
-"No publicamos, vendemos, trocamos, o alquilamos ninguna informaciÃ³n acerca "
-"tuyo."
+"No publicamos, vendemos, intercambiamos, o alquilamos ninguna informaciÃ³n "
+"acerca tuyo."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:98
 msgid ""
@@ -166,7 +167,7 @@ msgstr ""
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:114
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:655
 msgid "Back to Donate Page"
-msgstr "Vuelta a la PÃ¡gina de DonaciÃ³n"
+msgstr "Volver a la pÃ¡gina de donaciÃ³n"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:29
 msgid ""

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

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

2018-10-24 Thread translation

commit 040dc8c9f1190298ad75c0becf6d0c780feac8f3
Author: Translation commit bot 
Date:   Wed Oct 24 17:16:01 2018 +

Update translations for liveusb-creator_completed
---
 es_AR/es_AR.po | 90 +-
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index 3034f929b..a53ebc12c 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -6,7 +6,7 @@
 # Daniel Gray, 2015
 # TorUserSpanishHelp, 2013
 # guille1981 , 2014
-# JoaquÃn Serna, 2017
+# JoaquÃn Serna, 2017-2018
 # JosÃ© FabiÃ¡n, 2014
 # Juan JosÃ© Zapponi , 2014
 # Juan Manuel Cruz , 2013
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-19 01:51+\n"
-"Last-Translator: Zuhualime Akoochimoya\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-10-24 17:12+\n"
+"Last-Translator: JoaquÃn Serna\n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "Extrayendo imagen \"live\" en el dispositivo de 
destino..."
 #: ../tails_installer/creator.py:153
 #, python-format
 msgid "Wrote to device at %(speed)d MB/sec"
-msgstr "Copiando archivos a %(speed)d MB/sec"
+msgstr "Copiando archivos a %(speed)d MB/seg"
 
 #: ../tails_installer/creator.py:296
 #, python-format
@@ -87,194 +87,194 @@ msgstr "No se pudo copiar %(infile)s a %(outfile)s: 
%(message)s"
 msgid "Removing existing Live OS"
 msgstr "Eliminando LiveOS existente"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "No se pudo cambiar los permisos de acceso a %(file)s: %(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "No se pudieron borrar archivos del anterior LiveOS: %(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "No se pudieron remover directorios del LiveOS anterior: %(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "No se encontrÃ³ el dispositivo %s"
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "No se puede escribir en la unidad %(device)s, omitiendo."
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Algunas particiones del dispositivo de destino %(device)s estÃ¡n 
montadas y serÃ¡n desmontadas antes de comenzar con la instalaciÃ³n."
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistema de archivos desconocido. Su dispositivo puede necesitar ser 
reformateado."
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Sistema de archivos no soportado: %s"
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "ExcepciÃ³n GLib desconocida mientras se estaba intentando montar 
dispositivo:%(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "No se pudo montar el dispositivo: %(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "No se encontraron puntos de montaje"
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Ejecutando unmount_device para '%(device)s'"
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Desmontando sistemas de archivos montados en '%(device)s'"
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Desmontando '%(udi)s' en

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

2018-10-24 Thread translation

commit 4f809b355b843842aea9e494527063f0ceea99c8
Author: Translation commit bot 
Date:   Wed Oct 24 17:15:55 2018 +

Update translations for liveusb-creator
---
 es_AR/es_AR.po | 90 +-
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index 3034f929b..a53ebc12c 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -6,7 +6,7 @@
 # Daniel Gray, 2015
 # TorUserSpanishHelp, 2013
 # guille1981 , 2014
-# JoaquÃn Serna, 2017
+# JoaquÃn Serna, 2017-2018
 # JosÃ© FabiÃ¡n, 2014
 # Juan JosÃ© Zapponi , 2014
 # Juan Manuel Cruz , 2013
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-19 01:51+\n"
-"Last-Translator: Zuhualime Akoochimoya\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-10-24 17:12+\n"
+"Last-Translator: JoaquÃn Serna\n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "Extrayendo imagen \"live\" en el dispositivo de 
destino..."
 #: ../tails_installer/creator.py:153
 #, python-format
 msgid "Wrote to device at %(speed)d MB/sec"
-msgstr "Copiando archivos a %(speed)d MB/sec"
+msgstr "Copiando archivos a %(speed)d MB/seg"
 
 #: ../tails_installer/creator.py:296
 #, python-format
@@ -87,194 +87,194 @@ msgstr "No se pudo copiar %(infile)s a %(outfile)s: 
%(message)s"
 msgid "Removing existing Live OS"
 msgstr "Eliminando LiveOS existente"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "No se pudo cambiar los permisos de acceso a %(file)s: %(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "No se pudieron borrar archivos del anterior LiveOS: %(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "No se pudieron remover directorios del LiveOS anterior: %(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "No se encontrÃ³ el dispositivo %s"
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "No se puede escribir en la unidad %(device)s, omitiendo."
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Algunas particiones del dispositivo de destino %(device)s estÃ¡n 
montadas y serÃ¡n desmontadas antes de comenzar con la instalaciÃ³n."
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistema de archivos desconocido. Su dispositivo puede necesitar ser 
reformateado."
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Sistema de archivos no soportado: %s"
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "ExcepciÃ³n GLib desconocida mientras se estaba intentando montar 
dispositivo:%(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "No se pudo montar el dispositivo: %(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "No se encontraron puntos de montaje"
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Ejecutando unmount_device para '%(device)s'"
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Desmontando sistemas de archivos montados en '%(device)s'"
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Desmontando '%(udi)s' en '%(device)s'"

[tor-commits] [tor/master] Re-alphabetize the list of tests in tests.[ch]

2018-10-24 Thread nickm

commit c0bd800d267285d7372094b77121c63a4ba720d2
Author: Nick Mathewson 
Date:   Wed Oct 24 09:09:40 2018 -0400

Re-alphabetize the list of tests in tests.[ch]
---
 src/test/test.c | 20 ++--
 src/test/test.h | 34 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/test/test.c b/src/test/test.c
index 56eb15328..17b736d30 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -847,8 +847,8 @@ struct testgroup_t testgroups[] = {
   { "circuitbuild/", circuitbuild_tests },
   { "circuitlist/", circuitlist_tests },
   { "circuitmux/", circuitmux_tests },
-  { "circuituse/", circuituse_tests },
   { "circuitstats/", circuitstats_tests },
+  { "circuituse/", circuituse_tests },
   { "compat/libevent/", compat_libevent_tests },
   { "config/", config_tests },
   { "connection/", connection_tests },
@@ -865,34 +865,36 @@ struct testgroup_t testgroups[] = {
 #endif
   { "crypto/pem/", pem_tests },
   { "dir/", dir_tests },
-  { "dir_handle_get/", dir_handle_get_tests },
   { "dir/md/", microdesc_tests },
   { "dir/voting-schedule/", voting_schedule_tests },
+  { "dir_handle_get/", dir_handle_get_tests },
+  { "dns/", dns_tests },
   { "dos/", dos_tests },
   { "entryconn/", entryconn_tests },
   { "entrynodes/", entrynodes_tests },
-  { "guardfraction/", guardfraction_tests },
   { "extorport/", extorport_tests },
   { "geoip/", geoip_tests },
-  { "legacy_hs/", hs_tests },
+  { "guardfraction/", guardfraction_tests },
   { "hs_cache/", hs_cache },
   { "hs_cell/", hs_cell_tests },
+  { "hs_client/", hs_client_tests },
   { "hs_common/", hs_common_tests },
   { "hs_config/", hs_config_tests },
   { "hs_control/", hs_control_tests },
   { "hs_descriptor/", hs_descriptor },
+  { "hs_intropoint/", hs_intropoint_tests },
   { "hs_ntor/", hs_ntor_tests },
   { "hs_service/", hs_service_tests },
-  { "hs_client/", hs_client_tests },
-  { "hs_intropoint/", hs_intropoint_tests },
   { "introduce/", introduce_tests },
   { "keypin/", keypin_tests },
+  { "legacy_hs/", hs_tests },
   { "link-handshake/", link_handshake_tests },
   { "mainloop/", mainloop_tests },
   { "nodelist/", nodelist_tests },
   { "oom/", oom_tests },
   { "oos/", oos_tests },
   { "options/", options_tests },
+  { "parsecommon/", parsecommon_tests },
   { "periodic-event/" , periodic_event_tests },
   { "policy/" , policy_tests },
   { "procmon/", procmon_tests },
@@ -910,8 +912,8 @@ struct testgroup_t testgroups[] = {
   { "routerlist/", routerlist_tests },
   { "routerset/" , routerset_tests },
   { "scheduler/", scheduler_tests },
-  { "socks/", socks_tests },
   { "shared-random/", sr_tests },
+  { "socks/", socks_tests },
   { "status/" , status_tests },
   { "storagedir/", storagedir_tests },
   { "tortls/", tortls_tests },
@@ -921,11 +923,9 @@ struct testgroup_t testgroups[] = {
   { "tortls/x509/", x509_tests },
   { "util/", util_tests },
   { "util/format/", util_format_tests },
+  { "util/handle/", handle_tests },
   { "util/logging/", logging_tests },
   { "util/process/", util_process_tests },
   { "util/thread/", thread_tests },
-  { "util/handle/", handle_tests },
-  { "dns/", dns_tests },
-  { "parsecommon/", parsecommon_tests },
   END_OF_GROUPS
 };
diff --git a/src/test/test.h b/src/test/test.h
index 281551aa6..092356f0f 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -177,11 +177,11 @@ extern const struct testcase_setup_t ed25519_test_setup;
 
 extern struct testcase_t accounting_tests[];
 extern struct testcase_t addr_tests[];
-extern struct testcase_t address_tests[];
 extern struct testcase_t address_set_tests[];
+extern struct testcase_t address_tests[];
 extern struct testcase_t bridges_tests[];
-extern struct testcase_t bwmgt_tests[];
 extern struct testcase_t buffer_tests[];
+extern struct testcase_t bwmgt_tests[];
 extern struct testcase_t cell_format_tests[];
 extern struct testcase_t cell_queue_tests[];
 extern struct testcase_t channel_tests[];
@@ -191,8 +191,8 @@ extern struct testcase_t checkdir_tests[];
 extern struct testcase_t circuitbuild_tests[];
 extern struct testcase_t circuitlist_tests[];
 extern struct testcase_t circuitmux_tests[];
-extern struct testcase_t circuituse_tests[];
 extern struct testcase_t circuitstats_tests[];
+extern struct testcase_t circuituse_tests[];
 extern struct testcase_t compat_libevent_tests[];
 extern struct testcase_t config_tests[];
 extern struct testcase_t connection_tests[];
@@ -200,30 +200,32 @@ extern struct testcase_t conscache_tests[];
 extern struct testcase_t consdiff_tests[];
 extern struct testcase_t consdiffmgr_tests[];
 extern struct testcase_t container_tests[];
-extern struct testcase_t controller_tests[];
 extern struct testcase_t controller_event_tests[];
-extern struct testcase_t crypto_tests[];
+extern struct testcase_t controller_tests[];
 extern struct testcase_t crypto_ope_tests[];
 extern struct testcase_t crypto_openssl_tests[];
-extern struct testcase_t dir_tests[];
+extern struct

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

2018-10-24 Thread nickm

commit 76da5f8b807bfad1763e6ce3ac6dfba3725c9c13
Merge: 31ecbce3b c0bd800d2
Author: Nick Mathewson 
Date:   Wed Oct 24 12:59:51 2018 -0400

Merge branch 'ticket28177'

 src/test/test.c | 20 ++--
 src/test/test.h | 34 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

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

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

2018-10-24 Thread nickm

commit c78904b6302c53e0778854974c13aa4d5a499bb0
Merge: 6851a0809 b063ca060
Author: Nick Mathewson 
Date:   Wed Oct 24 12:57:14 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid taking a second instance of 27797.

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

[tor-commits] [tor/release-0.3.5] node: Make node_supports_v3_rendezvous_point() also check for the key

2018-10-24 Thread nickm

commit b063ca0604d6cc99adf1009818c10ee14d006aab
Author: David Goulet 
Date:   Thu Sep 20 08:50:27 2018 -0400

node: Make node_supports_v3_rendezvous_point() also check for the key

It is not enough to look at protover for v3 rendezvous support but also we
need to make sure that the curve25519 onion key is present or in other words
that the descriptor has been fetched and does contain it.

Fixes #27797.

Signed-off-by: David Goulet 
---
 changes/ticket27797 | 5 +
 src/or/nodelist.c   | 5 +
 2 files changed, 10 insertions(+)

diff --git a/changes/ticket27797 b/changes/ticket27797
new file mode 100644
index 0..f07e35f84
--- /dev/null
+++ b/changes/ticket27797
@@ -0,0 +1,5 @@
+  o Minor bugfixes (node, hidden service v3):
+- When selecting a v3 rendezvous point, not only look at the protover but
+  also if the curve25519 onion key is present. That way we avoid picking a
+  node that supports the v3 rendezvous but for which we don't have the
+  descriptor yet for the key. Fixes bug 27797; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index fcd5e0220..032e8d669 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1153,6 +1153,11 @@ node_supports_v3_rendezvous_point(const node_t *node)
 {
   tor_assert(node);
 
+  /* We can't use a v3 rendezvous point without the curve25519 onion pk. */
+  if (!node_get_curve25519_onion_key(node)) {
+return 0;
+  }
+
   return node_get_protover_summary_flags(node)->supports_v3_rendezvous_point;
 }
 



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

[tor-commits] [tor/maint-0.3.4] node: Make node_supports_v3_rendezvous_point() also check for the key

2018-10-24 Thread nickm

commit b063ca0604d6cc99adf1009818c10ee14d006aab
Author: David Goulet 
Date:   Thu Sep 20 08:50:27 2018 -0400

node: Make node_supports_v3_rendezvous_point() also check for the key

It is not enough to look at protover for v3 rendezvous support but also we
need to make sure that the curve25519 onion key is present or in other words
that the descriptor has been fetched and does contain it.

Fixes #27797.

Signed-off-by: David Goulet 
---
 changes/ticket27797 | 5 +
 src/or/nodelist.c   | 5 +
 2 files changed, 10 insertions(+)

diff --git a/changes/ticket27797 b/changes/ticket27797
new file mode 100644
index 0..f07e35f84
--- /dev/null
+++ b/changes/ticket27797
@@ -0,0 +1,5 @@
+  o Minor bugfixes (node, hidden service v3):
+- When selecting a v3 rendezvous point, not only look at the protover but
+  also if the curve25519 onion key is present. That way we avoid picking a
+  node that supports the v3 rendezvous but for which we don't have the
+  descriptor yet for the key. Fixes bug 27797; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index fcd5e0220..032e8d669 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1153,6 +1153,11 @@ node_supports_v3_rendezvous_point(const node_t *node)
 {
   tor_assert(node);
 
+  /* We can't use a v3 rendezvous point without the curve25519 onion pk. */
+  if (!node_get_curve25519_onion_key(node)) {
+return 0;
+  }
+
   return node_get_protover_summary_flags(node)->supports_v3_rendezvous_point;
 }
 

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

[tor-commits] [tor/maint-0.3.5] node: Make node_supports_v3_rendezvous_point() also check for the key

2018-10-24 Thread nickm

commit b063ca0604d6cc99adf1009818c10ee14d006aab
Author: David Goulet 
Date:   Thu Sep 20 08:50:27 2018 -0400

node: Make node_supports_v3_rendezvous_point() also check for the key

It is not enough to look at protover for v3 rendezvous support but also we
need to make sure that the curve25519 onion key is present or in other words
that the descriptor has been fetched and does contain it.

Fixes #27797.

Signed-off-by: David Goulet 
---
 changes/ticket27797 | 5 +
 src/or/nodelist.c   | 5 +
 2 files changed, 10 insertions(+)

diff --git a/changes/ticket27797 b/changes/ticket27797
new file mode 100644
index 0..f07e35f84
--- /dev/null
+++ b/changes/ticket27797
@@ -0,0 +1,5 @@
+  o Minor bugfixes (node, hidden service v3):
+- When selecting a v3 rendezvous point, not only look at the protover but
+  also if the curve25519 onion key is present. That way we avoid picking a
+  node that supports the v3 rendezvous but for which we don't have the
+  descriptor yet for the key. Fixes bug 27797; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index fcd5e0220..032e8d669 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1153,6 +1153,11 @@ node_supports_v3_rendezvous_point(const node_t *node)
 {
   tor_assert(node);
 
+  /* We can't use a v3 rendezvous point without the curve25519 onion pk. */
+  if (!node_get_curve25519_onion_key(node)) {
+return 0;
+  }
+
   return node_get_protover_summary_flags(node)->supports_v3_rendezvous_point;
 }
 



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

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

2018-10-24 Thread nickm

commit 31ecbce3b8198340b10771aa5789262207b55865
Merge: b77889fc5 c78904b63
Author: Nick Mathewson 
Date:   Wed Oct 24 12:57:26 2018 -0400

Merge branch 'maint-0.3.5'

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

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

2018-10-24 Thread nickm

commit c78904b6302c53e0778854974c13aa4d5a499bb0
Merge: 6851a0809 b063ca060
Author: Nick Mathewson 
Date:   Wed Oct 24 12:57:14 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid taking a second instance of 27797.




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

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

2018-10-24 Thread nickm

commit a7cd5cea6df23a4c639da8928e49862e6dd52419
Merge: 274ef2637 b063ca060
Author: Nick Mathewson 
Date:   Wed Oct 24 12:55:36 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/ticket27797 | 5 +
 src/or/nodelist.c   | 5 +
 2 files changed, 10 insertions(+)

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

[tor-commits] [tor/release-0.3.4] node: Make node_supports_v3_rendezvous_point() also check for the key

2018-10-24 Thread nickm

commit b063ca0604d6cc99adf1009818c10ee14d006aab
Author: David Goulet 
Date:   Thu Sep 20 08:50:27 2018 -0400

node: Make node_supports_v3_rendezvous_point() also check for the key

It is not enough to look at protover for v3 rendezvous support but also we
need to make sure that the curve25519 onion key is present or in other words
that the descriptor has been fetched and does contain it.

Fixes #27797.

Signed-off-by: David Goulet 
---
 changes/ticket27797 | 5 +
 src/or/nodelist.c   | 5 +
 2 files changed, 10 insertions(+)

diff --git a/changes/ticket27797 b/changes/ticket27797
new file mode 100644
index 0..f07e35f84
--- /dev/null
+++ b/changes/ticket27797
@@ -0,0 +1,5 @@
+  o Minor bugfixes (node, hidden service v3):
+- When selecting a v3 rendezvous point, not only look at the protover but
+  also if the curve25519 onion key is present. That way we avoid picking a
+  node that supports the v3 rendezvous but for which we don't have the
+  descriptor yet for the key. Fixes bug 27797; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index fcd5e0220..032e8d669 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1153,6 +1153,11 @@ node_supports_v3_rendezvous_point(const node_t *node)
 {
   tor_assert(node);
 
+  /* We can't use a v3 rendezvous point without the curve25519 onion pk. */
+  if (!node_get_curve25519_onion_key(node)) {
+return 0;
+  }
+
   return node_get_protover_summary_flags(node)->supports_v3_rendezvous_point;
 }
 



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

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

2018-10-24 Thread nickm

commit c78904b6302c53e0778854974c13aa4d5a499bb0
Merge: 6851a0809 b063ca060
Author: Nick Mathewson 
Date:   Wed Oct 24 12:57:14 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid taking a second instance of 27797.

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

[tor-commits] [tor/master] node: Make node_supports_v3_rendezvous_point() also check for the key

2018-10-24 Thread nickm

commit b063ca0604d6cc99adf1009818c10ee14d006aab
Author: David Goulet 
Date:   Thu Sep 20 08:50:27 2018 -0400

node: Make node_supports_v3_rendezvous_point() also check for the key

It is not enough to look at protover for v3 rendezvous support but also we
need to make sure that the curve25519 onion key is present or in other words
that the descriptor has been fetched and does contain it.

Fixes #27797.

Signed-off-by: David Goulet 
---
 changes/ticket27797 | 5 +
 src/or/nodelist.c   | 5 +
 2 files changed, 10 insertions(+)

diff --git a/changes/ticket27797 b/changes/ticket27797
new file mode 100644
index 0..f07e35f84
--- /dev/null
+++ b/changes/ticket27797
@@ -0,0 +1,5 @@
+  o Minor bugfixes (node, hidden service v3):
+- When selecting a v3 rendezvous point, not only look at the protover but
+  also if the curve25519 onion key is present. That way we avoid picking a
+  node that supports the v3 rendezvous but for which we don't have the
+  descriptor yet for the key. Fixes bug 27797; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index fcd5e0220..032e8d669 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1153,6 +1153,11 @@ node_supports_v3_rendezvous_point(const node_t *node)
 {
   tor_assert(node);
 
+  /* We can't use a v3 rendezvous point without the curve25519 onion pk. */
+  if (!node_get_curve25519_onion_key(node)) {
+return 0;
+  }
+
   return node_get_protover_summary_flags(node)->supports_v3_rendezvous_point;
 }
 



___
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

2018-10-24 Thread translation

commit 3f8fa7510923d2af95ab0b1c919bb096174582af
Author: Translation commit bot 
Date:   Wed Oct 24 15:46:16 2018 +

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

diff --git a/de.po b/de.po
index 10fc4bbbe..b8c538670 100644
--- a/de.po
+++ b/de.po
@@ -36,8 +36,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-15 19:38+\n"
-"Last-Translator: Fritz Hauser \n"
+"PO-Revision-Date: 2018-10-24 15:37+\n"
+"Last-Translator: Traumschule Riebau \n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -311,7 +311,7 @@ msgstr "Die ÃberprÃ¼fung auf Aktualisierungen fÃ¼r Ihre 
zusÃ¤tzliche Software s
 msgid ""
 "Please check your network connection, restart Tails, or read the system log "
 "to understand the problem."
-msgstr "Bitte Ã¼berprÃ¼fen Sie ihre Netzwerkverbindung, starten Sie Tails neu, 
oder lesen Sie die System-Logdatei /var/log/syslog, um das Problem zu 
verstehen."
+msgstr "Bitte Ã¼berprÃ¼fen Sie ihre Netzwerkverbindung, starten Sie Tails neu, 
oder lesen Sie die System-Logdatei syslog, um das Problem zu verstehen."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:589
 msgid "The upgrade of your additional software failed"

___
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

2018-10-24 Thread translation

commit 6834ec6b6ad438b4365c94738cdf511bc7c8a461
Author: Translation commit bot 
Date:   Wed Oct 24 15:46:10 2018 +

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

diff --git a/de.po b/de.po
index 10fc4bbbe..b8c538670 100644
--- a/de.po
+++ b/de.po
@@ -36,8 +36,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-15 19:38+\n"
-"Last-Translator: Fritz Hauser \n"
+"PO-Revision-Date: 2018-10-24 15:37+\n"
+"Last-Translator: Traumschule Riebau \n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -311,7 +311,7 @@ msgstr "Die ÃberprÃ¼fung auf Aktualisierungen fÃ¼r Ihre 
zusÃ¤tzliche Software s
 msgid ""
 "Please check your network connection, restart Tails, or read the system log "
 "to understand the problem."
-msgstr "Bitte Ã¼berprÃ¼fen Sie ihre Netzwerkverbindung, starten Sie Tails neu, 
oder lesen Sie die System-Logdatei /var/log/syslog, um das Problem zu 
verstehen."
+msgstr "Bitte Ã¼berprÃ¼fen Sie ihre Netzwerkverbindung, starten Sie Tails neu, 
oder lesen Sie die System-Logdatei syslog, um das Problem zu verstehen."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:589
 msgid "The upgrade of your additional software failed"

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

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

2018-10-24 Thread translation

commit 487b3f0637542f051f680cad2d796f8f0a75d1cb
Author: Translation commit bot 
Date:   Wed Oct 24 15:15:39 2018 +

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

diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd
index a27bf5796..fea7547df 100644
--- a/ko/https-everywhere.dtd
+++ b/ko/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -15,11 +15,11 @@
 
 
 
-
+
 
 
-
-
+
+
 
 
 
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 

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

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

2018-10-24 Thread translation

commit 4b916005a139cac335dc704abbb9ef762a50671a
Author: Translation commit bot 
Date:   Wed Oct 24 14:46:10 2018 +

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

diff --git a/fr.po b/fr.po
index 0d7823a38..dc2acb4da 100644
--- a/fr.po
+++ b/fr.po
@@ -29,7 +29,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-24 14:15+\n"
+"PO-Revision-Date: 2018-10-24 14:20+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -172,13 +172,13 @@ msgstr "non disponible"
 msgid ""
 "{details} Please check your list of additional software or read the system "
 "log to understand the problem."
-msgstr "{details} Veuillez consulter votre liste de logiciels supplÃ©mentaires 
ou lire le journal systÃ¨me pour comprendre le problÃ¨me."
+msgstr "{details} Veuillez consulter votre liste de logiciels supplÃ©mentaires 
ou lire le journal du systÃ¨me pour comprendre le problÃ¨me."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:149
 msgid ""
 "Please check your list of additional software or read the system log to "
 "understand the problem."
-msgstr "Veuillez consulter votre liste de logiciels supplÃ©mentaires ou lire 
le journal systÃ¨me pour comprendre le problÃ¨me."
+msgstr "Veuillez consulter votre liste de logiciels supplÃ©mentaires ou lire 
le journal du systÃ¨me pour comprendre le problÃ¨me."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
 msgid "Show Log"

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

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

2018-10-24 Thread nickm

commit 6851a08090325dc51b26e80350395c4a0c778cf8
Merge: bfab7b9d3 d1d66866b
Author: Nick Mathewson 
Date:   Wed Oct 24 10:20:41 2018 -0400

Merge branch 'ticket28115_035' into maint-0.3.5

 changes/bug28115   |  3 +++
 src/lib/crypt_ops/crypto_ope.c | 12 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

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

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

2018-10-24 Thread nickm

commit 6851a08090325dc51b26e80350395c4a0c778cf8
Merge: bfab7b9d3 d1d66866b
Author: Nick Mathewson 
Date:   Wed Oct 24 10:20:41 2018 -0400

Merge branch 'ticket28115_035' into maint-0.3.5

 changes/bug28115   |  3 +++
 src/lib/crypt_ops/crypto_ope.c | 12 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

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

[tor-commits] [tor/maint-0.3.5] Rename a function; it is used to convert a value _From_ le.

2018-10-24 Thread nickm

commit d1d66866b2c5e4e7ce246008f62f74d979cd8351
Author: Nick Mathewson 
Date:   Fri Oct 19 08:42:28 2018 -0400

Rename a function; it is used to convert a value _From_ le.

We can't use htons()/ntohs() -- those are no-ops on exactly the
wrong platforms.
---
 src/lib/crypt_ops/crypto_ope.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c
index 47e246127..789517eba 100644
--- a/src/lib/crypt_ops/crypto_ope.c
+++ b/src/lib/crypt_ops/crypto_ope.c
@@ -49,16 +49,16 @@ struct crypto_ope_t {
 typedef uint16_t ope_val_t;
 
 #ifdef WORDS_BIGENDIAN
-/** Convert an OPE value to little-endian */
+/** Convert an OPE value from little-endian. */
 static inline ope_val_t
-ope_val_to_le(ope_val_t x)
+ope_val_from_le(ope_val_t x)
 {
   return
 ((x) >> 8) |
 (((x)&0xff) << 8);
 }
 #else
-#define ope_val_to_le(x) (x)
+#define ope_val_from_le(x) (x)
 #endif
 
 /**
@@ -104,7 +104,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n)
 crypto_cipher_crypt_inplace(c, (char*)buf, BUFSZ*sizeof(ope_val_t));
 
 for (i = 0; i < BUFSZ; ++i) {
-  total += ope_val_to_le(buf[i]);
+  total += ope_val_from_le(buf[i]);
   total += 1;
 }
 n -= BUFSZ;
@@ -113,7 +113,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n)
   memset(buf, 0, n*sizeof(ope_val_t));
   crypto_cipher_crypt_inplace(c, (char*)buf, n*sizeof(ope_val_t));
   for (i = 0; i < n; ++i) {
-total += ope_val_to_le(buf[i]);
+total += ope_val_from_le(buf[i]);
 total += 1;
   }
 



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

[tor-commits] [tor/release-0.3.5] Rename a function; it is used to convert a value _From_ le.

2018-10-24 Thread nickm

commit d1d66866b2c5e4e7ce246008f62f74d979cd8351
Author: Nick Mathewson 
Date:   Fri Oct 19 08:42:28 2018 -0400

Rename a function; it is used to convert a value _From_ le.

We can't use htons()/ntohs() -- those are no-ops on exactly the
wrong platforms.
---
 src/lib/crypt_ops/crypto_ope.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c
index 47e246127..789517eba 100644
--- a/src/lib/crypt_ops/crypto_ope.c
+++ b/src/lib/crypt_ops/crypto_ope.c
@@ -49,16 +49,16 @@ struct crypto_ope_t {
 typedef uint16_t ope_val_t;
 
 #ifdef WORDS_BIGENDIAN
-/** Convert an OPE value to little-endian */
+/** Convert an OPE value from little-endian. */
 static inline ope_val_t
-ope_val_to_le(ope_val_t x)
+ope_val_from_le(ope_val_t x)
 {
   return
 ((x) >> 8) |
 (((x)&0xff) << 8);
 }
 #else
-#define ope_val_to_le(x) (x)
+#define ope_val_from_le(x) (x)
 #endif
 
 /**
@@ -104,7 +104,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n)
 crypto_cipher_crypt_inplace(c, (char*)buf, BUFSZ*sizeof(ope_val_t));
 
 for (i = 0; i < BUFSZ; ++i) {
-  total += ope_val_to_le(buf[i]);
+  total += ope_val_from_le(buf[i]);
   total += 1;
 }
 n -= BUFSZ;
@@ -113,7 +113,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n)
   memset(buf, 0, n*sizeof(ope_val_t));
   crypto_cipher_crypt_inplace(c, (char*)buf, n*sizeof(ope_val_t));
   for (i = 0; i < n; ++i) {
-total += ope_val_to_le(buf[i]);
+total += ope_val_from_le(buf[i]);
 total += 1;
   }
 



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

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

2018-10-24 Thread nickm

commit b77889fc5f40208a7c79a82c7c6b9d7f48fbcd51
Merge: c6d3bebb1 6851a0809
Author: Nick Mathewson 
Date:   Wed Oct 24 10:20:53 2018 -0400

Merge branch 'maint-0.3.5'

 changes/bug28115   |  3 +++
 src/lib/crypt_ops/crypto_ope.c | 12 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

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

[tor-commits] [tor/master] Fix a misspelled macro test that was breaking big-endian OPE

2018-10-24 Thread nickm

commit f8a1dc64f975bcaa74634f4666e448ca3fe88d3b
Author: Nick Mathewson 
Date:   Fri Oct 19 08:41:25 2018 -0400

Fix a misspelled macro test that was breaking big-endian OPE

Fixes bug 28115; bugfix on 0.3.5.1-alpha.
---
 changes/bug28115   | 3 +++
 src/lib/crypt_ops/crypto_ope.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug28115 b/changes/bug28115
new file mode 100644
index 0..e3e29968e
--- /dev/null
+++ b/changes/bug28115
@@ -0,0 +1,3 @@
+  o Minor bugfixes (portability):
+- Make the OPE code (which is used for v3 onion services) run correctly
+  on big-endian platforms. Fixes bug 28115; bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c
index fd5d5f377..47e246127 100644
--- a/src/lib/crypt_ops/crypto_ope.c
+++ b/src/lib/crypt_ops/crypto_ope.c
@@ -48,7 +48,7 @@ struct crypto_ope_t {
 /** The type to add up in order to produce our OPE ciphertexts */
 typedef uint16_t ope_val_t;
 
-#ifdef WORDS_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
 /** Convert an OPE value to little-endian */
 static inline ope_val_t
 ope_val_to_le(ope_val_t x)



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

[tor-commits] [tor/release-0.3.5] Fix a misspelled macro test that was breaking big-endian OPE

2018-10-24 Thread nickm

commit f8a1dc64f975bcaa74634f4666e448ca3fe88d3b
Author: Nick Mathewson 
Date:   Fri Oct 19 08:41:25 2018 -0400

Fix a misspelled macro test that was breaking big-endian OPE

Fixes bug 28115; bugfix on 0.3.5.1-alpha.
---
 changes/bug28115   | 3 +++
 src/lib/crypt_ops/crypto_ope.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug28115 b/changes/bug28115
new file mode 100644
index 0..e3e29968e
--- /dev/null
+++ b/changes/bug28115
@@ -0,0 +1,3 @@
+  o Minor bugfixes (portability):
+- Make the OPE code (which is used for v3 onion services) run correctly
+  on big-endian platforms. Fixes bug 28115; bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c
index fd5d5f377..47e246127 100644
--- a/src/lib/crypt_ops/crypto_ope.c
+++ b/src/lib/crypt_ops/crypto_ope.c
@@ -48,7 +48,7 @@ struct crypto_ope_t {
 /** The type to add up in order to produce our OPE ciphertexts */
 typedef uint16_t ope_val_t;
 
-#ifdef WORDS_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
 /** Convert an OPE value to little-endian */
 static inline ope_val_t
 ope_val_to_le(ope_val_t x)



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

[tor-commits] [tor/master] Rename a function; it is used to convert a value _From_ le.

2018-10-24 Thread nickm

commit d1d66866b2c5e4e7ce246008f62f74d979cd8351
Author: Nick Mathewson 
Date:   Fri Oct 19 08:42:28 2018 -0400

Rename a function; it is used to convert a value _From_ le.

We can't use htons()/ntohs() -- those are no-ops on exactly the
wrong platforms.
---
 src/lib/crypt_ops/crypto_ope.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c
index 47e246127..789517eba 100644
--- a/src/lib/crypt_ops/crypto_ope.c
+++ b/src/lib/crypt_ops/crypto_ope.c
@@ -49,16 +49,16 @@ struct crypto_ope_t {
 typedef uint16_t ope_val_t;
 
 #ifdef WORDS_BIGENDIAN
-/** Convert an OPE value to little-endian */
+/** Convert an OPE value from little-endian. */
 static inline ope_val_t
-ope_val_to_le(ope_val_t x)
+ope_val_from_le(ope_val_t x)
 {
   return
 ((x) >> 8) |
 (((x)&0xff) << 8);
 }
 #else
-#define ope_val_to_le(x) (x)
+#define ope_val_from_le(x) (x)
 #endif
 
 /**
@@ -104,7 +104,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n)
 crypto_cipher_crypt_inplace(c, (char*)buf, BUFSZ*sizeof(ope_val_t));
 
 for (i = 0; i < BUFSZ; ++i) {
-  total += ope_val_to_le(buf[i]);
+  total += ope_val_from_le(buf[i]);
   total += 1;
 }
 n -= BUFSZ;
@@ -113,7 +113,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n)
   memset(buf, 0, n*sizeof(ope_val_t));
   crypto_cipher_crypt_inplace(c, (char*)buf, n*sizeof(ope_val_t));
   for (i = 0; i < n; ++i) {
-total += ope_val_to_le(buf[i]);
+total += ope_val_from_le(buf[i]);
 total += 1;
   }
 



___
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 'ticket28115_035' into maint-0.3.5

2018-10-24 Thread nickm

commit 6851a08090325dc51b26e80350395c4a0c778cf8
Merge: bfab7b9d3 d1d66866b
Author: Nick Mathewson 
Date:   Wed Oct 24 10:20:41 2018 -0400

Merge branch 'ticket28115_035' into maint-0.3.5

 changes/bug28115   |  3 +++
 src/lib/crypt_ops/crypto_ope.c | 12 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)



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

[tor-commits] [tor/maint-0.3.5] Fix a misspelled macro test that was breaking big-endian OPE

2018-10-24 Thread nickm

commit f8a1dc64f975bcaa74634f4666e448ca3fe88d3b
Author: Nick Mathewson 
Date:   Fri Oct 19 08:41:25 2018 -0400

Fix a misspelled macro test that was breaking big-endian OPE

Fixes bug 28115; bugfix on 0.3.5.1-alpha.
---
 changes/bug28115   | 3 +++
 src/lib/crypt_ops/crypto_ope.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug28115 b/changes/bug28115
new file mode 100644
index 0..e3e29968e
--- /dev/null
+++ b/changes/bug28115
@@ -0,0 +1,3 @@
+  o Minor bugfixes (portability):
+- Make the OPE code (which is used for v3 onion services) run correctly
+  on big-endian platforms. Fixes bug 28115; bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c
index fd5d5f377..47e246127 100644
--- a/src/lib/crypt_ops/crypto_ope.c
+++ b/src/lib/crypt_ops/crypto_ope.c
@@ -48,7 +48,7 @@ struct crypto_ope_t {
 /** The type to add up in order to produce our OPE ciphertexts */
 typedef uint16_t ope_val_t;
 
-#ifdef WORDS_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
 /** Convert an OPE value to little-endian */
 static inline ope_val_t
 ope_val_to_le(ope_val_t x)



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

[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

2018-10-24 Thread translation

commit 3f0cea2eab0e5e6f1285a217a20c02f7b9d2c314
Author: Translation commit bot 
Date:   Wed Oct 24 14:17:54 2018 +

Update translations for tor-browser-manual_completed
---
 de/de.po | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/de/de.po b/de/de.po
index e4c451d25..5df371eac 100644
--- a/de/de.po
+++ b/de/de.po
@@ -2,13 +2,13 @@
 # Tobias Bannert , 2016
 # try once, 2016
 # Christian Kaindl , 2016
-# Ettore Atalan , 2016
+# Jim John , 2016
 # Sacro , 2016
+# Ettore Atalan , 2016
 # D P, 2016
 # gregweb , 2016
 # runasand , 2016
 # Curtis Baltimore , 2016
-# Jim John , 2016
 # Inter Webs , 2016
 # Axel Laemmert, 2016
 # Christian Humm , 2017
@@ -650,8 +650,8 @@ msgstr ""
 "Die nÃ¤chste Anzeige fragt ob deine Verbindung einen Proxy benÃ¶tigt. In den "
 "meisten FÃ¤llen ist dies nicht erforderlich. Normalerweise weisst du es, wenn"
 " du hier \"Ja\" antworten musst, da die Einstellungen auch fÃ¼r andere "
-"Browser auf deinem System benutzt werden. Wenn mÃ¶glich frage deinen "
-"Netzwerkadministrator nach Anleitung. Wenn deine Verbindung keinen Proxy "
+"Browser auf deinem System benutzt werden. Wenn mÃ¶glich bitte deinen "
+"Netzwerkadministrator um Hilfe. Wenn deine Verbindung keinen Proxy "
 "verwendet, klicke auf \"Fortfahren\"."
 
 #. This is a reference to an external file such as an image or video. When
@@ -682,7 +682,7 @@ msgstr ""
 
 #: index.page:8
 msgid "Tor Browser User Manual"
-msgstr "Tor-Browser-Benutzerhandbuch"
+msgstr "Tor Browser Benutzerhandbuch"
 
 #: known-issues.page:6
 msgid "A list of known issues."
@@ -695,9 +695,7 @@ msgstr "Bekannte Probleme"
 #: known-issues.page:14
 msgid ""
 "Tor needs your system clock (and your time zone) set to the correct time."
-msgstr ""
-"Tor braucht deine auf die richtige Uhrzeit eingestellte Systemuhr (und deine"
-" Zeitzone)."
+msgstr "Tor braucht eine richtig eingestellte Systemuhr (und Zeitzone)."
 
 #: known-issues.page:19
 msgid ""
@@ -1103,7 +1101,7 @@ msgid ""
 msgstr ""
 "Wenn du den gewÃ¼nschten Onion-Dienst nicht erreichen kannst, stelle sicher, "
 "dass du die Onion-Adresse korrekt eingegeben hast: Schon ein kleiner Fehler "
-"verhindert, dass Tor Browser die Seite erreichen kann."
+"verhindert, dass der Tor Browser die Seite erreichen kann."
 
 #: onionsites.page:64
 msgid ""
@@ -1235,7 +1233,7 @@ msgid ""
 "Tor Browser is based on Firefox, and any browser add-ons or themes that are "
 "compatible with Firefox can also be installed in Tor Browser."
 msgstr ""
-"Tor Browser basiert auf Firefox, und jede Erweiterung oder jedes Thema, das "
+"Tor Browser basiert auf Firefox, und jede Erweiterung oder jedes Theme, das "
 "mit Firefox kompatibel ist, kann auch im Tor Browser installiert werden."
 
 #: plugins.page:65

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-10-24 Thread translation

commit 5cb4d221352765ca131f9226e00e579479cf2687
Author: Translation commit bot 
Date:   Wed Oct 24 14:17:49 2018 +

Update translations for tor-browser-manual
---
 de/de.po | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/de/de.po b/de/de.po
index e4c451d25..5df371eac 100644
--- a/de/de.po
+++ b/de/de.po
@@ -2,13 +2,13 @@
 # Tobias Bannert , 2016
 # try once, 2016
 # Christian Kaindl , 2016
-# Ettore Atalan , 2016
+# Jim John , 2016
 # Sacro , 2016
+# Ettore Atalan , 2016
 # D P, 2016
 # gregweb , 2016
 # runasand , 2016
 # Curtis Baltimore , 2016
-# Jim John , 2016
 # Inter Webs , 2016
 # Axel Laemmert, 2016
 # Christian Humm , 2017
@@ -650,8 +650,8 @@ msgstr ""
 "Die nÃ¤chste Anzeige fragt ob deine Verbindung einen Proxy benÃ¶tigt. In den "
 "meisten FÃ¤llen ist dies nicht erforderlich. Normalerweise weisst du es, wenn"
 " du hier \"Ja\" antworten musst, da die Einstellungen auch fÃ¼r andere "
-"Browser auf deinem System benutzt werden. Wenn mÃ¶glich frage deinen "
-"Netzwerkadministrator nach Anleitung. Wenn deine Verbindung keinen Proxy "
+"Browser auf deinem System benutzt werden. Wenn mÃ¶glich bitte deinen "
+"Netzwerkadministrator um Hilfe. Wenn deine Verbindung keinen Proxy "
 "verwendet, klicke auf \"Fortfahren\"."
 
 #. This is a reference to an external file such as an image or video. When
@@ -682,7 +682,7 @@ msgstr ""
 
 #: index.page:8
 msgid "Tor Browser User Manual"
-msgstr "Tor-Browser-Benutzerhandbuch"
+msgstr "Tor Browser Benutzerhandbuch"
 
 #: known-issues.page:6
 msgid "A list of known issues."
@@ -695,9 +695,7 @@ msgstr "Bekannte Probleme"
 #: known-issues.page:14
 msgid ""
 "Tor needs your system clock (and your time zone) set to the correct time."
-msgstr ""
-"Tor braucht deine auf die richtige Uhrzeit eingestellte Systemuhr (und deine"
-" Zeitzone)."
+msgstr "Tor braucht eine richtig eingestellte Systemuhr (und Zeitzone)."
 
 #: known-issues.page:19
 msgid ""
@@ -1103,7 +1101,7 @@ msgid ""
 msgstr ""
 "Wenn du den gewÃ¼nschten Onion-Dienst nicht erreichen kannst, stelle sicher, "
 "dass du die Onion-Adresse korrekt eingegeben hast: Schon ein kleiner Fehler "
-"verhindert, dass Tor Browser die Seite erreichen kann."
+"verhindert, dass der Tor Browser die Seite erreichen kann."
 
 #: onionsites.page:64
 msgid ""
@@ -1235,7 +1233,7 @@ msgid ""
 "Tor Browser is based on Firefox, and any browser add-ons or themes that are "
 "compatible with Firefox can also be installed in Tor Browser."
 msgstr ""
-"Tor Browser basiert auf Firefox, und jede Erweiterung oder jedes Thema, das "
+"Tor Browser basiert auf Firefox, und jede Erweiterung oder jedes Theme, das "
 "mit Firefox kompatibel ist, kann auch im Tor Browser installiert werden."
 
 #: plugins.page:65

___
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

2018-10-24 Thread translation

commit 7913901d52978495a96d42966e78e89250d4d812
Author: Translation commit bot 
Date:   Wed Oct 24 14:16:09 2018 +

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

diff --git a/fr.po b/fr.po
index 2cde82ab9..0d7823a38 100644
--- a/fr.po
+++ b/fr.po
@@ -29,7 +29,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-23 19:07+\n"
+"PO-Revision-Date: 2018-10-24 14:15+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -247,27 +247,27 @@ msgstr "Ãchec de crÃ©ation de votre espace de stockage 
persistant. "
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:334
 #, python-brace-format
 msgid "You could install {packages} automatically when starting Tails"
-msgstr "Vous pouvez installer {packages} automatiquement quand Tails dÃ©bute."
+msgstr "Vous pourriez installer {packages} automatiquement lors du dÃ©marrage 
de Tails"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:337
 msgid ""
 "To do so, you need to run Tails from a USB stick installed using Tails "
 "Installer."
-msgstr "Pour le faire, you avez besoin d'opÃ©rer Tails depuis une clÃ© USB 
installÃ©e avec L'installeur Tails."
+msgstr "Pour ce faire, vous devez exÃ©cuter Tails Ã  partir dâune clÃ© USB 
installÃ©e avec le programme dâinstallationÂ Tails."
 
 #. Translators: Don't translate {packages}, it's a placeholder and will be
 #. replaced.
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:351
 #, python-brace-format
 msgid "Remove {packages} from your additional software?"
-msgstr "Retirer {packages} de votre logiciel supplÃ©mentaire ? "
+msgstr "Supprimer {packages} de vos logiciels supplÃ©mentairesâ? "
 
 #. Translators: Don't translate {packages}, it's a placeholder and will be
 #. replaced.
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:354
 #, python-brace-format
 msgid "This will stop installing {packages} automatically."
-msgstr "Ceci arrÃªtera l'installation automatique de {packages}."
+msgstr "Cela arrÃªtera lâinstallation automatique de {packages}."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:356
 msgid "Remove"
@@ -304,7 +304,7 @@ msgstr "Ãchec de recherche de mises Ã  niveau de vos 
logiciels supplÃ©mentaires
 msgid ""
 "Please check your network connection, restart Tails, or read the system log "
 "to understand the problem."
-msgstr "VÃ©rifiez votre connexion internet, redÃ©marrer Tails, ou lisez le 
journal systÃ¨me pour comprendre le problÃ¨me."
+msgstr "Veuillez vÃ©rifier votre connexion rÃ©seau, redÃ©marrer Tails, ou 
consulter le journal du systÃ¨me pour comprendre le problÃ¨me."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:589
 msgid "The upgrade of your additional software failed"

___
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

2018-10-24 Thread translation

commit 7c6cb72cd7ee2b6febe143c9add6176da7e6d5b5
Author: Translation commit bot 
Date:   Wed Oct 24 13:48:28 2018 +

Update translations for torbutton-torbuttondtd
---
 hr/torbutton.dtd | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/hr/torbutton.dtd b/hr/torbutton.dtd
index 42bfc12dd..7bb7bb18b 100644
--- a/hr/torbutton.dtd
+++ b/hr/torbutton.dtd
@@ -14,28 +14,28 @@
 
 
 
-
+
 
 
-
-
+
+
 
 
-
+
 
 
-
+
 
 
 
-
-
+
+
 
 
-
-
-
-
+
+
+
+
 
 
 

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

[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

2018-10-24 Thread translation

commit 49046edb20db1bc77047a0ac21d83afb2b1e45ca
Author: Translation commit bot 
Date:   Wed Oct 24 13:47:57 2018 +

Update translations for tor-browser-manual_completed
---
 de/de.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/de/de.po b/de/de.po
index 67f26719e..e4c451d25 100644
--- a/de/de.po
+++ b/de/de.po
@@ -501,7 +501,7 @@ msgstr ""
 
 #: downloading.page:89
 msgid "To download Tor Browser using Satori:"
-msgstr "So ladest du den Tor-Browser mit Satori herunter:"
+msgstr "So lÃ¤dst du den Tor-Browser mit Satori herunter:"
 
 #: downloading.page:94
 msgid "Install Satori from the Chrome App Store."
@@ -568,7 +568,7 @@ msgid ""
 "Settings window. This offers you the option to connect directly to the Tor "
 "network, or to configure Tor Browser for your connection."
 msgstr ""
-"Wenn du den Tor Browser zum ersten Mal startest, wist du das Fenster \"Tor "
+"Wenn du den Tor Browser zum ersten Mal startest, wirst du das Fenster \"Tor "
 "Netzwerkeinstellungen\" sehen. Es bietet Optionen, sich direkt mit dem Tor "
 "Netzwerk zu verbinden oder den Tor Browser fÃ¼r deine Verbindung zu "
 "konfigurieren."
@@ -618,8 +618,8 @@ msgid ""
 "configuration options."
 msgstr ""
 "Wenn du weisst, dass deine Verbindung zensiert wird oder einen Proxy "
-"benutzt, dann solltest du diese Option wÃ¤hlen. Tor Browser wird dich durch "
-"eine Reihe von Konfigurationsoptionen fÃ¼hren."
+"benutzt, dann solltest du diese Option wÃ¤hlen. Der Tor Browser wird dich "
+"durch eine Reihe von Konfigurationsoptionen fÃ¼hren."
 
 #: first-time.page:44
 msgid ""
@@ -637,7 +637,7 @@ msgstr ""
 " wird, oder du bereits versucht hast dich mit dem Tor Netzwerk zu verbinden "
 "und keine andere MÃ¶glichkeit funktioniert hat, wÃ¤hle \"Ja\". Du wirst "
 "anschlieÃend zum Fenster UmgehungsmaÃnahmen "
-" geleitet, um eine austauschbare Ãbertragungsart zu konfigurieren. "
+" geleitet, um eine andere Ãbertragungsart zu konfigurieren. "
 
 #: first-time.page:55
 msgid ""

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-10-24 Thread translation

commit 2384f133157b1bb294f07d62ff46da4304e85ebd
Author: Translation commit bot 
Date:   Wed Oct 24 13:47:51 2018 +

Update translations for tor-browser-manual
---
 de/de.po | 10 +-
 hr/hr.po |  7 ---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/de/de.po b/de/de.po
index 67f26719e..e4c451d25 100644
--- a/de/de.po
+++ b/de/de.po
@@ -501,7 +501,7 @@ msgstr ""
 
 #: downloading.page:89
 msgid "To download Tor Browser using Satori:"
-msgstr "So ladest du den Tor-Browser mit Satori herunter:"
+msgstr "So lÃ¤dst du den Tor-Browser mit Satori herunter:"
 
 #: downloading.page:94
 msgid "Install Satori from the Chrome App Store."
@@ -568,7 +568,7 @@ msgid ""
 "Settings window. This offers you the option to connect directly to the Tor "
 "network, or to configure Tor Browser for your connection."
 msgstr ""
-"Wenn du den Tor Browser zum ersten Mal startest, wist du das Fenster \"Tor "
+"Wenn du den Tor Browser zum ersten Mal startest, wirst du das Fenster \"Tor "
 "Netzwerkeinstellungen\" sehen. Es bietet Optionen, sich direkt mit dem Tor "
 "Netzwerk zu verbinden oder den Tor Browser fÃ¼r deine Verbindung zu "
 "konfigurieren."
@@ -618,8 +618,8 @@ msgid ""
 "configuration options."
 msgstr ""
 "Wenn du weisst, dass deine Verbindung zensiert wird oder einen Proxy "
-"benutzt, dann solltest du diese Option wÃ¤hlen. Tor Browser wird dich durch "
-"eine Reihe von Konfigurationsoptionen fÃ¼hren."
+"benutzt, dann solltest du diese Option wÃ¤hlen. Der Tor Browser wird dich "
+"durch eine Reihe von Konfigurationsoptionen fÃ¼hren."
 
 #: first-time.page:44
 msgid ""
@@ -637,7 +637,7 @@ msgstr ""
 " wird, oder du bereits versucht hast dich mit dem Tor Netzwerk zu verbinden "
 "und keine andere MÃ¶glichkeit funktioniert hat, wÃ¤hle \"Ja\". Du wirst "
 "anschlieÃend zum Fenster UmgehungsmaÃnahmen "
-" geleitet, um eine austauschbare Ãbertragungsart zu konfigurieren. "
+" geleitet, um eine andere Ãbertragungsart zu konfigurieren. "
 
 #: first-time.page:55
 msgid ""
diff --git a/hr/hr.po b/hr/hr.po
index 5901130fb..b180212a8 100644
--- a/hr/hr.po
+++ b/hr/hr.po
@@ -4,12 +4,13 @@
 # Igor , 2016
 # Vlado V. , 2016
 # Mark Belinsky, 2018
+# Karlo Prikratki , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2018-09-07 16:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Mark Belinsky, 2018\n"
+"Last-Translator: Karlo Prikratki , 2018\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1064,7 +1065,7 @@ msgstr ""
 
 #: security-slider.page:53
 msgid "Safer"
-msgstr ""
+msgstr "Sigurnije"
 
 #: security-slider.page:54
 msgid ""
@@ -1078,7 +1079,7 @@ msgstr ""
 
 #: security-slider.page:64
 msgid "Standard"
-msgstr ""
+msgstr "Standardno"
 
 #: security-slider.page:65
 msgid ""

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

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

2018-10-24 Thread translation

commit e8512a77764a8c629bc384ea496514b9499f5d98
Author: Translation commit bot 
Date:   Wed Oct 24 13:46:45 2018 +

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

diff --git a/hr/openpgp-applet.pot b/hr/openpgp-applet.pot
index 0ca5596c7..9f89207c4 100644
--- a/hr/openpgp-applet.pot
+++ b/hr/openpgp-applet.pot
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-10-04 00:29+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2018-10-24 13:20+\n"
+"Last-Translator: Karlo Prikratki \n"
 "Language-Team: Croatian 
(http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2018-10-24 Thread translation

commit 71c223676fe9683ece1a56d32e8502efc23f6c72
Author: Translation commit bot 
Date:   Wed Oct 24 13:46:01 2018 +

Update translations for mat-gui
---
 hr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr.po b/hr.po
index 214f8638b..7afe463f3 100644
--- a/hr.po
+++ b/hr.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2018-10-04 00:25+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2018-10-24 13:20+\n"
+"Last-Translator: Karlo Prikratki \n"
 "Language-Team: Croatian 
(http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2018-10-24 Thread translation

commit ec3787f8336dc9d2955dd045e94f5932855771cf
Author: Translation commit bot 
Date:   Wed Oct 24 13:19:51 2018 +

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

diff --git a/contents+de.po b/contents+de.po
index d4f979159..25b6b646e 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -1,6 +1,7 @@
 # Translators:
 # erinm, 2018
 # Curtis Baltimore , 2018
+# Jim John , 2018
 # Emma Peel, 2018
 msgid ""
 msgstr ""
@@ -51,7 +52,7 @@ msgstr ""
 #: http//localhost/tbb/need-tor-browser-language-not-english/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)
 msgid "* FranÃ§ais (fr)"
-msgstr "* FranÃ§ais (fr)"
+msgstr "* FranzÃ¶sisch (fr)"
 
 #: http//localhost/tbb/website-blocking-access-over-tor/
 #: (content/tbb/tbb-7/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

2018-10-24 Thread translation

commit d53ca7dd527acf98d6eca8dbbfdd957edc700514
Author: Translation commit bot 
Date:   Wed Oct 24 13:19:45 2018 +

Update translations for support-portal
---
 contents+de.po | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contents+de.po b/contents+de.po
index d4f979159..25b6b646e 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -1,6 +1,7 @@
 # Translators:
 # erinm, 2018
 # Curtis Baltimore , 2018
+# Jim John , 2018
 # Emma Peel, 2018
 msgid ""
 msgstr ""
@@ -51,7 +52,7 @@ msgstr ""
 #: http//localhost/tbb/need-tor-browser-language-not-english/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)
 msgid "* FranÃ§ais (fr)"
-msgstr "* FranÃ§ais (fr)"
+msgstr "* FranzÃ¶sisch (fr)"
 
 #: http//localhost/tbb/website-blocking-access-over-tor/
 #: (content/tbb/tbb-7/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/torbutton-branddtd] Update translations for torbutton-branddtd

2018-10-24 Thread translation

commit 0528d798c5f5007e3a1846f724dab226a1e23f76
Author: Translation commit bot 
Date:   Wed Oct 24 13:18:14 2018 +

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

diff --git a/hr/brand.dtd b/hr/brand.dtd
index c1be5558f..f34a6116b 100644
--- a/hr/brand.dtd
+++ b/hr/brand.dtd
@@ -6,10 +6,10 @@
 
 
 
-
+
 
 
-
+
 
-
-
+
+

___
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

2018-10-24 Thread translation

commit 5d6018107bf0facdd2d9805ea282b97d4f89a01f
Author: Translation commit bot 
Date:   Wed Oct 24 13:18:35 2018 +

Update translations for torbutton-torbuttondtd
---
 hr/torbutton.dtd | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/hr/torbutton.dtd b/hr/torbutton.dtd
index 9376e0c89..42bfc12dd 100644
--- a/hr/torbutton.dtd
+++ b/hr/torbutton.dtd
@@ -1,32 +1,32 @@
-
+
 
 
-
-
+
+
 
 
-
-
-
+
+
+
 
 
-
-
-
-
+
+
+
+
 
-
-
+
+
 
 
-
-
+
+
 
-
-
+
+
 
-
-
+
+
 
 
 

___
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

2018-10-24 Thread translation

commit c14dfb09b84e176854296cea8101a433e8155dff
Author: Translation commit bot 
Date:   Wed Oct 24 13:18:09 2018 +

Update translations for torbutton-brandproperties_completed
---
 hr/brand.properties | 16 
 1 file changed, 16 insertions(+)

diff --git a/hr/brand.properties b/hr/brand.properties
new file mode 100644
index 0..34445b25f
--- /dev/null
+++ b/hr/brand.properties
@@ -0,0 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShorterName=Tor Preglednik
+brandShortName=Tor Preglednik
+brandFullName=Tor Preglednik
+vendorShortName=Tor Projekt
+
+homePageSingleStartMain=Firefox Start, brza poÄetna stranica s ugraÄenim 
pretraÅ¾ivanjem
+homePageImport=Uvezite VaÅ¡u poÄetnu stranicu iz %S
+
+homePageMigrationPageTitle=Odabir poÄetne stranice
+homePageMigrationDescription=Odaberite poÄetnu stranicu koju Å¾elite 
koristiti:
+
+syncBrandShortName=Sync

___
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

2018-10-24 Thread translation

commit 04e923187d40a2f438679f4cf8dac20d085c94fe
Author: Translation commit bot 
Date:   Wed Oct 24 13:18:25 2018 +

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

diff --git a/hr/torbutton.properties b/hr/torbutton.properties
index 4815c4c69..6095c3464 100644
--- a/hr/torbutton.properties
+++ b/hr/torbutton.properties
@@ -36,7 +36,7 @@ torbutton.maximize_warning = Maximizing Tor Browser can allow 
websites to determ
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Ova stranica (%S) je pokuÅ¡ala izvuÄi podatke HTML5 slike, 
koji mogu biti koriÅ¡teni kako bi se unikatno identificiralo VaÅ¡e 
raÄunalo.\n\nTreba li Tor Browser dopustiti ovoj stranici izvlaÄenje podataka 
HTML5 slike?
 canvas.notNow=Ne sada
-canvas.notNowAccessKey=N
+canvas.notNowAccessKey=n
 canvas.allow=Dozvoli ubuduce
 canvas.allowAccessKey=O
 canvas.never=Nikada za ovu stranicu (preporuceno)

___
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

2018-10-24 Thread translation

commit 57e3f360c1b8121bec463cb56961b794dfc433f2
Author: Translation commit bot 
Date:   Wed Oct 24 13:18:19 2018 +

Update translations for torbutton-branddtd_completed
---
 hr/brand.dtd | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hr/brand.dtd b/hr/brand.dtd
index 572da5f7d..f34a6116b 100644
--- a/hr/brand.dtd
+++ b/hr/brand.dtd
@@ -2,7 +2,14 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+
 
 
 
-
+
+
+
+
+
+
+

___
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

2018-10-24 Thread translation

commit 3e9ed5de26679a93c44d423c38a2e98357ce13ca
Author: Translation commit bot 
Date:   Wed Oct 24 13:18:03 2018 +

Update translations for torbutton-brandproperties
---
 hr/brand.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hr/brand.properties b/hr/brand.properties
index 4bbb4556f..34445b25f 100644
--- a/hr/brand.properties
+++ b/hr/brand.properties
@@ -7,10 +7,10 @@ brandShortName=Tor Preglednik
 brandFullName=Tor Preglednik
 vendorShortName=Tor Projekt
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, brza poÄetna stranica s ugraÄenim 
pretraÅ¾ivanjem
+homePageImport=Uvezite VaÅ¡u poÄetnu stranicu iz %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Odabir poÄetne stranice
+homePageMigrationDescription=Odaberite poÄetnu stranicu koju Å¾elite 
koristiti:
 
 syncBrandShortName=Sync

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

[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

2018-10-24 Thread translation

commit 2160a7be5a24e2299f69578641b7a8e5b58e98e1
Author: Translation commit bot 
Date:   Wed Oct 24 13:17:58 2018 +

Update translations for tor-browser-manual_completed
---
 de/de.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/de/de.po b/de/de.po
index d8007486b..67f26719e 100644
--- a/de/de.po
+++ b/de/de.po
@@ -8,6 +8,7 @@
 # gregweb , 2016
 # runasand , 2016
 # Curtis Baltimore , 2016
+# Jim John , 2016
 # Inter Webs , 2016
 # Axel Laemmert, 2016
 # Christian Humm , 2017
@@ -52,8 +53,8 @@ msgid ""
 "Using the Tor network has two main properties:"
 msgstr ""
 "Der Tor-Browser benutzt das Tor Netzwerk, um deine PrivatsphÃ¤re und "
-"AnonymitÃ¤t zu schÃ¼tzen. Das Tor Netzwerk zu benutzen hat zwei "
-"Haupteigenschaften:"
+"AnonymitÃ¤t zu schÃ¼tzen. Die beiden wichtigsten GrÃ¼nde das Tor Netzwerk zu "
+"verwenden sind:"
 
 #: about-tor-browser.page:18
 msgid ""

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-10-24 Thread translation

commit 7f254bc8583069fe8e4f1c14113bc0ba7c3d5bb8
Author: Translation commit bot 
Date:   Wed Oct 24 13:17:52 2018 +

Update translations for tor-browser-manual
---
 de/de.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/de/de.po b/de/de.po
index d8007486b..67f26719e 100644
--- a/de/de.po
+++ b/de/de.po
@@ -8,6 +8,7 @@
 # gregweb , 2016
 # runasand , 2016
 # Curtis Baltimore , 2016
+# Jim John , 2016
 # Inter Webs , 2016
 # Axel Laemmert, 2016
 # Christian Humm , 2017
@@ -52,8 +53,8 @@ msgid ""
 "Using the Tor network has two main properties:"
 msgstr ""
 "Der Tor-Browser benutzt das Tor Netzwerk, um deine PrivatsphÃ¤re und "
-"AnonymitÃ¤t zu schÃ¼tzen. Das Tor Netzwerk zu benutzen hat zwei "
-"Haupteigenschaften:"
+"AnonymitÃ¤t zu schÃ¼tzen. Die beiden wichtigsten GrÃ¼nde das Tor Netzwerk zu "
+"verwenden sind:"
 
 #: about-tor-browser.page:18
 msgid ""

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

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

2018-10-24 Thread translation

commit 95c7dfaee5b9c11ba255eedfee8a5b83bd1fb591
Author: Translation commit bot 
Date:   Wed Oct 24 13:15:04 2018 +

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

diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index 62b87fe97..62a973383 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -32,11 +32,11 @@
 
 
 
-
+
 
 
 
 
 
 
-
+

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

[tor-commits] [tor/master] Add changes file

2018-10-24 Thread nickm

commit 65864be9bc59fb3743d2cebf497d0a4268596f95
Author: rl1987 
Date:   Tue Oct 16 17:53:17 2018 +0300

Add changes file
---
 changes/ticket27625 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/ticket27625 b/changes/ticket27625
new file mode 100644
index 0..33d40adf3
--- /dev/null
+++ b/changes/ticket27625
@@ -0,0 +1,4 @@
+  o Testing:
+- Write some unit tests for tokenize_string() and
+  get_next_token() functions. Resolves ticket 27625.
+



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

[tor-commits] [tor/master] Test AT_END checking in tokenize_string()

2018-10-24 Thread nickm

commit f10d664fd14b318fba23c7290c800590d0a474b4
Author: rl1987 
Date:   Tue Oct 16 15:54:11 2018 +0300

Test AT_END checking in tokenize_string()
---
 src/test/test_parsecommon.c | 62 +
 1 file changed, 62 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index 182f6fba5..13e4ac8c7 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -141,6 +141,66 @@ test_parsecommon_tokenize_string_max_cnt(void *arg)
 }
 
 static void
+test_parsecommon_tokenize_string_at_start(void *arg)
+{
+  memarea_t *area = memarea_new();
+  smartlist_t *tokens = smartlist_new();
+
+  (void)arg;
+
+  token_rule_t table[] = {
+  T1_START("client-name", C_CLIENT_NAME, CONCAT_ARGS, NO_OBJ),
+  T01("uptime", K_UPTIME, EQ(1), NO_OBJ),
+  END_OF_TABLE,
+  };
+
+  // "client-name" is not the first line.
+  char *str = tor_strdup(
+  "uptime 1024\nclient-name Alice\n");
+
+  int retval =
+  tokenize_string(area, str, NULL, tokens, table, 0);
+
+  tt_int_op(retval, OP_EQ, -1);
+
+ done:
+  tor_free(str);
+  memarea_drop_all(area);
+  smartlist_free(tokens);
+  return;
+}
+
+static void
+test_parsecommon_tokenize_string_at_end(void *arg)
+{
+  memarea_t *area = memarea_new();
+  smartlist_t *tokens = smartlist_new();
+
+  (void)arg;
+
+  token_rule_t table[] = {
+  T1_END("client-name", C_CLIENT_NAME, CONCAT_ARGS, NO_OBJ),
+  T01("uptime", K_UPTIME, EQ(1), NO_OBJ),
+  END_OF_TABLE,
+  };
+
+  // "client-name" is not the last line.
+  char *str = tor_strdup(
+  "client-name Alice\nuptime 1024\n");
+
+  int retval =
+  tokenize_string(area, str, NULL, tokens, table, 0);
+
+  tt_int_op(retval, OP_EQ, -1);
+
+ done:
+  tor_free(str);
+  memarea_drop_all(area);
+  smartlist_free(tokens);
+  return;
+}
+
+static void
 test_parsecommon_get_next_token_success(void *arg)
 {
   memarea_t *area = memarea_new();
@@ -488,6 +548,8 @@ struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(tokenize_string_multiple_lines),
   PARSECOMMON_TEST(tokenize_string_min_cnt),
   PARSECOMMON_TEST(tokenize_string_max_cnt),
+  PARSECOMMON_TEST(tokenize_string_at_start),
+  PARSECOMMON_TEST(tokenize_string_at_end),
   PARSECOMMON_TEST(get_next_token_success),
   PARSECOMMON_TEST(get_next_token_concat_args),
   PARSECOMMON_TEST(get_next_token_parse_keys),



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

[tor-commits] [tor/master] Test-case for public key parsing using get_next_token()

2018-10-24 Thread nickm

commit 569d8d8cd73987cd0ca126a6f98a75dd34b21137
Author: rl1987 
Date:   Fri Oct 12 18:33:27 2018 +0300

Test-case for public key parsing using get_next_token()
---
 src/test/test_parsecommon.c | 42 ++
 1 file changed, 42 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index b63327ecd..519bbf79e 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -80,6 +80,47 @@ test_parsecommon_get_next_token_concat_args(void *arg)
   memarea_drop_all(area);
 }
 
+static void
+test_parsecommon_get_next_token_parse_keys(void *arg)
+{
+  (void)arg;
+
+  memarea_t *area = memarea_new();
+  const char *base64_key =
+"MIGJAoGBAMDdIya33BfNlHOkzoTKSTT8EjD64waMfUr372syVHiFjHhObwKwGA5u\n"
+"sHaMIe9r+Ij/4C1dKyuXkcz3DOl6gWNhTD7dZ89I+Okoh1jWe30jxCiAcywC22p5\n"
+"XLhrDkX1A63Z7XCH9ltwU2WMqWsVM98N2GR6MTujP7wtqdLExYN1AgMBAAE=\n";
+  char *str;
+  tor_asprintf(, "onion-key\n"
+ "-BEGIN RSA PUBLIC KEY-\n"
+ "%s"
+ "-END RSA PUBLIC KEY-\n", base64_key);
+  const char *end = str + strlen(str);
+  const char **s = (const char **)
+  const char decoded[128];
+
+  base64_decode((char *)decoded, sizeof(decoded), base64_key,
+strlen(base64_key));
+
+  token_rule_t rule = T1("onion-key", R_IPO_ONION_KEY, NO_ARGS, NEED_KEY_1024);
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, R_IPO_ONION_KEY);
+  tt_int_op(token->n_args, OP_EQ, 0);
+  tt_str_op(token->object_type, OP_EQ, "RSA PUBLIC KEY");
+  tt_int_op(token->object_size, OP_EQ, 0);
+  tt_assert(!token->object_body);
+  tt_assert(token->key);
+  tt_assert(!token->error);
+
+  // TODO: same with secret key
+
+
+ done:
+  memarea_drop_all(area);
+}
+
 #define PARSECOMMON_TEST(name) \
   { #name, test_parsecommon_ ## name, 0, NULL, NULL }
 
@@ -87,6 +128,7 @@ struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(tokenize_string_null),
   PARSECOMMON_TEST(get_next_token_success),
   PARSECOMMON_TEST(get_next_token_concat_args),
+  PARSECOMMON_TEST(get_next_token_parse_keys),
   END_OF_TESTCASES
 };
 



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

[tor-commits] [tor/master] Unit-test some error conditions in get_next_token()

2018-10-24 Thread nickm

commit 81731a290d2a806047901c1835afb557533a0350
Author: rl1987 
Date:   Mon Oct 15 20:01:42 2018 +0300

Unit-test some error conditions in get_next_token()
---
 src/test/test_parsecommon.c | 173 
 1 file changed, 173 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index 59e366bc4..d8719747e 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -207,6 +207,173 @@ test_parsecommon_get_next_token_object(void *arg)
   memarea_drop_all(area);
 }
 
+static void
+test_parsecommon_get_next_token_err_too_many_args(void *arg)
+{
+  memarea_t *area = memarea_new();
+  const char *str = "uptime 1024 1024 1024";
+  const char *end = str + strlen(str);
+  const char **s = 
+  token_rule_t table = T01("uptime", K_UPTIME, EQ(1), NO_OBJ);
+  (void)arg;
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, ERR_);
+  tt_str_op(token->error, OP_EQ, "Too many arguments to uptime");
+
+ done:
+  memarea_drop_all(area);
+  return;
+}
+
+static void
+test_parsecommon_get_next_token_err_too_few_args(void *arg)
+{
+  memarea_t *area = memarea_new();
+  const char *str = "uptime";
+  const char *end = str + strlen(str);
+  const char **s = 
+  token_rule_t table = T01("uptime", K_UPTIME, EQ(1), NO_OBJ);
+  (void)arg;
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, ERR_);
+  tt_str_op(token->error, OP_EQ, "Too few arguments to uptime");
+
+ done:
+  memarea_drop_all(area);
+  return;
+}
+
+static void
+test_parsecommon_get_next_token_err_obj_missing_endline(void *arg)
+{
+  memarea_t *area = memarea_new();
+
+  const char *str =
+"directory-signature 0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+"CD1FD971855430880D3C31E0331C5C55800C2F79\n"
+"-BEGIN SIGNATURE-\n"
+"dLTbc1Lad/OWKBJhA/dERzDHumswTAzBFAWAz2vnQhLsebs1SOm0W/vceEsiEkiF\n"
+"A+JJSzIyfywJc6Mnk7aKMEIFjOO/MaxuAp4zv+q+JonJkF0ExjMqvKR0D6pSFmfN\n"
+"cnemnxGHxNuPDnKl0imbWKmWDsHtwgi4zWeTq3MekfMOXKi6gIh+bDFzCs9/Vquh\n"
+"uNKJI1jW/A2DEKeaSAODEv9VoCsYSvbVVEuHCBWjeNAurd5aL26BrAolW6m7pkD6\n"
+"I+cQ8dQG6Wa/Zt6gLXtBbOP2o/iDI7ahDP9diNkBI/rm4nfp9j4piTwsqpi7xz9J\n"
+"Ua9DEZB9KbJHVX1rGShrLA==\n";
+
+  const char *end = str + strlen(str);
+  const char **s = 
+  token_rule_t rule = T("directory-signature", K_DIRECTORY_SIGNATURE,
+GE(2), NEED_OBJ);
+  (void)arg;
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, ERR_);
+  tt_str_op(token->error, OP_EQ, "Malformed object: missing object end line");
+
+ done:
+  memarea_drop_all(area);
+  return;
+}
+
+static void
+test_parsecommon_get_next_token_err_bad_beginline(void *arg)
+{
+  memarea_t *area = memarea_new();
+
+  const char *str =
+"directory-signature 0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+"CD1FD971855430880D3C31E0331C5C55800C2F79\n"
+"-BEGIN SIGNATURE-Z---\n"
+"dLTbc1Lad/OWKBJhA/dERzDHumswTAzBFAWAz2vnQhLsebs1SOm0W/vceEsiEkiF\n"
+"A+JJSzIyfywJc6Mnk7aKMEIFjOO/MaxuAp4zv+q+JonJkF0ExjMqvKR0D6pSFmfN\n"
+"cnemnxGHxNuPDnKl0imbWKmWDsHtwgi4zWeTq3MekfMOXKi6gIh+bDFzCs9/Vquh\n"
+"uNKJI1jW/A2DEKeaSAODEv9VoCsYSvbVVEuHCBWjeNAurd5aL26BrAolW6m7pkD6\n"
+"I+cQ8dQG6Wa/Zt6gLXtBbOP2o/iDI7ahDP9diNkBI/rm4nfp9j4piTwsqpi7xz9J\n"
+"Ua9DEZB9KbJHVX1rGShrLA==\n"
+"-END SIGNATURE-\n";
+
+  const char *end = str + strlen(str);
+  const char **s = 
+  token_rule_t rule = T("directory-signature", K_DIRECTORY_SIGNATURE,
+GE(2), NEED_OBJ);
+  (void)arg;
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, ERR_);
+  tt_str_op(token->error, OP_EQ, "Malformed object: bad begin line");
+
+ done:
+  memarea_drop_all(area);
+  return;
+}
+
+static void
+test_parsecommon_get_next_token_err_tag_mismatch(void *arg)
+{
+  memarea_t *area = memarea_new();
+
+  const char *str =
+"directory-signature 0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+"CD1FD971855430880D3C31E0331C5C55800C2F79\n"
+"-BEGIN SIGNATURE-\n"
+"dLTbc1Lad/OWKBJhA/dERzDHumswTAzBFAWAz2vnQhLsebs1SOm0W/vceEsiEkiF\n"
+"A+JJSzIyfywJc6Mnk7aKMEIFjOO/MaxuAp4zv+q+JonJkF0ExjMqvKR0D6pSFmfN\n"
+"cnemnxGHxNuPDnKl0imbWKmWDsHtwgi4zWeTq3MekfMOXKi6gIh+bDFzCs9/Vquh\n"
+"uNKJI1jW/A2DEKeaSAODEv9VoCsYSvbVVEuHCBWjeNAurd5aL26BrAolW6m7pkD6\n"
+"I+cQ8dQG6Wa/Zt6gLXtBbOP2o/iDI7ahDP9diNkBI/rm4nfp9j4piTwsqpi7xz9J\n"
+"Ua9DEZB9KbJHVX1rGShrLA==\n"
+"-END SOMETHINGELSE-\n";
+
+  const char *end = str + strlen(str);
+  const char **s = 
+  token_rule_t rule = T("directory-signature", K_DIRECTORY_SIGNATURE,
+GE(2), NEED_OBJ);
+  (void)arg;
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, ERR_);
+  tt_str_op(token->error, OP_EQ,
+"Malformed object: mismatched end tag SIGNATURE");
+
+ done:

[tor-commits] [tor/master] Add testcase for too few elements in tokenize_string() input

2018-10-24 Thread nickm

commit 7c8bf2f7c7adbae3b0f56631c2a2c036076b322d
Author: rl1987 
Date:   Tue Oct 16 15:22:48 2018 +0300

Add testcase for too few elements in tokenize_string() input
---
 src/test/test_parsecommon.c | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index 0c754a8fe..e68d0fb88 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -80,6 +80,36 @@ test_parsecommon_tokenize_string_multiple_lines(void *arg)
 }
 
 static void
+test_parsecommon_tokenize_string_min_cnt(void *arg)
+{
+  memarea_t *area = memarea_new();
+  smartlist_t *tokens = smartlist_new();
+
+  (void)arg;
+
+  token_rule_t table[] = {
+  T01("uptime", K_UPTIME, EQ(2), NO_OBJ),
+  T01("hibernating", K_HIBERNATING, GE(1), NO_OBJ),
+  END_OF_TABLE,
+  };
+
+  // Missing "uptime"
+  char *str = tor_strdup("uptime 1024\nhibernating 0\n");
+
+  int retval =
+  tokenize_string(area, str, NULL,
+  tokens, table, 0);
+
+  tt_int_op(retval, OP_EQ, -1);
+
+ done:
+  tor_free(str);
+  memarea_drop_all(area);
+  smartlist_free(tokens);
+  return;
+}
+
+static void
 test_parsecommon_get_next_token_success(void *arg)
 {
   memarea_t *area = memarea_new();
@@ -425,6 +455,7 @@ test_parsecommon_get_next_token_err_bad_base64(void *arg)
 struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(tokenize_string_null),
   PARSECOMMON_TEST(tokenize_string_multiple_lines),
+  PARSECOMMON_TEST(tokenize_string_min_cnt),
   PARSECOMMON_TEST(get_next_token_success),
   PARSECOMMON_TEST(get_next_token_concat_args),
   PARSECOMMON_TEST(get_next_token_parse_keys),



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

[tor-commits] [tor/master] One testcase for annotation handling in tokenize_string()

2018-10-24 Thread nickm

commit 7fd82a4570c4c3ea887c02190a54e424eb5f4c5f
Author: rl1987 
Date:   Tue Oct 16 17:39:52 2018 +0300

One testcase for annotation handling in tokenize_string()
---
 src/test/test_parsecommon.c | 28 
 1 file changed, 28 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index 13e4ac8c7..7ce4b71b0 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -201,6 +201,33 @@ test_parsecommon_tokenize_string_at_end(void *arg)
 }
 
 static void
+test_parsecommon_tokenize_string_no_annotations(void *arg)
+{
+  memarea_t *area = memarea_new();
+  smartlist_t *tokens = smartlist_new();
+
+  (void)arg;
+
+  token_rule_t table[] = {
+  A01("@last-listed", A_LAST_LISTED, CONCAT_ARGS, NO_OBJ),
+  END_OF_TABLE,
+  };
+
+  char *str = tor_strdup("@last-listed 2018-09-21 15:30:03\n");
+
+  int retval =
+  tokenize_string(area, str, NULL, tokens, table, 0);
+
+  tt_int_op(retval, OP_EQ, -1);
+
+ done:
+  tor_free(str);
+  memarea_drop_all(area);
+  smartlist_free(tokens);
+  return;
+}
+
+static void
 test_parsecommon_get_next_token_success(void *arg)
 {
   memarea_t *area = memarea_new();
@@ -550,6 +577,7 @@ struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(tokenize_string_max_cnt),
   PARSECOMMON_TEST(tokenize_string_at_start),
   PARSECOMMON_TEST(tokenize_string_at_end),
+  PARSECOMMON_TEST(tokenize_string_no_annotations),
   PARSECOMMON_TEST(get_next_token_success),
   PARSECOMMON_TEST(get_next_token_concat_args),
   PARSECOMMON_TEST(get_next_token_parse_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 'tor-github/pr/409'

2018-10-24 Thread nickm

commit c6d3bebb1e32fa62712a475081a6724ffa5c9d67
Merge: c3e14a323 65864be9b
Author: Nick Mathewson 
Date:   Wed Oct 24 09:06:29 2018 -0400

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

 changes/ticket27625 |   4 +
 src/test/include.am |   1 +
 src/test/test.c |   1 +
 src/test/test.h |   1 +
 src/test/test_parsecommon.c | 593 
 5 files changed, 600 insertions(+)

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

[tor-commits] [tor/master] Test RSA private key parsing with get_next_token()

2018-10-24 Thread nickm

commit 7764d6dfc914d9a29c706cbcb2b399b09680c9b7
Author: rl1987 
Date:   Fri Oct 12 19:19:40 2018 +0300

Test RSA private key parsing with get_next_token()
---
 src/test/test_parsecommon.c | 41 +++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index 519bbf79e..ffd3902a8 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -114,8 +114,45 @@ test_parsecommon_get_next_token_parse_keys(void *arg)
   tt_assert(token->key);
   tt_assert(!token->error);
 
-  // TODO: same with secret key
-
+  const char *base64_skey =
+"MIICXAIBAAKBgQCwS810a2auH2PQchOBz9smNgjlDu31aq0IYlUohSYbhcv5AJ+d\n"
+"DY0nfZWzS+mZPwzL3UiEnTt6PVv7AgoZ5V9ZJWJTKIURjJpkK0mstfJKHKIZhf84\n"
+"pmFfRej9GQViB6NLtp1obOXJgJixSlMfw9doDI4NoAnEISCyH/tD77Qs2wIDAQAB\n"
+"AoGAbDg8CKkdQOnX9c7xFpCnsE8fKqz9eddgHHNwXw1NFTwOt+2gDWKSMZmv2X5S\n"
+"CVZg3owZxf5W0nT0D6Ny2+6nliak7foYAvkD0BsCiBhgftwC0zAo6k5rIbUKB3PJ\n"
+"QLFXgpJhqWuXkODyt/hS/GTernR437WVSEGp1bnALqiFabECQQDaqHOxzoWY/nvH\n"
+"KrfUi8EhqCnqERlRHwrW0MQZ1RPvF16OPPma+xa+ht/amfh3vYN5tZY82Zm43gGl\n"
+"XWL5cZhNAkEAzmdSootYVnqLLLRMfHKXnO1XbaEcA/08MDNKGlSclBJixFenE8jX\n"
+"iQsUbHwMJuGONvzWpRGPBP2f8xBd28ZtxwJARY+LZshtpfNniz/ixYJESaHG28je\n"
+"xfjbKOW3TQSFV+2WTifFvHEeljQwKMoMyoMGvYRwLCGJjs9JtMLVxsdFjQJBAKwD\n"
+"3BBvBQ39TuPQ1zWX4tb7zjMlY83HTFP3Sriq71tP/1QWoL2SUl56B2lp8E6vB/C3\n"
+"wsMK4SCNprHRYAd7VZ0CQDKn6Zhd11P94PLs0msybFEh1VXr6CEW/BrxBgbL4ls6\n"
+"dbX5XO0z4Ra8gYXgObgimhyMDYO98Idt5+Z3HIdyrSc=\n";
+
+  const char decoded2[128];
+  base64_decode((char *)decoded2, sizeof(decoded2), base64_skey,
+strlen(base64_skey));
+
+  char *str2;
+  tor_asprintf(, "client-key\n"
+  "-BEGIN RSA PRIVATE KEY-\n"
+  "%s"
+  "-END RSA PRIVATE KEY-\n", base64_skey);
+  const char *end2 = str2 + strlen(str2);
+  const char **s2 = (const char **)
+
+  token_rule_t rule2 = T01("client-key", C_CLIENT_KEY, NO_ARGS,
+   NEED_SKEY_1024);
+
+  directory_token_t *token2 = get_next_token(area, s2, end2, );
+
+  tt_int_op(token2->tp, OP_EQ, C_CLIENT_KEY);
+  tt_int_op(token2->n_args, OP_EQ, 0);
+  tt_str_op(token2->object_type, OP_EQ, "RSA PRIVATE KEY");
+  tt_int_op(token2->object_size, OP_EQ, 0);
+  tt_assert(!token2->object_body);
+  tt_assert(token2->key);
+  tt_assert(!token->error);
 
  done:
   memarea_drop_all(area);



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

[tor-commits] [tor/master] Add testcase for too many elements in tokenize_string() input

2018-10-24 Thread nickm

commit 1a4edceee9049d19a97b08dc28e87fa346d02536
Author: rl1987 
Date:   Tue Oct 16 15:31:47 2018 +0300

Add testcase for too many elements in tokenize_string() input
---
 src/test/test_parsecommon.c | 32 
 1 file changed, 32 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index e68d0fb88..182f6fba5 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -110,6 +110,37 @@ test_parsecommon_tokenize_string_min_cnt(void *arg)
 }
 
 static void
+test_parsecommon_tokenize_string_max_cnt(void *arg)
+{
+  memarea_t *area = memarea_new();
+  smartlist_t *tokens = smartlist_new();
+
+  (void)arg;
+
+  token_rule_t table[] = {
+  T01("uptime", K_UPTIME, EQ(1), NO_OBJ),
+  T01("hibernating", K_HIBERNATING, GE(1), NO_OBJ),
+  END_OF_TABLE,
+  };
+
+  // "uptime" expected once, but occurs twice in input.
+  char *str = tor_strdup(
+  "uptime 1024\nuptime 2048\nhibernating 0\n");
+
+  int retval =
+  tokenize_string(area, str, NULL,
+  tokens, table, 0);
+
+  tt_int_op(retval, OP_EQ, -1);
+
+ done:
+  tor_free(str);
+  memarea_drop_all(area);
+  smartlist_free(tokens);
+  return;
+}
+
+static void
 test_parsecommon_get_next_token_success(void *arg)
 {
   memarea_t *area = memarea_new();
@@ -456,6 +487,7 @@ struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(tokenize_string_null),
   PARSECOMMON_TEST(tokenize_string_multiple_lines),
   PARSECOMMON_TEST(tokenize_string_min_cnt),
+  PARSECOMMON_TEST(tokenize_string_max_cnt),
   PARSECOMMON_TEST(get_next_token_success),
   PARSECOMMON_TEST(get_next_token_concat_args),
   PARSECOMMON_TEST(get_next_token_parse_keys),



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

[tor-commits] [tor/master] Unit-test multiple line parsing with tokenize_string()

2018-10-24 Thread nickm

commit 78c446af7ef9900c31e84496a4547550d4c191e2
Author: rl1987 
Date:   Tue Oct 16 14:53:04 2018 +0300

Unit-test multiple line parsing with tokenize_string()
---
 src/test/test_parsecommon.c | 46 +
 1 file changed, 46 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index d8719747e..0c754a8fe 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -35,6 +35,51 @@ test_parsecommon_tokenize_string_null(void *arg)
 }
 
 static void
+test_parsecommon_tokenize_string_multiple_lines(void *arg)
+{
+  memarea_t *area = memarea_new();
+  smartlist_t *tokens = smartlist_new();
+
+  (void)arg;
+
+  token_rule_t table[] = {
+  T01("uptime", K_UPTIME, GE(1), NO_OBJ),
+  T01("hibernating", K_HIBERNATING, GE(1), NO_OBJ),
+  T1( "published", K_PUBLISHED, CONCAT_ARGS, NO_OBJ),
+  END_OF_TABLE,
+  };
+
+  char *str = tor_strdup(
+  "hibernating 0\nuptime 1024\n"
+  "published 2018-10-15 10:00:00\n");
+
+  int retval =
+  tokenize_string(area, str, NULL,
+  tokens, table, 0);
+
+  tt_int_op(smartlist_len(tokens), OP_EQ, 3);
+  directory_token_t *token = smartlist_get(tokens, 0);
+
+  tt_int_op(token->tp, OP_EQ, K_HIBERNATING);
+
+  token = smartlist_get(tokens, 1);
+
+  tt_int_op(token->tp, OP_EQ, K_UPTIME);
+
+  token = smartlist_get(tokens, 2);
+
+  tt_int_op(token->tp, OP_EQ, K_PUBLISHED);
+
+  tt_int_op(retval, OP_EQ, 0);
+
+ done:
+  tor_free(str);
+  memarea_drop_all(area);
+  smartlist_free(tokens);
+  return;
+}
+
+static void
 test_parsecommon_get_next_token_success(void *arg)
 {
   memarea_t *area = memarea_new();
@@ -379,6 +424,7 @@ test_parsecommon_get_next_token_err_bad_base64(void *arg)
 
 struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(tokenize_string_null),
+  PARSECOMMON_TEST(tokenize_string_multiple_lines),
   PARSECOMMON_TEST(get_next_token_success),
   PARSECOMMON_TEST(get_next_token_concat_args),
   PARSECOMMON_TEST(get_next_token_parse_keys),



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

[tor-commits] [tor/master] Fix memory management in test_parsecommon_get_next_token_parse_keys

2018-10-24 Thread nickm

commit 38a7033d3378a7b0cdc68258ebcd0e53371e8f24
Author: rl1987 
Date:   Mon Oct 15 17:44:40 2018 +0300

Fix memory management in test_parsecommon_get_next_token_parse_keys
---
 src/test/test_parsecommon.c | 41 +
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index ffd3902a8..6b5307619 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -86,25 +86,22 @@ test_parsecommon_get_next_token_parse_keys(void *arg)
   (void)arg;
 
   memarea_t *area = memarea_new();
-  const char *base64_key =
+  const char *str =
+"onion-key\n"
+"-BEGIN RSA PUBLIC KEY-\n"
 "MIGJAoGBAMDdIya33BfNlHOkzoTKSTT8EjD64waMfUr372syVHiFjHhObwKwGA5u\n"
 "sHaMIe9r+Ij/4C1dKyuXkcz3DOl6gWNhTD7dZ89I+Okoh1jWe30jxCiAcywC22p5\n"
-"XLhrDkX1A63Z7XCH9ltwU2WMqWsVM98N2GR6MTujP7wtqdLExYN1AgMBAAE=\n";
-  char *str;
-  tor_asprintf(, "onion-key\n"
- "-BEGIN RSA PUBLIC KEY-\n"
- "%s"
- "-END RSA PUBLIC KEY-\n", base64_key);
+"XLhrDkX1A63Z7XCH9ltwU2WMqWsVM98N2GR6MTujP7wtqdLExYN1AgMBAAE=\n"
+"-END RSA PUBLIC KEY-\n";
+
   const char *end = str + strlen(str);
   const char **s = (const char **)
-  const char decoded[128];
-
-  base64_decode((char *)decoded, sizeof(decoded), base64_key,
-strlen(base64_key));
+  directory_token_t *token = NULL;
+  directory_token_t *token2 = NULL;
 
   token_rule_t rule = T1("onion-key", R_IPO_ONION_KEY, NO_ARGS, NEED_KEY_1024);
 
-  directory_token_t *token = get_next_token(area, s, end, );
+  token = get_next_token(area, s, end, );
 
   tt_int_op(token->tp, OP_EQ, R_IPO_ONION_KEY);
   tt_int_op(token->n_args, OP_EQ, 0);
@@ -114,7 +111,9 @@ test_parsecommon_get_next_token_parse_keys(void *arg)
   tt_assert(token->key);
   tt_assert(!token->error);
 
-  const char *base64_skey =
+  const char *str2 =
+"client-key\n"
+"-BEGIN RSA PRIVATE KEY-\n"
 "MIICXAIBAAKBgQCwS810a2auH2PQchOBz9smNgjlDu31aq0IYlUohSYbhcv5AJ+d\n"
 "DY0nfZWzS+mZPwzL3UiEnTt6PVv7AgoZ5V9ZJWJTKIURjJpkK0mstfJKHKIZhf84\n"
 "pmFfRej9GQViB6NLtp1obOXJgJixSlMfw9doDI4NoAnEISCyH/tD77Qs2wIDAQAB\n"
@@ -127,24 +126,16 @@ test_parsecommon_get_next_token_parse_keys(void *arg)
 "xfjbKOW3TQSFV+2WTifFvHEeljQwKMoMyoMGvYRwLCGJjs9JtMLVxsdFjQJBAKwD\n"
 "3BBvBQ39TuPQ1zWX4tb7zjMlY83HTFP3Sriq71tP/1QWoL2SUl56B2lp8E6vB/C3\n"
 "wsMK4SCNprHRYAd7VZ0CQDKn6Zhd11P94PLs0msybFEh1VXr6CEW/BrxBgbL4ls6\n"
-"dbX5XO0z4Ra8gYXgObgimhyMDYO98Idt5+Z3HIdyrSc=\n";
-
-  const char decoded2[128];
-  base64_decode((char *)decoded2, sizeof(decoded2), base64_skey,
-strlen(base64_skey));
+"dbX5XO0z4Ra8gYXgObgimhyMDYO98Idt5+Z3HIdyrSc=\n"
+"-END RSA PRIVATE KEY-\n";
 
-  char *str2;
-  tor_asprintf(, "client-key\n"
-  "-BEGIN RSA PRIVATE KEY-\n"
-  "%s"
-  "-END RSA PRIVATE KEY-\n", base64_skey);
   const char *end2 = str2 + strlen(str2);
   const char **s2 = (const char **)
 
   token_rule_t rule2 = T01("client-key", C_CLIENT_KEY, NO_ARGS,
NEED_SKEY_1024);
 
-  directory_token_t *token2 = get_next_token(area, s2, end2, );
+  token2 = get_next_token(area, s2, end2, );
 
   tt_int_op(token2->tp, OP_EQ, C_CLIENT_KEY);
   tt_int_op(token2->n_args, OP_EQ, 0);
@@ -155,6 +146,8 @@ test_parsecommon_get_next_token_parse_keys(void *arg)
   tt_assert(!token->error);
 
  done:
+  if (token) token_clear(token);
+  if (token2) token_clear(token2);
   memarea_drop_all(area);
 }
 



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

[tor-commits] [tor/master] Test object parsing in get_next_token()

2018-10-24 Thread nickm

commit 6c5ba2662af08c8094e024a2c04141e776d966a6
Author: rl1987 
Date:   Mon Oct 15 18:51:08 2018 +0300

Test object parsing in get_next_token()
---
 src/test/test_parsecommon.c | 57 +
 1 file changed, 57 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index 6b5307619..59e366bc4 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -151,6 +151,62 @@ test_parsecommon_get_next_token_parse_keys(void *arg)
   memarea_drop_all(area);
 }
 
+static void
+test_parsecommon_get_next_token_object(void *arg)
+{
+  memarea_t *area = memarea_new();
+
+  const char *str =
+"directory-signature 0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+"CD1FD971855430880D3C31E0331C5C55800C2F79\n"
+"-BEGIN SIGNATURE-\n"
+"dLTbc1Lad/OWKBJhA/dERzDHumswTAzBFAWAz2vnQhLsebs1SOm0W/vceEsiEkiF\n"
+"A+JJSzIyfywJc6Mnk7aKMEIFjOO/MaxuAp4zv+q+JonJkF0ExjMqvKR0D6pSFmfN\n"
+"cnemnxGHxNuPDnKl0imbWKmWDsHtwgi4zWeTq3MekfMOXKi6gIh+bDFzCs9/Vquh\n"
+"uNKJI1jW/A2DEKeaSAODEv9VoCsYSvbVVEuHCBWjeNAurd5aL26BrAolW6m7pkD6\n"
+"I+cQ8dQG6Wa/Zt6gLXtBbOP2o/iDI7ahDP9diNkBI/rm4nfp9j4piTwsqpi7xz9J\n"
+"Ua9DEZB9KbJHVX1rGShrLA==\n"
+"-END SIGNATURE-\n";
+
+  const char *end = str + strlen(str);
+  const char **s = 
+  token_rule_t rule = T("directory-signature", K_DIRECTORY_SIGNATURE,
+GE(2), NEED_OBJ);
+  (void)arg;
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, K_DIRECTORY_SIGNATURE);
+  tt_int_op(token->n_args, OP_EQ, 2);
+  tt_str_op(token->args[0], OP_EQ,
+  "0232AF901C31A04EE9848595AF9BB7620D4C5B2E");
+  tt_str_op(token->args[1], OP_EQ,
+  "CD1FD971855430880D3C31E0331C5C55800C2F79");
+
+  tt_assert(!token->error);
+
+  char decoded[256];
+  const char *signature =
+"dLTbc1Lad/OWKBJhA/dERzDHumswTAzBFAWAz2vnQhLsebs1SOm0W/vceEsiEkiF\n"
+"A+JJSzIyfywJc6Mnk7aKMEIFjOO/MaxuAp4zv+q+JonJkF0ExjMqvKR0D6pSFmfN\n"
+"cnemnxGHxNuPDnKl0imbWKmWDsHtwgi4zWeTq3MekfMOXKi6gIh+bDFzCs9/Vquh\n"
+"uNKJI1jW/A2DEKeaSAODEv9VoCsYSvbVVEuHCBWjeNAurd5aL26BrAolW6m7pkD6\n"
+"I+cQ8dQG6Wa/Zt6gLXtBbOP2o/iDI7ahDP9diNkBI/rm4nfp9j4piTwsqpi7xz9J\n"
+"Ua9DEZB9KbJHVX1rGShrLA==\n";
+  tt_assert(signature);
+  size_t signature_len = strlen(signature);
+  base64_decode(decoded, sizeof(decoded), signature, signature_len);
+
+  tt_str_op(token->object_type, OP_EQ, "SIGNATURE");
+  tt_int_op(token->object_size, OP_EQ, 256);
+  tt_mem_op(token->object_body, OP_EQ, decoded, 256);
+
+  tt_assert(!token->key);
+
+ done:
+  memarea_drop_all(area);
+}
+
 #define PARSECOMMON_TEST(name) \
   { #name, test_parsecommon_ ## name, 0, NULL, NULL }
 
@@ -159,6 +215,7 @@ struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(get_next_token_success),
   PARSECOMMON_TEST(get_next_token_concat_args),
   PARSECOMMON_TEST(get_next_token_parse_keys),
+  PARSECOMMON_TEST(get_next_token_object),
   END_OF_TESTCASES
 };
 



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

[tor-commits] [tor/master] Test argument concatenation in get_next_token()

2018-10-24 Thread nickm

commit 5c891dba770b752d16f7e7cea8f61f15abd09ef5
Author: rl1987 
Date:   Fri Oct 12 15:48:38 2018 +0300

Test argument concatenation in get_next_token()
---
 src/test/test_parsecommon.c | 21 +
 1 file changed, 21 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index ba778d996..b63327ecd 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -60,12 +60,33 @@ test_parsecommon_get_next_token_success(void *arg)
   return;
 }
 
+static void
+test_parsecommon_get_next_token_concat_args(void *arg)
+{
+  memarea_t *area = memarea_new();
+  const char *str = "proto A=1 B=2";
+  const char *end = str + strlen(str);
+  const char **s = 
+  token_rule_t rule = T01("proto", K_PROTO, CONCAT_ARGS, NO_OBJ);
+  (void)arg;
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, K_PROTO);
+  tt_int_op(token->n_args, OP_EQ, 1);
+  tt_str_op(*(token->args), OP_EQ, "A=1 B=2");
+
+ done:
+  memarea_drop_all(area);
+}
+
 #define PARSECOMMON_TEST(name) \
   { #name, test_parsecommon_ ## name, 0, NULL, NULL }
 
 struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(tokenize_string_null),
   PARSECOMMON_TEST(get_next_token_success),
+  PARSECOMMON_TEST(get_next_token_concat_args),
   END_OF_TESTCASES
 };
 



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

[tor-commits] [tor/master] Add new source file to test target

2018-10-24 Thread nickm

commit 55412c4f3d3486d28fe337b919e7fddc2f93e1b4
Author: rl1987 
Date:   Thu Oct 11 15:22:12 2018 +0300

Add new source file to test target
---
 src/test/include.am |  1 +
 src/test/test.c |  1 +
 src/test/test.h |  1 +
 src/test/test_parsecommon.c | 44 
 4 files changed, 47 insertions(+)

diff --git a/src/test/include.am b/src/test/include.am
index 1055cd0a8..dd2986c67 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -182,6 +182,7 @@ src_test_test_SOURCES += \
src/test/test_x509.c \
src/test/test_helpers.c \
src/test/test_dns.c \
+   src/test/test_parsecommon.c \
src/test/testing_common.c \
src/test/testing_rsakeys.c \
src/ext/tinytest.c
diff --git a/src/test/test.c b/src/test/test.c
index 70d91e396..56eb15328 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -926,5 +926,6 @@ struct testgroup_t testgroups[] = {
   { "util/thread/", thread_tests },
   { "util/handle/", handle_tests },
   { "dns/", dns_tests },
+  { "parsecommon/", parsecommon_tests },
   END_OF_GROUPS
 };
diff --git a/src/test/test.h b/src/test/test.h
index a46fedf3e..281551aa6 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -266,6 +266,7 @@ extern struct testcase_t dns_tests[];
 extern struct testcase_t handle_tests[];
 extern struct testcase_t sr_tests[];
 extern struct testcase_t x509_tests[];
+extern struct testcase_t parsecommon_tests[];
 
 extern struct testcase_t slow_crypto_tests[];
 extern struct testcase_t slow_util_tests[];
diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
new file mode 100644
index 0..f152450f5
--- /dev/null
+++ b/src/test/test_parsecommon.c
@@ -0,0 +1,44 @@
+/* Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2018, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#include "core/or/or.h"
+#include "test/test.h"
+#include "lib/memarea/memarea.h"
+#include "lib/encoding/binascii.h"
+#include "feature/dirparse/parsecommon.h"
+#include "test/log_test_helpers.h"
+
+static void
+test_parsecommon_tokenize_string_null(void *arg)
+{
+
+  memarea_t *area = memarea_new();
+  smartlist_t *tokens = smartlist_new();
+
+  (void)arg;
+
+  const char *str_with_null = "a\0bc";
+
+  int retval =
+  tokenize_string(area, str_with_null,
+  str_with_null + 3,
+  tokens, NULL, 0);
+
+  tt_int_op(retval, OP_EQ, -1);
+
+ done:
+  memarea_drop_all(area);
+  smartlist_free(tokens);
+  return;
+}
+
+#define PARSECOMMON_TEST(name) \
+  { #name, test_parsecommon_ ## name, 0, NULL, NULL }
+
+struct testcase_t parsecommon_tests[] = {
+  PARSECOMMON_TEST(tokenize_string_null),
+  END_OF_TESTCASES
+};
+



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

[tor-commits] [tor/master] First testcase for get_next_token()

2018-10-24 Thread nickm

commit 7829e3a86875da16e3d7ac55be85145bd672fc12
Author: rl1987 
Date:   Fri Oct 12 14:19:40 2018 +0300

First testcase for get_next_token()
---
 src/test/test_parsecommon.c | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c
index f152450f5..ba778d996 100644
--- a/src/test/test_parsecommon.c
+++ b/src/test/test_parsecommon.c
@@ -34,11 +34,38 @@ test_parsecommon_tokenize_string_null(void *arg)
   return;
 }
 
+static void
+test_parsecommon_get_next_token_success(void *arg)
+{
+  memarea_t *area = memarea_new();
+  const char *str = "uptime 1024";
+  const char *end = str + strlen(str);
+  const char **s = 
+  token_rule_t table = T01("uptime", K_UPTIME, GE(1), NO_OBJ);
+  (void)arg;
+
+  directory_token_t *token = get_next_token(area, s, end, );
+
+  tt_int_op(token->tp, OP_EQ, K_UPTIME);
+  tt_int_op(token->n_args, OP_EQ, 1);
+  tt_str_op(*(token->args), OP_EQ, "1024");
+  tt_assert(!token->object_type);
+  tt_int_op(token->object_size, OP_EQ, 0);
+  tt_assert(!token->object_body);
+
+  tt_ptr_op(*s, OP_EQ, end);
+
+ done:
+  memarea_drop_all(area);
+  return;
+}
+
 #define PARSECOMMON_TEST(name) \
   { #name, test_parsecommon_ ## name, 0, NULL, NULL }
 
 struct testcase_t parsecommon_tests[] = {
   PARSECOMMON_TEST(tokenize_string_null),
+  PARSECOMMON_TEST(get_next_token_success),
   END_OF_TESTCASES
 };
 



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

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

2018-10-24 Thread nickm

commit c3e14a3236c2c7577f0b9425418684fc95f44862
Merge: 3dc5cce74 bfab7b9d3
Author: Nick Mathewson 
Date:   Wed Oct 24 09:02:06 2018 -0400

Merge branch 'maint-0.3.5'

 src/rust/tor_log/tor_log.rs | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/master] rust/tor_log: fix C_RUST_COUPLED documentation

2018-10-24 Thread nickm

commit bfab7b9d353227104c3f323c964b0e80fdf60d31
Author: cypherpunks 
Date:   Tue Oct 23 17:12:13 2018 +

rust/tor_log: fix C_RUST_COUPLED documentation

This file was moved in 97b15a1d7c51764888d2172711e3f3a71fb01916
and moved again in e7f5f48d68553206b95cbb4f610702c887500124.
---
 src/rust/tor_log/tor_log.rs | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs
index 5231d0c63..757c74ff4 100644
--- a/src/rust/tor_log/tor_log.rs
+++ b/src/rust/tor_log/tor_log.rs
@@ -89,15 +89,15 @@ pub mod log {
 use super::LogSeverity;
 use libc::{c_char, c_int};
 
-/// Severity log types. These mirror definitions in /src/common/torlog.h
-/// C_RUST_COUPLED: src/common/log.c, log domain types
+/// Severity log types. These mirror definitions in src/lib/log/log.h
+/// C_RUST_COUPLED: src/lib/log/log.c, log domain types
 extern "C" {
 static LOG_WARN_: c_int;
 static LOG_NOTICE_: c_int;
 }
 
-/// Domain log types. These mirror definitions in /src/common/torlog.h
-/// C_RUST_COUPLED: src/common/log.c, log severity types
+/// Domain log types. These mirror definitions in src/lib/log/log.h
+/// C_RUST_COUPLED: src/lib/log/log.c, log severity types
 extern "C" {
 static LD_NET_: u32;
 static LD_GENERAL_: u32;



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

1 2 >

1 - 100 of 155 matches

Mail list logo