date:20190221

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

2019-02-21 Thread translation

commit 9d900696166db6df838ec40be841daf23eb35cae
Author: Translation commit bot 
Date:   Fri Feb 22 01:45:35 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index c51d6f44e..834e80871 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -967,14 +967,14 @@ msgid ""
 "anonymous, because the more people using Tor, the harder it is to identify "
 "any single individual."
 msgstr ""
-"De plus, tous ceux qui utilisent Tor aident Ã  garder les autres utilisateurs"
-" en sÃ©curitÃ© et anonymes, car plus il y a de personnes qui utilisent Tor, "
-"plus il est difficile dâidentifier un seul individu."
+"De plus, tous ceux qui utilisent Tor aident Ã  assurer la sÃ©curitÃ© et "
+"lâanonymat dâautres utilisateurs, car plus nombreux sont les utilisateurs 
de"
+" Tor, plus il est difficile dâidentifier une personne en particulier."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:137
 msgid "How does the Tor software work to protect people's anonymity?"
 msgstr ""
-"Comment fonctionne le logiciel Tor pour protÃ©ger lâanonymat des gensâ?"
+"Comment Tor fonctionne-t-il pour protÃ©ger lâanonymat des utilisateursâ?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:141
 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

2019-02-21 Thread translation

commit 2ecffeae380ff34f8dffa4a745b70d43419bda8e
Author: Translation commit bot 
Date:   Fri Feb 22 01:45:27 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index c51d6f44e..834e80871 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -967,14 +967,14 @@ msgid ""
 "anonymous, because the more people using Tor, the harder it is to identify "
 "any single individual."
 msgstr ""
-"De plus, tous ceux qui utilisent Tor aident Ã  garder les autres utilisateurs"
-" en sÃ©curitÃ© et anonymes, car plus il y a de personnes qui utilisent Tor, "
-"plus il est difficile dâidentifier un seul individu."
+"De plus, tous ceux qui utilisent Tor aident Ã  assurer la sÃ©curitÃ© et "
+"lâanonymat dâautres utilisateurs, car plus nombreux sont les utilisateurs 
de"
+" Tor, plus il est difficile dâidentifier une personne en particulier."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:137
 msgid "How does the Tor software work to protect people's anonymity?"
 msgstr ""
-"Comment fonctionne le logiciel Tor pour protÃ©ger lâanonymat des gensâ?"
+"Comment Tor fonctionne-t-il pour protÃ©ger lâanonymat des utilisateursâ?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:141
 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

2019-02-21 Thread translation

commit 330385b2c51e0c9a1b479e0c44219e72fd480b6a
Author: Translation commit bot 
Date:   Fri Feb 22 01:15:45 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 46 +++
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index de37417d6..c51d6f44e 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -852,8 +852,8 @@ msgstr ""
 msgid ""
 "The paid staff of the Tor Project is very small: about 47 people in total."
 msgstr ""
-"Le personnel rÃ©munÃ©rÃ© du Projet Tor est trÃ¨s petit : environ 47 personnes 
au"
-" total."
+"Les membres rÃ©munÃ©rÃ©s du personnel du Projet Tor sont peu nombreuxÂ : 
environ"
+" 47Â personnes en tout."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90
 msgid ""
@@ -862,10 +862,10 @@ msgid ""
 "href=\"https://www.torproject.org/about/corepeople.html.en\;>Core People page."
 msgstr ""
-"Vous pouvez lire Ã  propos des principaux contributeurs au Projet Tor sur "
+"Vous pouvez lire au sujet des principaux contributeurs au Projet Tor sur "
 "notre https://www.torproject.org/about/corepeople.html.en\;>page Personnes principales."
+"class=\"links\">page les Principaux contributeurs."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:95
 msgid "Who uses Tor?"
@@ -877,8 +877,8 @@ msgid ""
 " privacy online or people whose internet use is censored."
 msgstr ""
 "La grande majoritÃ© des utilisateurs de Tor sont des gens ordinaires qui "
-"veulent contrÃ´ler leur vie privÃ©e en ligne ou dont lâutilisation 
dâInternet "
-"est censurÃ©e."
+"veulent contrÃ´ler leur vie privÃ©e en ligne ou des personnes dont "
+"lâutilisation dâInternet est censurÃ©e."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:101
 msgid ""
@@ -886,9 +886,8 @@ msgid ""
 "survivors, policymakers, diplomats, and academic and research institutions."
 msgstr ""
 "Les autres utilisateurs de Tor sont des journalistes, des dÃ©fenseurs des "
-"droits de la personne, des survivants de violence domestique, des dÃ©cideurs "
-"politiques, des diplomates et des institutions universitaires et de "
-"recherche."
+"droits de la personne, des survivants de violence familiale, des stratÃ¨ges, "
+"des diplomates et des Ã©tablissements universitaires et de recherche."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:107
 msgid "Can anyone use Tor?"
@@ -896,7 +895,7 @@ msgstr "Tout le monde peut-il utiliser Torâ?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:111
 msgid "Yes! Tor is free, and anyone can use it."
-msgstr "Oui ! Tor est gratuit, et tout le monde peut lâutiliser."
+msgstr "Ouiâ! Tor est gratuit et tout le monde peut lâutiliser."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:113
 msgid ""
@@ -904,8 +903,7 @@ msgid ""
 "href=\"https://www.torproject.org/projects/torbrowser.html.en\;>download Tor Browser."
 msgstr ""
-"Pour commencer, vous aurez besoin de https://www.torproject.org/projects/torbrowser.html.en\;>tÃ©lÃ©charger le Navigateur Tor."
 
@@ -923,8 +921,8 @@ msgstr ""
 "class=\"hyperlinks links\" target=\"_blank\" "
 
"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\;>Windows,"
 " https://www.torproject.org/projects/torbrowser.html.en#macosx\;>Mac "
-"OS X et https://www.torproject.org/projects/torbrowser.html.en#macosx\;>macOS"
+" et https://www.torproject.org/projects/torbrowser.html.en#linux\;>Linux."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:121
@@ -946,22 +944,22 @@ msgid ""
 "Omidyar Network, SRI International, and Radio Free Asia."
 msgstr ""
 "Des milliers de personnes ont fait des dons pour soutenir le Projet Tor, et "
-"nous avons Ã©galement reÃ§u des fonds dâun large Ã©ventail 
dâorganisations "
-"telles que Google, la Fondation Ford, la Fondation Knight, Reddit, la "
-"National Science Foundation des Ãtats-Unis, la Electronic Frontier "
-"Foundation, Human Rights Watch, lâAgence suÃ©doise de coopÃ©ration "
-"internationale au dÃ©veloppement, le ministÃ¨re fÃ©dÃ©ral allemand des 
Affaires "
-"Ã©trangÃ¨res, le laboratoire de recherche naval amÃ©ricain, Omidyar Network, "
-"SRI International, Radio Free Asia."
+"nous avons Ã©galement reÃ§u des fonds dâun large Ã©ventail 
dâorganisations tels"
+" que Google, la Fondation Ford, la Fondation Knight, Reddit, la Â«Â National "
+"Science FoundationÂ Â» des Ãtats-Unis, la Fondation FrontiÃ¨re 
Ãlectronique, "
+"Human Rights Watch, lâAgence suÃ©doise de coopÃ©ration internationale au "
+"dÃ©veloppement, le ministÃ¨re fÃ©dÃ©ral allemand des Affaires Ã©trangÃ¨res, 
le "

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

2019-02-21 Thread translation

commit 3f6d4470468e7e873f8526d1fb6259615e09cbe0
Author: Translation commit bot 
Date:   Fri Feb 22 01:15:39 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 46 +++
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index de37417d6..c51d6f44e 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -852,8 +852,8 @@ msgstr ""
 msgid ""
 "The paid staff of the Tor Project is very small: about 47 people in total."
 msgstr ""
-"Le personnel rÃ©munÃ©rÃ© du Projet Tor est trÃ¨s petit : environ 47 personnes 
au"
-" total."
+"Les membres rÃ©munÃ©rÃ©s du personnel du Projet Tor sont peu nombreuxÂ : 
environ"
+" 47Â personnes en tout."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90
 msgid ""
@@ -862,10 +862,10 @@ msgid ""
 "href=\"https://www.torproject.org/about/corepeople.html.en\;>Core People page."
 msgstr ""
-"Vous pouvez lire Ã  propos des principaux contributeurs au Projet Tor sur "
+"Vous pouvez lire au sujet des principaux contributeurs au Projet Tor sur "
 "notre https://www.torproject.org/about/corepeople.html.en\;>page Personnes principales."
+"class=\"links\">page les Principaux contributeurs."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:95
 msgid "Who uses Tor?"
@@ -877,8 +877,8 @@ msgid ""
 " privacy online or people whose internet use is censored."
 msgstr ""
 "La grande majoritÃ© des utilisateurs de Tor sont des gens ordinaires qui "
-"veulent contrÃ´ler leur vie privÃ©e en ligne ou dont lâutilisation 
dâInternet "
-"est censurÃ©e."
+"veulent contrÃ´ler leur vie privÃ©e en ligne ou des personnes dont "
+"lâutilisation dâInternet est censurÃ©e."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:101
 msgid ""
@@ -886,9 +886,8 @@ msgid ""
 "survivors, policymakers, diplomats, and academic and research institutions."
 msgstr ""
 "Les autres utilisateurs de Tor sont des journalistes, des dÃ©fenseurs des "
-"droits de la personne, des survivants de violence domestique, des dÃ©cideurs "
-"politiques, des diplomates et des institutions universitaires et de "
-"recherche."
+"droits de la personne, des survivants de violence familiale, des stratÃ¨ges, "
+"des diplomates et des Ã©tablissements universitaires et de recherche."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:107
 msgid "Can anyone use Tor?"
@@ -896,7 +895,7 @@ msgstr "Tout le monde peut-il utiliser Torâ?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:111
 msgid "Yes! Tor is free, and anyone can use it."
-msgstr "Oui ! Tor est gratuit, et tout le monde peut lâutiliser."
+msgstr "Ouiâ! Tor est gratuit et tout le monde peut lâutiliser."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:113
 msgid ""
@@ -904,8 +903,7 @@ msgid ""
 "href=\"https://www.torproject.org/projects/torbrowser.html.en\;>download Tor Browser."
 msgstr ""
-"Pour commencer, vous aurez besoin de https://www.torproject.org/projects/torbrowser.html.en\;>tÃ©lÃ©charger le Navigateur Tor."
 
@@ -923,8 +921,8 @@ msgstr ""
 "class=\"hyperlinks links\" target=\"_blank\" "
 
"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\;>Windows,"
 " https://www.torproject.org/projects/torbrowser.html.en#macosx\;>Mac "
-"OS X et https://www.torproject.org/projects/torbrowser.html.en#macosx\;>macOS"
+" et https://www.torproject.org/projects/torbrowser.html.en#linux\;>Linux."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:121
@@ -946,22 +944,22 @@ msgid ""
 "Omidyar Network, SRI International, and Radio Free Asia."
 msgstr ""
 "Des milliers de personnes ont fait des dons pour soutenir le Projet Tor, et "
-"nous avons Ã©galement reÃ§u des fonds dâun large Ã©ventail 
dâorganisations "
-"telles que Google, la Fondation Ford, la Fondation Knight, Reddit, la "
-"National Science Foundation des Ãtats-Unis, la Electronic Frontier "
-"Foundation, Human Rights Watch, lâAgence suÃ©doise de coopÃ©ration "
-"internationale au dÃ©veloppement, le ministÃ¨re fÃ©dÃ©ral allemand des 
Affaires "
-"Ã©trangÃ¨res, le laboratoire de recherche naval amÃ©ricain, Omidyar Network, "
-"SRI International, Radio Free Asia."
+"nous avons Ã©galement reÃ§u des fonds dâun large Ã©ventail 
dâorganisations tels"
+" que Google, la Fondation Ford, la Fondation Knight, Reddit, la Â«Â National "
+"Science FoundationÂ Â» des Ãtats-Unis, la Fondation FrontiÃ¨re 
Ãlectronique, "
+"Human Rights Watch, lâAgence suÃ©doise de coopÃ©ration internationale au "
+"dÃ©veloppement, le ministÃ¨re fÃ©dÃ©ral allemand des Affaires Ã©trangÃ¨res, 
le "
+"laboratoire

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

2019-02-21 Thread translation

commit 5d82e0eba8d36b30f26518be9fb66d290b9b17e6
Author: Translation commit bot 
Date:   Fri Feb 22 00:45:26 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 9704f6e73..de37417d6 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -816,8 +816,8 @@ msgid ""
 msgstr ""
 "Le produit principal du Projet Tor est le https://www.torproject.org/download/download-;
-"easy.html.en\">Navigateur Tor, qui permet aux gens de naviguer sur "
-"Internet de maniÃ¨re anonyme."
+"easy.html.en\">Navigateur Tor, qui permet de naviguer anonymement sur "
+"Internet."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:74
 msgid ""
@@ -842,11 +842,11 @@ msgid ""
 "cryptographers, computer scientists, and privacy advocates, and most are not"
 " paid by the Tor Project."
 msgstr ""
-"Des milliers de personnes Ã  travers le monde soutiennent activement le "
-"travail du Projet Tor, y compris des dÃ©veloppeurs, des concepteurs, des "
-"opÃ©rateurs de relais, des chercheurs, des cryptographes, des informaticiens "
-"et des dÃ©fenseurs de la vie privÃ©e, et la plupart ne sont pas payÃ©s par le 
"
-"Projet Tor."
+"Des milliers de personnes de par le monde soutiennent activement le travail "
+"du Projet Tor, y compris des dÃ©veloppeurs, des concepteurs, des opÃ©rateurs "
+"de relais, des chercheurs, des cryptographes, des informaticiens et des "
+"dÃ©fenseurs du droit Ã  la vie privÃ©e, et la plupart ne sont pas 
rÃ©munÃ©rÃ©s par"
+" le Projet Tor."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:88
 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

2019-02-21 Thread translation

commit f12b72aae6ea21f3410736ed8831787c14b19467
Author: Translation commit bot 
Date:   Fri Feb 22 00:45:34 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 9704f6e73..de37417d6 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -816,8 +816,8 @@ msgid ""
 msgstr ""
 "Le produit principal du Projet Tor est le https://www.torproject.org/download/download-;
-"easy.html.en\">Navigateur Tor, qui permet aux gens de naviguer sur "
-"Internet de maniÃ¨re anonyme."
+"easy.html.en\">Navigateur Tor, qui permet de naviguer anonymement sur "
+"Internet."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:74
 msgid ""
@@ -842,11 +842,11 @@ msgid ""
 "cryptographers, computer scientists, and privacy advocates, and most are not"
 " paid by the Tor Project."
 msgstr ""
-"Des milliers de personnes Ã  travers le monde soutiennent activement le "
-"travail du Projet Tor, y compris des dÃ©veloppeurs, des concepteurs, des "
-"opÃ©rateurs de relais, des chercheurs, des cryptographes, des informaticiens "
-"et des dÃ©fenseurs de la vie privÃ©e, et la plupart ne sont pas payÃ©s par le 
"
-"Projet Tor."
+"Des milliers de personnes de par le monde soutiennent activement le travail "
+"du Projet Tor, y compris des dÃ©veloppeurs, des concepteurs, des opÃ©rateurs "
+"de relais, des chercheurs, des cryptographes, des informaticiens et des "
+"dÃ©fenseurs du droit Ã  la vie privÃ©e, et la plupart ne sont pas 
rÃ©munÃ©rÃ©s par"
+" le Projet Tor."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:88
 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

2019-02-21 Thread translation

commit 4b054db06da3aabd7cfffef0e458aa8988db8eea
Author: Translation commit bot 
Date:   Thu Feb 21 23:45:26 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 40425e223..9704f6e73 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -802,11 +802,11 @@ msgid ""
 "supporting their unrestricted availability and use, and furthering their "
 "scientific and popular understanding."
 msgstr ""
-"La mission du Projet Tor est de promouvoir les droits de la personne et les "
-"libertÃ©s en crÃ©ant et en dÃ©ployant des technologies libres et anonymat "
-"ouvertes et de confidentialitÃ© en favorisant leur disponibilitÃ© et leur "
-"utilisation sans restriction, et en favorisant leur comprÃ©hension "
-"scientifique et populaire."
+"La mission du Projet Tor est de faire progresser la situation des droits de "
+"la personne et les libertÃ©s en crÃ©ant et en dÃ©ployant des technologies "
+"dâanonymat et de confidentialitÃ© libres et ouvertes, en soutenant leur "
+"disponibilitÃ© et leur utilisation sans restriction, et en les faisant mieux "
+"connaÃ®tre des scientifiques et du public."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:72
 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

2019-02-21 Thread translation

commit 65db69a018b6e0c218198bcb8b597d9b384ea7ae
Author: Translation commit bot 
Date:   Thu Feb 21 23:45:33 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 40425e223..9704f6e73 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -802,11 +802,11 @@ msgid ""
 "supporting their unrestricted availability and use, and furthering their "
 "scientific and popular understanding."
 msgstr ""
-"La mission du Projet Tor est de promouvoir les droits de la personne et les "
-"libertÃ©s en crÃ©ant et en dÃ©ployant des technologies libres et anonymat "
-"ouvertes et de confidentialitÃ© en favorisant leur disponibilitÃ© et leur "
-"utilisation sans restriction, et en favorisant leur comprÃ©hension "
-"scientifique et populaire."
+"La mission du Projet Tor est de faire progresser la situation des droits de "
+"la personne et les libertÃ©s en crÃ©ant et en dÃ©ployant des technologies "
+"dâanonymat et de confidentialitÃ© libres et ouvertes, en soutenant leur "
+"disponibilitÃ© et leur utilisation sans restriction, et en les faisant mieux "
+"connaÃ®tre des scientifiques et du public."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:72
 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

2019-02-21 Thread translation

commit 4a255ca886f5c79e4edf967a867fcc82b839f885
Author: Translation commit bot 
Date:   Thu Feb 21 23:15:26 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 7ed45eb0d..40425e223 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -713,12 +713,12 @@ msgid ""
 "We need people to run relays, write code, organize the community and spread "
 "the word about our good work."
 msgstr ""
-"Nous avons besoin de gens pour faire fonctionner les relais, Ã©crire du code,"
-" organiser la communautÃ© et faire passer le mot sur notre bon travail."
+"Nous avons besoin de personnes pour exploiter des relais, Ã©crire du code, "
+"organiser la communautÃ© et faire connaÃ®tre notre bon travail."
 
 #: 
tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:129
 msgid "Learn how you can help."
-msgstr "Apprenez comment vous pouvez aider."
+msgstr "DÃ©couvrez comment vous pouvez aider."
 
 #: 
tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:137
 msgid "I Want To Volunteer"
@@ -740,12 +740,13 @@ msgstr ""
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:31
 msgid "Subscribe to Our Newsletter"
-msgstr "Abonnez-vous Ã  notre bulletin dâinformation"
+msgstr "Abonnez-vous Ã  notre lettre dâinformation"
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:35
 msgid "Get monthly updates and opportunities from the Tor Project."
 msgstr ""
-"Recevez les mises Ã  jour mensuelles et les opportunitÃ©s du Projet Tor."
+"Recevez chaque mois les mises Ã  jour et les offres de bÃ©nÃ©volat du Projet "
+"Tor."
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:39
 msgid "Sign Up"
@@ -771,7 +772,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:34
 msgid "Tor Donor FAQ"
-msgstr "FAQ sur les donateurs Tor"
+msgstr "FAQ Tor pour les donateurs"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:44
 msgid "Questions?"
@@ -784,11 +785,11 @@ msgid ""
 "inquiries, or giving(at)torproject.org with "
 "donor-specific questions."
 msgstr ""
-"Si vous ne trouvez pas de rÃ©ponse Ã¢ votre question ci-dessous, envoyez un "
-"courriel Ã¢ frontdesk(at)rt.torproject.org avec "
-"des questions gÃ©nÃ©rales sur Tor, ou giving(at)torproject.org avec des questions "
-"spÃ©cifiques aux donateurs."
+"Si vous ne trouvez pas ci-dessous de rÃ©ponse Ã  votre question, envoyez un "
+"courriel Ã  frontdesk(at)rt.torproject.org pour "
+"les questions dâordre gÃ©nÃ©ral sur Tor, ou Ã  giving(at)torproject.org pour les questions propres "
+"aux donateurs."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:66
 msgid "What is the Tor Project and what does it do?"

___
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

2019-02-21 Thread translation

commit 6ad7a9935379f910b7133fb8b3ec3a679af07879
Author: Translation commit bot 
Date:   Thu Feb 21 23:15:33 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 7ed45eb0d..40425e223 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -713,12 +713,12 @@ msgid ""
 "We need people to run relays, write code, organize the community and spread "
 "the word about our good work."
 msgstr ""
-"Nous avons besoin de gens pour faire fonctionner les relais, Ã©crire du code,"
-" organiser la communautÃ© et faire passer le mot sur notre bon travail."
+"Nous avons besoin de personnes pour exploiter des relais, Ã©crire du code, "
+"organiser la communautÃ© et faire connaÃ®tre notre bon travail."
 
 #: 
tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:129
 msgid "Learn how you can help."
-msgstr "Apprenez comment vous pouvez aider."
+msgstr "DÃ©couvrez comment vous pouvez aider."
 
 #: 
tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:137
 msgid "I Want To Volunteer"
@@ -740,12 +740,13 @@ msgstr ""
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:31
 msgid "Subscribe to Our Newsletter"
-msgstr "Abonnez-vous Ã  notre bulletin dâinformation"
+msgstr "Abonnez-vous Ã  notre lettre dâinformation"
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:35
 msgid "Get monthly updates and opportunities from the Tor Project."
 msgstr ""
-"Recevez les mises Ã  jour mensuelles et les opportunitÃ©s du Projet Tor."
+"Recevez chaque mois les mises Ã  jour et les offres de bÃ©nÃ©volat du Projet "
+"Tor."
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:39
 msgid "Sign Up"
@@ -771,7 +772,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:34
 msgid "Tor Donor FAQ"
-msgstr "FAQ sur les donateurs Tor"
+msgstr "FAQ Tor pour les donateurs"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:44
 msgid "Questions?"
@@ -784,11 +785,11 @@ msgid ""
 "inquiries, or giving(at)torproject.org with "
 "donor-specific questions."
 msgstr ""
-"Si vous ne trouvez pas de rÃ©ponse Ã¢ votre question ci-dessous, envoyez un "
-"courriel Ã¢ frontdesk(at)rt.torproject.org avec "
-"des questions gÃ©nÃ©rales sur Tor, ou giving(at)torproject.org avec des questions "
-"spÃ©cifiques aux donateurs."
+"Si vous ne trouvez pas ci-dessous de rÃ©ponse Ã  votre question, envoyez un "
+"courriel Ã  frontdesk(at)rt.torproject.org pour "
+"les questions dâordre gÃ©nÃ©ral sur Tor, ou Ã  giving(at)torproject.org pour les questions propres "
+"aux donateurs."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:66
 msgid "What is the Tor Project and what does it do?"

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

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

2019-02-21 Thread translation

commit 18496024ac6b64e47a4d3a92c6d6d02a63dde626
Author: Translation commit bot 
Date:   Thu Feb 21 22:50:18 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index eb2f534c3..aeca39526 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4684,8 +4684,8 @@ msgstr ""
 "Si vous utilisez un antivirus, veuillez consulter http://support.torproject.org/#tbb-10\;>Mon antivirus ou ma "
 "protection contre les programmes malveillants mâempÃªche dâaccÃ©der au "
-"Navigateur Tor. Il nâest pas rare que les logiciels antivirus ou 
"
-"antiprogrammes malveillants provoquent ce genre de problÃ¨me."
+"Navigateur Tor.. Il nâest pas rare que les logiciels antivirus 
ou"
+" les antiprogrammes malveillants provoquent ce genre de problÃ¨me."
 
 #: https//support.torproject.org/tbb/use-another-browser-chrome-firefox/
 #: (content/tbb/tbb-5/contents+en.lrquestion.title)

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

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

2019-02-21 Thread translation

commit fee7d8518caf9244136c156a26851a9e6404d7c8
Author: Translation commit bot 
Date:   Thu Feb 21 22:50:11 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index eb2f534c3..aeca39526 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4684,8 +4684,8 @@ msgstr ""
 "Si vous utilisez un antivirus, veuillez consulter http://support.torproject.org/#tbb-10\;>Mon antivirus ou ma "
 "protection contre les programmes malveillants mâempÃªche dâaccÃ©der au "
-"Navigateur Tor. Il nâest pas rare que les logiciels antivirus ou 
"
-"antiprogrammes malveillants provoquent ce genre de problÃ¨me."
+"Navigateur Tor.. Il nâest pas rare que les logiciels antivirus 
ou"
+" les antiprogrammes malveillants provoquent ce genre de problÃ¨me."
 
 #: https//support.torproject.org/tbb/use-another-browser-chrome-firefox/
 #: (content/tbb/tbb-5/contents+en.lrquestion.title)

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

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

2019-02-21 Thread translation

commit ea224ae278a24c717eac46c3f082a7e821b659d2
Author: Translation commit bot 
Date:   Thu Feb 21 22:47:37 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+fr.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 94867a60f..156acfb31 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1003,14 +1003,14 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq#EntryGuards\;>FAQ and https://support.torproject.org/tbb/tbb-2/\;>Support Portal."
 msgstr ""
-"Dans le circuit, le nÅud Garde ou nÅud dâentrÃ©e est le premier nÅud et 
il "
-"est automatiquement et alÃ©atoirement sÃ©lectionnÃ© par Tor. Mais il est "
-"diffÃ©rent des autres nÅuds du circuit. Afin dâÃ©viter les attaques de "
-"profilage, le nÅud Guard ne change quâaprÃ¨s 2-3 mois, contrairement aux "
-"autres nÅuds, qui changent Ã  chaque nouveau domaine. Pour plus "
-"dâinformations sur Guards, consultez la https://www.torproject.org/docs/faq#EntryGuards\;>FAQ et le https://support.torproject.org/tbb/tbb-2/\;>Portail de support."
+"href=\"https://support.torproject.org/tbb/tbb-2/\;>Portail 
dâassistance."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)

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

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

2019-02-21 Thread translation

commit ea9fac3b97172a2bffc6f8d5a4dafa4468d88b55
Author: Translation commit bot 
Date:   Thu Feb 21 22:47:31 2019 +

Update translations for tbmanual-contentspot
---
 contents+fr.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 94867a60f..156acfb31 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1003,14 +1003,14 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq#EntryGuards\;>FAQ and https://support.torproject.org/tbb/tbb-2/\;>Support Portal."
 msgstr ""
-"Dans le circuit, le nÅud Garde ou nÅud dâentrÃ©e est le premier nÅud et 
il "
-"est automatiquement et alÃ©atoirement sÃ©lectionnÃ© par Tor. Mais il est "
-"diffÃ©rent des autres nÅuds du circuit. Afin dâÃ©viter les attaques de "
-"profilage, le nÅud Guard ne change quâaprÃ¨s 2-3 mois, contrairement aux "
-"autres nÅuds, qui changent Ã  chaque nouveau domaine. Pour plus "
-"dâinformations sur Guards, consultez la https://www.torproject.org/docs/faq#EntryGuards\;>FAQ et le https://support.torproject.org/tbb/tbb-2/\;>Portail de support."
+"href=\"https://support.torproject.org/tbb/tbb-2/\;>Portail 
dâassistance."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)

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

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

2019-02-21 Thread translation

commit 89d8c6f6d9ef037f1f3be34e5fb56951d3a075e8
Author: Translation commit bot 
Date:   Thu Feb 21 22:45:32 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index f5db82d85..7ed45eb0d 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,12 +2,12 @@
 # N W, 2018
 # erinm, 2018
 # Curtis Baltimore , 2018
-# AO , 2019
 # Thomas PrÃ©vost , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Thomas PrÃ©vost , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -602,8 +602,8 @@ msgid ""
 "Stand up for the universal human rights to privacy and freedom and help keep"
 " Tor robust and secure."
 msgstr ""
-"DÃ©fendez les droits universels de l'homme Ã  la vie privÃ©e et Ã  la 
libertÃ© et"
-" aidez Tor Ã  rester robuste et en sÃ©curitÃ©."
+"DÃ©fendez les droits universels de la personne Ã  la vie privÃ©e et Ã  la "
+"libertÃ©, et aidez Ã  assurer la robustesse et la sÃ©curitÃ© de Tor."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:656
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:650
@@ -617,7 +617,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:52
 msgid "Company"
-msgstr "Entreprise"
+msgstr "SociÃ©tÃ©"
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:60
 msgid "Matching Conditions"
@@ -675,10 +675,10 @@ msgid ""
 "making it easier for third-party developers to integrate Tor into their "
 "applications."
 msgstr ""
-"Avec votre support, nous serons capables de maintenir des projets ambitieux,"
-" comme le dÃ©veloppement d'un navigateur mobile Ã  la sÃ©curitÃ© accrue, "
-"protÃ©geant la vie privÃ©e et permettant aux dÃ©veloppeurs  tierces 
d'intÃ©grer "
-"Tor plus facilement dans leurs applications."
+"Avec votre soutien, nous pourrons nous attaquer Ã  dâambitieux projets, 
tels "
+"que le dÃ©veloppement dâun navigateur pour appareils mobiles plus 
sÃ©curisÃ© et"
+" qui amÃ©liore la confidentialitÃ©. Nous pourrons aussi faciliter "
+"lâintÃ©gration de Tor aux applications de dÃ©veloppeurs tiers."
 
 #: 
tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:71
 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

2019-02-21 Thread translation

commit 104fb0f921f17997f78f14dad006f224313bfa49
Author: Translation commit bot 
Date:   Thu Feb 21 22:45:26 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index f5db82d85..7ed45eb0d 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,12 +2,12 @@
 # N W, 2018
 # erinm, 2018
 # Curtis Baltimore , 2018
-# AO , 2019
 # Thomas PrÃ©vost , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Thomas PrÃ©vost , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -602,8 +602,8 @@ msgid ""
 "Stand up for the universal human rights to privacy and freedom and help keep"
 " Tor robust and secure."
 msgstr ""
-"DÃ©fendez les droits universels de l'homme Ã  la vie privÃ©e et Ã  la 
libertÃ© et"
-" aidez Tor Ã  rester robuste et en sÃ©curitÃ©."
+"DÃ©fendez les droits universels de la personne Ã  la vie privÃ©e et Ã  la "
+"libertÃ©, et aidez Ã  assurer la robustesse et la sÃ©curitÃ© de Tor."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:656
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:650
@@ -617,7 +617,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:52
 msgid "Company"
-msgstr "Entreprise"
+msgstr "SociÃ©tÃ©"
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:60
 msgid "Matching Conditions"
@@ -675,10 +675,10 @@ msgid ""
 "making it easier for third-party developers to integrate Tor into their "
 "applications."
 msgstr ""
-"Avec votre support, nous serons capables de maintenir des projets ambitieux,"
-" comme le dÃ©veloppement d'un navigateur mobile Ã  la sÃ©curitÃ© accrue, "
-"protÃ©geant la vie privÃ©e et permettant aux dÃ©veloppeurs  tierces 
d'intÃ©grer "
-"Tor plus facilement dans leurs applications."
+"Avec votre soutien, nous pourrons nous attaquer Ã  dâambitieux projets, 
tels "
+"que le dÃ©veloppement dâun navigateur pour appareils mobiles plus 
sÃ©curisÃ© et"
+" qui amÃ©liore la confidentialitÃ©. Nous pourrons aussi faciliter "
+"lâintÃ©gration de Tor aux applications de dÃ©veloppeurs tiers."
 
 #: 
tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:71
 msgid ""

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

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

2019-02-21 Thread translation

commit 05a5f8e32d6ba759e4cdc6d945d58e454fd9249b
Author: Translation commit bot 
Date:   Thu Feb 21 22:20:19 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index dadad96fb..eb2f534c3 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -397,15 +397,15 @@ msgid ""
 "service)), and never an exit node. You can view your current Tor circuit by "
 "clicking on the onion button in Tor Browser."
 msgstr ""
-"Un chemin Ã  travers le rÃ©seau [Tor](#tor-/-tor-tor-network/-core-tor) "
-"construit par [clients](#client) composÃ© de noeuds sÃ©lectionnÃ©s au hasard. 
"
-"Le circuit commence par un [pont](#pont) ou un [garde](#garde). La plupart "
-"des circuits se composent de trois nÅuds - un garde ou un pont, un [relais "
-"du milieu](#relais du milieu), et une [sortie](#sortie). La plupart des "
-"[services onion](#onion-services) utilisent six sauts dans un circuit (Ã  "
-"l'exception des [services d'oignon simple](#single-onion-service)), et "
-"jamais un noeud de sortie. Vous pouvez voir votre circuit Tor actuel en "
-"cliquant sur le bouton oignon dans le Navigateur Tor."
+"Un chemin au travers du rÃ©seau [Tor](#tor-/-tor-tor-network/-core-tor) "
+"construit par des [clients](#client) et composÃ© de nÅuds sÃ©lectionnÃ©s au "
+"hasard. Le circuit commence soit par un [pont](#bridge) soit par un "
+"[garde](#guard). La plupart des circuits comprennent trois nÅudsÂ : un garde 
"
+"ou un pont, un [relais intermÃ©diaire](#middle-relay) et une [sortie](#exit)."
+" La plupart des [services onion](#onion-services) utilisent six sauts dans "
+"un circuit (Ã  lâexception des [services onion simples](#single-onion-"
+"service)), et jamais de nÅud de sortie. Vous pouvez visualiser votre circuit"
+" Tor actuel en cliquant sur le bouton oignon du Navigateur Tor."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -2052,11 +2052,11 @@ msgid ""
 "connecting to their service. Single onion services use only three hops in "
 "the [circuit](#circuit) rather than the typical six hops for onion services."
 msgstr ""
-"Un service d'onion unique est un service d'onion qui peut Ãªtre configurÃ© "
-"pour des services qui ne requiÃ¨rent pas l'anonymat, mais que l'on veut "
-"offrir aux clients qui se connectent Ã  leur service. Les services d'onion "
-"simple utilisent seulement trois sauts dans le [circuit] (#circuit) plutÃ´t "
-"que les six sauts typiques pour les services d'onion."
+"Un service onion simple est un service onion qui peut Ãªtre configurÃ© pour "
+"des services qui nâexigent pas lâanonymat, mais qui veulent lâoffrir 
aux "
+"clients qui se connectent Ã  leur service. Les services onion simples "
+"nâutilisent que trois sauts dans le [circuit] (#circuit), au lieu des six "
+"sauts habituels des services onion."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)

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

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

2019-02-21 Thread translation

commit f3496c7592a7d8792e00fe1159e8c5c6b93ddc70
Author: Translation commit bot 
Date:   Thu Feb 21 22:20:12 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index dadad96fb..eb2f534c3 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -397,15 +397,15 @@ msgid ""
 "service)), and never an exit node. You can view your current Tor circuit by "
 "clicking on the onion button in Tor Browser."
 msgstr ""
-"Un chemin Ã  travers le rÃ©seau [Tor](#tor-/-tor-tor-network/-core-tor) "
-"construit par [clients](#client) composÃ© de noeuds sÃ©lectionnÃ©s au hasard. 
"
-"Le circuit commence par un [pont](#pont) ou un [garde](#garde). La plupart "
-"des circuits se composent de trois nÅuds - un garde ou un pont, un [relais "
-"du milieu](#relais du milieu), et une [sortie](#sortie). La plupart des "
-"[services onion](#onion-services) utilisent six sauts dans un circuit (Ã  "
-"l'exception des [services d'oignon simple](#single-onion-service)), et "
-"jamais un noeud de sortie. Vous pouvez voir votre circuit Tor actuel en "
-"cliquant sur le bouton oignon dans le Navigateur Tor."
+"Un chemin au travers du rÃ©seau [Tor](#tor-/-tor-tor-network/-core-tor) "
+"construit par des [clients](#client) et composÃ© de nÅuds sÃ©lectionnÃ©s au "
+"hasard. Le circuit commence soit par un [pont](#bridge) soit par un "
+"[garde](#guard). La plupart des circuits comprennent trois nÅudsÂ : un garde 
"
+"ou un pont, un [relais intermÃ©diaire](#middle-relay) et une [sortie](#exit)."
+" La plupart des [services onion](#onion-services) utilisent six sauts dans "
+"un circuit (Ã  lâexception des [services onion simples](#single-onion-"
+"service)), et jamais de nÅud de sortie. Vous pouvez visualiser votre circuit"
+" Tor actuel en cliquant sur le bouton oignon du Navigateur Tor."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -2052,11 +2052,11 @@ msgid ""
 "connecting to their service. Single onion services use only three hops in "
 "the [circuit](#circuit) rather than the typical six hops for onion services."
 msgstr ""
-"Un service d'onion unique est un service d'onion qui peut Ãªtre configurÃ© "
-"pour des services qui ne requiÃ¨rent pas l'anonymat, mais que l'on veut "
-"offrir aux clients qui se connectent Ã  leur service. Les services d'onion "
-"simple utilisent seulement trois sauts dans le [circuit] (#circuit) plutÃ´t "
-"que les six sauts typiques pour les services d'onion."
+"Un service onion simple est un service onion qui peut Ãªtre configurÃ© pour "
+"des services qui nâexigent pas lâanonymat, mais qui veulent lâoffrir 
aux "
+"clients qui se connectent Ã  leur service. Les services onion simples "
+"nâutilisent que trois sauts dans le [circuit] (#circuit), au lieu des six "
+"sauts habituels des services onion."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)

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

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

2019-02-21 Thread translation

commit dc8ecd179d695f0cd8361ae209ca24424dcc62bf
Author: Translation commit bot 
Date:   Thu Feb 21 22:18:38 2019 +

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

diff --git a/fr/torbutton.properties b/fr/torbutton.properties
index 02a344d0a..23ef8f439 100644
--- a/fr/torbutton.properties
+++ b/fr/torbutton.properties
@@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Ce navigateur
 torbutton.circuit_display.relay = Relais
 torbutton.circuit_display.tor_bridge = Pont
 torbutton.circuit_display.unknown_country = Pays inconnu
-torbutton.circuit_display.guard = Garde
+torbutton.circuit_display.guard = garde
 torbutton.circuit_display.guard_note = Votre nÅud de [Guard] ne peut pas 
changer.
 torbutton.circuit_display.learn_more = En apprendre davantage
 torbutton.content_sizer.margin_tooltip = Le Navigateur Tor ajoute cette marge 
pour rendre la largeur et la hauteur de votre fenÃªtre moins distinctives, et 
pour rÃ©duire par consÃ©quent la possibilitÃ© que lâon vous suive Ã  la trace 
en ligne.

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

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

2019-02-21 Thread translation

commit 7a0ca7691b2415f2f39fcc5df2dddf40f1ed9739
Author: Translation commit bot 
Date:   Thu Feb 21 22:18:32 2019 +

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

diff --git a/fr/torbutton.properties b/fr/torbutton.properties
index 02a344d0a..23ef8f439 100644
--- a/fr/torbutton.properties
+++ b/fr/torbutton.properties
@@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Ce navigateur
 torbutton.circuit_display.relay = Relais
 torbutton.circuit_display.tor_bridge = Pont
 torbutton.circuit_display.unknown_country = Pays inconnu
-torbutton.circuit_display.guard = Garde
+torbutton.circuit_display.guard = garde
 torbutton.circuit_display.guard_note = Votre nÅud de [Guard] ne peut pas 
changer.
 torbutton.circuit_display.learn_more = En apprendre davantage
 torbutton.content_sizer.margin_tooltip = Le Navigateur Tor ajoute cette marge 
pour rendre la largeur et la hauteur de votre fenÃªtre moins distinctives, et 
pour rÃ©duire par consÃ©quent la possibilitÃ© que lâon vous suive Ã  la trace 
en ligne.

___
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

2019-02-21 Thread translation

commit 0ed434ae5d3c0888daff3b3ec0e223a1a5f1d305
Author: Translation commit bot 
Date:   Thu Feb 21 22:15:35 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 49a874a13..f5db82d85 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -505,7 +505,7 @@ msgstr "Commentaires"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:476
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:470
 msgid "Donating:"
-msgstr "Faire un don :"
+msgstr "Don deÂ :"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:483
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:477
@@ -613,7 +613,7 @@ msgstr "Mozilla Ã©galera votre cadeau et doublera votre 
impact."
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:22
 msgid "See if your employer offers employee gift matching"
 msgstr ""
-"Voyez si votre employeur offre des cadeaux de contrepartie aux employÃ©s."
+"VÃ©rifiez si votre employeur offre un programme de bonification des dons"
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:52
 msgid "Company"
@@ -621,7 +621,7 @@ msgstr "Entreprise"
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:60
 msgid "Matching Conditions"
-msgstr "Conditions dâappariement"
+msgstr "Conditions de bonification des don"
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:68
 msgid "Contact Information"

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

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

2019-02-21 Thread translation

commit 7504cacd9486b945ecfabea6910517cf0691a1c5
Author: Translation commit bot 
Date:   Thu Feb 21 22:15:28 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 49a874a13..f5db82d85 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -505,7 +505,7 @@ msgstr "Commentaires"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:476
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:470
 msgid "Donating:"
-msgstr "Faire un don :"
+msgstr "Don deÂ :"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:483
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:477
@@ -613,7 +613,7 @@ msgstr "Mozilla Ã©galera votre cadeau et doublera votre 
impact."
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:22
 msgid "See if your employer offers employee gift matching"
 msgstr ""
-"Voyez si votre employeur offre des cadeaux de contrepartie aux employÃ©s."
+"VÃ©rifiez si votre employeur offre un programme de bonification des dons"
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:52
 msgid "Company"
@@ -621,7 +621,7 @@ msgstr "Entreprise"
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:60
 msgid "Matching Conditions"
-msgstr "Conditions dâappariement"
+msgstr "Conditions de bonification des don"
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:68
 msgid "Contact Information"

___
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

2019-02-21 Thread translation

commit 22b13a1c82a3cd9140c957dcdaaffe3c8c1cc2d4
Author: Translation commit bot 
Date:   Thu Feb 21 20:45:32 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 575f6b49c..49a874a13 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 # Translators:
 # N W, 2018
 # erinm, 2018
-# AO , 2018
 # Curtis Baltimore , 2018
+# AO , 2019
 # Thomas PrÃ©vost , 2019
 # 
 msgid ""
@@ -334,7 +334,7 @@ msgstr "tee-shirt"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:259
 msgid "$15"
-msgstr "15$"
+msgstr "15Â $"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:261
 msgid "OFF"

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

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

2019-02-21 Thread translation

commit f31c317fa885177eaef6109101caf168e60c9fbd
Author: Translation commit bot 
Date:   Thu Feb 21 20:45:26 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 575f6b49c..49a874a13 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 # Translators:
 # N W, 2018
 # erinm, 2018
-# AO , 2018
 # Curtis Baltimore , 2018
+# AO , 2019
 # Thomas PrÃ©vost , 2019
 # 
 msgid ""
@@ -334,7 +334,7 @@ msgstr "tee-shirt"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:259
 msgid "$15"
-msgstr "15$"
+msgstr "15Â $"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:261
 msgid "OFF"

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

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

2019-02-21 Thread translation

commit 6263ddd93d3591c936436ca69c2ae22988020be6
Author: Translation commit bot 
Date:   Thu Feb 21 20:20:26 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 96df7320f..dadad96fb 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2520,11 +2520,10 @@ msgid ""
 "Settings...\", \"Tor Network Settings...\" and \"Check for [Tor Browser"
 "](#tor-browser) Update...\" options."
 msgstr ""
-"Son menu vous offre les options \"[Nouvelle identitÃ©](#new-identity)\", "
-"\"[Nouveau circuit Tor pour ce site](#nouveau circuit Tor pour ce site)\", "
-"\"ParamÃ¨tres de confidentialitÃ© et de sÃ©curitÃ©...\", \"ParamÃ¨tres 
rÃ©seau "
-"Tor...\" et \"VÃ©rifier la mise Ã  jour[Navigateur Tor](# Navigateur "
-"Tor)...\"."
+"Son menu vous propose les options Â«Â [Nouvelle identitÃ©](#new-identity)Â 
Â», Â«Â "
+"[Nouveau circuit Tor pour ce site](#new-tor-circuit-for-this-site)Â Â», Â«Â "
+"ParamÃ¨tres de sÃ©curitÃ©...Â Â», Â«Â ParamÃ¨tres du rÃ©seau Tor...Â Â» et 
Â«Â VÃ©rifier "
+"les mises Ã  jour du [Navigateur Tor](#navigateur-tor)â¦Â Â»."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)

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

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

2019-02-21 Thread translation

commit fa3e8906d963eb9564bf7cfeebb1d4cfd9de29ab
Author: Translation commit bot 
Date:   Thu Feb 21 20:20:18 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 96df7320f..dadad96fb 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2520,11 +2520,10 @@ msgid ""
 "Settings...\", \"Tor Network Settings...\" and \"Check for [Tor Browser"
 "](#tor-browser) Update...\" options."
 msgstr ""
-"Son menu vous offre les options \"[Nouvelle identitÃ©](#new-identity)\", "
-"\"[Nouveau circuit Tor pour ce site](#nouveau circuit Tor pour ce site)\", "
-"\"ParamÃ¨tres de confidentialitÃ© et de sÃ©curitÃ©...\", \"ParamÃ¨tres 
rÃ©seau "
-"Tor...\" et \"VÃ©rifier la mise Ã  jour[Navigateur Tor](# Navigateur "
-"Tor)...\"."
+"Son menu vous propose les options Â«Â [Nouvelle identitÃ©](#new-identity)Â 
Â», Â«Â "
+"[Nouveau circuit Tor pour ce site](#new-tor-circuit-for-this-site)Â Â», Â«Â "
+"ParamÃ¨tres de sÃ©curitÃ©...Â Â», Â«Â ParamÃ¨tres du rÃ©seau Tor...Â Â» et 
Â«Â VÃ©rifier "
+"les mises Ã  jour du [Navigateur Tor](#navigateur-tor)â¦Â Â»."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)

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

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

2019-02-21 Thread translation

commit 2b0544b87f3b2a9005447d2f817c16acf7e5cc2f
Author: Translation commit bot 
Date:   Thu Feb 21 20:15:27 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index a2155d8a8..575f6b49c 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -14,11 +14,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34
 msgid "Processing Donation - Tor"
-msgstr "Traitement du don - Tor"
+msgstr "Traitement du don â Tor"
 
 #: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:44
 msgid "Processing Donation. Please Wait..."
-msgstr "Traitement des dons. Sâil vous plaÃ®t attendez"
+msgstr "Traitement du don. Veuillez patienterâ¦"
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34
 msgid "Tor Privacy Policy"
@@ -1115,9 +1115,9 @@ msgid ""
 "class=\"hyperlinks links\" target=\"_blank\" "
 "href=\"https://www.eff.org/torchallenge/faq.html\;>EFF site."
 msgstr ""
-"Vous pouvez trouver plus dâinformations sur le statut lÃ©gal de Tor sur le 
https://www.eff.org/torchallenge/faq.html\;>site de lâEFF."
+"Vous trouverez plus de renseignements sur le statut juridique de Tor sur le "
+"https://www.eff.org/torchallenge/faq.html\;>site de la FFÃ."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:196
 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

2019-02-21 Thread translation

commit d6dcd2ea06a49873084487b1715fa0a085b4a03b
Author: Translation commit bot 
Date:   Thu Feb 21 20:15:34 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index a2155d8a8..575f6b49c 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -14,11 +14,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34
 msgid "Processing Donation - Tor"
-msgstr "Traitement du don - Tor"
+msgstr "Traitement du don â Tor"
 
 #: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:44
 msgid "Processing Donation. Please Wait..."
-msgstr "Traitement des dons. Sâil vous plaÃ®t attendez"
+msgstr "Traitement du don. Veuillez patienterâ¦"
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34
 msgid "Tor Privacy Policy"
@@ -1115,9 +1115,9 @@ msgid ""
 "class=\"hyperlinks links\" target=\"_blank\" "
 "href=\"https://www.eff.org/torchallenge/faq.html\;>EFF site."
 msgstr ""
-"Vous pouvez trouver plus dâinformations sur le statut lÃ©gal de Tor sur le 
https://www.eff.org/torchallenge/faq.html\;>site de lâEFF."
+"Vous trouverez plus de renseignements sur le statut juridique de Tor sur le "
+"https://www.eff.org/torchallenge/faq.html\;>site de la FFÃ."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:196
 msgid ""

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

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

2019-02-21 Thread translation

commit e9e2f68578087817a64e0c17207b60516066af40
Author: Translation commit bot 
Date:   Thu Feb 21 19:50:19 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index d4321aa6f..96df7320f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -62,9 +62,8 @@ msgid ""
 "Add-ons, extensions, and plugins are components that can be added to [web "
 "browsers](#web-browser) to give them new features."
 msgstr ""
-"Les add-ons, extensions et plugins sont des composants qui peuvent Ãªtre "
-"ajoutÃ©s Ã [Web browsers](#Web-browser) pour leur donner de nouvelles "
-"fonctionnalitÃ©s."
+"Les extensions et greffons sont des composants qui peuvent Ãªtre ajoutÃ©s Ã  "
+"des [navigateurs Web](#Web-browser) pour leur donner de nouvelles fonctions."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -85,8 +84,8 @@ msgid ""
 "You should not install any additional add-ons to Tor Browser because that "
 "can compromise some of its privacy features."
 msgstr ""
-"Vous ne devriez pas installer d'add-ons supplÃ©mentaires au Navigateur Tor "
-"car cela peut compromettre certaines de ses fonctionnalitÃ©s de "
+"Vous ne devriez pas installer dâextensions supplÃ©mentaires au Navigateur "
+"Tor, car cela peut compromettre certaines de ses fonctions de "
 "confidentialitÃ©."
 
 #: https//support.torproject.org/glossary/
@@ -507,9 +506,9 @@ msgid ""
 "Cross-Site Scripting (XSS) allows an attacker to add malicious functionality"
 " or behavior to a website when they shouldn't have the ability to do so."
 msgstr ""
-"Le Scripting intersites (XSS) permet Ã  un attaquant d'ajouter des "
-"fonctionnalitÃ©s ou des comportements malveillants Ã  un site Web alors qu'il 
"
-"ne devrait pas avoir la possibilitÃ© de le faire."
+"Les scripts intersites (XSS) permettent Ã  un assaillant dâajouter des "
+"fonctions ou des comportements malveillants Ã  un site Web alors quâil ne "
+"devrait pas pouvoir le faire."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -654,10 +653,10 @@ msgid ""
 "connecting to (website, chat service, email provider, etc..) will see the "
 "[IP address](#ip-address) of the exit."
 msgstr ""
-"Le dernier [relais](#relais) dans le [circuit Tor](#circuit) qui envoie "
-"[trafic](#trafic) sur Internet public. Le service auquel vous vous connectez"
-" (site Web, service de chat, fournisseur d'email, etc.) verra l'adresse "
-"[IP](#adresse IP) de l'exit."
+"Le dernier [relais](#relay) dans le [circuit Tor](#circuit) qui envoie le "
+"[trafic](#trafic) vers lâInternet public. Le service auquel vous vous "
+"connectez (site Web, service de dialogue en ligne, fournisseur de services "
+"de courriel, etc.) verra lâ[adresse IP](#adresse IP) du relais de sortie."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -982,9 +981,9 @@ msgid ""
 "of the HTTP channel used to transfer files and data between devices on a "
 "network."
 msgstr ""
-"Hypertext Transfer Protocol Secure est la version [cryptÃ©e](#encryption) du "
-"canal HTTP utilisÃ©e pour transfÃ©rer des fichiers et des donnÃ©es entre les "
-"pÃ©riphÃ©riques d'un rÃ©seau."
+"Le protocole de transfert hypertexte est la version [chiffrÃ©e](#encryption) "
+"du canal HTTP utilisÃ© pour transfÃ©rer des fichiers et des donnÃ©es entre 
les "
+"pÃ©riphÃ©riques dâun rÃ©seau."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -2454,16 +2453,16 @@ msgid ""
 "default and sends all of its [traffic](#traffic) over [Tor](#tor-/-tor-"
 "network/-core-tor)."
 msgstr ""
-"Tor Messenger Ã©tait un programme de chat multiplateforme qui vise Ã  Ãªtre "
-"sÃ©curisÃ© par dÃ©faut et envoie tout son [trafic](#trafic) sur [Tor](#tor"
-"-/-tor-network/-core-tor)."
+"La Messagerie Tor Ã©tait un programme multiplateforme de dialogue en ligne "
+"qui avait pour objectif dâÃªtre sÃ©curisÃ© par dÃ©faut en envoyant tout son 
"
+"[trafic](#trafic) par [Tor](#tor-/-tor-network/-core-tor)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
 #: https//support.torproject.org/misc/tor-glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "Tor Messenger is not in development anymore."
-msgstr "Tor Messenger n'est plus en dÃ©veloppement."
+msgstr "La Messagerie Tor nâest plus dÃ©veloppÃ©e."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -2474,10 +2473,10 @@ msgid ""
 " and others; enabled Off-the-Record (OTR) Messaging automatically; and had "
 "an easy-to-use graphical user interface localized into multiple languages."
 msgstr ""
-"Il prenait en charge Jabber (XMPP), IRC, Google

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

2019-02-21 Thread translation

commit f7bf4d267bb2a8f5c4990a4dcf5ef6bf49e2373b
Author: Translation commit bot 
Date:   Thu Feb 21 19:50:26 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index d4321aa6f..96df7320f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -62,9 +62,8 @@ msgid ""
 "Add-ons, extensions, and plugins are components that can be added to [web "
 "browsers](#web-browser) to give them new features."
 msgstr ""
-"Les add-ons, extensions et plugins sont des composants qui peuvent Ãªtre "
-"ajoutÃ©s Ã [Web browsers](#Web-browser) pour leur donner de nouvelles "
-"fonctionnalitÃ©s."
+"Les extensions et greffons sont des composants qui peuvent Ãªtre ajoutÃ©s Ã  "
+"des [navigateurs Web](#Web-browser) pour leur donner de nouvelles fonctions."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -85,8 +84,8 @@ msgid ""
 "You should not install any additional add-ons to Tor Browser because that "
 "can compromise some of its privacy features."
 msgstr ""
-"Vous ne devriez pas installer d'add-ons supplÃ©mentaires au Navigateur Tor "
-"car cela peut compromettre certaines de ses fonctionnalitÃ©s de "
+"Vous ne devriez pas installer dâextensions supplÃ©mentaires au Navigateur "
+"Tor, car cela peut compromettre certaines de ses fonctions de "
 "confidentialitÃ©."
 
 #: https//support.torproject.org/glossary/
@@ -507,9 +506,9 @@ msgid ""
 "Cross-Site Scripting (XSS) allows an attacker to add malicious functionality"
 " or behavior to a website when they shouldn't have the ability to do so."
 msgstr ""
-"Le Scripting intersites (XSS) permet Ã  un attaquant d'ajouter des "
-"fonctionnalitÃ©s ou des comportements malveillants Ã  un site Web alors qu'il 
"
-"ne devrait pas avoir la possibilitÃ© de le faire."
+"Les scripts intersites (XSS) permettent Ã  un assaillant dâajouter des "
+"fonctions ou des comportements malveillants Ã  un site Web alors quâil ne "
+"devrait pas pouvoir le faire."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -654,10 +653,10 @@ msgid ""
 "connecting to (website, chat service, email provider, etc..) will see the "
 "[IP address](#ip-address) of the exit."
 msgstr ""
-"Le dernier [relais](#relais) dans le [circuit Tor](#circuit) qui envoie "
-"[trafic](#trafic) sur Internet public. Le service auquel vous vous connectez"
-" (site Web, service de chat, fournisseur d'email, etc.) verra l'adresse "
-"[IP](#adresse IP) de l'exit."
+"Le dernier [relais](#relay) dans le [circuit Tor](#circuit) qui envoie le "
+"[trafic](#trafic) vers lâInternet public. Le service auquel vous vous "
+"connectez (site Web, service de dialogue en ligne, fournisseur de services "
+"de courriel, etc.) verra lâ[adresse IP](#adresse IP) du relais de sortie."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -982,9 +981,9 @@ msgid ""
 "of the HTTP channel used to transfer files and data between devices on a "
 "network."
 msgstr ""
-"Hypertext Transfer Protocol Secure est la version [cryptÃ©e](#encryption) du "
-"canal HTTP utilisÃ©e pour transfÃ©rer des fichiers et des donnÃ©es entre les "
-"pÃ©riphÃ©riques d'un rÃ©seau."
+"Le protocole de transfert hypertexte est la version [chiffrÃ©e](#encryption) "
+"du canal HTTP utilisÃ© pour transfÃ©rer des fichiers et des donnÃ©es entre 
les "
+"pÃ©riphÃ©riques dâun rÃ©seau."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -2454,16 +2453,16 @@ msgid ""
 "default and sends all of its [traffic](#traffic) over [Tor](#tor-/-tor-"
 "network/-core-tor)."
 msgstr ""
-"Tor Messenger Ã©tait un programme de chat multiplateforme qui vise Ã  Ãªtre "
-"sÃ©curisÃ© par dÃ©faut et envoie tout son [trafic](#trafic) sur [Tor](#tor"
-"-/-tor-network/-core-tor)."
+"La Messagerie Tor Ã©tait un programme multiplateforme de dialogue en ligne "
+"qui avait pour objectif dâÃªtre sÃ©curisÃ© par dÃ©faut en envoyant tout son 
"
+"[trafic](#trafic) par [Tor](#tor-/-tor-network/-core-tor)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
 #: https//support.torproject.org/misc/tor-glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "Tor Messenger is not in development anymore."
-msgstr "Tor Messenger n'est plus en dÃ©veloppement."
+msgstr "La Messagerie Tor nâest plus dÃ©veloppÃ©e."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -2474,10 +2473,10 @@ msgid ""
 " and others; enabled Off-the-Record (OTR) Messaging automatically; and had "
 "an easy-to-use graphical user interface localized into multiple languages."
 msgstr ""
-"Il prenait en charge Jabber (XMPP),

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

2019-02-21 Thread translation

commit a6f5240211cc9807dd9d2099f27afc0a02b4ea42
Author: Translation commit bot 
Date:   Thu Feb 21 19:20:43 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 7e44df6b2..d4321aa6f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -284,7 +284,7 @@ msgstr ""
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "[Tor Browser](#tor-browser) prevents fingerprinting."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) empÃªche le pistage par empreinte 
numÃ©rique"
+"Le [Navigateur Tor](#tor-browser) empÃªche le pistage par empreinte 
numÃ©rique"
 " unique."
 
 #: https//support.torproject.org/glossary/
@@ -314,7 +314,7 @@ msgid ""
 "[Tor Browser](#tor-browser) deletes your browsing history after you close "
 "your [session](#session)."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) efface votre historique de navigation "
+"Le [Navigateur Tor](#tor-browser) efface votre historique de navigation "
 "aprÃ¨s fermeture de votre [session](#session)."
 
 #: https//support.torproject.org/glossary/
@@ -489,8 +489,8 @@ msgstr ""
 "Un tÃ©moin [HTTP](#http) (aussi appelÃ© fichier tÃ©moin ou Â«Â cookieÂ Â») 
est un "
 "petit Ã©lÃ©ment de donnÃ©es envoyÃ© dâun site Web et stockÃ© sur 
lâordinateur de "
 "lâutilisateur par le [navigateur Web](#Web-browser) de lâutilisateur 
quand "
-"il parcourt des sites. [Le Navigateur Tor](#tor-browser) nâenregistre pas 
de"
-" tÃ©moins."
+"il parcourt des sites. Le [Navigateur Tor](#tor-browser) nâenregistre aucun 
"
+"tÃ©moin."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1012,7 +1012,7 @@ msgstr ""
 #: https//support.torproject.org/misc/tor-glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "HTTPS Everywhere is installed in [Tor Browser](#tor-browser)."
-msgstr "HTTPS Everywhere est installÃ© dans [Navigateur Tor](#tor-browser)."
+msgstr "HTTPS partout est installÃ© dans le [Navigateur Tor](#tor-browser)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1083,7 +1083,7 @@ msgid ""
 "[Tor Browser](#tor-browser) obscures your location by making it look like "
 "your [traffic](#traffic) is coming from an IP address that is not your own."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) dissimule votre position gÃ©ographique en "
+"Le [Navigateur Tor](#tor-browser) dissimule votre position gÃ©ographique en "
 "prÃ©tendant que votre [trafic](#traffic) provient dâune adresse IP qui 
nâest "
 "pas la vÃ´tre."
 
@@ -1115,12 +1115,12 @@ msgid ""
 "websites."
 msgstr ""
 "JavaScript est un langage de programmation que les sites Web utilisent pour "
-"offrir des Ã©lÃ©ments interactifs tels que la vidÃ©o, l'animation, l'audio et 
"
-"la chronologie des Ã©tats. Malheureusement, JavaScript peut aussi activer des"
-" attaques sur la sÃ©curitÃ© du [navigateur Web](#Web-browser), ce qui peut "
-"conduire Ã  la dÃ©anonymisation. Le [NoScript](#noscript)[extension](#add-on-"
-"extension-or-or-plugin) dans [le Navigateur Tor](#tor-browser) peut Ãªtre "
-"utilisÃ© pour gÃ©rer Javascript sur diffÃ©rents sites Web."
+"offrir des Ã©lÃ©ments interactifs tels que la vidÃ©o, lâanimation, le son 
et la"
+" chronologie des Ã©tats. Malheureusement, JavaScript peut aussi permettre des"
+" attaques contre la sÃ©curitÃ© du [navigateur Web](#Web-browser), ce qui peut 
"
+"conduire Ã  la dÃ©sanonymisation. Dans [le Navigateur Tor](#tor-browser), "
+"lâ[extension](#add-on-extension-or-or-plugin) [NoScript](#noscript) peut "
+"Ãªtre utilisÃ©e pour gÃ©rer JavaScript sur diffÃ©rents sites Web."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1343,11 +1343,11 @@ msgid ""
 "the window, which allows you to control the [JavaScript](#javascript)that "
 "runs on individual web pages, or to block it entirely."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) comprend une [extension](#add-on-"
+"Le [Navigateur Tor](#tor-browser) comprend une [extension](#add-on-"
 "extension-or-or-plugin) appelÃ©e NoScript, Ã  laquelle lâon peut accÃ©der 
par "
-"lâicÃ´ne Â«Â SÂ Â» en haut Ã  gauche de la fenÃªtre. Elle vous permet de 
contrÃ´ler "
-"le [JavaScript](#javascript) qui sâexÃ©cute sur les diffÃ©rentes pages Web 
ou "
-"de le bloquer entiÃ¨rement."
+"lâicÃ´ne Â«Â SÂ Â» situÃ©e en haut Ã  gauche de la fenÃªtre. Elle vous 
permet de "
+"contrÃ´ler le [JavaScript](#javascript) qui sâexÃ©cute sur les diffÃ©rentes 
"
+"pages Web ou de le bloquer entiÃ¨rement."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1645,11 +1645,11 @@ msgid ""
 "enhancing features to make them compatible with Firefox for Android and the "
 "Android [operating

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

2019-02-21 Thread translation

commit 90ab267abf9c671ce563a2e2b8307be2e9a84b9d
Author: Translation commit bot 
Date:   Thu Feb 21 19:20:36 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 7e44df6b2..d4321aa6f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -284,7 +284,7 @@ msgstr ""
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "[Tor Browser](#tor-browser) prevents fingerprinting."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) empÃªche le pistage par empreinte 
numÃ©rique"
+"Le [Navigateur Tor](#tor-browser) empÃªche le pistage par empreinte 
numÃ©rique"
 " unique."
 
 #: https//support.torproject.org/glossary/
@@ -314,7 +314,7 @@ msgid ""
 "[Tor Browser](#tor-browser) deletes your browsing history after you close "
 "your [session](#session)."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) efface votre historique de navigation "
+"Le [Navigateur Tor](#tor-browser) efface votre historique de navigation "
 "aprÃ¨s fermeture de votre [session](#session)."
 
 #: https//support.torproject.org/glossary/
@@ -489,8 +489,8 @@ msgstr ""
 "Un tÃ©moin [HTTP](#http) (aussi appelÃ© fichier tÃ©moin ou Â«Â cookieÂ Â») 
est un "
 "petit Ã©lÃ©ment de donnÃ©es envoyÃ© dâun site Web et stockÃ© sur 
lâordinateur de "
 "lâutilisateur par le [navigateur Web](#Web-browser) de lâutilisateur 
quand "
-"il parcourt des sites. [Le Navigateur Tor](#tor-browser) nâenregistre pas 
de"
-" tÃ©moins."
+"il parcourt des sites. Le [Navigateur Tor](#tor-browser) nâenregistre aucun 
"
+"tÃ©moin."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1012,7 +1012,7 @@ msgstr ""
 #: https//support.torproject.org/misc/tor-glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "HTTPS Everywhere is installed in [Tor Browser](#tor-browser)."
-msgstr "HTTPS Everywhere est installÃ© dans [Navigateur Tor](#tor-browser)."
+msgstr "HTTPS partout est installÃ© dans le [Navigateur Tor](#tor-browser)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1083,7 +1083,7 @@ msgid ""
 "[Tor Browser](#tor-browser) obscures your location by making it look like "
 "your [traffic](#traffic) is coming from an IP address that is not your own."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) dissimule votre position gÃ©ographique en "
+"Le [Navigateur Tor](#tor-browser) dissimule votre position gÃ©ographique en "
 "prÃ©tendant que votre [trafic](#traffic) provient dâune adresse IP qui 
nâest "
 "pas la vÃ´tre."
 
@@ -1115,12 +1115,12 @@ msgid ""
 "websites."
 msgstr ""
 "JavaScript est un langage de programmation que les sites Web utilisent pour "
-"offrir des Ã©lÃ©ments interactifs tels que la vidÃ©o, l'animation, l'audio et 
"
-"la chronologie des Ã©tats. Malheureusement, JavaScript peut aussi activer des"
-" attaques sur la sÃ©curitÃ© du [navigateur Web](#Web-browser), ce qui peut "
-"conduire Ã  la dÃ©anonymisation. Le [NoScript](#noscript)[extension](#add-on-"
-"extension-or-or-plugin) dans [le Navigateur Tor](#tor-browser) peut Ãªtre "
-"utilisÃ© pour gÃ©rer Javascript sur diffÃ©rents sites Web."
+"offrir des Ã©lÃ©ments interactifs tels que la vidÃ©o, lâanimation, le son 
et la"
+" chronologie des Ã©tats. Malheureusement, JavaScript peut aussi permettre des"
+" attaques contre la sÃ©curitÃ© du [navigateur Web](#Web-browser), ce qui peut 
"
+"conduire Ã  la dÃ©sanonymisation. Dans [le Navigateur Tor](#tor-browser), "
+"lâ[extension](#add-on-extension-or-or-plugin) [NoScript](#noscript) peut "
+"Ãªtre utilisÃ©e pour gÃ©rer JavaScript sur diffÃ©rents sites Web."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1343,11 +1343,11 @@ msgid ""
 "the window, which allows you to control the [JavaScript](#javascript)that "
 "runs on individual web pages, or to block it entirely."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) comprend une [extension](#add-on-"
+"Le [Navigateur Tor](#tor-browser) comprend une [extension](#add-on-"
 "extension-or-or-plugin) appelÃ©e NoScript, Ã  laquelle lâon peut accÃ©der 
par "
-"lâicÃ´ne Â«Â SÂ Â» en haut Ã  gauche de la fenÃªtre. Elle vous permet de 
contrÃ´ler "
-"le [JavaScript](#javascript) qui sâexÃ©cute sur les diffÃ©rentes pages Web 
ou "
-"de le bloquer entiÃ¨rement."
+"lâicÃ´ne Â«Â SÂ Â» situÃ©e en haut Ã  gauche de la fenÃªtre. Elle vous 
permet de "
+"contrÃ´ler le [JavaScript](#javascript) qui sâexÃ©cute sur les diffÃ©rentes 
"
+"pages Web ou de le bloquer entiÃ¨rement."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1645,11 +1645,11 @@ msgid ""
 "enhancing features to make them compatible with Firefox for Android and the "
 "Android [operating

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

2019-02-21 Thread translation

commit b5d0fc1406dc27a7b0e52554f96dffc148ee3dbe
Author: Translation commit bot 
Date:   Thu Feb 21 19:17:45 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 717a2bd6b..94867a60f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -213,10 +213,10 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
 "Institute](https://tor.calyxinstitute.org)."
 msgstr ""
-"Si vous ne parvenez pas Ã  tÃ©lÃ©charger le Navigateur Tor Ã  partir du site "
-"officiel du Projet Tor, vous pouvez essayer de le tÃ©lÃ©charger Ã  partir 
dâun "
-"de nos miroirs officiels, soit via [EFF](https://tor.eff.org) ou [Calyx "
-"Institute](https://tor.calyxinstitute.org)."
+"Si vous ne parvenez pas Ã  tÃ©lÃ©charger le Navigateur Tor du site officiel 
du "
+"Projet Tor, vous pouvez plutÃ´t essayer de le tÃ©lÃ©charger dâun de nos 
miroirs"
+" officiels, soit par la [FFÃ](https://tor.eff.org) ou lâ[Institut "
+"Calyx](https://tor.calyxinstitute.org)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)

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

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

2019-02-21 Thread translation

commit 5fb310a51835b564431c7e1521030253b53de912
Author: Translation commit bot 
Date:   Thu Feb 21 19:17:53 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+fr.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 717a2bd6b..94867a60f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -213,10 +213,10 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
 "Institute](https://tor.calyxinstitute.org)."
 msgstr ""
-"Si vous ne parvenez pas Ã  tÃ©lÃ©charger le Navigateur Tor Ã  partir du site "
-"officiel du Projet Tor, vous pouvez essayer de le tÃ©lÃ©charger Ã  partir 
dâun "
-"de nos miroirs officiels, soit via [EFF](https://tor.eff.org) ou [Calyx "
-"Institute](https://tor.calyxinstitute.org)."
+"Si vous ne parvenez pas Ã  tÃ©lÃ©charger le Navigateur Tor du site officiel 
du "
+"Projet Tor, vous pouvez plutÃ´t essayer de le tÃ©lÃ©charger dâun de nos 
miroirs"
+" officiels, soit par la [FFÃ](https://tor.eff.org) ou lâ[Institut "
+"Calyx](https://tor.calyxinstitute.org)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)

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

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

2019-02-21 Thread translation

commit 5f1f0b1b7428f6410ebabf6bbf4995be9b11b8e7
Author: Translation commit bot 
Date:   Thu Feb 21 18:50:49 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 0e2352c3e..7e44df6b2 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -199,9 +199,9 @@ msgid ""
 "authorities take periodic measurements of the [relays](#relay) in the "
 "[consensus](#consensus)."
 msgstr ""
-"Pour dÃ©terminer le dÃ©bit d'un relais, des relayes spÃ©ciaux appelÃ©s 
autoritÃ©s"
-" de la bande passante prennent des mesures pÃ©riodiques des [relais](#relais)"
-" dans le [consensus](#consensus)."
+"Pour dÃ©terminer le dÃ©bit d'un relais, des relais spÃ©ciaux appelÃ©s 
autoritÃ©s "
+"de bande passante prennent des mesures pÃ©riodiques des [relais](#relais) "
+"dans le [consensus](#consensus)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -219,10 +219,9 @@ msgid ""
 "ordinary relays, however, they are not listed publicly, so an adversary "
 "cannot identify them easily."
 msgstr ""
-"Comme les relais Tor [relayes](#relais), les ponts sont gÃ©rÃ©s par des "
-"volontaires ; contrairement aux relais ordinaires, cependant, ils ne sont "
-"pas listÃ©s publiquement, donc un adversaire ne peut pas les identifier "
-"facilement."
+"Comme les [relais](#relais), les ponts sont exploitÃ©s par des 
bÃ©nÃ©volesâ; "
+"cependant, contrairement aux relais ordinaires, ils ne sont pas listÃ©s "
+"publiquement. Un adversaire ne peut donc pas les dÃ©couvrir facilement."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -585,9 +584,9 @@ msgid ""
 " relays and periodically publishes a [consensus](#consensus) together with "
 "the other directory authorities."
 msgstr ""
-"Un relais spÃ©cial [relais](#relais) qui maintient une liste des relais en "
-"cours de fonctionnement et publie pÃ©riodiquement un [consensus](#consensus) "
-"avec les autres autoritÃ©s d'annuaire."
+"Un [relais](#relais) Ã  usage spÃ©cifique qui maintient une liste de relais 
en"
+" cours de fonctionnement et publie pÃ©riodiquement un [consensus](#consensus)"
+" avec les autres autoritÃ©s dâannuaire."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -719,8 +718,8 @@ msgid ""
 "[Tor Browser](#tor-browser) is built from a modified version of Firefox ESR "
 "(Extended Support Release)."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) est dÃ©veloppÃ© Ã  partir dâune version "
-"modifiÃ©e de Firefox ESR (Version Ã  assistance prolongÃ©e)."
+"Le [Navigateur Tor](#tor-browser) est conÃ§u Ã  partir dâune version 
modifiÃ©e "
+"de Firefox ESR (version Ã  assistance prolongÃ©e)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1230,9 +1229,9 @@ msgid ""
 " your subsequent browser activity from being linkable to what you were doing"
 " before."
 msgstr ""
-"New Identity est une fonction [le Navigateur Tor](#tor-browser) si vous "
-"voulez empÃªcher votre activitÃ© de navigation ultÃ©rieure d'Ãªtre liÃ©e Ã  
ce que"
-" vous faisiez auparavant."
+"Nouvelle identitÃ© est une fonction du [Navigateur Tor](#tor-browser) si vous"
+" voulez empÃªcher que votre activitÃ© de navigation ultÃ©rieure soit liÃ©e Ã  
ce "
+"que vous faisiez avant."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1481,9 +1480,9 @@ msgid ""
 " services (like websites) that are only accessible through the [Tor "
 "network](#tor-/-tor-network/-core-tor)."
 msgstr ""
-"Les services Onion (anciennement connus sous le nom de \"[hidden services"
-"](#hidden-services)\") sont des services (comme les sites Web) qui ne sont "
-"accessibles que par le rÃ©seau [Tor](#tor-/-tor-network/-core-tor)."
+"Les services onion (anciennement appelÃ©s Â«Â [services cachÃ©s](#hidden-"
+"services)Â Â») sont des services (comme les sites Web) qui ne sont 
accessibles"
+" que par le [rÃ©seau Tor](#tor-/-tor-network/-core-tor)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1893,11 +1892,11 @@ msgid ""
 "including [Tor Browser](#tor-browser), from different sources. You can "
 "Install Satori from the Chrome App Store."
 msgstr ""
-"C'est un [add-on](#add-on-extension-or-or-plugin) pour les navigateurs "
+"Câest une [extension](#add-on-extension-or-or-plugin) pour les navigateurs "
 "Chrome ou Chromium qui vous permet de tÃ©lÃ©charger plusieurs programmes de "
-"sÃ©curitÃ© et de confidentialitÃ©, dont [Tor Browser](#tor-browser), depuis "
-"diffÃ©rentes sources. Vous pouvez installer Satori Ã  partir de l'App Store "
-"Chrome."
+"sÃ©curitÃ© et de confidentialitÃ©, dont le [Navigateur Tor](#tor-browser), de

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

2019-02-21 Thread translation

commit 6c4ad5b2ac25dfaf81d0485bb7d6391095672e42
Author: Translation commit bot 
Date:   Thu Feb 21 18:50:41 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 0e2352c3e..7e44df6b2 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -199,9 +199,9 @@ msgid ""
 "authorities take periodic measurements of the [relays](#relay) in the "
 "[consensus](#consensus)."
 msgstr ""
-"Pour dÃ©terminer le dÃ©bit d'un relais, des relayes spÃ©ciaux appelÃ©s 
autoritÃ©s"
-" de la bande passante prennent des mesures pÃ©riodiques des [relais](#relais)"
-" dans le [consensus](#consensus)."
+"Pour dÃ©terminer le dÃ©bit d'un relais, des relais spÃ©ciaux appelÃ©s 
autoritÃ©s "
+"de bande passante prennent des mesures pÃ©riodiques des [relais](#relais) "
+"dans le [consensus](#consensus)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -219,10 +219,9 @@ msgid ""
 "ordinary relays, however, they are not listed publicly, so an adversary "
 "cannot identify them easily."
 msgstr ""
-"Comme les relais Tor [relayes](#relais), les ponts sont gÃ©rÃ©s par des "
-"volontaires ; contrairement aux relais ordinaires, cependant, ils ne sont "
-"pas listÃ©s publiquement, donc un adversaire ne peut pas les identifier "
-"facilement."
+"Comme les [relais](#relais), les ponts sont exploitÃ©s par des 
bÃ©nÃ©volesâ; "
+"cependant, contrairement aux relais ordinaires, ils ne sont pas listÃ©s "
+"publiquement. Un adversaire ne peut donc pas les dÃ©couvrir facilement."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -585,9 +584,9 @@ msgid ""
 " relays and periodically publishes a [consensus](#consensus) together with "
 "the other directory authorities."
 msgstr ""
-"Un relais spÃ©cial [relais](#relais) qui maintient une liste des relais en "
-"cours de fonctionnement et publie pÃ©riodiquement un [consensus](#consensus) "
-"avec les autres autoritÃ©s d'annuaire."
+"Un [relais](#relais) Ã  usage spÃ©cifique qui maintient une liste de relais 
en"
+" cours de fonctionnement et publie pÃ©riodiquement un [consensus](#consensus)"
+" avec les autres autoritÃ©s dâannuaire."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -719,8 +718,8 @@ msgid ""
 "[Tor Browser](#tor-browser) is built from a modified version of Firefox ESR "
 "(Extended Support Release)."
 msgstr ""
-"[Le Navigateur Tor](#tor-browser) est dÃ©veloppÃ© Ã  partir dâune version "
-"modifiÃ©e de Firefox ESR (Version Ã  assistance prolongÃ©e)."
+"Le [Navigateur Tor](#tor-browser) est conÃ§u Ã  partir dâune version 
modifiÃ©e "
+"de Firefox ESR (version Ã  assistance prolongÃ©e)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1230,9 +1229,9 @@ msgid ""
 " your subsequent browser activity from being linkable to what you were doing"
 " before."
 msgstr ""
-"New Identity est une fonction [le Navigateur Tor](#tor-browser) si vous "
-"voulez empÃªcher votre activitÃ© de navigation ultÃ©rieure d'Ãªtre liÃ©e Ã  
ce que"
-" vous faisiez auparavant."
+"Nouvelle identitÃ© est une fonction du [Navigateur Tor](#tor-browser) si vous"
+" voulez empÃªcher que votre activitÃ© de navigation ultÃ©rieure soit liÃ©e Ã  
ce "
+"que vous faisiez avant."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1481,9 +1480,9 @@ msgid ""
 " services (like websites) that are only accessible through the [Tor "
 "network](#tor-/-tor-network/-core-tor)."
 msgstr ""
-"Les services Onion (anciennement connus sous le nom de \"[hidden services"
-"](#hidden-services)\") sont des services (comme les sites Web) qui ne sont "
-"accessibles que par le rÃ©seau [Tor](#tor-/-tor-network/-core-tor)."
+"Les services onion (anciennement appelÃ©s Â«Â [services cachÃ©s](#hidden-"
+"services)Â Â») sont des services (comme les sites Web) qui ne sont 
accessibles"
+" que par le [rÃ©seau Tor](#tor-/-tor-network/-core-tor)."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)
@@ -1893,11 +1892,11 @@ msgid ""
 "including [Tor Browser](#tor-browser), from different sources. You can "
 "Install Satori from the Chrome App Store."
 msgstr ""
-"C'est un [add-on](#add-on-extension-or-or-plugin) pour les navigateurs "
+"Câest une [extension](#add-on-extension-or-or-plugin) pour les navigateurs "
 "Chrome ou Chromium qui vous permet de tÃ©lÃ©charger plusieurs programmes de "
-"sÃ©curitÃ© et de confidentialitÃ©, dont [Tor Browser](#tor-browser), depuis "
-"diffÃ©rentes sources. Vous pouvez installer Satori Ã  partir de l'App Store "
-"Chrome."
+"sÃ©curitÃ© et de confidentialitÃ©, dont le [Navigateur Tor](#tor-browser), de 
"

[tor-commits] [tor/release-0.4.0] Bump to 0.3.4.11-dev

2019-02-21 Thread nickm

commit a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index c8a641a4c..bb807094a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.11])
+AC_INIT([tor],[0.3.4.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af0ce944a..18bc2a62c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.11"
+!define VERSION "0.3.4.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3901be2f8..434b6dd4c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.11"
+#define VERSION "0.3.4.11-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:22 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump




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

[tor-commits] [tor/release-0.4.0] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit e1079266e73c70cc0e5141249ebf3199a849017d
Merge: 4a8a1f76e a56b9501f
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:52 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.




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

[tor-commits] [tor/release-0.4.0] Bump to 0.4.0.2-alpha-dev

2019-02-21 Thread nickm

commit 1bff5646e64a32b83dcf5ac5acf4e31b98382aae
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:33 2019 -0500

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

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



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

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

2019-02-21 Thread nickm

commit 81a1d7eb86e47e393eca7e4a2fd73ec340d6645e
Merge: 5030edfb5 955ca72f9
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:39 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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

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

[tor-commits] [tor/release-0.3.5] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit 5f44e1e5dc9a624d36e622bb943390f627b83867
Merge: 00a93b19c 955ca72f9
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:02 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




___
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] Bump to 0.3.5.8-dev

2019-02-21 Thread nickm

commit 955ca72f956f2747809def40b99b87b5647ee8ce
Author: Nick Mathewson 
Date:   Thu Feb 21 13:24:42 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index b83310684..52cc877db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8])
+AC_INIT([tor],[0.3.5.8-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5af1ca0dd..9d82c5c3d 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.8"
+!define VERSION "0.3.5.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3936dc850..8512da128 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.8"
+#define VERSION "0.3.5.8-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit 635c59d553e420c4c54b95ac56b7d52f53a53111
Merge: 4fd31340f a56b9501f
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:39 2019 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

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

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

[tor-commits] [tor/release-0.3.4] Bump to 0.3.4.11-dev

2019-02-21 Thread nickm

commit a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index c8a641a4c..bb807094a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.11])
+AC_INIT([tor],[0.3.4.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af0ce944a..18bc2a62c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.11"
+!define VERSION "0.3.4.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3901be2f8..434b6dd4c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.11"
+#define VERSION "0.3.4.11-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit e1079266e73c70cc0e5141249ebf3199a849017d
Merge: 4a8a1f76e a56b9501f
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:52 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.




___
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] Bump to 0.3.4.11-dev

2019-02-21 Thread nickm

commit a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index c8a641a4c..bb807094a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.11])
+AC_INIT([tor],[0.3.4.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af0ce944a..18bc2a62c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.11"
+!define VERSION "0.3.4.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3901be2f8..434b6dd4c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.11"
+#define VERSION "0.3.4.11-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:22 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump




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

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

2019-02-21 Thread nickm

commit b83d46feb87d1a629a1798907cac279df257df05
Merge: f3e21c276 fb309f6eb
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:39 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

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

[tor-commits] [tor/master] Bump to 0.3.5.8-dev

2019-02-21 Thread nickm

commit 955ca72f956f2747809def40b99b87b5647ee8ce
Author: Nick Mathewson 
Date:   Thu Feb 21 13:24:42 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index b83310684..52cc877db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8])
+AC_INIT([tor],[0.3.5.8-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5af1ca0dd..9d82c5c3d 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.8"
+!define VERSION "0.3.5.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3936dc850..8512da128 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.8"
+#define VERSION "0.3.5.8-dev"
 
 
 



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

[tor-commits] [tor/release-0.3.3] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 



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

[tor-commits] [tor/release-0.4.0] Bump to 0.3.5.8-dev

2019-02-21 Thread nickm

commit 955ca72f956f2747809def40b99b87b5647ee8ce
Author: Nick Mathewson 
Date:   Thu Feb 21 13:24:42 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index b83310684..52cc877db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8])
+AC_INIT([tor],[0.3.5.8-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5af1ca0dd..9d82c5c3d 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.8"
+!define VERSION "0.3.5.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3936dc850..8512da128 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.8"
+#define VERSION "0.3.5.8-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit 37698d92bbf601d8399292f9e42a09d188cc5d5f
Merge: feb744f0d 1bff5646e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:39 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files 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/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-02-21 Thread nickm

commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:22 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump




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

2019-02-21 Thread nickm

commit 9ac8c854354eac7178eb8e99384f34c5a7abd5f4
Merge: 658770a0f 1bff5646e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:54 2019 -0500

Merge branch 'maint-0.4.0'

"ours" to avoid version bump.

___
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] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 



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

[tor-commits] [tor/master] Bump to 0.4.0.2-alpha-dev

2019-02-21 Thread nickm

commit 1bff5646e64a32b83dcf5ac5acf4e31b98382aae
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:33 2019 -0500

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

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



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

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

2019-02-21 Thread nickm

commit e1079266e73c70cc0e5141249ebf3199a849017d
Merge: 4a8a1f76e a56b9501f
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:52 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.




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

2019-02-21 Thread nickm

commit 5f44e1e5dc9a624d36e622bb943390f627b83867
Merge: 00a93b19c 955ca72f9
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:02 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




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

[tor-commits] [tor/maint-0.4.0] Bump to 0.3.5.8-dev

2019-02-21 Thread nickm

commit 955ca72f956f2747809def40b99b87b5647ee8ce
Author: Nick Mathewson 
Date:   Thu Feb 21 13:24:42 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index b83310684..52cc877db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8])
+AC_INIT([tor],[0.3.5.8-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5af1ca0dd..9d82c5c3d 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.8"
+!define VERSION "0.3.5.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3936dc850..8512da128 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.8"
+#define VERSION "0.3.5.8-dev"
 
 
 



___
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] Bump to 0.3.5.8-dev

2019-02-21 Thread nickm

commit 955ca72f956f2747809def40b99b87b5647ee8ce
Author: Nick Mathewson 
Date:   Thu Feb 21 13:24:42 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index b83310684..52cc877db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8])
+AC_INIT([tor],[0.3.5.8-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5af1ca0dd..9d82c5c3d 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.8"
+!define VERSION "0.3.5.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3936dc850..8512da128 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.8"
+#define VERSION "0.3.5.8-dev"
 
 
 

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

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

2019-02-21 Thread nickm

commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:22 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump




___
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] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 



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

[tor-commits] [tor/maint-0.4.0] Bump to 0.4.0.2-alpha-dev

2019-02-21 Thread nickm

commit 1bff5646e64a32b83dcf5ac5acf4e31b98382aae
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:33 2019 -0500

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

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

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

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

2019-02-21 Thread nickm

commit 5f44e1e5dc9a624d36e622bb943390f627b83867
Merge: 00a93b19c 955ca72f9
Author: Nick Mathewson 
Date:   Thu Feb 21 13:25:02 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




___
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.3' into maint-0.3.4

2019-02-21 Thread nickm

commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:22 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump




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

[tor-commits] [tor/maint-0.4.0] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 



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

[tor-commits] [tor/maint-0.4.0] Bump to 0.3.4.11-dev

2019-02-21 Thread nickm

commit a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index c8a641a4c..bb807094a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.11])
+AC_INIT([tor],[0.3.4.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af0ce944a..18bc2a62c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.11"
+!define VERSION "0.3.4.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3901be2f8..434b6dd4c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.11"
+#define VERSION "0.3.4.11-dev"
 
 
 



___
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] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:22 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump




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

[tor-commits] [tor/master] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit e1079266e73c70cc0e5141249ebf3199a849017d
Merge: 4a8a1f76e a56b9501f
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:52 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.




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

[tor-commits] [tor/master] Bump to 0.3.4.11-dev

2019-02-21 Thread nickm

commit a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index c8a641a4c..bb807094a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.11])
+AC_INIT([tor],[0.3.4.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af0ce944a..18bc2a62c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.11"
+!define VERSION "0.3.4.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3901be2f8..434b6dd4c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.11"
+#define VERSION "0.3.4.11-dev"
 
 
 



___
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] Bump to 0.3.4.11-dev

2019-02-21 Thread nickm

commit a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index c8a641a4c..bb807094a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.11])
+AC_INIT([tor],[0.3.4.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af0ce944a..18bc2a62c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.11"
+!define VERSION "0.3.4.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3901be2f8..434b6dd4c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.11"
+#define VERSION "0.3.4.11-dev"
 
 
 



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

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

2019-02-21 Thread nickm

commit e1079266e73c70cc0e5141249ebf3199a849017d
Merge: 4a8a1f76e a56b9501f
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:52 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.




___
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] Bump to 0.3.4.11-dev

2019-02-21 Thread nickm

commit a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index c8a641a4c..bb807094a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.11])
+AC_INIT([tor],[0.3.4.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af0ce944a..18bc2a62c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.11"
+!define VERSION "0.3.4.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3901be2f8..434b6dd4c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.11"
+#define VERSION "0.3.4.11-dev"
 
 
 

___
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.3] Bump to 0.3.3.12-dev

2019-02-21 Thread nickm

commit fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: Nick Mathewson 
Date:   Thu Feb 21 13:22:56 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 5162a70e6..aaa0e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.12])
+AC_INIT([tor],[0.3.3.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24d1076b..e4dc0ab5f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.12"
+!define VERSION "0.3.3.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 472ab87b6..13e65955e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.12"
+#define VERSION "0.3.3.12-dev"
 
 
 

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

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

2019-02-21 Thread nickm

commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson 
Date:   Thu Feb 21 13:23:22 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump




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

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

2019-02-21 Thread translation

commit 1326986ee864cb9f80adcc21d8f8909bb589e192
Author: Translation commit bot 
Date:   Thu Feb 21 18:20:05 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 64f684e45..0e2352c3e 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -833,10 +833,10 @@ msgid ""
 "Twitter) with links to the latest version of [Tor Browser](#tor-browser), "
 "hosted at a variety of locations, such as Dropbox, Google Drive and Github."
 msgstr ""
-"C'est un service qui rÃ©pond automatiquement aux messages (Email, XMPP, "
-"Twitter) avec des liens vers la derniÃ¨re version de [le Navigateur Tor"
-"](#tor-browser), hÃ©bergÃ© Ã  diffÃ©rents endroits, tels que Dropbox, Google "
-"Drive et Github."
+"Câest un service qui rÃ©pond automatiquement aux messages (courriel, XMPP, "
+"Twitter) avec des liens vers la derniÃ¨re version du [Navigateur Tor](#tor-"
+"browser), hÃ©bergÃ©e en diffÃ©rents endroits, tels que Dropbox, Google Drive 
et"
+" GitHub."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)

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

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

2019-02-21 Thread translation

commit f530c60ca26038149c6eda02479f3fbf95650c70
Author: Translation commit bot 
Date:   Thu Feb 21 18:20:12 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 64f684e45..0e2352c3e 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -833,10 +833,10 @@ msgid ""
 "Twitter) with links to the latest version of [Tor Browser](#tor-browser), "
 "hosted at a variety of locations, such as Dropbox, Google Drive and Github."
 msgstr ""
-"C'est un service qui rÃ©pond automatiquement aux messages (Email, XMPP, "
-"Twitter) avec des liens vers la derniÃ¨re version de [le Navigateur Tor"
-"](#tor-browser), hÃ©bergÃ© Ã  diffÃ©rents endroits, tels que Dropbox, Google "
-"Drive et Github."
+"Câest un service qui rÃ©pond automatiquement aux messages (courriel, XMPP, "
+"Twitter) avec des liens vers la derniÃ¨re version du [Navigateur Tor](#tor-"
+"browser), hÃ©bergÃ©e en diffÃ©rents endroits, tels que Dropbox, Google Drive 
et"
+" GitHub."
 
 #: https//support.torproject.org/glossary/
 #: (content/glossary/contents+en.lrquestion.description)

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

[tor-commits] [webwml/master] new tor source release versions

2019-02-21 Thread nickm

commit dd00ba6e86da8a3a7b15913c11dc154a5e258f11
Author: Nick Mathewson 
Date:   Thu Feb 21 12:50:07 2019 -0500

new tor source release versions
---
 Makefile | 4 ++--
 include/versions.wmi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ba3058ac..258ce3d6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@
 # branch to your personal webwml repository, open a trac ticket in the
 # website component, and set it to needs_review.
 
-export STABLETAG=tor-0.3.5.7
-export DEVTAG=tor-0.4.0.1-alpha
+export STABLETAG=tor-0.3.5.8
+export DEVTAG=tor-0.4.0.2-alpha
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index 13429dc3..c3f4ac60 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
-0.3.5.7
-0.4.0.1-alpha
+0.3.5.8
+0.4.0.2-alpha
 
 maint-8.0
 

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

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

2019-02-21 Thread translation

commit 2b766a88dbae252f79fe1b07bcc460dd823bdbb3
Author: Translation commit bot 
Date:   Thu Feb 21 15:46:24 2019 +

Update translations for https_everywhere_completed
---
 it/https-everywhere.dtd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd
index 2f91e36c1..3a2f573d4 100644
--- a/it/https-everywhere.dtd
+++ b/it/https-everywhere.dtd
@@ -33,8 +33,9 @@
 
 
 
-
+
 
+
 
 
 

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

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

2019-02-21 Thread translation

commit 66ca01d7c0669d19402ee731a7ae785edafcb5e2
Author: Translation commit bot 
Date:   Thu Feb 21 15:46:15 2019 +

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

diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd
index 2b56ac8ae..3a2f573d4 100644
--- a/it/https-everywhere.dtd
+++ b/it/https-everywhere.dtd
@@ -33,7 +33,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [tor/master] Copy today's releases into changelogs and releasenotes.

2019-02-21 Thread nickm

commit 85e1c493788557a3256bbe732208654340c3344b
Author: Nick Mathewson 
Date:   Thu Feb 21 10:32:08 2019 -0500

Copy today's releases into changelogs and releasenotes.
---
 ChangeLog| 321 +++
 ReleaseNotes | 186 ++
 2 files changed, 507 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e6bcc806e..dd2a98469 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,324 @@
+Changes in version 0.3.5.8 - 2019-02-21
+  Tor 0.3.5.8 backports serveral fixes from later releases, including fixes
+  for an annoying SOCKS-parsing bug that affected users in earlier 0.3.5.x
+  releases.
+
+  It also includes a fix for a medium-severity security bug affecting Tor
+  0.3.2.1-alpha and later. All Tor instances running an affected release
+  should upgrade to 0.3.3.12, 0.3.4.11, 0.3.5.8, or 0.4.0.2-alpha.
+
+  o Major bugfixes (cell scheduler, KIST, security):
+- Make KIST consider the outbuf length when computing what it can
+  put in the outbuf. Previously, KIST acted as though the outbuf
+  were empty, which could lead to the outbuf becoming too full. It
+  is possible that an attacker could exploit this bug to cause a Tor
+  client or relay to run out of memory and crash. Fixes bug 29168;
+  bugfix on 0.3.2.1-alpha. This issue is also being tracked as
+  TROVE-2019-001 and CVE-2019-8955.
+
+  o Major bugfixes (networking, backport from 0.4.0.2-alpha):
+- Gracefully handle empty username/password fields in SOCKS5
+  username/password auth messsage and allow SOCKS5 handshake to
+  continue. Previously, we had rejected these handshakes, breaking
+  certain applications. Fixes bug 29175; bugfix on 0.3.5.1-alpha.
+
+  o Minor features (compilation, backport from 0.4.0.2-alpha):
+- Compile correctly when OpenSSL is built with engine support
+  disabled, or with deprecated APIs disabled. Closes ticket 29026.
+  Patches from "Mangix".
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the February 5 2019 Maxmind GeoLite2
+  Country database. Closes ticket 29478.
+
+  o Minor features (testing, backport from 0.4.0.2-alpha):
+- Treat all unexpected ERR and BUG messages as test failures. Closes
+  ticket 28668.
+
+  o Minor bugfixes (onion service v3, client, backport from 0.4.0.1-alpha):
+- Stop logging a "BUG()" warning and stacktrace when we find a SOCKS
+  connection waiting for a descriptor that we actually have in the
+  cache. It turns out that this can actually happen, though it is
+  rare. Now, tor will recover and retry the descriptor. Fixes bug
+  28669; bugfix on 0.3.2.4-alpha.
+
+  o Minor bugfixes (IPv6, backport from 0.4.0.1-alpha):
+- Fix tor_ersatz_socketpair on IPv6-only systems. Previously, the
+  IPv6 socket was bound using an address family of AF_INET instead
+  of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. Patch from
+  Kris Katterjohn.
+
+  o Minor bugfixes (build, compatibility, rust, backport from 0.4.0.2-alpha):
+- Update Cargo.lock file to match the version made by the latest
+  version of Rust, so that "make distcheck" will pass again. Fixes
+  bug 29244; bugfix on 0.3.3.4-alpha.
+
+  o Minor bugfixes (client, clock skew, backport from 0.4.0.1-alpha):
+- Select guards even if the consensus has expired, as long as the
+  consensus is still reasonably live. Fixes bug 24661; bugfix
+  on 0.3.0.1-alpha.
+
+  o Minor bugfixes (compilation, backport from 0.4.0.1-alpha):
+- Compile correctly on OpenBSD; previously, we were missing some
+  headers required in order to detect it properly. Fixes bug 28938;
+  bugfix on 0.3.5.1-alpha. Patch from Kris Katterjohn.
+
+  o Minor bugfixes (documentation, backport from 0.4.0.2-alpha):
+- Describe the contents of the v3 onion service client authorization
+  files correctly: They hold public keys, not private keys. Fixes
+  bug 28979; bugfix on 0.3.5.1-alpha. Spotted by "Felixix".
+
+  o Minor bugfixes (logging, backport from 0.4.0.1-alpha):
+- Rework rep_hist_log_link_protocol_counts() to iterate through all
+  link protocol versions when logging incoming/outgoing connection
+  counts. Tor no longer skips version 5, and we won't have to
+  remember to update this function when new link protocol version is
+  developed. Fixes bug 28920; bugfix on 0.2.6.10.
+
+  o Minor bugfixes (logging, backport from 0.4.0.2-alpha):
+- Log more information at "warning" level when unable to read a
+  private key; log more information at "info" level when unable to
+  read a public key. We had warnings here before, but they were lost
+  during our NSS work. Fixes bug 29042; bugfix on 0.3.5.1-alpha.
+
+  o Minor bugfixes (misc, backport from 0.4.0.2-alpha):
+- The amount of total available physical memory is now determined
+  using the sysctl identifier HW_PHYSMEM (rather than

[tor-commits] [tor/release-0.3.4] 0.3.4.11: copy changelog to releasenotes

2019-02-21 Thread nickm

commit 4fd31340f3355342deebf49b586ae38bc2e9c8fe
Author: Nick Mathewson 
Date:   Thu Feb 21 10:31:44 2019 -0500

0.3.4.11: copy changelog to releasenotes
---
 ReleaseNotes | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index 37e4eab75..cba32f82e 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,37 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.3.4.11 - 2019-02-21
+  Tor 0.3.4.11 is the third stable release in its series.  It includes
+  a fix for a medium-severity security bug affecting Tor 0.3.2.1-alpha and
+  later. All Tor instances running an affected release should upgrade to
+  0.3.3.12, 0.3.4.11, 0.3.5.8, or 0.4.0.2-alpha.
+
+  o Major bugfixes (cell scheduler, KIST, security):
+- Make KIST consider the outbuf length when computing what it can
+  put in the outbuf. Previously, KIST acted as though the outbuf
+  were empty, which could lead to the outbuf becoming too full. It
+  is possible that an attacker could exploit this bug to cause a Tor
+  client or relay to run out of memory and crash. Fixes bug 29168;
+  bugfix on 0.3.2.1-alpha. This issue is also being tracked as
+  TROVE-2019-001 and CVE-2019-8955.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the February 5 2019 Maxmind GeoLite2
+  Country database. Closes ticket 29478.
+
+  o Minor bugfixes (build, compatibility, rust, backport from 0.4.0.2-alpha):
+- Update Cargo.lock file to match the version made by the latest
+  version of Rust, so that "make distcheck" will pass again. Fixes
+  bug 29244; bugfix on 0.3.3.4-alpha.
+
+  o Minor bugfixes (onion services, backport from 0.4.0.2-alpha):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..."
+  as a warning. Instead, log it as a protocol warning, because there
+  is nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
+
+
 Changes in version 0.3.4.10 - 2019-01-07
   Tor 0.3.4.9 is the second stable release in its series; it backports
   numerous fixes, including an important fix for relays, and for anyone

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

[tor-commits] [tor/master] Remove changes entries for fixes that appeared in 0.4.0.2-alpha

2019-02-21 Thread nickm

commit 658770a0f05810cf9a12f4efe349ecda9b63c969
Author: Nick Mathewson 
Date:   Thu Feb 21 10:33:16 2019 -0500

Remove changes entries for fixes that appeared in 0.4.0.2-alpha
---
 changes/bug28698 | 3 ---
 changes/bug28979 | 4 
 changes/bug28981 | 5 -
 changes/bug29029 | 5 -
 changes/bug29040 | 4 
 changes/bug29042 | 5 -
 changes/bug29122 | 3 ---
 changes/bug29135 | 5 -
 changes/bug29145 | 3 ---
 changes/bug29150 | 3 ---
 changes/bug29161 | 3 ---
 changes/bug29169 | 3 ---
 changes/bug29175_035 | 4 
 changes/bug29244 | 4 
 changes/bug29298 | 5 -
 changes/bug29508 | 3 ---
 changes/doc28623 | 3 ---
 changes/feature28976 | 4 
 changes/geoip-2019-02-05 | 4 
 changes/ticket26698  | 4 
 changes/ticket27761  | 4 
 changes/ticket28614  | 8 
 changes/ticket28668  | 3 ---
 changes/ticket29026  | 4 
 changes/ticket29072  | 2 --
 changes/ticket29160  | 4 
 changes/ticket29168  | 5 -
 27 files changed, 107 deletions(-)

diff --git a/changes/bug28698 b/changes/bug28698
deleted file mode 100644
index 716aa0c55..0
--- a/changes/bug28698
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfix (logging):
-- Avoid logging about relaxing circuits when their time is fixed.
-  Fixes bug 28698; bugfix on 0.2.4.7-alpha
diff --git a/changes/bug28979 b/changes/bug28979
deleted file mode 100644
index 0625fd5d2..0
--- a/changes/bug28979
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (documentation):
-- Describe the contents of the v3 onion service client authorization
-  files correctly: They hold public keys, not private keys. Fixes bug
-  28979; bugfix on 0.3.5.1-alpha. Spotted by "Felixix".
diff --git a/changes/bug28981 b/changes/bug28981
deleted file mode 100644
index c0ea92ab3..0
--- a/changes/bug28981
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (misc):
-- The amount of total available physical memory is now determined
-  using the sysctl identifier HW_PHYSMEM (rather than HW_USERMEM)
-  when it is defined and a 64-bit variant is not available.  Fixes
-  bug 28981; bugfix on 0.2.5.4-alpha.  Patch from Kris Katterjohn.
diff --git a/changes/bug29029 b/changes/bug29029
deleted file mode 100644
index e100a8c2e..0
--- a/changes/bug29029
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (logging, onion services):
-- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
-  a warning. Instead, log it as a protocol warning, because there is
-  nothing that relay operators can do to fix it. Fixes bug 29029;
-  bugfix on 0.2.5.7-rc.
diff --git a/changes/bug29040 b/changes/bug29040
deleted file mode 100644
index 0662aaa8a..0
--- a/changes/bug29040
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (onion services):
-- Avoid crashing if ClientOnionAuthDir (incorrectly) contains
-  more than one private key for a hidden service. Fixes bug 29040;
-  bugfix on 0.3.5.1-alpha.
diff --git a/changes/bug29042 b/changes/bug29042
deleted file mode 100644
index 8d76939ce..0
--- a/changes/bug29042
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (logging):
-- Log more information at "warning" level when unable to read a private
-  key; log more information ad "info" level when unable to read a public
-  key. We had warnings here before, but they were lost during our
-  NSS work. Fixes bug 29042; bugfix on 0.3.5.1-alpha.
diff --git a/changes/bug29122 b/changes/bug29122
deleted file mode 100644
index 020052ff8..0
--- a/changes/bug29122
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (unit tests):
-- Fix intermittent failures on an adaptive padding unittest. Fixes bug
-  29122; bugfix on 0.4.0.1-alpha
diff --git a/changes/bug29135 b/changes/bug29135
deleted file mode 100644
index fd7b1ae80..0
--- a/changes/bug29135
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (onion services, logging):
-- In hs_cache_store_as_client() log an HSDesc we failed to parse at Debug
-  loglevel. Tor used to log it at Warning loglevel, which caused
-  very long log lines to appear for some users. Fixes bug 29135; bugfix on
-  0.3.2.1-alpha.
diff --git a/changes/bug29145 b/changes/bug29145
deleted file mode 100644
index 40d3da4b9..0
--- a/changes/bug29145
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (compilation, testing):
-- Silence a compiler warning in test-memwipe.c on OpenBSD.  Fixes
-  bug 29145; bugfix on 0.2.9.3-alpha.  Patch from Kris Katterjohn.
diff --git a/changes/bug29150 b/changes/bug29150
deleted file mode 100644
index 7696b9037..0
--- a/changes/bug29150
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (linux seccomp sandbox):
-- Fix startup crash when experimental sandbox support is enabled.
-  Fixes

[tor-commits] [tor/release-0.3.3] 0.3.3.12: copy changelog to releasenotes

2019-02-21 Thread nickm

commit f3e21c27631ee40603c1cab01b8e6b495689b69c
Author: Nick Mathewson 
Date:   Thu Feb 21 10:31:58 2019 -0500

0.3.3.12: copy changelog to releasenotes
---
 ReleaseNotes | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index 7f217cb56..7c40ec1a4 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,41 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.3.3.12 - 2019-02-21
+  Tor 0.3.3.12 fixes a medium-severity security bug affecting Tor
+  0.3.2.1-alpha and later. All Tor instances running an affected release
+  should upgrade to 0.3.3.12, 0.3.4.11, 0.3.5.8, or 0.4.0.2-alpha.
+
+  This release marks the end of support for the Tor 0.3.3.x series. We
+  recommend that users switch to either the Tor 0.3.4 series (supported
+  until at least 10 June 2019), or the Tor 0.3.5 series, which will
+  receive long-term support until at least 1 Feb 2022.
+
+  o Major bugfixes (cell scheduler, KIST, security):
+- Make KIST consider the outbuf length when computing what it can
+  put in the outbuf. Previously, KIST acted as though the outbuf
+  were empty, which could lead to the outbuf becoming too full. It
+  is possible that an attacker could exploit this bug to cause a Tor
+  client or relay to run out of memory and crash. Fixes bug 29168;
+  bugfix on 0.3.2.1-alpha. This issue is also being tracked as
+  TROVE-2019-001 and CVE-2019-8955.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the February 5 2019 Maxmind GeoLite2
+  Country database. Closes ticket 29478.
+
+  o Minor bugfixes (build, compatibility, rust, backport from 0.4.0.2-alpha):
+- Update Cargo.lock file to match the version made by the latest
+  version of Rust, so that "make distcheck" will pass again. Fixes
+  bug 29244; bugfix on 0.3.3.4-alpha.
+
+  o Minor bugfixes (onion services, backport from 0.4.0.2-alpha):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..."
+  as a warning. Instead, log it as a protocol warning, because there
+  is nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
+
+
 Changes in version 0.3.3.11 - 2019-01-07
   Tor 0.3.3.11 backports numerous fixes from later versions of Tor,
   including an important fix for anyone using OpenSSL 1.1.1. Anyone

___
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] 0.3.5.8: copy changelog to releasenotes

2019-02-21 Thread nickm

commit 5030edfb534245ed3f7e6b476f38a706247f3cb8
Author: Nick Mathewson 
Date:   Thu Feb 21 10:31:35 2019 -0500

0.3.5.8: copy changelog to releasenotes
---
 ReleaseNotes | 120 +++
 1 file changed, 120 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index 71cd5df04..83cdd185f 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,126 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.3.5.8 - 2019-02-21
+  Tor 0.3.5.8 backports serveral fixes from later releases, including fixes
+  for an annoying SOCKS-parsing bug that affected users in earlier 0.3.5.x
+  releases.
+
+  It also includes a fix for a medium-severity security bug affecting Tor
+  0.3.2.1-alpha and later. All Tor instances running an affected release
+  should upgrade to 0.3.3.12, 0.3.4.11, 0.3.5.8, or 0.4.0.2-alpha.
+
+  o Major bugfixes (cell scheduler, KIST, security):
+- Make KIST consider the outbuf length when computing what it can
+  put in the outbuf. Previously, KIST acted as though the outbuf
+  were empty, which could lead to the outbuf becoming too full. It
+  is possible that an attacker could exploit this bug to cause a Tor
+  client or relay to run out of memory and crash. Fixes bug 29168;
+  bugfix on 0.3.2.1-alpha. This issue is also being tracked as
+  TROVE-2019-001 and CVE-2019-8955.
+
+  o Major bugfixes (networking, backport from 0.4.0.2-alpha):
+- Gracefully handle empty username/password fields in SOCKS5
+  username/password auth messsage and allow SOCKS5 handshake to
+  continue. Previously, we had rejected these handshakes, breaking
+  certain applications. Fixes bug 29175; bugfix on 0.3.5.1-alpha.
+
+  o Minor features (compilation, backport from 0.4.0.2-alpha):
+- Compile correctly when OpenSSL is built with engine support
+  disabled, or with deprecated APIs disabled. Closes ticket 29026.
+  Patches from "Mangix".
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the February 5 2019 Maxmind GeoLite2
+  Country database. Closes ticket 29478.
+
+  o Minor features (testing, backport from 0.4.0.2-alpha):
+- Treat all unexpected ERR and BUG messages as test failures. Closes
+  ticket 28668.
+
+  o Minor bugfixes (onion service v3, client, backport from 0.4.0.1-alpha):
+- Stop logging a "BUG()" warning and stacktrace when we find a SOCKS
+  connection waiting for a descriptor that we actually have in the
+  cache. It turns out that this can actually happen, though it is
+  rare. Now, tor will recover and retry the descriptor. Fixes bug
+  28669; bugfix on 0.3.2.4-alpha.
+
+  o Minor bugfixes (IPv6, backport from 0.4.0.1-alpha):
+- Fix tor_ersatz_socketpair on IPv6-only systems. Previously, the
+  IPv6 socket was bound using an address family of AF_INET instead
+  of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. Patch from
+  Kris Katterjohn.
+
+  o Minor bugfixes (build, compatibility, rust, backport from 0.4.0.2-alpha):
+- Update Cargo.lock file to match the version made by the latest
+  version of Rust, so that "make distcheck" will pass again. Fixes
+  bug 29244; bugfix on 0.3.3.4-alpha.
+
+  o Minor bugfixes (client, clock skew, backport from 0.4.0.1-alpha):
+- Select guards even if the consensus has expired, as long as the
+  consensus is still reasonably live. Fixes bug 24661; bugfix
+  on 0.3.0.1-alpha.
+
+  o Minor bugfixes (compilation, backport from 0.4.0.1-alpha):
+- Compile correctly on OpenBSD; previously, we were missing some
+  headers required in order to detect it properly. Fixes bug 28938;
+  bugfix on 0.3.5.1-alpha. Patch from Kris Katterjohn.
+
+  o Minor bugfixes (documentation, backport from 0.4.0.2-alpha):
+- Describe the contents of the v3 onion service client authorization
+  files correctly: They hold public keys, not private keys. Fixes
+  bug 28979; bugfix on 0.3.5.1-alpha. Spotted by "Felixix".
+
+  o Minor bugfixes (logging, backport from 0.4.0.1-alpha):
+- Rework rep_hist_log_link_protocol_counts() to iterate through all
+  link protocol versions when logging incoming/outgoing connection
+  counts. Tor no longer skips version 5, and we won't have to
+  remember to update this function when new link protocol version is
+  developed. Fixes bug 28920; bugfix on 0.2.6.10.
+
+  o Minor bugfixes (logging, backport from 0.4.0.2-alpha):
+- Log more information at "warning" level when unable to read a
+  private key; log more information at "info" level when unable to
+  read a public key. We had warnings here before, but they were lost
+  during our NSS work. Fixes bug 29042; bugfix on 0.3.5.1-alpha.
+
+  o Minor bugfixes (misc, backport from

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

2019-02-21 Thread nickm

commit 4a8a1f76ea6cbde128f2cda49049866ea739931d
Merge: c663716b6 506264791
Author: Nick Mathewson 
Date:   Thu Feb 21 10:08:14 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/ticket29168  | 5 +
 src/core/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --cc src/core/or/scheduler_kist.c
index e17d67cfd,0..79ecb0bc7
mode 100644,00..100644
--- a/src/core/or/scheduler_kist.c
+++ b/src/core/or/scheduler_kist.c
@@@ -1,844 -1,0 +1,844 @@@
 +/* Copyright (c) 2017-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +#define SCHEDULER_KIST_PRIVATE
 +
 +#include "core/or/or.h"
 +#include "lib/container/buffers.h"
 +#include "app/config/config.h"
 +#include "core/mainloop/connection.h"
 +#include "feature/nodelist/networkstatus.h"
 +#define TOR_CHANNEL_INTERNAL_
 +#include "core/or/channel.h"
 +#include "core/or/channeltls.h"
 +#define SCHEDULER_PRIVATE_
 +#include "core/or/scheduler.h"
 +#include "lib/math/fp.h"
 +
 +#include "core/or/or_connection_st.h"
 +
 +#ifdef HAVE_SYS_IOCTL_H
 +#include 
 +#endif
 +
 +#ifdef HAVE_KIST_SUPPORT
 +/* Kernel interface needed for KIST. */
 +#include 
 +#include 
 +#endif /* HAVE_KIST_SUPPORT */
 +
 +/*
 + * Data structures and supporting functions
 + 
*/
 +
 +/* Socket_table hash table stuff. The socket_table keeps track of per-socket
 + * limit information imposed by kist and used by kist. */
 +
 +static uint32_t
 +socket_table_ent_hash(const socket_table_ent_t *ent)
 +{
 +  return (uint32_t)ent->chan->global_identifier;
 +}
 +
 +static unsigned
 +socket_table_ent_eq(const socket_table_ent_t *a, const socket_table_ent_t *b)
 +{
 +  return a->chan == b->chan;
 +}
 +
 +typedef HT_HEAD(socket_table_s, socket_table_ent_s) socket_table_t;
 +
 +static socket_table_t socket_table = HT_INITIALIZER();
 +
 +HT_PROTOTYPE(socket_table_s, socket_table_ent_s, node, socket_table_ent_hash,
 + socket_table_ent_eq)
 +HT_GENERATE2(socket_table_s, socket_table_ent_s, node, socket_table_ent_hash,
 + socket_table_ent_eq, 0.6, tor_reallocarray, tor_free_)
 +
 +/* outbuf_table hash table stuff. The outbuf_table keeps track of which
 + * channels have data sitting in their outbuf so the kist scheduler can force
 + * a write from outbuf to kernel periodically during a run and at the end of a
 + * run. */
 +
 +typedef struct outbuf_table_ent_s {
 +  HT_ENTRY(outbuf_table_ent_s) node;
 +  channel_t *chan;
 +} outbuf_table_ent_t;
 +
 +static uint32_t
 +outbuf_table_ent_hash(const outbuf_table_ent_t *ent)
 +{
 +  return (uint32_t)ent->chan->global_identifier;
 +}
 +
 +static unsigned
 +outbuf_table_ent_eq(const outbuf_table_ent_t *a, const outbuf_table_ent_t *b)
 +{
 +  return a->chan->global_identifier == b->chan->global_identifier;
 +}
 +
 +HT_PROTOTYPE(outbuf_table_s, outbuf_table_ent_s, node, outbuf_table_ent_hash,
 + outbuf_table_ent_eq)
 +HT_GENERATE2(outbuf_table_s, outbuf_table_ent_s, node, outbuf_table_ent_hash,
 + outbuf_table_ent_eq, 0.6, tor_reallocarray, tor_free_)
 +
 +/*
 + * Other internal data
 + 
*/
 +
 +/* Store the last time the scheduler was run so we can decide when to next run
 + * the scheduler based on it. */
 +static monotime_t scheduler_last_run;
 +/* This is a factor for the extra_space calculation in kist per-socket limits.
 + * It is the number of extra congestion windows we want to write to the 
kernel.
 + */
 +static double sock_buf_size_factor = 1.0;
 +/* How often the scheduler runs. */
 +STATIC int sched_run_interval = KIST_SCHED_RUN_INTERVAL_DEFAULT;
 +
 +#ifdef HAVE_KIST_SUPPORT
 +/* Indicate if KIST lite mode is on or off. We can disable it at runtime.
 + * Important to have because of the KISTLite -> KIST possible transition. */
 +static unsigned int kist_lite_mode = 0;
 +/* Indicate if we don't have the kernel support. This can happen if the kernel
 + * changed and it doesn't recognized the values passed to the syscalls needed
 + * by KIST. In that case, fallback to the naive approach. */
 +static unsigned int kist_no_kernel_support = 0;
 +#else /* !(defined(HAVE_KIST_SUPPORT)) */
 +static unsigned int kist_lite_mode = 1;
 +#endif /* defined(HAVE_KIST_SUPPORT) */
 +
 +/*
 + * Internally called function implementations
 + 
*/
 +
 +/* Little helper function to get the length of a channel's output buffer */
 +static inline size_t
 +channel_outbuf_length(channel_t *chan)
 +{
 +  tor_assert(chan);
 +  /* In theory, this can not happen because we can not scheduler a channel

[tor-commits] [tor/release-0.4.0] Add TROVE-2019-001 to changelog for 0.4.0.2-alpha

2019-02-21 Thread nickm

commit feb744f0d488a0e5768385639311f50aab1f4f5d
Author: Nick Mathewson 
Date:   Thu Feb 21 10:21:10 2019 -0500

Add TROVE-2019-001 to changelog for 0.4.0.2-alpha
---
 ChangeLog   | 13 +
 changes/ticket29168 |  5 -
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a99632ed0..8c10b6079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,19 @@ Changes in version 0.4.0.2-alpha - 2019-02-21
   bugs from earlier versions, including several that had broken
   backward compatibility.
 
+  It also includes a fix for a medium-severity security bug affecting Tor
+  0.3.2.1-alpha and later. All Tor instances running an affected release
+  should upgrade to 0.3.3.12, 0.3.4.11, 0.3.5.8, or 0.4.0.2-alpha.
+
+  o Major bugfixes (cell scheduler, KIST, security):
+- Make KIST consider the outbuf length when computing what it can
+  put in the outbuf. Previously, KIST acted as though the outbuf
+  were empty, which could lead to the outbuf becoming too full. It
+  is possible that an attacker could exploit this bug to cause a Tor
+  client or relay to run out of memory and crash. Fixes bug 29168;
+  bugfix on 0.3.2.1-alpha. This issue is also being tracked as
+  TROVE-2019-001 and CVE-2019-8955.
+
   o Major bugfixes (networking):
 - Gracefully handle empty username/password fields in SOCKS5
   username/password auth messsage and allow SOCKS5 handshake to
diff --git a/changes/ticket29168 b/changes/ticket29168
deleted file mode 100644
index 65c5232f6..0
--- a/changes/ticket29168
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (cell scheduler, KIST):
-- Make KIST to always take into account the outbuf length when computing
-  what we can actually put in the outbuf. This could lead to the outbuf
-  being filled up and thus a possible memory DoS vector. TROVE-2019-001.
-  Fixes bug 29168; bugfix on 0.3.2.1-alpha.

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

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

2019-02-21 Thread nickm

commit 50626479183858d25d4e52b80b000dbb43097917
Merge: 508002a4c be84ed1a6
Author: Nick Mathewson 
Date:   Thu Feb 21 10:08:14 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/ticket29168 | 5 +
 src/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




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

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

2019-02-21 Thread nickm

commit 50626479183858d25d4e52b80b000dbb43097917
Merge: 508002a4c be84ed1a6
Author: Nick Mathewson 
Date:   Thu Feb 21 10:08:14 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/ticket29168 | 5 +
 src/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
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] kist: Don't write above the highwater outbuf mark

2019-02-21 Thread nickm

commit be84ed1a64ed7ce810bd3924fa96c2588b491ef5
Author: David Goulet 
Date:   Thu Jan 24 10:52:08 2019 -0500

kist: Don't write above the highwater outbuf mark

KIST works by computing how much should be allowed to write to the kernel 
for
a given socket, and then it writes that amount to the outbuf.

The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.

This commit makes it for KIST to take into account the outbuf length when
computing the available space.

Bug found and patch by Rob Jansen.

Closes #29168. TROVE-2019-001.

Signed-off-by: David Goulet 
---
 changes/ticket29168 | 5 +
 src/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/ticket29168 b/changes/ticket29168
new file mode 100644
index 0..65c5232f6
--- /dev/null
+++ b/changes/ticket29168
@@ -0,0 +1,5 @@
+  o Major bugfixes (cell scheduler, KIST):
+- Make KIST to always take into account the outbuf length when computing
+  what we can actually put in the outbuf. This could lead to the outbuf
+  being filled up and thus a possible memory DoS vector. TROVE-2019-001.
+  Fixes bug 29168; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
index 6d6490077..fb33a5d1d 100644
--- a/src/or/scheduler_kist.c
+++ b/src/or/scheduler_kist.c
@@ -280,7 +280,7 @@ update_socket_info_impl, (socket_table_ent_t *ent))
   extra_space =
 clamp_double_to_int64(
  (ent->cwnd * (int64_t)ent->mss) * sock_buf_size_factor) -
-ent->notsent;
+ent->notsent - (int64_t)channel_outbuf_length((channel_t *) ent->chan);
   if ((tcp_space + extra_space) < 0) {
 /* This means that the "notsent" queue is just too big so we shouldn't put
  * more in the kernel for now. */



___
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] kist: Don't write above the highwater outbuf mark

2019-02-21 Thread nickm

commit be84ed1a64ed7ce810bd3924fa96c2588b491ef5
Author: David Goulet 
Date:   Thu Jan 24 10:52:08 2019 -0500

kist: Don't write above the highwater outbuf mark

KIST works by computing how much should be allowed to write to the kernel 
for
a given socket, and then it writes that amount to the outbuf.

The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.

This commit makes it for KIST to take into account the outbuf length when
computing the available space.

Bug found and patch by Rob Jansen.

Closes #29168. TROVE-2019-001.

Signed-off-by: David Goulet 
---
 changes/ticket29168 | 5 +
 src/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/ticket29168 b/changes/ticket29168
new file mode 100644
index 0..65c5232f6
--- /dev/null
+++ b/changes/ticket29168
@@ -0,0 +1,5 @@
+  o Major bugfixes (cell scheduler, KIST):
+- Make KIST to always take into account the outbuf length when computing
+  what we can actually put in the outbuf. This could lead to the outbuf
+  being filled up and thus a possible memory DoS vector. TROVE-2019-001.
+  Fixes bug 29168; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
index 6d6490077..fb33a5d1d 100644
--- a/src/or/scheduler_kist.c
+++ b/src/or/scheduler_kist.c
@@ -280,7 +280,7 @@ update_socket_info_impl, (socket_table_ent_t *ent))
   extra_space =
 clamp_double_to_int64(
  (ent->cwnd * (int64_t)ent->mss) * sock_buf_size_factor) -
-ent->notsent;
+ent->notsent - (int64_t)channel_outbuf_length((channel_t *) ent->chan);
   if ((tcp_space + extra_space) < 0) {
 /* This means that the "notsent" queue is just too big so we shouldn't put
  * more in the kernel for now. */



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

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

2019-02-21 Thread nickm

commit fdcd2f2f8666a78398cc23ab57fa542f3b00ce19
Merge: eb0600c6b 00a93b19c
Author: Nick Mathewson 
Date:   Thu Feb 21 10:08:14 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

 changes/ticket29168  | 5 +
 src/core/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

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

2019-02-21 Thread nickm

commit 4a8a1f76ea6cbde128f2cda49049866ea739931d
Merge: c663716b6 506264791
Author: Nick Mathewson 
Date:   Thu Feb 21 10:08:14 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/ticket29168  | 5 +
 src/core/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --cc src/core/or/scheduler_kist.c
index e17d67cfd,0..79ecb0bc7
mode 100644,00..100644
--- a/src/core/or/scheduler_kist.c
+++ b/src/core/or/scheduler_kist.c
@@@ -1,844 -1,0 +1,844 @@@
 +/* Copyright (c) 2017-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +#define SCHEDULER_KIST_PRIVATE
 +
 +#include "core/or/or.h"
 +#include "lib/container/buffers.h"
 +#include "app/config/config.h"
 +#include "core/mainloop/connection.h"
 +#include "feature/nodelist/networkstatus.h"
 +#define TOR_CHANNEL_INTERNAL_
 +#include "core/or/channel.h"
 +#include "core/or/channeltls.h"
 +#define SCHEDULER_PRIVATE_
 +#include "core/or/scheduler.h"
 +#include "lib/math/fp.h"
 +
 +#include "core/or/or_connection_st.h"
 +
 +#ifdef HAVE_SYS_IOCTL_H
 +#include 
 +#endif
 +
 +#ifdef HAVE_KIST_SUPPORT
 +/* Kernel interface needed for KIST. */
 +#include 
 +#include 
 +#endif /* HAVE_KIST_SUPPORT */
 +
 +/*
 + * Data structures and supporting functions
 + 
*/
 +
 +/* Socket_table hash table stuff. The socket_table keeps track of per-socket
 + * limit information imposed by kist and used by kist. */
 +
 +static uint32_t
 +socket_table_ent_hash(const socket_table_ent_t *ent)
 +{
 +  return (uint32_t)ent->chan->global_identifier;
 +}
 +
 +static unsigned
 +socket_table_ent_eq(const socket_table_ent_t *a, const socket_table_ent_t *b)
 +{
 +  return a->chan == b->chan;
 +}
 +
 +typedef HT_HEAD(socket_table_s, socket_table_ent_s) socket_table_t;
 +
 +static socket_table_t socket_table = HT_INITIALIZER();
 +
 +HT_PROTOTYPE(socket_table_s, socket_table_ent_s, node, socket_table_ent_hash,
 + socket_table_ent_eq)
 +HT_GENERATE2(socket_table_s, socket_table_ent_s, node, socket_table_ent_hash,
 + socket_table_ent_eq, 0.6, tor_reallocarray, tor_free_)
 +
 +/* outbuf_table hash table stuff. The outbuf_table keeps track of which
 + * channels have data sitting in their outbuf so the kist scheduler can force
 + * a write from outbuf to kernel periodically during a run and at the end of a
 + * run. */
 +
 +typedef struct outbuf_table_ent_s {
 +  HT_ENTRY(outbuf_table_ent_s) node;
 +  channel_t *chan;
 +} outbuf_table_ent_t;
 +
 +static uint32_t
 +outbuf_table_ent_hash(const outbuf_table_ent_t *ent)
 +{
 +  return (uint32_t)ent->chan->global_identifier;
 +}
 +
 +static unsigned
 +outbuf_table_ent_eq(const outbuf_table_ent_t *a, const outbuf_table_ent_t *b)
 +{
 +  return a->chan->global_identifier == b->chan->global_identifier;
 +}
 +
 +HT_PROTOTYPE(outbuf_table_s, outbuf_table_ent_s, node, outbuf_table_ent_hash,
 + outbuf_table_ent_eq)
 +HT_GENERATE2(outbuf_table_s, outbuf_table_ent_s, node, outbuf_table_ent_hash,
 + outbuf_table_ent_eq, 0.6, tor_reallocarray, tor_free_)
 +
 +/*
 + * Other internal data
 + 
*/
 +
 +/* Store the last time the scheduler was run so we can decide when to next run
 + * the scheduler based on it. */
 +static monotime_t scheduler_last_run;
 +/* This is a factor for the extra_space calculation in kist per-socket limits.
 + * It is the number of extra congestion windows we want to write to the 
kernel.
 + */
 +static double sock_buf_size_factor = 1.0;
 +/* How often the scheduler runs. */
 +STATIC int sched_run_interval = KIST_SCHED_RUN_INTERVAL_DEFAULT;
 +
 +#ifdef HAVE_KIST_SUPPORT
 +/* Indicate if KIST lite mode is on or off. We can disable it at runtime.
 + * Important to have because of the KISTLite -> KIST possible transition. */
 +static unsigned int kist_lite_mode = 0;
 +/* Indicate if we don't have the kernel support. This can happen if the kernel
 + * changed and it doesn't recognized the values passed to the syscalls needed
 + * by KIST. In that case, fallback to the naive approach. */
 +static unsigned int kist_no_kernel_support = 0;
 +#else /* !(defined(HAVE_KIST_SUPPORT)) */
 +static unsigned int kist_lite_mode = 1;
 +#endif /* defined(HAVE_KIST_SUPPORT) */
 +
 +/*
 + * Internally called function implementations
 + 
*/
 +
 +/* Little helper function to get the length of a channel's output buffer */
 +static inline size_t
 +channel_outbuf_length(channel_t *chan)
 +{
 +  tor_assert(chan);
 +  /* In theory, this can not happen because we can not scheduler a channel

[tor-commits] [tor/release-0.4.0] kist: Don't write above the highwater outbuf mark

2019-02-21 Thread nickm

commit be84ed1a64ed7ce810bd3924fa96c2588b491ef5
Author: David Goulet 
Date:   Thu Jan 24 10:52:08 2019 -0500

kist: Don't write above the highwater outbuf mark

KIST works by computing how much should be allowed to write to the kernel 
for
a given socket, and then it writes that amount to the outbuf.

The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.

This commit makes it for KIST to take into account the outbuf length when
computing the available space.

Bug found and patch by Rob Jansen.

Closes #29168. TROVE-2019-001.

Signed-off-by: David Goulet 
---
 changes/ticket29168 | 5 +
 src/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/ticket29168 b/changes/ticket29168
new file mode 100644
index 0..65c5232f6
--- /dev/null
+++ b/changes/ticket29168
@@ -0,0 +1,5 @@
+  o Major bugfixes (cell scheduler, KIST):
+- Make KIST to always take into account the outbuf length when computing
+  what we can actually put in the outbuf. This could lead to the outbuf
+  being filled up and thus a possible memory DoS vector. TROVE-2019-001.
+  Fixes bug 29168; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
index 6d6490077..fb33a5d1d 100644
--- a/src/or/scheduler_kist.c
+++ b/src/or/scheduler_kist.c
@@ -280,7 +280,7 @@ update_socket_info_impl, (socket_table_ent_t *ent))
   extra_space =
 clamp_double_to_int64(
  (ent->cwnd * (int64_t)ent->mss) * sock_buf_size_factor) -
-ent->notsent;
+ent->notsent - (int64_t)channel_outbuf_length((channel_t *) ent->chan);
   if ((tcp_space + extra_space) < 0) {
 /* This means that the "notsent" queue is just too big so we shouldn't put
  * more in the kernel for now. */



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

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

2019-02-21 Thread nickm

commit 50626479183858d25d4e52b80b000dbb43097917
Merge: 508002a4c be84ed1a6
Author: Nick Mathewson 
Date:   Thu Feb 21 10:08:14 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/ticket29168 | 5 +
 src/or/scheduler_kist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




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

1 2 >

1 - 100 of 179 matches

Mail list logo