date:20190819

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

2019-08-19 Thread translation

commit ab5ac25128e4bc33097f500e4844f7683ac5040f
Author: Translation commit bot 
Date:   Tue Aug 20 05:55:32 2019 +

Update translations for tbmanual-contentspot
---
 contents+fa.po | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/contents+fa.po b/contents+fa.po
index 92f01f3d6..a78a0bf24 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -1807,7 +1807,8 @@ msgstr "Ø¯Ø± Ø§ÛÙ Ø³Ø·ØØ ØªÙØ§Ù ÙÛÚÚ¯Û ÙØ§Û Ù
Ø±ÙØ±Ú¯Ø± ØªÙØ± Ù 
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid "This level disables website features that are often dangerous."
 msgstr ""
-"Ø§ÛÙ Ø³Ø·Ø Ø§ÙÙÛØªÛØ ØªÙØ§Ù ÙÛÚÚ¯Û ÙØ§Û Ø§ØºÙØ¨ Ø®Ø·Ø±ÙØ§Ú© 
ÛÚ© ÙØ¨ Ø³Ø§ÛØª Ø±Ø§ ØºÛØ±ÙØ¹Ø§Ù ÙÛ Ú©ÙØ¯."
+"Ø§ÛÙ Ø³Ø·Ø Ø§ÙÙÛØªÛØ ØªÙØ§Ù ÙÛÚÚ¯Û ÙØ§Û ÛÚ© ÙØ¨ Ø³Ø§ÛØª 
Ú©Ù ÙØ¹ÙÙÙØ§ Ø®Ø·Ø±ÙØ§Ú© ÙØ³ØªÙØ¯ Ø±Ø§ ØºÛØ±ÙØ¹Ø§Ù "
+"ÙÛ Ú©ÙØ¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1821,6 +1822,10 @@ msgid ""
 "sites; some fonts and math symbols are disabled; audio and video (HTML5 "
 "media) are click-to-play."
 msgstr ""
+"Ø¬Ø§ÙØ§ Ø§Ø³Ú©Ø±ÛÙ¾Øª Ø¯Ø± ØªÙØ§Ù ÙØ¨ Ø³Ø§ÛØª ÙØ§ÛÛ Ú©Ù Ø§Ø² 
Ù¾Ø±ÙØªÚ©Ù HTTPS Ø§Ø³ØªÙØ§Ø¯Ù ÙÙÛ Ú©ÙÙØ¯Ø ØºÛØ±ÙØ¹Ø§Ù ÙÛ 
Ø¨Ø§Ø´Ø¯Ø Ø¨Ø±Ø®Û ÙÙÙØª ÙØ§ Ù "
+"ÙØ´Ø§ÙÙ ÙØ§Û Ø±ÛØ§Ø¶Û ØºÛØ±ÙØ¹Ø§Ù Ø´Ø¯Ù Ø§ÙØ¯Ø Ù Ø¨Ø±Ø§Û 
Ø§Ø¬Ø±Ø§Û Ø±Ø³Ø§ÙÙ ÙØ§Û ÙÛØ¯ÛÙÛÛ Ù "
+"ØµÙØªÛ(HTML5) Ø¨Ø§ÛØ¯ Ø¨Ù ØµÙØ±Øª Ø¯Ø³ØªÛ Ø¢Ù ÙØ§ Ø±Ø§ Ø§Ø¬Ø±Ø§ 
Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1828,6 +1833,8 @@ msgid ""
 "This level only allows website features required for static sites and basic "
 "services."
 msgstr ""
+"Ø¯Ø± Ø§ÛÙ Ø³Ø·ØØ ÙÙØ· ÙÛÚÚ¯Û ÙØ§ÛÛ Ø§Ø² ÙØ¨ Ø³Ø§ÛØª ÙØ¹Ø§Ù 
ÙØ³ØªÙØ¯ Ú©Ù Ø¨Ø±Ø§Û Ø³Ø§ÛØª ÙØ§Û Ø§ÛØ³ØªØ§ Ù "
+"Ø³Ø±ÙÛØ³ ÙØ§Û Ù¾Ø§ÛÙ ÙÙØ±Ø¯ÙÛØ§Ø² ÙÛ Ø¨Ø§Ø´ÙØ¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1841,6 +1848,9 @@ msgid ""
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
+"Ø¨Ù ØµÙØ±Øª Ù¾ÛØ´ ÙØ±Ø¶Ø Ø¬Ø§ÙØ§ Ø§Ø³Ú©Ø±ÛÙ¾Øª Ø¯Ø± ØªÙØ§Ù Ø³Ø§ÛØª 
ÙØ§ ØºÛØ± ÙØ¹Ø§Ù ÙÛ Ø¨Ø§Ø´Ø¯Ø Ø¨Ø±Ø®Û Ø§Ø² "
+"Ø¢ÛÚ©ÙÙ ÙØ§Ø ÙÙÙØª ÙØ§Ø ÙØ´Ø§ÙÙ ÙØ§Û Ø±ÛØ§Ø¶Û Ù 
ØªØµØ§ÙÛØ± ÙÛØ² ØºÛØ± ÙØ¹Ø§Ù ÙØ³ØªÙØ¯Ø Ù Ø¨Ø±Ø§Û Ø§Ø¬Ø±Ø§Û"
+" Ø±Ø³Ø§ÙÙ ÙØ§Û ÙÛØ¯ÛÙÛÛ Ù ØµÙØªÛ(HTML5) Ø¨Ø§ÛØ¯ Ø¨Ù ØµÙØ±Øª 
Ø¯Ø³ØªÛ Ø¢Ù ÙØ§ Ø±Ø§ Ø§Ø¬Ø±Ø§ Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1859,6 +1869,9 @@ msgid ""
 "outdated version of the software, you may be vulnerable to serious security "
 "flaws that compromise your privacy and anonymity."
 msgstr ""
+"ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ Ø¨Ø§ÛØ¯ ÙÙÛØ´Ù Ø¨Ù Ø±ÙØ² ÙÚ¯Ù Ø¯Ø§Ø±ÛØ¯. 
Ø§Ú¯Ø± Ø´ÙØ§ Ø§Ø² ÛÚ© ÙØ³Ø®Ù ÙØ¯ÛÙÛ ÙØ±ÙØ±Ú¯Ø± "
+"Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯Ø ÙÙÚ©Ù Ø§Ø³Øª Ø¯Ø± ÙØ¹Ø±Ø¶ Ø®Ø·Ø±ÙØ§ Ù 
Ø¢Ø³ÛÛØ¨ Ù¾Ø°ÛØ±ÙØ§Û Ø¬Ø¯Û Ù Ø¯Ø± ÙØªÛØ¬Ù Ø§Ø² Ø¯Ø³Øª "
+"Ø¯Ø§Ø¯Ù Ú¯ÙÙØ§ÙÛ Ù ØØ±ÛÙ Ø®ØµÙØµÛ Ø¯Ø± ÙØ¨ Ø´ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1917,7 +1930,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
 msgid "# UPDATING TOR BROWSER MANUALLY"
-msgstr ""
+msgstr "# Ø¨Ù Ø±ÙØ²Ø±Ø³Ø§ÙÛ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø¨Ù ØµÙØ±Øª Ø¯Ø³ØªÛ"
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.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-08-19 Thread translation

commit d67775289a196b87137c3426ef45b512a9a5f949
Author: Translation commit bot 
Date:   Tue Aug 20 05:26:09 2019 +

Update translations for tbmanual-contentspot
---
 contents+fa.po | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/contents+fa.po b/contents+fa.po
index 05c9c94f0..92f01f3d6 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -1717,6 +1717,9 @@ msgid ""
 "You can do this by increasing Tor Browser's Security Settings in the shield "
 "menu."
 msgstr ""
+"Ø§ÛÙ Ú©Ø§Ø± Ø±Ø§ ÙÛ ØªÙØ§Ù Ø§Ø² Ø·Ø±ÛÙ Ø§ÙØ²Ø§ÛØ´ Ø³Ø·Ø Ø§Ù
ÙÛØªÛ Ø¯Ø± \"ØªÙØ¸ÛÙØ§Øª Ø§ÙÙÛØªÛ "
+"Ù¾ÛØ´Ø±ÙØªÙ...\" ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ú©Ù Ø¯Ø± \"ÙÙÙÛ Ø³Ù¾Ø±\" - Ø¯Ø± 
Ú©ÙØ§Ø± ÙÙØ§Ø± Ø¢Ø¯Ø±Ø³ - ÙØ±Ø§Ø± Ú¯Ø±ÙØªÙ "
+"Ø§Ø³ØªØ Ø§ÙØ¬Ø§Ù Ø¯Ø§Ø¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1725,6 +1728,9 @@ msgid ""
 "functioning properly, so you should weigh your security needs against the "
 "degree of usability you require."
 msgstr ""
+"Ø¨Ø§ Ø§ÙØ²Ø§ÛØ´ Ø¯Ø±Ø¬Ù Ø§ÙÙÛØªÛ ÙØ±ÙØ±Ú¯Ø± ØªÙØ±Ø Ø¨Ø±Ø®Û Ø¹Ù
ÙÚ©Ø±Ø¯ÙØ§ Ø¯Ø± ÙØ¨ Ø³Ø§ÛØª ÙØ§ Ø¯ÚØ§Ø± Ø§Ø®ØªÙØ§Ù "
+"Ø®ÙØ§ÙÙØ¯ Ø´Ø¯ Ù ÙÙÛ ØªÙØ§ÙÙØ¯ Ø¨Ù Ø¯Ø±Ø³ØªÛ Ú©Ø§Ø± Ú©ÙÙØ¯. 
Ø¨ÙØ§Ø¨Ø±Ø§ÛÙ Ø´ÙØ§ Ø¨Ø§ÛØ¯ Ø¨ÛÙ ÙÛØ²Ø§Ù Ø§ÙÙÛØª "
+"Ù Ø¹ÙÙÚ©Ø±Ø¯ Ø¯Ø±Ø³Øª Ù Ú©Ø§ÙÙ Ø³Ø§ÛØª ÙØ§Ø ØªÙØ§Ø²Ù Ø¨Ø±ÙØ±Ø§Ø± 
Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1737,6 +1743,8 @@ msgid ""
 "The Security Settings can be accessed by clicking the Shield icon next to "
 "the Tor Browser URL bar."
 msgstr ""
+"Ø¨Ø±Ø§Û Ø¯Ø³ØªØ±Ø³Û Ø¨Ù \"ØªÙØ¸ÛÙØ§Øª Ø§ÙÙÛØªÛ Ù¾ÛØ´Ø±ÙØªÙ...\" 
Ø¯Ø± ÙØ±ÙØ±Ú¯Ø± ØªÙØ±Ø ÙÛ Ø¨Ø§ÛØ³Øª Ø¨Ø± Ø±ÙÛ "
+"Ø¢ÛÚ©ÙÙ \"Ø³Ù¾Ø±\" -Ú©Ù Ø¯Ø± Ú©ÙØ§Ø± ÙÙØ§Ø± Ø¢Ø¯Ø±Ø³ ÙØ±Ø§Ø± 
Ú¯Ø±ÙØªÙ Ø§Ø³ØªØ Ú©ÙÛÚ© Ú©Ø±Ø¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1744,6 +1752,9 @@ msgid ""
 "To view and adjust your Security Settings, click the 'Advanced Security "
 "Settings...' button in the shield menu."
 msgstr ""
+"Ø¨Ø§ Ú©ÙÛÚ© Ø¨Ø± Ø±ÙÛ Ø¯Ú©ÙÙ \"Ø³Ù¾Ø±\" Ø¯Ø± Ú©ÙØ§Ø± ÙÙØ§Ø± Ø¢Ø¯Ø±Ø³ 
 Ù Ø³Ù¾Ø³ Ø§ÙØªØ®Ø§Ø¨ Ú¯Ø²ÛÙÙ  \"ØªÙØ¸ÛÙØ§Øª"
+" Ø§ÙÙÛØªÛ Ù¾ÛØ´Ø±ÙØªÙ...\"Ø ÙÛ ØªÙØ§Ù ØªÙØ¸ÛÙØ§Øª Ø§ÙÙÛØª Ù
Ø±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ ÙØ´Ø§ÙØ¯Ù Ú©Ø±Ø¯ ÛØ§ "
+"ØªØºÛÛØ± Ø¯Ø§Ø¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1766,6 +1777,8 @@ msgid ""
 "disable or partially disable certain browser features to protect against "
 "possible attacks."
 msgstr ""
+"Ø¨Ø§ Ø§ÙØ²Ø§ÛØ´ Ø³Ø·Ø Ø§ÙÙÛØªÛ Ø¯Ø± ÙØ±ÙØ±Ú¯Ø± ØªÙØ±Ø ÙÙÙ ÛØ§ 
Ø¨Ø±Ø®Û Ø§Ø² ÙÛÚÚ¯Û ÙØ§Û Ø®Ø§Øµ ÙØ±ÙØ±Ú¯Ø± "
+"ØºÛØ±ÙØ¹Ø§Ù ÙÛ Ø´ÙÙØ¯ ØªØ§ Ø§Ø² Ø´ÙØ§ Ø¯Ø± Ø¨Ø±Ø§Ø¨Ø± ØÙÙØ§Øª 
Ø§ØØªÙØ§ÙÛ ÙØØ§ÙØ¸Øª Ú¯Ø±Ø¯Ø¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1773,6 +1786,8 @@ msgid ""
 "You can enable these settings again at any time by adjusting your Security "
 "Level."
 msgstr ""
+"Ø´ÙØ§ ÙÛ ØªÙØ§ÙÛØ¯ ÙØ± Ø²ÙØ§Ù Ú©Ù ÙÛØ§Ø² Ø¯Ø§Ø´ØªÛØ¯Ø Ø¨Ø§ 
ØªØºÛÛØ± Ø³Ø·Ø Ø§ÙÙÛØªÛ ÙØ±ÙØ±Ú¯Ø±Ø Ø§ÛÙ "
+"ØªÙØ¸ÛÙØ§Øª Ø±Ø§ Ø¯ÙØ¨Ø§Ø±Ù ÙØ¹Ø§Ù Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1780,16 +1795,19 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
+msgstr "Ø¯Ø± Ø§ÛÙ Ø³Ø·ØØ ØªÙØ§Ù ÙÛÚÚ¯Û ÙØ§Û ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ù 
ÙØ¨ Ø³Ø§ÛØª ÙØ§Ø ÙØ¹Ø§Ù ÙÛ Ø¨Ø§Ø´ÙØ¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid "This level disables website features that are often dangerous."
 msgstr ""
+"Ø§ÛÙ Ø³Ø·Ø Ø§ÙÙÛØªÛØ ØªÙØ§Ù ÙÛÚÚ¯Û ÙØ§Û Ø§ØºÙØ¨ Ø®Ø·Ø±ÙØ§Ú© 
ÛÚ© ÙØ¨ Ø³Ø§ÛØª Ø±Ø§ ØºÛØ±ÙØ¹Ø§Ù ÙÛ Ú©ÙØ¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.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-08-19 Thread translation

commit 464887cba5c0d5c76c56a46f4b9586acee876ff0
Author: Translation commit bot 
Date:   Tue Aug 20 04:55:52 2019 +

Update translations for tbmanual-contentspot
---
 contents+fa.po | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/contents+fa.po b/contents+fa.po
index ff90cce76..05c9c94f0 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -1638,6 +1638,14 @@ msgid ""
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
+"Ø¯Ø± Ø§ÛÙ Ø³Ø·ØØ Ø¨Ø±Ø§Û Ø§Ø¬Ø±Ø§Û ÙÛØ¯ÛÙÙØ§Û HTML5 Ù Ø±Ø³Ø§ÙÙ 
ÙØ§Û ØµÙØªÛØ Ø¨Ø§ÛØ¯ Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² "
+"Ø§ÙØ²ÙÙÙ NoScript Ú©Ù Ø¨Ù ØµÙØ±Øª Ù¾ÛØ´ ÙØ±Ø¶ Ø¯Ø± ÙØ±ÙØ±Ú¯Ø± 
ØªÙØ± ÙØµØ¨ Ø´Ø¯Ù Ø§Ø³ØªØ Ø¢Ù ÙØ§ Ø±Ø§ Ø¨Ù "
+"ØµÙØ±Øª Ø¯Ø³ØªÛ Ø§Ø¬Ø±Ø§ Ú©Ø±Ø¯Ø ÙÙÙ Ø¨ÙÛÙÙ Ø³Ø§Ø²Û ÙØ§Û Ø¹Ù
ÙÚ©Ø±Ø¯ÙØ§Û Ø¬Ø§ÙØ§ Ø§Ø³Ú©Ø±ÛÙ¾Øª ØºÛØ±ÙØ¹Ø§Ù Ø´Ø¯Ù "
+"Ø§ÙØ¯Ø ÙÙÚ©Ù Ø§Ø³Øª Ø¨Ø±Ø®Û Ø§Ø² ÙØ¹Ø§Ø¯ÙØ§Øª Ø±ÛØ§Ø¶Û Ø¨Ù 
Ø¯Ø±Ø³ØªÛ ÙÙØ§ÛØ´ Ø¯Ø§Ø¯Ù ÙØ´ÙÙØ¯Ø Ø¨Ø±Ø®Û Ø§Ø² ÙÛÚÚ¯Û"
+" ÙØ§Û Ø´ÙØ§Ø³Ø§ÛÛ Ù ÙÙØ§ÛØ´ ÙÙÙØª ÙÛØ² ØºÛØ±ÙØ¹Ø§Ù Ø´Ø¯Ù 
Ø§ÙØ¯Ø Ø¨Ø¹Ø¶Û Ø§Ø² Ø§ÙÙØ§Ø¹ ØªØµØ§ÙÛØ± ØºÛØ±ÙØ¹Ø§Ù "
+"Ø´Ø¯Ù Ø§ÙØ¯Ø Ø¨Ù ØµÙØ±Øª Ù¾ÛØ´ ÙØ±Ø¶Ø Ø¬Ø§ÙØ§ Ø§Ø³Ú©Ø±ÛÙ¾Øª Ø¯Ø± 
ÙÙÙ Ø³Ø§ÛØª ÙØ§ ØºÛØ±ÙØ¹Ø§Ù Ø´Ø¯Ù Ø§Ø³ØªØ Ø¨ÛØ´ØªØ±"
+" ÙØ±ÙØª ÙØ§Û ÙÛØ¯ÛÙÛÛ Ù ØµÙØªÛ ÙÛØ² ØºÛØ±ÙØ¹Ø§Ù Ø´Ø¯Ù 
Ø§ÙØ¯Ø Ù ÙÙÚ©Ù Ø§Ø³Øª Ø¨Ø±Ø®Û ÙÙÙØª ÙØ§ Ù "
+"Ø¢ÛÚ©ÙÙ ÙØ§ Ø¨Ù Ø¯Ø±Ø³ØªÛ ÙÙØ§ÛØ´ Ø¯Ø§Ø¯Ù ÙØ´ÙÙØ¯."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1656,6 +1664,13 @@ msgid ""
 "disabled by default on all non-HTTPS "
 "sites."
 msgstr ""
+"Ø¯Ø± Ø§ÛÙ Ø³Ø·ØØ Ø¨Ø±Ø§Û Ø§Ø¬Ø±Ø§Û ÙÛØ¯ÛÙÙØ§Û HTML5 Ù Ø±Ø³Ø§ÙÙ 
ÙØ§Û ØµÙØªÛØ Ø¨Ø§ÛØ¯ Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² "
+"Ø§ÙØ²ÙÙÙ NoScript Ú©Ù Ø¨Ù ØµÙØ±Øª Ù¾ÛØ´ ÙØ±Ø¶ Ø¯Ø± ÙØ±ÙØ±Ú¯Ø± 
ØªÙØ± ÙØµØ¨ Ø´Ø¯Ù Ø§Ø³ØªØ Ø¢Ù ÙØ§ Ø±Ø§ Ø¨Ù "
+"ØµÙØ±Øª Ø¯Ø³ØªÛ Ø§Ø¬Ø±Ø§ Ú©Ø±Ø¯Ø ÙÙÙ Ø¨ÙÛÙÙ Ø³Ø§Ø²Û ÙØ§Û Ø¹Ù
ÙÚ©Ø±Ø¯ÙØ§Û Ø¬Ø§ÙØ§ Ø§Ø³Ú©Ø±ÛÙ¾Øª ØºÛØ±ÙØ¹Ø§Ù Ø´Ø¯Ù "
+"Ø§ÙØ¯Ø ÙÙÚ©Ù Ø§Ø³Øª Ø¨Ø±Ø®Û Ø§Ø² ÙØ¹Ø§Ø¯ÙØ§Øª Ø±ÛØ§Ø¶Û Ø¨Ù 
Ø¯Ø±Ø³ØªÛ ÙÙØ§ÛØ´ Ø¯Ø§Ø¯Ù ÙØ´ÙÙØ¯Ø Ø¨Ø±Ø®Û Ø§Ø² ÙÛÚÚ¯Û"
+" ÙØ§Û Ø´ÙØ§Ø³Ø§ÛÛ Ù ÙÙØ§ÛØ´ ÙÙÙØª ÙÛØ² ØºÛØ±ÙØ¹Ø§Ù Ø´Ø¯Ù 
Ø§ÙØ¯Ø Ø¨Ø¹Ø¶Û Ø§Ø² Ø§ÙÙØ§Ø¹ ØªØµØ§ÙÛØ± ØºÛØ±ÙØ¹Ø§Ù "
+"Ø´Ø¯Ù Ø§ÙØ¯Ø Ù Ø¨Ù ØµÙØ±Øª Ù¾ÛØ´ ÙØ±Ø¶Ø Ø¬Ø§ÙØ§ Ø§Ø³Ú©Ø±ÛÙ¾Øª Ø¯Ø± 
ÙÙÙ Ø³Ø§ÛØª ÙØ§ÛÛ Ú©Ù Ø§Ø² Ù¾Ø±ÙØªÚ©Ù HTTPS Ø§Ø³ØªÙØ§Ø¯Ù ÙÙÛ Ú©ÙÙØ¯Ø 
ØºÛØ±ÙØ¹Ø§Ù Ø´Ø¯Ù Ø§Ø³Øª."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1692,6 +1707,9 @@ msgid ""
 "You can further increase your security by choosing to disable certain web "
 "features that can be used to attack your security and anonymity."
 msgstr ""
+"Ø´ÙØ§ ÙÛ ØªÙØ§ÙÛØ¯ Ø¨Ø§ ØºÛØ±ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù Ø¨Ø±Ø®Û ÙÛÚÚ¯Û 
Ø®Ø§Øµ ÙØ±ÙØ±Ú¯Ø± Ú©Ù ÙÛ ØªÙØ§ÙÙØ¯ Ø¯Ø± ØÙÙØ§Øª "
+"Ø¹ÙÛÙ Ø§ÙÙÛØª Ù Ú¯ÙÙØ§ÙÛ Ø´ÙØ§ ÙÙØ±Ø¯ Ø§Ø³ØªÙØ§Ø¯Ù ÙØ±Ø§Ø± 
Ø¨Ú¯ÛØ±ÙØ¯Ø Ø§ÛÙÙÛ Ø®ÙØ¯ØªØ§Ù Ø±Ø§ Ø¨ÛØ´ØªØ± "
+"Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.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-08-19 Thread translation

commit bc07df154bdc8202e7339d66ffc5b730b84d7bce
Author: Translation commit bot 
Date:   Tue Aug 20 04:25:26 2019 +

Update translations for tbmanual-contentspot
---
 contents+fa.po | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/contents+fa.po b/contents+fa.po
index 9e33e4477..ff90cce76 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -1577,6 +1577,12 @@ msgid ""
 "some web pages from functioning properly, so you should weigh your security "
 "needs against the degree of usability you require."
 msgstr ""
+"Ø¯Ø± ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ÛÚ© \"Ø¨Ø®Ø´ Ø§ÙÙÛØªÛ\" ÙØ¬ÙØ¯ Ø¯Ø§Ø±Ø¯ Ú©Ù 
Ø´ÙØ§ ÙÛ ØªÙØ§ÙÛØ¯ Ø¨Ø§ ØºÛØ±ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù "
+"Ø¨Ø±Ø®Û Ø§Ø² ÙÛÚÚ¯Û ÙØ§ÛÛ Ú©Ù ÙÛ ØªÙØ§ÙÙØ¯ ÙÙØ¬Ø¨ ØÙÙÙ 
Ø¨Ù Ø§ÙÙÛØª Ù Ú¯ÙÙØ§ÙÛ Ø´ÙØ§ Ø´ÙÙØ¯Ø Ø§Ø² "
+"Ø§ÛÙÙÛ Ø¨ÛØ´ØªØ±Û Ø¯Ø± ÙÙÚ¯Ø§Ù ÙØ¨Ú¯Ø±Ø¯Û Ø¨Ø±Ø®ÙØ±Ø¯Ø§Ø± 
Ø´ÙÛØ¯. Ø¨Ø§ Ø§ÙØ²Ø§ÛØ´ Ø¯Ø±Ø¬Ù Ø§ÙÙÛØªÛ ÙØ±ÙØ±Ú¯Ø± "
+"ØªÙØ±Ø Ø¨Ø±Ø®Û Ø¹ÙÙÚ©Ø±Ø¯ÙØ§ Ø¯Ø± ÙØ¨ Ø³Ø§ÛØª ÙØ§ Ø¯ÚØ§Ø± 
Ø§Ø®ØªÙØ§Ù Ø®ÙØ§ÙÙØ¯ Ø´Ø¯ Ù ÙÙÛ ØªÙØ§ÙÙØ¯ Ø¨Ù Ø¯Ø±Ø³ØªÛ"
+" Ú©Ø§Ø± Ú©ÙÙØ¯. Ø¨ÙØ§Ø¨Ø±Ø§ÛÙ Ø´ÙØ§ Ø¨Ø§ÛØ¯ Ø¨ÛÙ ÙÛØ²Ø§Ù Ø§Ù
ÙÛØª Ù Ø¹ÙÙÚ©Ø±Ø¯ Ø¯Ø±Ø³Øª Ù Ú©Ø§ÙÙ Ø³Ø§ÛØª ÙØ§Ø "
+"ØªÙØ§Ø²Ù Ø¨Ø±ÙØ±Ø§Ø± Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1593,6 +1599,8 @@ msgstr ""
 msgid ""
 "The Security Slider is located in Torbuttonâs âSecurity Settingsâ menu."
 msgstr ""
+"Ø¨Ø®Ø´ Ø§ÙÙÛØªÛ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø¯Ø± ÙÙÙÛ \"ØªÙØ¸ÛÙØ§Øª Ø§Ù
ÙÛØªÛ Ù¾ÛØ´Ø±ÙØªÙ...\" Ø¯Ø± Ú©ÙØ§Ø± ÙÙØ§Ø± "
+"Ø¢Ø¯Ø±Ø³ - Ø¯Ø§Ø®Ù Ø¢ÛÚ©ÙÙ Ø³Ù¾Ø± -  ÙØ±Ø§Ø± Ú¯Ø±ÙØªÙ Ø§Ø³Øª."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1610,6 +1618,8 @@ msgid ""
 "Increasing the level of the Security Slider will disable or partially "
 "disable certain browser features to protect against possible attacks."
 msgstr ""
+"Ø¨Ø§ Ø§ÙØ²Ø§ÛØ´ Ø³Ø·Ø Ø§ÙÙÛØªÛØ ÙÙÙ ÛØ§ Ø¨Ø±Ø®Û Ø§Ø² ÙÛÚÚ¯Û 
ÙØ§Û Ø®Ø§Øµ ÙØ±ÙØ±Ú¯Ø± ØºÛØ±ÙØ¹Ø§Ù ÙÛ Ø´ÙÙØ¯ ØªØ§"
+" Ø§Ø² Ø´ÙØ§ Ø¯Ø± Ø¨Ø±Ø§Ø¨Ø± ØÙÙØ§Øª Ø§ØØªÙØ§ÙÛ ÙØØ§ÙØ¸Øª Ú¯Ø±Ø¯Ø¯."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)

___
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.1] ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entries

2019-08-19 Thread nickm

commit 36c02339712bd3050755d86066a18ad9523aa618
Author: teor 
Date:   Tue Aug 20 11:46:48 2019 +1000

ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entries

Part of 31461.
---
 ChangeLog| 2 +-
 ReleaseNotes | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bf876d20..fc3588cad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -306,7 +306,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   circuits. This feature is only enabled when also supported by the
   circuit's middle node. (Clients may specify fixed middle nodes
   with the MiddleNodes option, and may force-disable this feature
-  with the CircuitPadding torrc.) Closes ticket 28634.
+  with the CircuitPadding option.) Closes ticket 28634.
 
   o Major features (code organization):
 - Tor now includes a generic publish-subscribe message-passing
diff --git a/ReleaseNotes b/ReleaseNotes
index 091502946..98df0754a 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -31,7 +31,7 @@ Changes in version 0.4.1.5 - 2019-08-20
   circuits. This feature is only enabled when also supported by the
   circuit's middle node. (Clients may specify fixed middle nodes
   with the MiddleNodes option, and may force-disable this feature
-  with the CircuitPadding torrc.) Closes ticket 28634.
+  with the CircuitPadding option.) Closes ticket 28634.
 
   o Major features (code organization):
 - Tor now includes a generic publish-subscribe message-passing



___
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.1] ChangeLog/ReleaseNotes: fix some incorrect bugfix versions

2019-08-19 Thread nickm

commit 38975db140409bf907a2ee23d1cd4c3e63cac571
Author: teor 
Date:   Tue Aug 20 11:48:07 2019 +1000

ChangeLog/ReleaseNotes: fix some incorrect bugfix versions

Closes 31461.
---
 ChangeLog| 6 +++---
 ReleaseNotes | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc3588cad..b5f401cce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -490,7 +490,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
 
   o Minor bugfixes (directory authority, ipv6):
 - Directory authorities with IPv6 support now always mark themselves
-  as reachable via IPv6. Fixes bug 24338; bugfix on 0.4.0.2-alpha.
+  as reachable via IPv6. Fixes bug 24338; bugfix on 0.2.4.1-alpha.
   Patch by Neel Chauhan.
 
   o Minor bugfixes (documentation):
@@ -528,7 +528,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22
   Neel Chauhan.
 - When relaunching a circuit to a rendezvous service, mark the
   circuit as needing high-uptime routers as appropriate. Fixes bug
-  17357; bugfix on 0.4.0.2-alpha. Patch by Neel Chauhan.
+  17357; bugfix on 0.1.0.1-rc. Patch by Neel Chauhan.
 - Stop ignoring IPv6 link specifiers sent to v3 onion services.
   (IPv6 support for v3 onion services is still incomplete: see
   ticket 23493 for details.) Fixes bug 23588; bugfix on
@@ -1462,7 +1462,7 @@ Changes in version 0.4.0.1-alpha - 2019-01-18
   we had added up the sum of all nodes with a descriptor, but that
   could cause us to build failing circuits when we had either too
   many bridges or not enough guard nodes. Fixes bug 25885; bugfix on
-  0.3.6.1-alpha. Patch by Neel Chauhan.
+  0.2.3.1-alpha. Patch by Neel Chauhan.
 
   o Minor bugfixes (IPv6):
 - Fix tor_ersatz_socketpair on IPv6-only systems. Previously, the
diff --git a/ReleaseNotes b/ReleaseNotes
index 98df0754a..67dff48ef 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -341,7 +341,7 @@ Changes in version 0.4.1.5 - 2019-08-20
   votes so that it conforms to dir-spec.txt. Fixes bug 30316; bugfix
   on 0.3.5.1-alpha.
 - Directory authorities with IPv6 support now always mark themselves
-  as reachable via IPv6. Fixes bug 24338; bugfix on 0.4.0.2-alpha.
+  as reachable via IPv6. Fixes bug 24338; bugfix on 0.2.4.1-alpha.
   Patch by Neel Chauhan.
 
   o Minor bugfixes (documentation):
@@ -387,7 +387,7 @@ Changes in version 0.4.1.5 - 2019-08-20
   Neel Chauhan.
 - When relaunching a circuit to a rendezvous service, mark the
   circuit as needing high-uptime routers as appropriate. Fixes bug
-  17357; bugfix on 0.4.0.2-alpha. Patch by Neel Chauhan.
+  17357; bugfix on 0.1.0.1-rc. Patch by Neel Chauhan.
 - Stop ignoring IPv6 link specifiers sent to v3 onion services.
   (IPv6 support for v3 onion services is still incomplete: see
   ticket 23493 for details.) Fixes bug 23588; bugfix on
@@ -911,7 +911,7 @@ Changes in version 0.4.0.5 - 2019-05-02
   we had added up the sum of all nodes with a descriptor, but that
   could cause us to build failing circuits when we had either too
   many bridges or not enough guard nodes. Fixes bug 25885; bugfix on
-  0.3.6.1-alpha. Patch by Neel Chauhan.
+  0.2.3.1-alpha. Patch by Neel Chauhan.
 
   o Minor bugfixes (IPv6):
 - Fix tor_ersatz_socketpair on IPv6-only systems. Previously, the

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

[tor-commits] [doctor/master] Check dizum's prior address

2019-08-19 Thread atagar

commit 9ddd6e7c7ecb1dff6865cea74f2ff974bd2c22a1
Author: Damian Johnson 
Date:   Mon Aug 19 17:35:46 2019 -0700

Check dizum's prior address

Dizum moved...

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

Alex has requested monitoring of its old address, which will hopefully 
forward
until clients that reference it get deprecated.
---
 consensus_health_checker.py | 18 ++
 data/consensus_health.cfg   |  1 +
 2 files changed, 19 insertions(+)

diff --git a/consensus_health_checker.py b/consensus_health_checker.py
index ecd70c4..eb4620c 100755
--- a/consensus_health_checker.py
+++ b/consensus_health_checker.py
@@ -344,6 +344,7 @@ def run_checks(consensuses, votes):
 shared_random_present,
 shared_random_commit_partitioning,
 shared_random_reveal_partitioning,
+old_dizum_address_reachable,
   )
 
   all_issues = []
@@ -914,6 +915,23 @@ def shared_random_reveal_partitioning(latest_consensus, 
consensuses, votes):
   elif matches[0] != reveal:
 issues.append(Issue(Runlevel.WARNING, 'SHARED_RANDOM_REVEAL_MISMATCH', 
authority = authority, their_v3ident = v3ident, our_value = matches[0], 
their_value = reveal, to = [authority]))
 
+
+def old_dizum_address_reachable(latest_consensus, consensuses, votes):
+  """
+  Check that dizum's old address is still reachable...
+
+https://trac.torproject.org/projects/tor/ticket/31406
+  """
+
+  try:
+desc = stem.descriptor.remote.their_server_descriptor(endpoints = 
[('194.109.206.212', 80)]).run()[0]
+
+if desc.nickname != 'dizum':
+  raise IOError("Unexpected nickname at dizum's old address (%s)" % 
desc.nickname)
+  except Exception as exc:
+return Issue(Runlevel.WARNING, 'OLD_DIZUM_UNAVAILABLE', address = 
'194.109.206.212', error = exc, to = ['dizum'])
+
+
 def get_consensuses():
   """
   Provides a mapping of directory authority nicknames to their present 
consensus.
diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg
index 994b361..64bf154 100644
--- a/data/consensus_health.cfg
+++ b/data/consensus_health.cfg
@@ -22,6 +22,7 @@ msg TOR_OUT_OF_DATE =>  The following authorities are an out 
of date version of
 msg BADEXIT_OUT_OF_SYNC => Authorities disagree about the BadExit flag for 
{fingerprint} ({counts})
 msg BANDWIDTH_AUTHORITIES_OUT_OF_SYNC => Bandwidth authorities have a 
substantially different number of measured entries: {authorities}
 msg AUTHORITY_UNAVAILABLE => Unable to retrieve the {fetch_type} from 
{authority} ({url}): {error}
+msg OLD_DIZUM_UNAVAILABLE => Unable to reach dizum's prior address 
({address}): {error}
 msg UNABLE_TO_REACH_ORPORT => Unable to reach the ORPort of {authority} 
({address}, port {port}): {error}
 msg CURRENT_SHARED_RANDOM_MISSING => Consensus is missing a current shared 
random value (shared-rand-current-value)
 msg PREVIOUS_SHARED_RANDOM_MISSING => Consensus is missing a previous shared 
random value (shared-rand-previous-value)

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

[tor-commits] [stem/master] Update dizum's address

2019-08-19 Thread atagar

commit 66279fc84267f3e9f580c7e63ae84e07a164297c
Author: Damian Johnson 
Date:   Mon Aug 19 17:15:53 2019 -0700

Update dizum's address

Alex recently migrated dizum. Updating ourselves to the new address...

  https://trac.torproject.org/projects/tor/ticket/31406
  https://gitweb.torproject.org/tor.git/commit/?id=5a1c3e4
---
 docs/change_log.rst | 1 +
 stem/directory.py   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index a2337e60..9adc7613 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -74,6 +74,7 @@ The following are only available within Stem's `git repository
   * Default the **version_flavor** attribute of 
:class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3` to 'ns' 
(:spec:`d97f8d9`)
   * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`)
   * Don't download from Serge, a bridge authority that frequently timeout
+  * Updated dizum authority's address (:trac:`31406`)
 
  * **Client**
 
diff --git a/stem/directory.py b/stem/directory.py
index 9e397d88..8139a935 100644
--- a/stem/directory.py
+++ b/stem/directory.py
@@ -597,7 +597,7 @@ DIRECTORY_AUTHORITIES = {
   ),
   'dizum': Authority(
 nickname = 'dizum',
-address = '194.109.206.212',
+address = '45.66.33.45',
 or_port = 443,
 dir_port = 80,
 fingerprint = '7EA6EAD6FD83083C538F44038BBFA077587DD755',



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

[tor-commits] [stem/master] Missing changelog entry

2019-08-19 Thread atagar

commit acfcc58b011adaa43d19b80869f54404dfd480b6
Author: Damian Johnson 
Date:   Mon Aug 19 17:16:18 2019 -0700

Missing changelog entry
---
 cache_fallback_directories.py |  4 ++--
 docs/change_log.rst   | 10 --
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py
index 7827f712..05d7f827 100755
--- a/cache_fallback_directories.py
+++ b/cache_fallback_directories.py
@@ -18,12 +18,12 @@ try:
 except ImportError:
   import urllib2 as urllib
 
-GITWEB_MAN_LOG = 
'https://gitweb.torproject.org/tor.git/log/src/app/config/fallback_dirs.inc'
+GITWEB_FALLBACK_LOG = 
'https://gitweb.torproject.org/tor.git/log/src/app/config/fallback_dirs.inc'
 FALLBACK_DIR_LINK = 
"href='/tor.git/commit/src/app/config/fallback_dirs.inc\\?id=([^']*)'"
 
 if __name__ == '__main__':
   try:
-fallback_dir_page = urllib.urlopen(GITWEB_MAN_LOG).read()
+fallback_dir_page = urllib.urlopen(GITWEB_FALLBACK_LOG).read()
 fallback_dir_commit = re.search(FALLBACK_DIR_LINK, 
fallback_dir_page).group(1)
   except:
 print("Unable to determine the latest commit to edit tor's fallback 
directories: %s" % sys.exc_info()[1])
diff --git a/docs/change_log.rst b/docs/change_log.rst
index 9adc7613..c244d7d2 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -52,14 +52,19 @@ The following are only available within Stem's `git 
repository
   * Controller events could fail to be delivered in a timely fashion 
(:trac:`27173`)
   * Adjusted :func:`~stem.control.Controller.get_microdescriptors` fallback to 
also use '.new' cache files (:trac:`28508`)
   * ExitPolicies could raise TypeError when read concurrently (:trac:`29899`)
+  * **STALE_DESC** :data:`~stem.Flag` (:spec:`d14164d8`)
   * **DORMANT** and **ACTIVE** :data:`~stem.Signal` (:spec:`4421149`)
+  * **QUERY_RATE_LIMITED** :data:`~stem.HSDescReason` (:spec:`bd80679`)
+  * **EXTOR** and **HTTPTUNNEL** :data:`~stem.Listener`
 
  * **Descriptors**
 
-  * Added the `stem.descriptor.collector `_ 
module.
+  * Added the `stem.descriptor.collector `_ 
module (:trac:`17979`)
   * `Bandwidth file support `_ 
(:trac:`29056`)
-  * Ed25519 validity checks are now done though the cryptography module rather 
than PyNaCl (:trac:`22022`)
+  * `stem.descriptor.remote `_ now raise 
:class:`stem.DownloadFailed`
+  * Check Ed25519 validity though the cryptography module rather than PyNaCl 
(:trac:`22022`)
   * Download compressed descriptors by default (:trac:`29186`)
+  * Added :class:`~stem.descriptor.Compression` class
   * Added :func:`stem.descriptor.remote.get_microdescriptors`
   * Added :func:`stem.descriptor.remote.get_bandwidth_file` (:trac:`26902`)
   * Added :class:`~stem.descriptor.networkstatus.DetachedSignature` parsing 
(:trac:`28495`)
@@ -88,6 +93,7 @@ The following are only available within Stem's `git repository
  * **Website**
 
   * Added NetBSD to our `download page `_
+  * Exemplify `manual SAFECOOKIE authentication 
`_
   * `Update PyPI links 
`_ (:trac:`30137`)
 
  * **Interpreter**

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

[tor-commits] [policies/master] Include catshadow among checked repos

2019-08-19 Thread atagar

commit 3d9c3b156f64202c272479e892ed26c783be4848
Author: Damian Johnson 
Date:   Mon Aug 19 15:45:03 2019 -0700

Include catshadow among checked repos

David (dawuud) is mostly involved with a subproject called catshadow 
nowadays,
so including it among the repos we check for commit activity.
---
 scripts/commit_activity.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/commit_activity.py b/scripts/commit_activity.py
index 5dcee77..722e3d8 100644
--- a/scripts/commit_activity.py
+++ b/scripts/commit_activity.py
@@ -94,6 +94,7 @@ GIT_REPOS = {
   'webstats': 'https://git.torproject.org/webstats.git',
 
   'carml': 'https://github.com/meejah/carml.git',
+  'catshadow': 'https://github.com/katzenpost/catshadow.git',
   'exitmap': 'https://github.com/NullHypothesis/exitmap.git',
   'shadow': 'https://github.com/shadow/shadow.git',
   'tails': 'https://git-tails.immerda.ch/tails',

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

[tor-commits] [stem/master] Integ test fails with a malformed default torrc

2019-08-19 Thread atagar

commit 967f766e87efb39be90503921e9a5c38c087031a
Author: Damian Johnson 
Date:   Mon Aug 19 15:37:20 2019 -0700

Integ test fails with a malformed default torrc

Great catch from teor...

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

Reproed by creating a mangled default torrc (/usr/local/etc/tor/torrc).
---
 test/integ/process.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integ/process.py b/test/integ/process.py
index d3e873f9..26346ece 100644
--- a/test/integ/process.py
+++ b/test/integ/process.py
@@ -155,10 +155,10 @@ class TestProcess(unittest.TestCase):
 Check that we only get warnings and errors when running 'tor --hush'.
 """
 
-output = run_tor(tor_cmd, '--hush', '--invalid_argument', expect_failure = 
True)
+output = run_tor(tor_cmd, '--hush', '--invalid_argument', with_torrc = 
True, expect_failure = True)
 assert_in("[warn] Command-line option '--invalid_argument' with no value. 
Failing.", output)
 
-output = run_tor(tor_cmd, '--hush', '--invalid_argument', 'true', 
expect_failure = True)
+output = run_tor(tor_cmd, '--hush', '--invalid_argument', 'true', 
with_torrc = True, expect_failure = True)
 assert_in("[warn] Failed to parse/validate config: Unknown option 
'invalid_argument'.  Failing.", output)
 
   @asynchronous

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

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

2019-08-19 Thread translation

commit 705acc10ff5d5b319b9009652655e5f7ff089251
Author: Translation commit bot 
Date:   Mon Aug 19 21:57:31 2019 +

Update translations for tpo-web_completed
---
 contents+fr.po | 31 +--
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 15fbd7cde..5142ab13e 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -244,12 +244,14 @@ msgstr "TÃ©lÃ©charger le code source de Tor"
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.title)
 msgid "Cy Pres Awards"
-msgstr ""
+msgstr "IndemnitÃ©s cy-prÃ¨s"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
 msgid "### Cy Pres Awards â Consumer Privacy and Privacy Online"
 msgstr ""
+"### IndemnitÃ©s cy-prÃ¨s â Protection de la vie privÃ©e et vie privÃ©e sur "
+"Internet"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
@@ -270,11 +272,11 @@ msgstr ""
 "des droits ou Ã  des groupes de recherche qui reprÃ©sentent habituellement 
les"
 " membres du recours. Les indemnitÃ©s cy-prÃ¨s pour la protection de la vie "
 "privÃ©e des consommateurs peuvent aider le ProjetÂ Tor Ã  expliquer aux "
-"personnes et aux organisations comment assurer leur vie privÃ©e sur Internet,"
-" faire valoir la protection de leur vie privÃ©e et de leurs donnÃ©es "
+"personnes et aux organisations comment conserver leur vie privÃ©e sur "
+"Internet, faire valoir la protection de leur vie privÃ©e et de leurs donnÃ©es 
"
 "personnelles, et comment construire dâimportantes technologies gratuites et 
"
-"Ã  code source ouvert qui accordent une prioritÃ© Ã  la vie privÃ©e et Ã  la "
-"protection des donnÃ©es personnelles."
+"ouvertes qui accordent une prioritÃ© Ã  la vie privÃ©e et Ã  la protection 
des "
+"donnÃ©es personnelles."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
@@ -331,11 +333,11 @@ msgid ""
 "journalists, human rights defenders, librarians, consumers, and average "
 "internet users about how to protect and retain their privacy online."
 msgstr ""
-"Au-delÃ  du dÃ©veloppement de la technologie, l'organisation aide les "
-"personnes Ã  conserver leur vie privÃ©e en ligne. Le projet Tor a 
sensibilisÃ© "
-"des milliers de militants, de journalistes, de dÃ©fenseurs des droits de "
-"lâhomme, de bibliothÃ©caires, de consommateurs et dâinternautes 
ordinaires Ã  "
-"la protection et Ã  la conservation de leur vie privÃ©e en ligne."
+"Outre le dÃ©veloppement de la technologie, lâorganisme aide les personnes Ã 
 "
+"conserver leur vie privÃ©e sur Internet. Le ProjetÂ Tor a expliquÃ© Ã  des "
+"milliers dâactivistes, de journalistes, de dÃ©fenseurs des droits de la "
+"personne, de bibliothÃ©caires, de consommateurs et dâinternautes moyens "
+"comment se protÃ©ger et conserver leur vie privÃ©e en ligne."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
@@ -344,10 +346,11 @@ msgid ""
 "[often turned to by the media for information about how individuals and "
 "consumers can protect their privacy](https://www.torproject.org/press/)."
 msgstr ""
-"Le projet Tor est reconnu comme un expert de premier plan en matiÃ¨re de "
-"protection de la vie privÃ©e en ligne et est [souvent consultÃ© par les 
mÃ©dias"
-" pour savoir comment les particuliers et les consommateurs peuvent protÃ©ger "
-"leur vie privÃ©e] (https://www.torproject.org/press/)."
+"Le ProjetÂ Tor est reconnu comme un Ã©minent spÃ©cialiste en matiÃ¨re de "
+"protection de la vie privÃ©e et des donnÃ©es personnelles sur Internet, et "
+"[les mÃ©dias le consultent souvent afin obtenir des renseignements sur la "
+"protection de la vie privÃ©e et des donnÃ©es personnelles des personnes et 
des"
+" consommateurs](https://www.torproject.org/fr/press/)."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)

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

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

2019-08-19 Thread translation

commit afeeb37aef8365bf617ec96160c3d7d0b3cce2e3
Author: Translation commit bot 
Date:   Mon Aug 19 21:57:25 2019 +

Update translations for tpo-web
---
 contents+fr.po | 31 +--
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 15fbd7cde..5142ab13e 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -244,12 +244,14 @@ msgstr "TÃ©lÃ©charger le code source de Tor"
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.title)
 msgid "Cy Pres Awards"
-msgstr ""
+msgstr "IndemnitÃ©s cy-prÃ¨s"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
 msgid "### Cy Pres Awards â Consumer Privacy and Privacy Online"
 msgstr ""
+"### IndemnitÃ©s cy-prÃ¨s â Protection de la vie privÃ©e et vie privÃ©e sur "
+"Internet"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
@@ -270,11 +272,11 @@ msgstr ""
 "des droits ou Ã  des groupes de recherche qui reprÃ©sentent habituellement 
les"
 " membres du recours. Les indemnitÃ©s cy-prÃ¨s pour la protection de la vie "
 "privÃ©e des consommateurs peuvent aider le ProjetÂ Tor Ã  expliquer aux "
-"personnes et aux organisations comment assurer leur vie privÃ©e sur Internet,"
-" faire valoir la protection de leur vie privÃ©e et de leurs donnÃ©es "
+"personnes et aux organisations comment conserver leur vie privÃ©e sur "
+"Internet, faire valoir la protection de leur vie privÃ©e et de leurs donnÃ©es 
"
 "personnelles, et comment construire dâimportantes technologies gratuites et 
"
-"Ã  code source ouvert qui accordent une prioritÃ© Ã  la vie privÃ©e et Ã  la "
-"protection des donnÃ©es personnelles."
+"ouvertes qui accordent une prioritÃ© Ã  la vie privÃ©e et Ã  la protection 
des "
+"donnÃ©es personnelles."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
@@ -331,11 +333,11 @@ msgid ""
 "journalists, human rights defenders, librarians, consumers, and average "
 "internet users about how to protect and retain their privacy online."
 msgstr ""
-"Au-delÃ  du dÃ©veloppement de la technologie, l'organisation aide les "
-"personnes Ã  conserver leur vie privÃ©e en ligne. Le projet Tor a 
sensibilisÃ© "
-"des milliers de militants, de journalistes, de dÃ©fenseurs des droits de "
-"lâhomme, de bibliothÃ©caires, de consommateurs et dâinternautes 
ordinaires Ã  "
-"la protection et Ã  la conservation de leur vie privÃ©e en ligne."
+"Outre le dÃ©veloppement de la technologie, lâorganisme aide les personnes Ã 
 "
+"conserver leur vie privÃ©e sur Internet. Le ProjetÂ Tor a expliquÃ© Ã  des "
+"milliers dâactivistes, de journalistes, de dÃ©fenseurs des droits de la "
+"personne, de bibliothÃ©caires, de consommateurs et dâinternautes moyens "
+"comment se protÃ©ger et conserver leur vie privÃ©e en ligne."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
@@ -344,10 +346,11 @@ msgid ""
 "[often turned to by the media for information about how individuals and "
 "consumers can protect their privacy](https://www.torproject.org/press/)."
 msgstr ""
-"Le projet Tor est reconnu comme un expert de premier plan en matiÃ¨re de "
-"protection de la vie privÃ©e en ligne et est [souvent consultÃ© par les 
mÃ©dias"
-" pour savoir comment les particuliers et les consommateurs peuvent protÃ©ger "
-"leur vie privÃ©e] (https://www.torproject.org/press/)."
+"Le ProjetÂ Tor est reconnu comme un Ã©minent spÃ©cialiste en matiÃ¨re de "
+"protection de la vie privÃ©e et des donnÃ©es personnelles sur Internet, et "
+"[les mÃ©dias le consultent souvent afin obtenir des renseignements sur la "
+"protection de la vie privÃ©e et des donnÃ©es personnelles des personnes et 
des"
+" consommateurs](https://www.torproject.org/fr/press/)."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)

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

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

2019-08-19 Thread translation

commit b2bfb59f9d0323964338d7167c2236768d6c1236
Author: Translation commit bot 
Date:   Mon Aug 19 21:27:27 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index ed3d34e06..15fbd7cde 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -287,25 +287,29 @@ msgid ""
 "The Tor Project is a U.S.-based 501(c)3 nonprofit founded in 2006 with the "
 "mission of advancing human rights and freedoms by:"
 msgstr ""
+"BasÃ© aux Ãtats-Unis, le ProjetÂ Tor est un organisme sans but lucratifÂ "
+"501(c)(3) fondÃ© en 2006 avec pour mission de promouvoir les droits de la "
+"personne et les libertÃ©s enÂ :"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
 msgid ""
 "- Creating and deploying free and open anonymity and privacy technologies,"
 msgstr ""
-"- CrÃ©er et dÃ©ployer un anonymat gratuit et open source et les technologies "
-"de la vie privÃ©e"
+"âÂ CrÃ©ant et dÃ©ployant des technologies de protection de la vie privÃ©e 
et des"
+" donnÃ©es personnelles et un anonymat gratuits et ouverts,"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
 msgid "- Supporting their unrestricted availability and use, and"
-msgstr ""
-"- Soutenir leur disponibilitÃ© et leur utilisation sans restriction, et"
+msgstr "âÂ Soutenant leur disponibilitÃ© et leur utilisation sans 
restriction,"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
 msgid "- Furthering their scientific and popular understanding."
-msgstr "- Approfondir leur comprÃ©hension scientifique et populaire."
+msgstr ""
+"âÂ Approfondissant la comprÃ©hension scientifique et populaire de cet 
anonymat"
+" et de ces technologies."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
@@ -314,10 +318,10 @@ msgid ""
 "of the most popular and widely used free, open source privacy technologies: "
 "Tor Browser and the Tor network."
 msgstr ""
-"Le Projet Tor et sa communautÃ© environnante dÃ©veloppent et distribuent "
-"certaines des technologies de confidentialitÃ© open source gratuites les plus"
-" populaires et les plus largement utilisÃ©es : Navigateur Tor et le rÃ©seau "
-"Tor."
+"Le ProjetÂ Tor et sa communautÃ© environnante dÃ©veloppent et distribuent des 
"
+"technologies gratuites et ouvertes de protection de la vie privÃ©e et des "
+"donnÃ©es personnelles des plus populaires et des plus utilisÃ©esÂ : le "
+"NavigateurÂ Tor et le rÃ©seauÂ Tor."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)

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

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

2019-08-19 Thread translation

commit 5e42ef443c5f83a91c346de4a2b1f1f4e775f7a3
Author: Translation commit bot 
Date:   Mon Aug 19 21:27:20 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index ed3d34e06..15fbd7cde 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -287,25 +287,29 @@ msgid ""
 "The Tor Project is a U.S.-based 501(c)3 nonprofit founded in 2006 with the "
 "mission of advancing human rights and freedoms by:"
 msgstr ""
+"BasÃ© aux Ãtats-Unis, le ProjetÂ Tor est un organisme sans but lucratifÂ "
+"501(c)(3) fondÃ© en 2006 avec pour mission de promouvoir les droits de la "
+"personne et les libertÃ©s enÂ :"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
 msgid ""
 "- Creating and deploying free and open anonymity and privacy technologies,"
 msgstr ""
-"- CrÃ©er et dÃ©ployer un anonymat gratuit et open source et les technologies "
-"de la vie privÃ©e"
+"âÂ CrÃ©ant et dÃ©ployant des technologies de protection de la vie privÃ©e 
et des"
+" donnÃ©es personnelles et un anonymat gratuits et ouverts,"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
 msgid "- Supporting their unrestricted availability and use, and"
-msgstr ""
-"- Soutenir leur disponibilitÃ© et leur utilisation sans restriction, et"
+msgstr "âÂ Soutenant leur disponibilitÃ© et leur utilisation sans 
restriction,"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
 msgid "- Furthering their scientific and popular understanding."
-msgstr "- Approfondir leur comprÃ©hension scientifique et populaire."
+msgstr ""
+"âÂ Approfondissant la comprÃ©hension scientifique et populaire de cet 
anonymat"
+" et de ces technologies."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)
@@ -314,10 +318,10 @@ msgid ""
 "of the most popular and widely used free, open source privacy technologies: "
 "Tor Browser and the Tor network."
 msgstr ""
-"Le Projet Tor et sa communautÃ© environnante dÃ©veloppent et distribuent "
-"certaines des technologies de confidentialitÃ© open source gratuites les plus"
-" populaires et les plus largement utilisÃ©es : Navigateur Tor et le rÃ©seau "
-"Tor."
+"Le ProjetÂ Tor et sa communautÃ© environnante dÃ©veloppent et distribuent des 
"
+"technologies gratuites et ouvertes de protection de la vie privÃ©e et des "
+"donnÃ©es personnelles des plus populaires et des plus utilisÃ©esÂ : le "
+"NavigateurÂ Tor et le rÃ©seauÂ Tor."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)

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

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

2019-08-19 Thread translation

commit a8284c89f5309a22e3f547f22a88305d31c2a59e
Author: Translation commit bot 
Date:   Mon Aug 19 20:58:39 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 66ada1ce6..ed3d34e06 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -263,6 +263,18 @@ msgid ""
 "advocate for privacy protections, and build important free, open source "
 "technologies that prioritize privacy."
 msgstr ""
+"Les indemnitÃ©s cy-prÃ¨s sont des sommes distribuÃ©es dans le cadre 
dâententes "
+"de rÃ¨glement de recours collectifs aux Ãtats-Unis. Quand la totalitÃ© des "
+"sommes ne peut pas Ãªtre distribuÃ©e aux membres du recours, elles peuvent "
+"Ãªtre distribuÃ©es Ã  des groupes sans but lucratif, Ã  des groupes de 
dÃ©fense "
+"des droits ou Ã  des groupes de recherche qui reprÃ©sentent habituellement 
les"
+" membres du recours. Les indemnitÃ©s cy-prÃ¨s pour la protection de la vie "
+"privÃ©e des consommateurs peuvent aider le ProjetÂ Tor Ã  expliquer aux "
+"personnes et aux organisations comment assurer leur vie privÃ©e sur Internet,"
+" faire valoir la protection de leur vie privÃ©e et de leurs donnÃ©es "
+"personnelles, et comment construire dâimportantes technologies gratuites et 
"
+"Ã  code source ouvert qui accordent une prioritÃ© Ã  la vie privÃ©e et Ã  la "
+"protection des donnÃ©es personnelles."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)

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

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

2019-08-19 Thread translation

commit db7d57ba9ffb1ff9b2184de9666e9dff8ba7b9d4
Author: Translation commit bot 
Date:   Mon Aug 19 20:58:31 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 66ada1ce6..ed3d34e06 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -263,6 +263,18 @@ msgid ""
 "advocate for privacy protections, and build important free, open source "
 "technologies that prioritize privacy."
 msgstr ""
+"Les indemnitÃ©s cy-prÃ¨s sont des sommes distribuÃ©es dans le cadre 
dâententes "
+"de rÃ¨glement de recours collectifs aux Ãtats-Unis. Quand la totalitÃ© des "
+"sommes ne peut pas Ãªtre distribuÃ©e aux membres du recours, elles peuvent "
+"Ãªtre distribuÃ©es Ã  des groupes sans but lucratif, Ã  des groupes de 
dÃ©fense "
+"des droits ou Ã  des groupes de recherche qui reprÃ©sentent habituellement 
les"
+" membres du recours. Les indemnitÃ©s cy-prÃ¨s pour la protection de la vie "
+"privÃ©e des consommateurs peuvent aider le ProjetÂ Tor Ã  expliquer aux "
+"personnes et aux organisations comment assurer leur vie privÃ©e sur Internet,"
+" faire valoir la protection de leur vie privÃ©e et de leurs donnÃ©es "
+"personnelles, et comment construire dâimportantes technologies gratuites et 
"
+"Ã  code source ouvert qui accordent une prioritÃ© Ã  la vie privÃ©e et Ã  la "
+"protection des donnÃ©es personnelles."
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.body)

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

[tor-commits] [snowflake/master] Bug 31453: use only SVG for the status images.

2019-08-19 Thread dcf

commit 0ef7c6f1fa6abc5ffeff455be0143efce0adb207
Author: David Fifield 
Date:   Mon Aug 19 12:44:30 2019 -0600

Bug 31453: use only SVG for the status images.
---
 proxy/static/assets/status-off-dark.png| Bin 3626 -> 0 bytes
 proxy/static/assets/status-off-d...@2x.png | Bin 8891 -> 0 bytes
 proxy/static/assets/status-off-d...@3x.png | Bin 13339 -> 0 bytes
 proxy/static/assets/status-off.png | Bin 3389 -> 0 bytes
 proxy/static/assets/status-...@2x.png  | Bin 8022 -> 0 bytes
 proxy/static/assets/status-...@3x.png  | Bin 12459 -> 0 bytes
 proxy/static/assets/status-on-dark.png | Bin 3209 -> 0 bytes
 proxy/static/assets/status-on-d...@2x.png  | Bin 7268 -> 0 bytes
 proxy/static/assets/status-on-d...@3x.png  | Bin 11360 -> 0 bytes
 proxy/static/assets/status-on.png  | Bin 3077 -> 0 bytes
 proxy/static/assets/status...@2x.png   | Bin 7185 -> 0 bytes
 proxy/static/assets/status...@3x.png   | Bin 10844 -> 0 bytes
 proxy/static/assets/status-running.png | Bin  -> 0 bytes
 proxy/static/assets/status-runn...@2x.png  | Bin 7912 -> 0 bytes
 proxy/static/assets/status-runn...@3x.png  | Bin 12441 -> 0 bytes
 proxy/static/embed.css |  12 ++--
 16 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/proxy/static/assets/status-off-dark.png 
b/proxy/static/assets/status-off-dark.png
deleted file mode 100644
index 75cf163..000
Binary files a/proxy/static/assets/status-off-dark.png and /dev/null differ
diff --git a/proxy/static/assets/status-off-d...@2x.png 
b/proxy/static/assets/status-off-d...@2x.png
deleted file mode 100644
index 374881e..000
Binary files a/proxy/static/assets/status-off-d...@2x.png and /dev/null differ
diff --git a/proxy/static/assets/status-off-d...@3x.png 
b/proxy/static/assets/status-off-d...@3x.png
deleted file mode 100644
index a1e3fff..000
Binary files a/proxy/static/assets/status-off-d...@3x.png and /dev/null differ
diff --git a/proxy/static/assets/status-off.png 
b/proxy/static/assets/status-off.png
deleted file mode 100644
index 3cc438e..000
Binary files a/proxy/static/assets/status-off.png and /dev/null differ
diff --git a/proxy/static/assets/status-...@2x.png 
b/proxy/static/assets/status-...@2x.png
deleted file mode 100644
index a102a80..000
Binary files a/proxy/static/assets/status-...@2x.png and /dev/null differ
diff --git a/proxy/static/assets/status-...@3x.png 
b/proxy/static/assets/status-...@3x.png
deleted file mode 100644
index 4e119b6..000
Binary files a/proxy/static/assets/status-...@3x.png and /dev/null differ
diff --git a/proxy/static/assets/status-on-dark.png 
b/proxy/static/assets/status-on-dark.png
deleted file mode 100644
index 09435c2..000
Binary files a/proxy/static/assets/status-on-dark.png and /dev/null differ
diff --git a/proxy/static/assets/status-on-d...@2x.png 
b/proxy/static/assets/status-on-d...@2x.png
deleted file mode 100644
index 18efcf5..000
Binary files a/proxy/static/assets/status-on-d...@2x.png and /dev/null differ
diff --git a/proxy/static/assets/status-on-d...@3x.png 
b/proxy/static/assets/status-on-d...@3x.png
deleted file mode 100644
index 026f6be..000
Binary files a/proxy/static/assets/status-on-d...@3x.png and /dev/null differ
diff --git a/proxy/static/assets/status-on.png 
b/proxy/static/assets/status-on.png
deleted file mode 100644
index 94aee66..000
Binary files a/proxy/static/assets/status-on.png and /dev/null differ
diff --git a/proxy/static/assets/status...@2x.png 
b/proxy/static/assets/status...@2x.png
deleted file mode 100644
index 227ca77..000
Binary files a/proxy/static/assets/status...@2x.png and /dev/null differ
diff --git a/proxy/static/assets/status...@3x.png 
b/proxy/static/assets/status...@3x.png
deleted file mode 100644
index f1b7f70..000
Binary files a/proxy/static/assets/status...@3x.png and /dev/null differ
diff --git a/proxy/static/assets/status-running.png 
b/proxy/static/assets/status-running.png
deleted file mode 100644
index 9dfe9fc..000
Binary files a/proxy/static/assets/status-running.png and /dev/null differ
diff --git a/proxy/static/assets/status-runn...@2x.png 
b/proxy/static/assets/status-runn...@2x.png
deleted file mode 100644
index fe1163c..000
Binary files a/proxy/static/assets/status-runn...@2x.png and /dev/null differ
diff --git a/proxy/static/assets/status-runn...@3x.png 
b/proxy/static/assets/status-runn...@3x.png
deleted file mode 100644
index 29f8b90..000
Binary files a/proxy/static/assets/status-runn...@3x.png and /dev/null differ
diff --git a/proxy/static/embed.css b/proxy/static/embed.css
index 860d2b0..162521a 100644
--- a/proxy/static/embed.css
+++ b/proxy/static/embed.css
@@ -12,16 +12,16 @@ body {
 }
 
 #statusimg {
-  background-image: url("assets/status-off.png");
+  background-image: url("assets/status-off.svg");
   background-repeat: no-repeat;
   background-position: center center;
   min-height: 60px;
 }
 #statusimg.on {
-  background-image:

[tor-commits] [snowflake/master] Make a dark-mode version of the arrowhead icon.

2019-08-19 Thread dcf

commit f9173f61a2c90fbc2979f8f73ab79a1a5bc90eee
Author: David Fifield 
Date:   Mon Aug 19 12:16:06 2019 -0600

Make a dark-mode version of the arrowhead icon.

The former icon used fill="context-fill", which I believe doesn't work
except in Mozilla's own extensions. So I changed that one to
fill="black" and made a new one with fill="white".
---
 proxy/static/assets/arrowhead-right-12.svg  | 2 +-
 proxy/static/assets/arrowhead-right-dark-12.svg | 4 
 proxy/static/embed.css  | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/proxy/static/assets/arrowhead-right-12.svg 
b/proxy/static/assets/arrowhead-right-12.svg
index 54afc2e..3f7e664 100644
--- a/proxy/static/assets/arrowhead-right-12.svg
+++ b/proxy/static/assets/arrowhead-right-12.svg
@@ -1,4 +1,4 @@
 
-http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
\ No newline at end of file
+http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
\ No newline at end of file
diff --git a/proxy/static/assets/arrowhead-right-dark-12.svg 
b/proxy/static/assets/arrowhead-right-dark-12.svg
new file mode 100644
index 000..6534fd0
--- /dev/null
+++ b/proxy/static/assets/arrowhead-right-dark-12.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
\ No newline at end of file
diff --git a/proxy/static/embed.css b/proxy/static/embed.css
index 4a58d45..860d2b0 100644
--- a/proxy/static/embed.css
+++ b/proxy/static/embed.css
@@ -144,4 +144,7 @@ input:checked + .slider:before {
   input:focus + .slider {
 box-shadow: 0 0 1px #cc80ff;
   }
+  .learn:before {
+background-image: url('assets/arrowhead-right-dark-12.svg');
+  }
 }

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

[tor-commits] [snowflake/master] Popup CSS for dark mode.

2019-08-19 Thread dcf

commit 36815bd57bcc1e91fcd4dd8d7ddff5b7e1d8850e
Author: David Fifield 
Date:   Tue Jul 23 10:14:37 2019 -0600

Popup CSS for dark mode.

In Firefox, this requires version 67 for support for
prefers-color-scheme media queries.
https://hacks.mozilla.org/2019/05/firefox-67-dark-mode-css-webrender/
To force Firefox into dark mode, set ui.systemUsesDarkTheme=1 (and
optionally browser.in-content.dark-mode=true, to put pages such as
about:addons into dark mode as well) in about:config. You can check if
it's working at https://bugzilla.mozilla.org/, which has its own
dark-mode styling. Note that this kind of dark mode is *independent* of
the "Dark" theme that can be selected in about:addons.

Chrome requires version 76 for prefers-color-scheme. You can force it by
running with the --force-dark-mode command-line option.
---
 proxy/static/embed.css | 24 
 1 file changed, 24 insertions(+)

diff --git a/proxy/static/embed.css b/proxy/static/embed.css
index 156a688..4a58d45 100644
--- a/proxy/static/embed.css
+++ b/proxy/static/embed.css
@@ -121,3 +121,27 @@ input:checked + .slider:before {
   -ms-transform: translateX(13px);
   transform: translateX(13px);
 }
+
+/* Dark Mode */
+@media (prefers-color-scheme: dark) {
+  body {
+/* https://design.firefox.com/photon/visuals/color.html#dark-theme */
+color: white;
+background-color: #38383d;
+  }
+  #statusimg {
+background-image: url("assets/status-off-dark.png");
+  }
+  #statusimg.on {
+background-image: url("assets/status-on-dark.png");
+  }
+  #statusimg.on.running {
+background-image: url("assets/status-running.png");
+  }
+  input:checked + .slider {
+background-color: #cc80ff;
+  }
+  input:focus + .slider {
+box-shadow: 0 0 1px #cc80ff;
+  }
+}



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

[tor-commits] [snowflake/master] Redo the status-running icon to match the others.

2019-08-19 Thread dcf

commit 1e6dd4d86f25bce9e015412dab99ea18247fb0f6
Author: David Fifield 
Date:   Tue Aug 6 23:31:50 2019 -0600

Redo the status-running icon to match the others.

This one was missing from the redesigned icons. I made it by making a
copy of status-on.svg and changing the fill from #8000D7 to #40E0D0.

I didn't make a separate dark-mode version of the icon.
---
 proxy/static/assets/status-running.png| Bin 4758 -> 3342 bytes
 proxy/static/assets/status-running.svg|   8 ++--
 proxy/static/assets/status-runn...@2x.png | Bin 0 -> 8109 bytes
 proxy/static/assets/status-runn...@3x.png | Bin 0 -> 12386 bytes
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/proxy/static/assets/status-running.png 
b/proxy/static/assets/status-running.png
index 96ff7b2..187e915 100644
Binary files a/proxy/static/assets/status-running.png and 
b/proxy/static/assets/status-running.png differ
diff --git a/proxy/static/assets/status-running.svg 
b/proxy/static/assets/status-running.svg
index 4cc9602..24236c7 100644
--- a/proxy/static/assets/status-running.svg
+++ b/proxy/static/assets/status-running.svg
@@ -1,11 +1,7 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
 status-on
-Created with Sketch.
 
-
-
-
+
 
 
diff --git a/proxy/static/assets/status-runn...@2x.png 
b/proxy/static/assets/status-runn...@2x.png
new file mode 100644
index 000..587c288
Binary files /dev/null and b/proxy/static/assets/status-runn...@2x.png differ
diff --git a/proxy/static/assets/status-runn...@3x.png 
b/proxy/static/assets/status-runn...@3x.png
new file mode 100644
index 000..0d356cc
Binary files /dev/null and b/proxy/static/assets/status-runn...@3x.png differ



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

[tor-commits] [snowflake/master] Toolbar icons that work in both light and dark modes.

2019-08-19 Thread dcf

commit 6ab50e32b9fcc0e201d16b40352ce03287bb4320
Author: David Fifield 
Date:   Tue Aug 6 23:13:56 2019 -0600

Toolbar icons that work in both light and dark modes.

https://bugs.torproject.org/31170#comment:8

I chose these icons for the "on" and "off" icons:
toolbar_icon_purple.svg â toolbar-on.svg
toolbar_icon_grey.svg â toolbar-off.svg

I then made toolbar-running.svg by copying toolbar-off.svg and changing
the stroke and fill from #4A4A4F to #40E0D0.
---
 proxy/init-webext.js   |  16 
 proxy/static/assets/toolbar-off-48.png | Bin 0 -> 3657 bytes
 proxy/static/assets/toolbar-off-96.png | Bin 0 -> 7214 bytes
 proxy/static/assets/toolbar-off.svg|  14 ++
 proxy/static/assets/toolbar-on-48.png  | Bin 0 -> 3674 bytes
 proxy/static/assets/toolbar-on-96.png  | Bin 0 -> 7355 bytes
 proxy/static/assets/toolbar-on.svg |  14 ++
 proxy/static/assets/toolbar-running-48.png | Bin 0 -> 3268 bytes
 proxy/static/assets/toolbar-running-96.png | Bin 0 -> 6617 bytes
 proxy/static/assets/toolbar-running.svg|  14 ++
 proxy/webext/manifest.json |   3 ++-
 11 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/proxy/init-webext.js b/proxy/init-webext.js
index 05a46f6..fc0a841 100644
--- a/proxy/init-webext.js
+++ b/proxy/init-webext.js
@@ -78,13 +78,15 @@ class WebExtUI extends UI {
 if (this.active) {
   return chrome.browserAction.setIcon({
 path: {
-  32: "assets/status-running.png"
+  48: "assets/toolbar-running-48.png",
+  96: "assets/toolbar-running-96.png"
 }
   });
 } else {
   return chrome.browserAction.setIcon({
 path: {
-  32: "assets/status-on.png"
+  48: "assets/toolbar-on-48.png",
+  96: "assets/toolbar-on-96.png"
 }
   });
 }
@@ -94,7 +96,8 @@ class WebExtUI extends UI {
 update();
 return chrome.browserAction.setIcon({
   path: {
-32: "assets/status-" + (enabled ? "on" : "off") + ".png"
+48: "assets/toolbar-" + (enabled ? "on" : "off") + "-48.png",
+96: "assets/toolbar-" + (enabled ? "on" : "off") + "-96.png"
   }
 });
   }
@@ -142,7 +145,12 @@ var debug, snowflake, config, broker, ui, log, dbg, init, 
update, silenceNotific
 missingFeature: true
   });
 });
-chrome.browserAction.setIcon({ path: { 32: "assets/status-off.png" } });
+chrome.browserAction.setIcon({
+  path: {
+48: "assets/toolbar-off-48.png",
+96: "assets/toolbar-off-96.png"
+  }
+});
 return;
   }
 
diff --git a/proxy/static/assets/toolbar-off-48.png 
b/proxy/static/assets/toolbar-off-48.png
new file mode 100644
index 000..9a28a6f
Binary files /dev/null and b/proxy/static/assets/toolbar-off-48.png differ
diff --git a/proxy/static/assets/toolbar-off-96.png 
b/proxy/static/assets/toolbar-off-96.png
new file mode 100644
index 000..d022b51
Binary files /dev/null and b/proxy/static/assets/toolbar-off-96.png differ
diff --git a/proxy/static/assets/toolbar-off.svg 
b/proxy/static/assets/toolbar-off.svg
new file mode 100644
index 000..2b35669
--- /dev/null
+++ b/proxy/static/assets/toolbar-off.svg
@@ -0,0 +1,14 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+toolbar_icon_grey
+Created with Sketch.
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/proxy/static/assets/toolbar-on-48.png 
b/proxy/static/assets/toolbar-on-48.png
new file mode 100644
index 000..990ab30
Binary files /dev/null and b/proxy/static/assets/toolbar-on-48.png differ
diff --git a/proxy/static/assets/toolbar-on-96.png 
b/proxy/static/assets/toolbar-on-96.png
new file mode 100644
index 000..d0226b6
Binary files /dev/null and b/proxy/static/assets/toolbar-on-96.png differ
diff --git a/proxy/static/assets/toolbar-on.svg 
b/proxy/static/assets/toolbar-on.svg
new file mode 100644
index 000..70c079a
--- /dev/null
+++ b/proxy/static/assets/toolbar-on.svg
@@ -0,0 +1,14 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+toolbar_icon_purple
+Created with Sketch.
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/proxy/static/assets/toolbar-running-48.png 
b/proxy/static/assets/toolbar-running-48.png
new file mode 100644
index 000..2337e8a
Binary files /dev/null and b/proxy/static/assets/toolbar-running-48.png differ
diff --git a/proxy/static/assets/toolbar-running-96.png 
b/proxy/static/assets/toolbar-running-96.png
new file mode 100644
index 000..637e366
Binary files /dev/null and b/proxy/static/assets/toolbar-running-96.png differ
diff --git a/proxy/static/assets/toolbar-running.svg

[tor-commits] [snowflake/master] Dark-mode images from Antonela.

2019-08-19 Thread dcf

commit 7e2936dcec7374d72fe5579ea1ca3e6cd5c8e157
Author: David Fifield 
Date:   Mon Jul 22 22:45:20 2019 -0600

Dark-mode images from Antonela.

https://bugs.torproject.org/31170#comment:3

Also revises the light-mode images.
---
 proxy/static/assets/status-off-dark.png| Bin 0 -> 3626 bytes
 proxy/static/assets/status-off-dark.svg|  11 +++
 proxy/static/assets/status-off-d...@2x.png | Bin 0 -> 8891 bytes
 proxy/static/assets/status-off-d...@3x.png | Bin 0 -> 13339 bytes
 proxy/static/assets/status-off.png | Bin 5021 -> 3389 bytes
 proxy/static/assets/status-off.svg |   8 ++--
 proxy/static/assets/status-...@2x.png  | Bin 11206 -> 8022 bytes
 proxy/static/assets/status-...@3x.png  | Bin 17252 -> 12459 bytes
 proxy/static/assets/status-on-dark.png | Bin 0 -> 3209 bytes
 proxy/static/assets/status-on-dark.svg |  11 +++
 proxy/static/assets/status-on-d...@2x.png  | Bin 0 -> 7268 bytes
 proxy/static/assets/status-on-d...@3x.png  | Bin 0 -> 11360 bytes
 proxy/static/assets/status-on.png  | Bin 4250 -> 3077 bytes
 proxy/static/assets/status-on.svg  |   8 ++--
 proxy/static/assets/status...@2x.png   | Bin 10913 -> 7185 bytes
 proxy/static/assets/status...@3x.png   | Bin 17084 -> 10844 bytes
 16 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/proxy/static/assets/status-off-dark.png 
b/proxy/static/assets/status-off-dark.png
new file mode 100644
index 000..75cf163
Binary files /dev/null and b/proxy/static/assets/status-off-dark.png differ
diff --git a/proxy/static/assets/status-off-dark.svg 
b/proxy/static/assets/status-off-dark.svg
new file mode 100644
index 000..3df7cc3
--- /dev/null
+++ b/proxy/static/assets/status-off-dark.svg
@@ -0,0 +1,11 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+Fill-4
+Created with Sketch.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/proxy/static/assets/status-off-d...@2x.png 
b/proxy/static/assets/status-off-d...@2x.png
new file mode 100644
index 000..374881e
Binary files /dev/null and b/proxy/static/assets/status-off-d...@2x.png differ
diff --git a/proxy/static/assets/status-off-d...@3x.png 
b/proxy/static/assets/status-off-d...@3x.png
new file mode 100644
index 000..a1e3fff
Binary files /dev/null and b/proxy/static/assets/status-off-d...@3x.png differ
diff --git a/proxy/static/assets/status-off.png 
b/proxy/static/assets/status-off.png
index dd4065e..3cc438e 100644
Binary files a/proxy/static/assets/status-off.png and 
b/proxy/static/assets/status-off.png differ
diff --git a/proxy/static/assets/status-off.svg 
b/proxy/static/assets/status-off.svg
index f6605ea..843b278 100644
--- a/proxy/static/assets/status-off.svg
+++ b/proxy/static/assets/status-off.svg
@@ -1,11 +1,7 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
 status-off
-Created with Sketch.
 
-
-
-
+
 
 
\ No newline at end of file
diff --git a/proxy/static/assets/status-...@2x.png 
b/proxy/static/assets/status-...@2x.png
index 902d1b5..a102a80 100644
Binary files a/proxy/static/assets/status-...@2x.png and 
b/proxy/static/assets/status-...@2x.png differ
diff --git a/proxy/static/assets/status-...@3x.png 
b/proxy/static/assets/status-...@3x.png
index 71a6dc8..4e119b6 100644
Binary files a/proxy/static/assets/status-...@3x.png and 
b/proxy/static/assets/status-...@3x.png differ
diff --git a/proxy/static/assets/status-on-dark.png 
b/proxy/static/assets/status-on-dark.png
new file mode 100644
index 000..09435c2
Binary files /dev/null and b/proxy/static/assets/status-on-dark.png differ
diff --git a/proxy/static/assets/status-on-dark.svg 
b/proxy/static/assets/status-on-dark.svg
new file mode 100644
index 000..bfc9894
--- /dev/null
+++ b/proxy/static/assets/status-on-dark.svg
@@ -0,0 +1,11 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+Fill-4
+Created with Sketch.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/proxy/static/assets/status-on-d...@2x.png 
b/proxy/static/assets/status-on-d...@2x.png
new file mode 100644
index 000..18efcf5
Binary files /dev/null and b/proxy/static/assets/status-on-d...@2x.png differ
diff --git a/proxy/static/assets/status-on-d...@3x.png 
b/proxy/static/assets/status-on-d...@3x.png
new file mode 100644
index 000..026f6be
Binary files /dev/null and b/proxy/static/assets/status-on-d...@3x.png differ
diff --git a/proxy/static/assets/status-on.png 
b/proxy/static/assets/status-on.png
index ee1856b..94aee66 100644
Binary files a/proxy/static/assets/status-on.png and 
b/proxy/static/assets/status-on.png differ
diff --git a/proxy/static/assets/status-on.svg 
b/proxy/static/assets/status-on.svg
index 6c7df00..4cd2be8 100644

[tor-commits] [snowflake/master] Change the "running" color to #68B030.

2019-08-19 Thread dcf

commit 251b6a26fac63045a774d2798f0c51a95f9a7b68
Author: David Fifield 
Date:   Mon Aug 19 11:42:41 2019 -0600

Change the "running" color to #68B030.

Not so light against a white background.
https://bugs.torproject.org/31170#comment:13
---
 proxy/static/assets/status-running.png | Bin 3342 ->  bytes
 proxy/static/assets/status-running.svg |   2 +-
 proxy/static/assets/status-runn...@2x.png  | Bin 8109 -> 7912 bytes
 proxy/static/assets/status-runn...@3x.png  | Bin 12386 -> 12441 bytes
 proxy/static/assets/toolbar-running-48.png | Bin 3268 -> 3660 bytes
 proxy/static/assets/toolbar-running-96.png | Bin 6617 -> 7385 bytes
 proxy/static/assets/toolbar-running.svg|   4 ++--
 7 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/proxy/static/assets/status-running.png 
b/proxy/static/assets/status-running.png
index 187e915..9dfe9fc 100644
Binary files a/proxy/static/assets/status-running.png and 
b/proxy/static/assets/status-running.png differ
diff --git a/proxy/static/assets/status-running.svg 
b/proxy/static/assets/status-running.svg
index 24236c7..dffb7ea 100644
--- a/proxy/static/assets/status-running.svg
+++ b/proxy/static/assets/status-running.svg
@@ -2,6 +2,6 @@
 http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
 status-on
 
-
+
 
 
diff --git a/proxy/static/assets/status-runn...@2x.png 
b/proxy/static/assets/status-runn...@2x.png
index 587c288..fe1163c 100644
Binary files a/proxy/static/assets/status-runn...@2x.png and 
b/proxy/static/assets/status-runn...@2x.png differ
diff --git a/proxy/static/assets/status-runn...@3x.png 
b/proxy/static/assets/status-runn...@3x.png
index 0d356cc..29f8b90 100644
Binary files a/proxy/static/assets/status-runn...@3x.png and 
b/proxy/static/assets/status-runn...@3x.png differ
diff --git a/proxy/static/assets/toolbar-running-48.png 
b/proxy/static/assets/toolbar-running-48.png
index 2337e8a..9df5476 100644
Binary files a/proxy/static/assets/toolbar-running-48.png and 
b/proxy/static/assets/toolbar-running-48.png differ
diff --git a/proxy/static/assets/toolbar-running-96.png 
b/proxy/static/assets/toolbar-running-96.png
index 637e366..956c7d1 100644
Binary files a/proxy/static/assets/toolbar-running-96.png and 
b/proxy/static/assets/toolbar-running-96.png differ
diff --git a/proxy/static/assets/toolbar-running.svg 
b/proxy/static/assets/toolbar-running.svg
index c45943f..5599c87 100644
--- a/proxy/static/assets/toolbar-running.svg
+++ b/proxy/static/assets/toolbar-running.svg
@@ -7,8 +7,8 @@
 
 
 
-
+
 
 
 
-
\ No newline at end of file
+



___
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-08-19 Thread translation

commit 07d618dcc77e99bfd38c14219b8c9048324334c7
Author: Translation commit bot 
Date:   Mon Aug 19 18:25:32 2019 +

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

diff --git a/contents+fa.po b/contents+fa.po
index da05cca6e..9e33e4477 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -79,7 +79,7 @@ msgstr "Ø¯Ø± ØØ§Ù Ø¯Ø§ÙÙÙØ¯"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Running Tor Browser for the first time"
-msgstr "Ø¯Ø± ØØ§Ù Ø§Ø¬Ø±Ø§Û ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø¨Ø±Ø§Û ÙØ®Ø³ØªÛÙ 
Ø¨Ø§Ø±"
+msgstr "Ø§Ø¬Ø±Ø§Û ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø¨Ø±Ø§Û ÙØ®Ø³ØªÛÙ Ø¨Ø§Ø±"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
@@ -152,7 +152,8 @@ msgstr "Ø¯Ø±Ø¨Ø§Ø±Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ±"
 #: (content/about/contents+en.lrtopic.description)
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
-"ÛØ§Ø¯ Ø¨Ú¯ÛØ±ÛØ¯ Ú©Ù ÚÚ¯ÙÙÙ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø§Ø² ØØ±ÛÙ 
Ø®ØµÙØµÛ Ù Ú¯ÙÙØ§ÙÛ Ø´ÙØ§ ØÙØ§Ø¸Øª ÙÛ Ú©ÙØ¯"
+"ÙØ·Ø§ÙØ¨ Ø¨ÛØ´ØªØ±Û Ø±Ø§ Ø¯Ø±Ø¨Ø§Ø±Ù Ø§ÛÙÚ©Ù Ú©Ù ÚÚ¯ÙÙÙ Ù
Ø±ÙØ±Ú¯Ø± ØªÙØ± Ø§Ø² ØØ±ÛÙ Ø®ØµÙØµÛ Ù Ú¯ÙÙØ§ÙÛ Ø´ÙØ§ "
+"Ø¯Ø± Ø§ÛÙØªØ±ÙØª ØÙØ§Ø¸Øª ÙÛ Ú©ÙØ¯Ø Ø¨ÛØ§ÙÙØ²ÛØ¯. "
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -183,7 +184,7 @@ msgid ""
 "explicitly identify yourself."
 msgstr ""
 "* ÙØ³Ø¦ÙÙØ§Ù Ø³Ø§ÛØª ÙØ§ Ù Ø³Ø±ÙÛØ³ ÙØ§ÛÛ Ú©Ù Ø´ÙØ§ 
Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ú©ÙÛØ¯ Ù ÙØ± Ú©Ø³Û Ú©Ù Ø¨Ø± Ø¢Ù ÙØ§ "
-"ÙØ¸Ø§Ø±Øª Ø¯Ø§Ø±Ø¯Ø ÙÙØ· ÙÛ ØªÙØ§ÙÙØ¯ ÛÚ© Ø§Ø±ØªØ¨Ø§Ø· Ø§Ø² 
Ø´Ø¨Ú©Ù Tor Ø±Ø§ Ø¨Ù Ø¬Ø§Û Ø¢Ø¯Ø±Ø³ Ø§ÛÙØªØ±ÙØª(IP) "
+"ÙØ¸Ø§Ø±Øª Ø¯Ø§Ø±Ø¯Ø ÙÙØ· ÙÛ ØªÙØ§ÙÙØ¯ ÛÚ© Ø§Ø±ØªØ¨Ø§Ø· Ø§Ø² 
Ø´Ø¨Ú©Ù ØªÙØ± Ø±Ø§ Ø¨Ù Ø¬Ø§Û Ø¢Ø¯Ø±Ø³ Ø§ÛÙØªØ±ÙØªÛ(IP) "
 "ÙØ§ÙØ¹Û Ø´ÙØ§ Ø¨Ø¨ÛÙÙØ¯ Ù ØªÙØ§ÙØ§ÛÛ Ø´ÙØ§Ø³Ø§ÛÛ Ø´ÙØ§ Ø±Ø§ 
ÙØ¯Ø§Ø±ÙØ¯Ø ÙÚ¯Ø± Ø§ÛÙÚ©Ù Ø´ÙØ§ ÙØ³ØªÙÛÙØ§ "
 "Ø®ÙØ¯ØªØ§Ù  Ø±Ø§ ÙØ¹Ø±ÙÛ Ú©ÙÛØ¯."
 
@@ -356,7 +357,7 @@ msgid ""
 " are using."
 msgstr ""
 "GetTor Ø¨Ø§ Ø§Ø±Ø³Ø§Ù ÛÚ© Ø§ÛÙÛÙ Ú©Ù Ø´Ø§ÙÙ ÙÛÙÚ© Ø¯Ø§ÙÙÙØ¯ Ù
Ø±ÙØ±Ú¯Ø± ØªÙØ±Ø Ø§ÙØ¶Ø§Û Ø±ÙØ²ÙÚ¯Ø§Ø±Û Ø´Ø¯Ù(Ø¨Ø±Ø§Û ØªØ§ÛÛØ¯ 
Ø¯Ø§ÙÙÙØ¯ ÙÛØ§Ø² Ø§Ø³Øª)Ø Ø§Ø«Ø± Ø§ÙÚ¯Ø´Øª Ú©ÙÛØ¯Û Ú©Ù Ø¨Ø±Ø§Û 
Ø³Ø§Ø®Øª Ø§ÙØ¶Ø§ Ø§Ø³ØªÙØ§Ø¯Ù Ø´Ø¯Ù Ù Checksum Ù¾Ú©ÛØ¬ ÙÛ Ø¨Ø§Ø´Ø¯Ø 
Ø¨Ù Ø´ÙØ§ Ù¾Ø§Ø³Ø® ÙÛ Ø¯ÙØ¯.\n"
-"Ø¨Ø³ØªÙ Ø¨Ù ÙØ¯Ù Ú©Ø§ÙÙ¾ÛÙØªØ±Û Ú©Ù Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ú©ÙÛØ¯Ø Ù
ÙÚ©Ù Ø§Ø³Øª Ø¨Ù Ø´ÙØ§ Ù¾ÛØ´ÙÙØ§Ø¯ Ø´ÙØ¯ Ú©Ù ÙØ³Ø®Ù 32 Ø¨ÛØª ÛØ§ 64 
Ø¨ÛØª ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø±Ø§ Ø¯Ø§ÙÙÙØ¯ Ú©ÙÛØ¯."
+"Ø¨Ø³ØªÙ Ø¨Ù ÙØ¯Ù Ú©Ø§ÙÙ¾ÛÙØªØ±Û Ú©Ù Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ú©ÙÛØ¯Ø Ù
ÙÚ©Ù Ø§Ø³Øª Ø¨Ù Ø´ÙØ§ Ù¾ÛØ´ÙÙØ§Ø¯ Ø´ÙØ¯ Ú©Ù ÙØ³Ø®Ù \"32 Ø¨ÛØª\" 
ÛØ§ \"64 Ø¨ÛØª\" ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø±Ø§ Ø¯Ø§ÙÙÙØ¯ Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)

___
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.1] Blurb for 0.4.1.5

2019-08-19 Thread nickm

commit b0cdfb9d56178da27d0e6b9a9e7695eca955ae65
Author: Nick Mathewson 
Date:   Mon Aug 19 14:21:31 2019 -0400

Blurb for 0.4.1.5
---
 ChangeLog| 15 ++-
 ReleaseNotes | 15 ++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44559554b..0bf876d20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 Changes in version 0.4.1.5 - 2019-08-20
-  BLURB HERE
+  This is the first stable release in the 0.4.1.x series. This series
+  adds experimental circuit-level padding, authenticated SENDME cells to
+  defend against certain attacks, and several performance improvements
+  to save on CPU consumption. It fixes bugs in bootstrapping and v3
+  onion services. It also includes numerous smaller features and
+  bugfixes on earlier versions.
+
+  Per our support policy, we will support the 0.4.1.x series for nine
+  months, or until three months after the release of a stable 0.4.2.x:
+  whichever is longer. If you need longer-term support, please stick
+  with 0.3.5.x, which will we plan to support until Feb 2022.
+
+  Below are the changes since 0.4.1.4-rc. For a complete list of changes
+  since 0.4.0.5, see the ReleaseNotes file.
 
   o Directory authority changes:
 - The directory authority "dizum" has a new IP address. Closes
diff --git a/ReleaseNotes b/ReleaseNotes
index 9137c7072..091502946 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -3,7 +3,20 @@ 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.4.1.5 - 2019-08-20
-  BLURB BLURB
+  This is the first stable release in the 0.4.1.x series. This series
+  adds experimental circuit-level padding, authenticated SENDME cells to
+  defend against certain attacks, and several performance improvements
+  to save on CPU consumption. It fixes bugs in bootstrapping and v3
+  onion services. It also includes numerous smaller features and
+  bugfixes on earlier versions.
+
+  Per our support policy, we will support the 0.4.1.x series for nine
+  months, or until three months after the release of a stable 0.4.2.x:
+  whichever is longer. If you need longer-term support, please stick
+  with 0.3.5.x, which will we plan to support until Feb 2022.
+
+  Below are the changes since 0.4.0.5. For a list of only the changes
+  since 0.4.1.4-rc, see the ChangeLog file.
 
   o Directory authority changes:
 - The directory authority "dizum" has a new IP address. Closes

___
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.1] Update version to 0.4.1.5

2019-08-19 Thread nickm

commit ab92881d9a758dcf1394924a2a852fb5a4756fce
Author: Nick Mathewson 
Date:   Mon Aug 19 11:35:48 2019 -0400

Update version to 0.4.1.5
---
 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 14e70f71a..d26545be2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.4-rc-dev])
+AC_INIT([tor],[0.4.1.5])
 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-07-26"], # for 0.4.1.4-rc-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-08-19"], # for 0.4.1.5
   [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 fac98bab5..d22bc7c0c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.4-rc-dev"
+!define VERSION "0.4.1.5"
 !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 78f951c04..9bb1a9092 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.4-rc-dev"
+#define VERSION "0.4.1.5"
 
 
 

___
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.1] Update version to 0.4.1.5

2019-08-19 Thread nickm

commit ab92881d9a758dcf1394924a2a852fb5a4756fce
Author: Nick Mathewson 
Date:   Mon Aug 19 11:35:48 2019 -0400

Update version to 0.4.1.5
---
 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 14e70f71a..d26545be2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.4-rc-dev])
+AC_INIT([tor],[0.4.1.5])
 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-07-26"], # for 0.4.1.4-rc-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-08-19"], # for 0.4.1.5
   [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 fac98bab5..d22bc7c0c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.4-rc-dev"
+!define VERSION "0.4.1.5"
 !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 78f951c04..9bb1a9092 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.4-rc-dev"
+#define VERSION "0.4.1.5"
 
 
 



___
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.1] Merge branch 'maint-0.4.1' into release-0.4.1

2019-08-19 Thread nickm

commit b91126b5464f4bea366a5f771b01dfa95e121221
Merge: c5a68c185 ab92881d9
Author: Nick Mathewson 
Date:   Mon Aug 19 11:37:15 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

 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/master] Update version to 0.4.1.5

2019-08-19 Thread nickm

commit ab92881d9a758dcf1394924a2a852fb5a4756fce
Author: Nick Mathewson 
Date:   Mon Aug 19 11:35:48 2019 -0400

Update version to 0.4.1.5
---
 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 14e70f71a..d26545be2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.4-rc-dev])
+AC_INIT([tor],[0.4.1.5])
 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-07-26"], # for 0.4.1.4-rc-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-08-19"], # for 0.4.1.5
   [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 fac98bab5..d22bc7c0c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.4-rc-dev"
+!define VERSION "0.4.1.5"
 !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 78f951c04..9bb1a9092 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.4-rc-dev"
+#define VERSION "0.4.1.5"
 
 
 



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

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

2019-08-19 Thread nickm

commit 36a27fa2d331c53802635431849ca9a400122a4e
Merge: e5812c91d ab92881d9
Author: Nick Mathewson 
Date:   Mon Aug 19 11:36:55 2019 -0400

Merge branch 'maint-0.4.1'

"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 remote-tracking branch 'tor-github/pr/1231'

2019-08-19 Thread nickm

commit e5812c91d6a682f9604032dde2285c87774ec3dd
Merge: 29bd43ab0 2ea2d6f30
Author: Nick Mathewson 
Date:   Mon Aug 19 11:34:27 2019 -0400

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

 src/core/or/circuitpadding.c | 28 +++-
 1 file changed, 23 insertions(+), 5 deletions(-)

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

[tor-commits] [tor/master] Clarify comment for bug30942 and improve logline.

2019-08-19 Thread nickm

commit 2ea2d6f30add2350adb29467d0f27203571388fc
Author: Mike Perry 
Date:   Mon Aug 12 14:23:43 2019 -0500

Clarify comment for bug30942 and improve logline.
---
 src/core/or/circuitpadding.c | 28 +++-
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 9ccad8744..47870bcaa 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -1800,8 +1800,6 @@ circpad_check_received_cell(cell_t *cell, circuit_t *circ,
 crypt_path_t *layer_hint,
 const relay_header_t *rh)
 {
-  unsigned domain = layer_hint?LD_APP:LD_EXIT;
-
   /* First handle the padding commands, since we want to ignore any other
* commands if this circuit is padding-specific. */
   switch (rh->command) {
@@ -1818,10 +1816,30 @@ circpad_check_received_cell(cell_t *cell, circuit_t 
*circ,
   }
 
   /* If this is a padding circuit we don't need to parse any other commands
-   * than the padding ones. Just drop them to the floor. */
+   * than the padding ones. Just drop them to the floor.
+   *
+   * Note: we deliberately do not call circuit_read_valid_data() here. The
+   * vanguards addon (specifically the 'bandguards' component's dropped cell
+   * detection) will thus close this circuit, as it would for any other
+   * unexpected cell. However, default tor will *not* close the circuit.
+   *
+   * This is intentional. We are not yet certain that is it optimal to keep
+   * padding circuits open in cases like these, rather than closing them.
+   * We suspect that continuing to pad is optimal against a passive classifier,
+   * but as soon as the adversary is active (even as a client adversary) this
+   * might change.
+   *
+   * So as a way forward, we log the cell command and circuit number, to
+   * help us enumerate the most common instances of this in testing with
+   * vanguards, to see which are common enough to verify and handle
+   * properly.
+   * - Mike
+   */
   if (circ->purpose == CIRCUIT_PURPOSE_C_CIRCUIT_PADDING) {
-log_info(domain, "Ignored cell (%d) that arrived in padding circuit.",
- rh->command);
+log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
+   "Ignored cell (%d) that arrived in padding circuit "
+  " %u.", rh->command, CIRCUIT_IS_ORIGIN(circ) ?
+   TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0);
 return 0;
   }
 



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1224'

2019-08-19 Thread nickm

commit 29bd43ab03fd09e9d23b33ae4f126382008739ea
Merge: b51a822a8 64d2133a6
Author: Nick Mathewson 
Date:   Mon Aug 19 11:26:58 2019 -0400

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

 scripts/maint/practracker/exceptions.txt | 4 ++--
 src/core/or/relay.c  | 9 +
 2 files changed, 7 insertions(+), 6 deletions(-)

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

[tor-commits] [tor/master] Move the connection_edge_process_relay_cell() assignments out of if statements in circuit_receive_relay_cell()

2019-08-19 Thread nickm

commit 64d2133a6164e201edb075154124e210cbbffe51
Author: Neel 
Date:   Thu Aug 8 13:05:46 2019 -0400

Move the connection_edge_process_relay_cell() assignments out of if 
statements in circuit_receive_relay_cell()
---
 scripts/maint/practracker/exceptions.txt | 4 ++--
 src/core/or/relay.c  | 9 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 75a8b5096..c9399da5d 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -117,8 +117,8 @@ problem function-size 
/src/core/or/connection_or.c:connection_or_compute_authent
 problem file-size /src/core/or/policies.c 3249
 problem function-size /src/core/or/policies.c:policy_summarize() 107
 problem function-size /src/core/or/protover.c:protover_all_supported() 117
-problem file-size /src/core/or/relay.c 3263
-problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 126
+problem file-size /src/core/or/relay.c 3264
+problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 127
 problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 109
 problem function-size 
/src/core/or/relay.c:connection_ap_process_end_not_open() 192
 problem function-size 
/src/core/or/relay.c:connection_edge_process_relay_cell_not_open() 137
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index d66caf3ad..a437b5479 100644
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -265,8 +265,8 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
 if (cell_direction == CELL_DIRECTION_OUT) {
   ++stats_n_relay_cells_delivered;
   log_debug(LD_OR,"Sending away from origin.");
-  if ((reason = connection_edge_process_relay_cell(cell, circ, conn, NULL))
-  < 0) {
+  reason = connection_edge_process_relay_cell(cell, circ, conn, NULL);
+  if (reason < 0) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"connection_edge_process_relay_cell (away from origin) "
"failed.");
@@ -276,8 +276,9 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
 if (cell_direction == CELL_DIRECTION_IN) {
   ++stats_n_relay_cells_delivered;
   log_debug(LD_OR,"Sending to origin.");
-  if ((reason = connection_edge_process_relay_cell(cell, circ, conn,
-   layer_hint)) < 0) {
+  reason = connection_edge_process_relay_cell(cell, circ, conn,
+  layer_hint);
+  if (reason < 0) {
 /* If a client is trying to connect to unknown hidden service port,
  * END_CIRC_AT_ORIGIN is sent back so we can then close the circuit.
  * Do not log warn as this is an expected behavior for a service. */



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

[tor-commits] [tor/master] Remove dead code from circpad_machine_remove_token().

2019-08-19 Thread nickm

commit 0e4753e579c0288a295d1e0a585e1156dd26590a
Author: George Kadianakis 
Date:   Sat Jun 29 19:38:14 2019 +0300

Remove dead code from circpad_machine_remove_token().
---
 changes/bug31027 | 3 +++
 src/core/or/circuitpadding.c | 9 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/changes/bug31027 b/changes/bug31027
new file mode 100644
index 0..dd3ce20b6
--- /dev/null
+++ b/changes/bug31027
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Remove some dead code from circpad_machine_remove_token() to fix some
+  Coverity warnings (CID 1447298). Fixes bug 31027; bugfix on 
0.4.1.1-alpha.
\ No newline at end of file
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 0214cc421..626787da7 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -1083,8 +1083,11 @@ circpad_machine_remove_token(circpad_machine_runtime_t 
*mi)
 
   state = circpad_machine_current_state(mi);
 
+  /* If we are not in a padding state (like start or end), we're done */
+  if (!state)
+return;
   /* Don't remove any tokens if we're not doing token removal */
-  if (!state || state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE)
+  if (state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE)
 return;
 
   current_time = monotime_absolute_usec();
@@ -1103,10 +1106,6 @@ circpad_machine_remove_token(circpad_machine_runtime_t 
*mi)
 timer_disable(mi->padding_timer);
   }
 
-  /* If we are not in a padding state (like start or end), we're done */
-  if (!state)
-return;
-
   /* Perform the specified token removal strategy */
   switch (state->token_removal) {
 case CIRCPAD_TOKEN_REMOVAL_CLOSEST_USEC:



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

[tor-commits] [tor/master] Always check the retval of circpad_machine_current_state().

2019-08-19 Thread nickm

commit 98c1262b2a374de9dc2579a71a1c7464f4435f1d
Author: George Kadianakis 
Date:   Sat Jun 29 19:46:43 2019 +0300

Always check the retval of circpad_machine_current_state().
---
 changes/bug31024 | 4 
 src/core/or/circuitpadding.c | 6 ++
 2 files changed, 10 insertions(+)

diff --git a/changes/bug31024 b/changes/bug31024
new file mode 100644
index 0..888fb2a26
--- /dev/null
+++ b/changes/bug31024
@@ -0,0 +1,4 @@
+  o Minor bugfixes (circuitpadding):
+- Add two NULL checks in unreachable places to silence Coverity (CID 144729
+  and 1447291) and better future proof ourselves. Fixes bug 31024; bugfix
+  on 0.4.1.1-alpha.
\ No newline at end of file
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 626787da7..c4670bbc2 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -450,6 +450,9 @@ 
circpad_is_token_removal_supported(circpad_machine_runtime_t *mi)
 /* Machines that do want token removal are less sensitive to performance.
  * Let's spend some time to check that our state is consistent and sane */
 const circpad_state_t *state = circpad_machine_current_state(mi);
+if (BUG(!state)) {
+  return 1;
+}
 tor_assert_nonfatal(state->token_removal != CIRCPAD_TOKEN_REMOVAL_NONE);
 tor_assert_nonfatal(state->histogram_len == mi->histogram_len);
 tor_assert_nonfatal(mi->histogram_len != 0);
@@ -1667,6 +1670,9 @@ circpad_estimate_circ_rtt_on_received(circuit_t *circ,
 }
   } else {
 const circpad_state_t *state = circpad_machine_current_state(mi);
+if (BUG(!state)) {
+  return;
+}
 
 /* Since monotime is unpredictably expensive, only update this field
  * if rtt estimates are needed. Otherwise, stop the rtt update. */



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1160'

2019-08-19 Thread nickm

commit b51a822a80c5a4d391a3c5f294230982aeccf46b
Merge: 78d2559d8 98c1262b2
Author: Nick Mathewson 
Date:   Mon Aug 19 11:25:45 2019 -0400

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

___
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.1] Fold in changelog/release-notes entries

2019-08-19 Thread nickm

commit c5a68c185b21fcd760ad0f6cbebbd6d34652c842
Author: Nick Mathewson 
Date:   Mon Aug 19 11:23:22 2019 -0400

Fold in changelog/release-notes entries
---
 ChangeLog | 38 ++
 ReleaseNotes  | 30 ++
 changes/bug31343  |  9 -
 changes/bug31356_and_logs | 11 ---
 changes/ticket30591   |  3 ---
 changes/ticket30694   |  3 ---
 changes/ticket31374   |  4 
 changes/ticket31406   |  3 ---
 8 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 661e7d971..44559554b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,34 @@
 Changes in version 0.4.1.5 - 2019-08-20
   BLURB HERE
 
+  o Directory authority changes:
+- The directory authority "dizum" has a new IP address. Closes
+  ticket 31406.
+
+  o Minor features (circuit padding logging):
+- Demote noisy client-side warn logs about circuit padding to
+  protocol warnings. Add additional log messages and circuit ID
+  fields to help with bug 30992 and any other future issues.
+
+  o Minor bugfixes (circuit padding negotiation):
+- Bump the circuit padding protocol version to explicitly signify
+  that the HS setup machine support is finalized in 0.4.1.x-stable.
+  This also means that 0.4.1.x-alpha clients will not negotiate
+  padding with 0.4.1.x-stable relays, and 0.4.1.x-stable clients
+  will not negotiate padding with 0.4.1.x-alpha relays (or 0.4.0.x
+  relays). Fixes bug 31356; bugfix on 0.4.1.1-alpha.
+
   o Minor bugfixes (circuit padding):
 - Ignore non-padding cells on padding circuits. This addresses
   various warning messages from subsystems that were not expecting
   padding circuits. Fixes bug 30942; bugfix on 0.4.1.1-alpha.
 
+  o Minor bugfixes (clock skew detection):
+- Don't believe clock skew results from NETINFO cells that appear to
+  arrive before we sent the VERSIONS cells they are responding to.
+  Previously, we would accept them up to 3 minutes "in the past".
+  Fixes bug 31343; bugfix on 0.2.4.4-alpha.
+
   o Minor bugfixes (compatibility, standards compliance):
 - Fix a bug that would invoke undefined behavior on certain
   operating systems when trying to asprintf() a string exactly
@@ -13,11 +36,26 @@ Changes in version 0.4.1.5 - 2019-08-20
   better to fix it anyway. Fixes bug 31001; bugfix on 0.2.2.11-alpha.
   Found and fixed by Tobias Stoeckmann.
 
+  o Minor bugfixes (compilation warning):
+- Fix a compilation warning on Windows about casting a function
+  pointer for GetTickCount64(). Fixes bug 31374; bugfix
+  on 0.2.9.1-alpha.
+
+  o Minor bugfixes (compilation):
+- Avoid using labs() on time_t, which can cause compilation warnings
+  on 64-bit Windows builds. Fixes bug 31343; bugfix on 0.2.4.4-alpha.
+
   o Minor bugfixes (distribution):
 - Do not ship any temporary files found in the
   scripts/maint/practracker directory. Fixes bug 31311; bugfix
   on 0.4.1.1-alpha.
 
+  o Testing (continuous integration):
+- In Travis, make stem log a controller trace to the console. And
+  tail stem's tor log after failure. Closes ticket 30591.
+- In Travis, only run the stem tests that use a tor binary. Closes
+  ticket 30694.
+
 
 Changes in version 0.4.1.4-rc - 2019-07-25
   Tor 0.4.1.4-rc fixes a few bugs from previous versions of Tor, and
diff --git a/ReleaseNotes b/ReleaseNotes
index b2d935d83..9137c7072 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -5,6 +5,10 @@ changes in each development snapshot, see the ChangeLog file.
 Changes in version 0.4.1.5 - 2019-08-20
   BLURB BLURB
 
+  o Directory authority changes:
+- The directory authority "dizum" has a new IP address. Closes
+  ticket 31406.
+
   o Major features (circuit padding):
 - Onion service clients now add padding cells at the start of their
   INTRODUCE and RENDEZVOUS circuits, to make those circuits' traffic
@@ -99,6 +103,11 @@ Changes in version 0.4.1.5 - 2019-08-20
   at the end of a cell that we can fill with random bytes. Closes
   ticket 26846.
 
+  o Minor features (circuit padding logging):
+- Demote noisy client-side warn logs about circuit padding to protocol
+  warnings. Add additional log messages and circuit ID fields to help
+  with bug 30992 and any other future issues.
+
   o Minor features (circuit padding):
 - We now use a fast PRNG when scheduling circuit padding. Part of
   ticket 28636.
@@ -255,6 +264,12 @@ Changes in version 0.4.1.5 - 2019-08-20
   that do not use token removal or circuit RTT estimation. Fixes bug
   29085; bugfix on 0.4.0.1-alpha.
 
+  o Minor bugfixes (clock skew detection):
+- Don't believe clock skew results from NETINFO cells that appear to
+  arrive before we sent the VERSIONS cells they are responding to.
+  Previously, we would accept them up to 3

[tor-commits] [torspec/master] tor-spec: Clarify protover Padding=1 and Padding=2.

2019-08-19 Thread nickm

commit 4c11245fe3781bbe022fb58bd3cff75b1049fab6
Author: George Kadianakis 
Date:   Tue Aug 13 17:59:00 2019 +0300

tor-spec: Clarify protover Padding=1 and Padding=2.
---
 tor-spec.txt | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tor-spec.txt b/tor-spec.txt
index 1a211bc..a23003c 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -2169,7 +2169,13 @@ see tor-design.pdf.
 
Describes the padding capabilities of the relay.
 
-   "1" -- Relay supports circuit-level padding.
+   "1" -- [DEFUNCT] Relay supports circuit-level padding. This version MUST NOT
+  be used as it was also enabled in relays that don't actually support
+  circuit-level padding. Advertised by Tor versions from
+  tor-0.4.0.1-alpha and only up to and including tor-0.4.1.4-rc.
+
+   "2" -- Relay supports the HS circuit setup padding machines (proposal 302).
+  Advertised by Tor versions from tor-0.4.1.5-rc and onwards.
 
 9.12. "FlowCtrl"
 



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

[tor-commits] [torspec/master] 0.4.1.5 is scheduled to be a stable release.

2019-08-19 Thread nickm

commit d03d6ace4b8075861feb0a7ac3ef8eedb204482c
Author: Nick Mathewson 
Date:   Mon Aug 19 11:17:38 2019 -0400

0.4.1.5 is scheduled to be a stable release.
---
 tor-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-spec.txt b/tor-spec.txt
index a23003c..21abfdf 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -2175,7 +2175,7 @@ see tor-design.pdf.
   tor-0.4.0.1-alpha and only up to and including tor-0.4.1.4-rc.
 
"2" -- Relay supports the HS circuit setup padding machines (proposal 302).
-  Advertised by Tor versions from tor-0.4.1.5-rc and onwards.
+  Advertised by Tor versions from tor-0.4.1.5 and onwards.
 
 9.12. "FlowCtrl"
 

___
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.1] Bug 31356: Bump protover for new padding machines

2019-08-19 Thread nickm

commit b14bb12e39d3ccb95a9e5d9cf3eda8428c129520
Author: Mike Perry 
Date:   Thu Aug 8 12:49:33 2019 -0500

Bug 31356: Bump protover for new padding machines

By binding the protover numbering to specific padding machines, we can make
our padding negotiation simpler. We probably should have done this in the
first place.

This has the side effect that earlier 0.4.1.x-alpha clients won't negotiate
with 0.4.1.x-stable relays, and 0.4.1.x-stable clients won't negotiate with
earlier 0.4.1.x-alpha relays (or 0.4.0.x relays). Since we don't support
alphas after the stable is released, this is fine, so long as it gets in
before the first stable of 0.4.1.x.
---
 src/core/or/protover.c| 2 +-
 src/rust/protover/protover.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/or/protover.c b/src/core/or/protover.c
index e12919f0a..ccd33fabf 100644
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@ -402,7 +402,7 @@ protover_get_supported_protocols(void)
 #endif
 "Microdesc=1-2 "
 "Relay=1-2 "
-"Padding=1 "
+"Padding=2 "
 "FlowCtrl=1";
 }
 
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index f7d9d6d15..7a76fcdd9 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -168,7 +168,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static 
CStr {
  LinkAuth=3 \
  Microdesc=1-2 \
  Relay=1-2 \
- Padding=1 \
+ Padding=2 \
  FlowCtrl=1"
 )
 } else {
@@ -183,7 +183,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static 
CStr {
  LinkAuth=1,3 \
  Microdesc=1-2 \
  Relay=1-2 \
- Padding=1 \
+ Padding=2 \
  FlowCtrl=1"
 )
 }



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

[tor-commits] [tor/release-0.4.1] Bug 31356: Add changes file.

2019-08-19 Thread nickm

commit 02c89c955d60d1135aa231ce8ebc431af732f560
Author: Mike Perry 
Date:   Thu Aug 8 13:59:49 2019 -0500

Bug 31356: Add changes file.

Also document the other log changes in this branch.
---
 changes/bug31356_and_logs | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/changes/bug31356_and_logs b/changes/bug31356_and_logs
new file mode 100644
index 0..fb5307cb6
--- /dev/null
+++ b/changes/bug31356_and_logs
@@ -0,0 +1,11 @@
+  o Minor bugfixes (circuit padding negotiation):
+- Bump circuit padding protover to explicitly signify that the hs setup
+  machine support is finalized in 0.4.1.x-stable. This also means that
+  0.4.1.x-alpha clients will not negotiate padding with 0.4.1.x-stable
+  relays, and 0.4.1.x-stable clients will not negotiate padding with
+  0.4.1.x-alpha relays (or 0.4.0.x relays). Fixes bug 31356;
+  bugfix on 0.4.1.1-alpha.
+  o Minor features (circuit padding logging):
+- Demote noisy client-side warn log to a protocol warning. Add additional
+  log messages and circuit id fields to help with fixing bug 30992 and any
+  other future issues.



___
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.1] Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1

2019-08-19 Thread nickm

commit 6a89b0104970037893536f3336a1ec982da13dc6
Merge: bba64c988 6deba34fe
Author: Nick Mathewson 
Date:   Mon Aug 19 11:11:32 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1

 changes/bug31356_and_logs| 11 +
 scripts/maint/practracker/exceptions.txt |  3 ++
 src/core/or/circuitpadding.c | 81 +++-
 src/core/or/or.h |  4 +-
 src/core/or/protover.c   |  2 +-
 src/core/or/protover.h   |  2 +
 src/core/or/versions.c   |  5 +-
 src/rust/protover/protover.rs|  4 +-
 src/test/test_circuitpadding.c   |  4 +-
 9 files changed, 84 insertions(+), 32 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.4.1] Bug 31356: Propogate protover padding support to circpad

2019-08-19 Thread nickm

commit b2821b72bc4e228934b5187ae5015230e7cbd26b
Author: Mike Perry 
Date:   Mon Aug 12 13:15:31 2019 -0500

Bug 31356: Propogate protover padding support to circpad
---
 src/core/or/circuitpadding.c   | 5 +++--
 src/core/or/or.h   | 4 ++--
 src/core/or/protover.h | 2 ++
 src/core/or/versions.c | 5 +++--
 src/test/test_circuitpadding.c | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index cdebda33f..a62cdcf9e 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2696,8 +2696,9 @@ circpad_node_supports_padding(const node_t *node)
 {
   if (node->rs) {
 log_fn(LOG_INFO, LD_CIRC, "Checking padding: %s",
-   node->rs->pv.supports_padding ? "supported" : "unsupported");
-return node->rs->pv.supports_padding;
+   node->rs->pv.supports_hs_setup_padding ?
+  "supported" : "unsupported");
+return node->rs->pv.supports_hs_setup_padding;
   }
 
   log_fn(LOG_INFO, LD_CIRC, "Empty routerstatus in padding check");
diff --git a/src/core/or/or.h b/src/core/or/or.h
index db6d08958..ab258629a 100644
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -841,8 +841,8 @@ typedef struct protover_summary_flags_t {
   unsigned int supports_v3_rendezvous_point: 1;
 
   /** True iff this router has a protocol list that allows clients to
-   * negotiate link-level padding. Requires Padding>=1. */
-  unsigned int supports_padding : 1;
+   * negotiate hs circuit setup padding. Requires Padding>=2. */
+  unsigned int supports_hs_setup_padding : 1;
 } protover_summary_flags_t;
 
 typedef struct routerinfo_t routerinfo_t;
diff --git a/src/core/or/protover.h b/src/core/or/protover.h
index d8e541735..af45a31ae 100644
--- a/src/core/or/protover.h
+++ b/src/core/or/protover.h
@@ -28,6 +28,8 @@ struct smartlist_t;
 #define PROTOVER_HS_INTRO_V3 4
 /** The protover version number that signifies HSv3 rendezvous point support */
 #define PROTOVER_HS_RENDEZVOUS_POINT_V3 2
+/** The protover that signals support for HS circuit setup padding machines */
+#define PROTOVER_HS_SETUP_PADDING 2
 
 /** List of recognized subprotocols. */
 /// C_RUST_COUPLED: src/rust/protover/ffi.rs `translate_to_rust`
diff --git a/src/core/or/versions.c b/src/core/or/versions.c
index 2a572d470..06417bb4e 100644
--- a/src/core/or/versions.c
+++ b/src/core/or/versions.c
@@ -448,8 +448,9 @@ memoize_protover_summary(protover_summary_flags_t *out,
   out->supports_v3_rendezvous_point =
 protocol_list_supports_protocol(protocols, PRT_HSREND,
 PROTOVER_HS_RENDEZVOUS_POINT_V3);
-out->supports_padding =
-  protocol_list_supports_protocol(protocols, PRT_PADDING, 1);
+  out->supports_hs_setup_padding =
+protocol_list_supports_protocol(protocols, PRT_PADDING,
+  PROTOVER_HS_SETUP_PADDING);
 
   protover_summary_flags_t *new_cached = tor_memdup(out, sizeof(*out));
   cached = strmap_set(protover_summary_map, protocols, new_cached);
diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c
index 236f4a192..25f8fd311 100644
--- a/src/test/test_circuitpadding.c
+++ b/src/test/test_circuitpadding.c
@@ -90,10 +90,10 @@ static void
 nodes_init(void)
 {
   padding_node.rs = tor_malloc_zero(sizeof(routerstatus_t));
-  padding_node.rs->pv.supports_padding = 1;
+  padding_node.rs->pv.supports_hs_setup_padding = 1;
 
   non_padding_node.rs = tor_malloc_zero(sizeof(routerstatus_t));
-  non_padding_node.rs->pv.supports_padding = 0;
+  non_padding_node.rs->pv.supports_hs_setup_padding = 0;
 }
 
 static void



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1235'

2019-08-19 Thread nickm

commit e7aabfce61e00c903f5d5cff3ba0c8472de5a4ed
Merge: deccd3aa6 b257e8e55
Author: Nick Mathewson 
Date:   Mon Aug 19 11:10:21 2019 -0400

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

 changes/bug31356_and_logs| 11 +
 scripts/maint/practracker/exceptions.txt |  1 +
 src/core/or/circuitpadding.c | 81 +++-
 src/core/or/or.h |  4 +-
 src/core/or/protover.c   |  2 +-
 src/core/or/protover.h   |  2 +
 src/core/or/versions.c   |  5 +-
 src/rust/protover/protover.rs|  4 +-
 src/test/test_circuitpadding.c   |  4 +-
 9 files changed, 82 insertions(+), 32 deletions(-)



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

[tor-commits] [tor/master] Bug 31356: Add changes file.

2019-08-19 Thread nickm

commit 02c89c955d60d1135aa231ce8ebc431af732f560
Author: Mike Perry 
Date:   Thu Aug 8 13:59:49 2019 -0500

Bug 31356: Add changes file.

Also document the other log changes in this branch.
---
 changes/bug31356_and_logs | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/changes/bug31356_and_logs b/changes/bug31356_and_logs
new file mode 100644
index 0..fb5307cb6
--- /dev/null
+++ b/changes/bug31356_and_logs
@@ -0,0 +1,11 @@
+  o Minor bugfixes (circuit padding negotiation):
+- Bump circuit padding protover to explicitly signify that the hs setup
+  machine support is finalized in 0.4.1.x-stable. This also means that
+  0.4.1.x-alpha clients will not negotiate padding with 0.4.1.x-stable
+  relays, and 0.4.1.x-stable clients will not negotiate padding with
+  0.4.1.x-alpha relays (or 0.4.0.x relays). Fixes bug 31356;
+  bugfix on 0.4.1.1-alpha.
+  o Minor features (circuit padding logging):
+- Demote noisy client-side warn log to a protocol warning. Add additional
+  log messages and circuit id fields to help with fixing bug 30992 and any
+  other future issues.



___
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.1] Merge branch 'maint-0.4.1' into release-0.4.1

2019-08-19 Thread nickm

commit 7e6957d0d936cabd7cb8bee1d6fe06eb6603
Merge: 262f30dd3 6a89b0104
Author: Nick Mathewson 
Date:   Mon Aug 19 11:11:39 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug31356_and_logs| 11 +
 scripts/maint/practracker/exceptions.txt |  3 ++
 src/core/or/circuitpadding.c | 81 +++-
 src/core/or/or.h |  4 +-
 src/core/or/protover.c   |  2 +-
 src/core/or/protover.h   |  2 +
 src/core/or/versions.c   |  5 +-
 src/rust/protover/protover.rs|  4 +-
 src/test/test_circuitpadding.c   |  4 +-
 9 files changed, 84 insertions(+), 32 deletions(-)

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

[tor-commits] [tor/master] Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final

2019-08-19 Thread nickm

commit b257e8e5530b00b3b1eb5d778d7621dfa27a7aea
Merge: c214402a5 6deba34fe
Author: George Kadianakis 
Date:   Mon Aug 19 17:53:00 2019 +0300

Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into 
bug31356_final

 changes/bug31356_and_logs| 11 +
 scripts/maint/practracker/exceptions.txt |  1 +
 src/core/or/circuitpadding.c | 81 +++-
 src/core/or/or.h |  4 +-
 src/core/or/protover.c   |  2 +-
 src/core/or/protover.h   |  2 +
 src/core/or/versions.c   |  5 +-
 src/rust/protover/protover.rs|  4 +-
 src/test/test_circuitpadding.c   |  4 +-
 9 files changed, 82 insertions(+), 32 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index 8e4618a72,726dc9c3e..a6f10a99a
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -276,10 -279,11 +276,11 @@@ problem function-size /src/lib/process/
  problem function-size /src/lib/process/setuid.c:switch_id() 156
  problem function-size /src/lib/sandbox/sandbox.c:prot_strings() 104
  problem function-size /src/lib/string/scanf.c:tor_vsscanf() 112
 -problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 153
 -problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 171
 -problem function-size 
/src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 126
 +problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 152
 +problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 170
 +problem function-size 
/src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 121
  problem function-size /src/tools/tor-gencert.c:parse_commandline() 111
 -problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 
104
 -problem function-size /src/tools/tor-resolve.c:do_resolve() 174
 +problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 
102
 +problem function-size /src/tools/tor-resolve.c:do_resolve() 171
  problem function-size /src/tools/tor-resolve.c:main() 112
+ 



___
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.1] Bug 30992: Demote logline of wronghop padding to protocol warn.

2019-08-19 Thread nickm

commit f6bc9d7c7eff9d50e5499007ea3a742b259e6ff9
Author: Mike Perry 
Date:   Thu Aug 8 12:24:31 2019 -0500

Bug 30992: Demote logline of wronghop padding to protocol warn.

This can happen, it's not great, but it's not the worst thing in the world
either. Deferring full fix for 0.4.2/later.
---
 src/core/or/circuitpadding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 392dc5333..cdebda33f 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2907,7 +2907,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t 
*cell,
 
   /* Verify this came from the expected hop */
   if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) {
-log_fn(LOG_WARN, LD_CIRC,
+log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
"Padding negotiated cell from wrong hop on circuit %u",
  TO_ORIGIN_CIRCUIT(circ)->global_identifier);
 return -1;



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1

2019-08-19 Thread nickm

commit 6a89b0104970037893536f3336a1ec982da13dc6
Merge: bba64c988 6deba34fe
Author: Nick Mathewson 
Date:   Mon Aug 19 11:11:32 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1

 changes/bug31356_and_logs| 11 +
 scripts/maint/practracker/exceptions.txt |  3 ++
 src/core/or/circuitpadding.c | 81 +++-
 src/core/or/or.h |  4 +-
 src/core/or/protover.c   |  2 +-
 src/core/or/protover.h   |  2 +
 src/core/or/versions.c   |  5 +-
 src/rust/protover/protover.rs|  4 +-
 src/test/test_circuitpadding.c   |  4 +-
 9 files changed, 84 insertions(+), 32 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.4.1] Practracker

2019-08-19 Thread nickm

commit 6deba34fee9b3ea99771db4fec562a776ff1ed4d
Author: Mike Perry 
Date:   Mon Aug 12 13:40:29 2019 -0500

Practracker
---
 scripts/maint/practracker/exceptions.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 9073f2f1d..726dc9c3e 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -87,7 +87,9 @@ problem function-size 
/src/core/or/circuitlist.c:circuit_about_to_free() 120
 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117
 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110
 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114
+problem file-size /src/core/or/circuitpadding.c 3040
 problem function-size 
/src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107
+problem function-size 
/src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 
 problem function-size 
/src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits()
 104
 problem function-size 
/src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits()
 112
 problem function-size 
/src/core/or/circuitstats.c:circuit_build_times_parse_state() 124
@@ -284,3 +286,4 @@ problem function-size 
/src/tools/tor-gencert.c:parse_commandline() 111
 problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 
104
 problem function-size /src/tools/tor-resolve.c:do_resolve() 174
 problem function-size /src/tools/tor-resolve.c:main() 112
+



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

2019-08-19 Thread nickm

commit 78d2559d85d79b4daefb2b65a19f9c994a654dac
Merge: e7aabfce6 6a89b0104
Author: Nick Mathewson 
Date:   Mon Aug 19 11:11:39 2019 -0400

Merge branch 'maint-0.4.1'

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

[tor-commits] [tor/master] Bug 31356: Propogate protover padding support to circpad

2019-08-19 Thread nickm

commit b2821b72bc4e228934b5187ae5015230e7cbd26b
Author: Mike Perry 
Date:   Mon Aug 12 13:15:31 2019 -0500

Bug 31356: Propogate protover padding support to circpad
---
 src/core/or/circuitpadding.c   | 5 +++--
 src/core/or/or.h   | 4 ++--
 src/core/or/protover.h | 2 ++
 src/core/or/versions.c | 5 +++--
 src/test/test_circuitpadding.c | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index cdebda33f..a62cdcf9e 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2696,8 +2696,9 @@ circpad_node_supports_padding(const node_t *node)
 {
   if (node->rs) {
 log_fn(LOG_INFO, LD_CIRC, "Checking padding: %s",
-   node->rs->pv.supports_padding ? "supported" : "unsupported");
-return node->rs->pv.supports_padding;
+   node->rs->pv.supports_hs_setup_padding ?
+  "supported" : "unsupported");
+return node->rs->pv.supports_hs_setup_padding;
   }
 
   log_fn(LOG_INFO, LD_CIRC, "Empty routerstatus in padding check");
diff --git a/src/core/or/or.h b/src/core/or/or.h
index db6d08958..ab258629a 100644
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -841,8 +841,8 @@ typedef struct protover_summary_flags_t {
   unsigned int supports_v3_rendezvous_point: 1;
 
   /** True iff this router has a protocol list that allows clients to
-   * negotiate link-level padding. Requires Padding>=1. */
-  unsigned int supports_padding : 1;
+   * negotiate hs circuit setup padding. Requires Padding>=2. */
+  unsigned int supports_hs_setup_padding : 1;
 } protover_summary_flags_t;
 
 typedef struct routerinfo_t routerinfo_t;
diff --git a/src/core/or/protover.h b/src/core/or/protover.h
index d8e541735..af45a31ae 100644
--- a/src/core/or/protover.h
+++ b/src/core/or/protover.h
@@ -28,6 +28,8 @@ struct smartlist_t;
 #define PROTOVER_HS_INTRO_V3 4
 /** The protover version number that signifies HSv3 rendezvous point support */
 #define PROTOVER_HS_RENDEZVOUS_POINT_V3 2
+/** The protover that signals support for HS circuit setup padding machines */
+#define PROTOVER_HS_SETUP_PADDING 2
 
 /** List of recognized subprotocols. */
 /// C_RUST_COUPLED: src/rust/protover/ffi.rs `translate_to_rust`
diff --git a/src/core/or/versions.c b/src/core/or/versions.c
index 2a572d470..06417bb4e 100644
--- a/src/core/or/versions.c
+++ b/src/core/or/versions.c
@@ -448,8 +448,9 @@ memoize_protover_summary(protover_summary_flags_t *out,
   out->supports_v3_rendezvous_point =
 protocol_list_supports_protocol(protocols, PRT_HSREND,
 PROTOVER_HS_RENDEZVOUS_POINT_V3);
-out->supports_padding =
-  protocol_list_supports_protocol(protocols, PRT_PADDING, 1);
+  out->supports_hs_setup_padding =
+protocol_list_supports_protocol(protocols, PRT_PADDING,
+  PROTOVER_HS_SETUP_PADDING);
 
   protover_summary_flags_t *new_cached = tor_memdup(out, sizeof(*out));
   cached = strmap_set(protover_summary_map, protocols, new_cached);
diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c
index 236f4a192..25f8fd311 100644
--- a/src/test/test_circuitpadding.c
+++ b/src/test/test_circuitpadding.c
@@ -90,10 +90,10 @@ static void
 nodes_init(void)
 {
   padding_node.rs = tor_malloc_zero(sizeof(routerstatus_t));
-  padding_node.rs->pv.supports_padding = 1;
+  padding_node.rs->pv.supports_hs_setup_padding = 1;
 
   non_padding_node.rs = tor_malloc_zero(sizeof(routerstatus_t));
-  non_padding_node.rs->pv.supports_padding = 0;
+  non_padding_node.rs->pv.supports_hs_setup_padding = 0;
 }
 
 static void



___
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.1] Additional circpad diagnostic logs

2019-08-19 Thread nickm

commit ccd16caeacd3cec84f6a2c419bfc9a4500506d55
Author: Mike Perry 
Date:   Mon Aug 12 13:40:54 2019 -0500

Additional circpad diagnostic logs

Also add controller circuit id to all relevant circpad loglines. This will
make debugging any future issues like #30992 much easier.
---
 src/core/or/circuitpadding.c | 74 
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index c4670bbc2..392dc5333 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -138,6 +138,11 @@ static void
 circpad_circuit_machineinfo_free_idx(circuit_t *circ, int idx)
 {
   if (circ->padding_info[idx]) {
+log_fn(LOG_INFO,LD_CIRC, "Freeing padding info idx %d on circuit %u (%d)",
+   idx, CIRCUIT_IS_ORIGIN(circ) ?
+ TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0,
+   circ->purpose);
+
 tor_free(circ->padding_info[idx]->histogram);
 timer_free(circ->padding_info[idx]->padding_timer);
 tor_free(circ->padding_info[idx]);
@@ -210,8 +215,9 @@ circpad_marked_circuit_for_padding(circuit_t *circ, int 
reason)
 }
 
 log_info(LD_CIRC, "Circuit %d is not marked for close because of a "
- " pending padding machine.", CIRCUIT_IS_ORIGIN(circ) ?
- TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0);
+ "pending padding machine in index %d.",
+ CIRCUIT_IS_ORIGIN(circ) ?
+ TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0, i);
 
 /* If the machine has had no network events at all within the
  * last circpad_delay_t timespan, it's in some deadlock state.
@@ -222,10 +228,11 @@ circpad_marked_circuit_for_padding(circuit_t *circ, int 
reason)
 if (circ->padding_info[i]->last_cell_time_sec +
 (time_t)CIRCPAD_DELAY_MAX_SECS < approx_time()) {
   log_notice(LD_BUG, "Circuit %d was not marked for close because of a "
-   " pending padding machine for over an hour. Circuit is a %s",
+   "pending padding machine in index %d for over an hour. "
+   "Circuit is a %s",
CIRCUIT_IS_ORIGIN(circ) ?
TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0,
-   circuit_purpose_to_string(circ->purpose));
+   i, circuit_purpose_to_string(circ->purpose));
 
   return 0; // abort timer reached; mark the circuit for close now
 }
@@ -524,7 +531,9 @@ circpad_choose_state_length(circpad_machine_runtime_t *mi)
 
   mi->state_length = clamp_double_to_int64(length);
 
-  log_info(LD_CIRC, "State length sampled to %"PRIu64".", mi->state_length);
+  log_info(LD_CIRC, "State length sampled to %"PRIu64" for circuit %u",
+  mi->state_length, CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+ TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 }
 
 /**
@@ -1198,7 +1207,9 @@ 
circpad_send_padding_cell_for_callback(circpad_machine_runtime_t *mi)
   /* Make sure circuit didn't close on us */
   if (mi->on_circ->marked_for_close) {
 log_fn(LOG_INFO,LD_CIRC,
-   "Padding callback on a circuit marked for close. Ignoring.");
+   "Padding callback on circuit marked for close (%u). Ignoring.",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+ TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 return CIRCPAD_STATE_CHANGED;
   }
 
@@ -1409,7 +1420,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   // Don't pad in end (but  also don't cancel any previously
   // scheduled padding either).
   if (mi->current_state == CIRCPAD_STATE_END) {
-log_fn(LOG_INFO, LD_CIRC, "Padding end state");
+log_fn(LOG_INFO, LD_CIRC, "Padding end state on circuit %u",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 return CIRCPAD_STATE_UNCHANGED;
   }
 
@@ -1449,7 +1462,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   } else {
 mi->padding_scheduled_at_usec = 1;
   }
-  log_fn(LOG_INFO,LD_CIRC,"\tPadding in %u usec", in_usec);
+  log_fn(LOG_INFO,LD_CIRC,"\tPadding in %u usec on circuit %u", in_usec,
+   CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 
   // Don't schedule if we have infinite delay.
   if (in_usec == CIRCPAD_DELAY_INFINITE) {
@@ -1473,7 +1488,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   timeout.tv_sec = in_usec/TOR_USEC_PER_SEC;
   timeout.tv_usec = (in_usec%TOR_USEC_PER_SEC);
 
-  log_fn(LOG_INFO, LD_CIRC, "\tPadding in %u sec, %u usec",
+  log_fn(LOG_INFO, LD_CIRC, "\tPadding circuit %u in %u sec, %u usec",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0,
   (unsigned)timeout.tv_sec, (unsigned)timeout.tv_usec);
 
   if (mi->padding_timer) {
@@ -1504,6 +1521,12 @@ static void

[tor-commits] [tor/maint-0.4.1] Bug 30992: Demote logline of wronghop padding to protocol warn.

2019-08-19 Thread nickm

commit f6bc9d7c7eff9d50e5499007ea3a742b259e6ff9
Author: Mike Perry 
Date:   Thu Aug 8 12:24:31 2019 -0500

Bug 30992: Demote logline of wronghop padding to protocol warn.

This can happen, it's not great, but it's not the worst thing in the world
either. Deferring full fix for 0.4.2/later.
---
 src/core/or/circuitpadding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 392dc5333..cdebda33f 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2907,7 +2907,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t 
*cell,
 
   /* Verify this came from the expected hop */
   if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) {
-log_fn(LOG_WARN, LD_CIRC,
+log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
"Padding negotiated cell from wrong hop on circuit %u",
  TO_ORIGIN_CIRCUIT(circ)->global_identifier);
 return -1;



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

[tor-commits] [tor/master] Additional circpad diagnostic logs

2019-08-19 Thread nickm

commit ccd16caeacd3cec84f6a2c419bfc9a4500506d55
Author: Mike Perry 
Date:   Mon Aug 12 13:40:54 2019 -0500

Additional circpad diagnostic logs

Also add controller circuit id to all relevant circpad loglines. This will
make debugging any future issues like #30992 much easier.
---
 src/core/or/circuitpadding.c | 74 
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index c4670bbc2..392dc5333 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -138,6 +138,11 @@ static void
 circpad_circuit_machineinfo_free_idx(circuit_t *circ, int idx)
 {
   if (circ->padding_info[idx]) {
+log_fn(LOG_INFO,LD_CIRC, "Freeing padding info idx %d on circuit %u (%d)",
+   idx, CIRCUIT_IS_ORIGIN(circ) ?
+ TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0,
+   circ->purpose);
+
 tor_free(circ->padding_info[idx]->histogram);
 timer_free(circ->padding_info[idx]->padding_timer);
 tor_free(circ->padding_info[idx]);
@@ -210,8 +215,9 @@ circpad_marked_circuit_for_padding(circuit_t *circ, int 
reason)
 }
 
 log_info(LD_CIRC, "Circuit %d is not marked for close because of a "
- " pending padding machine.", CIRCUIT_IS_ORIGIN(circ) ?
- TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0);
+ "pending padding machine in index %d.",
+ CIRCUIT_IS_ORIGIN(circ) ?
+ TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0, i);
 
 /* If the machine has had no network events at all within the
  * last circpad_delay_t timespan, it's in some deadlock state.
@@ -222,10 +228,11 @@ circpad_marked_circuit_for_padding(circuit_t *circ, int 
reason)
 if (circ->padding_info[i]->last_cell_time_sec +
 (time_t)CIRCPAD_DELAY_MAX_SECS < approx_time()) {
   log_notice(LD_BUG, "Circuit %d was not marked for close because of a "
-   " pending padding machine for over an hour. Circuit is a %s",
+   "pending padding machine in index %d for over an hour. "
+   "Circuit is a %s",
CIRCUIT_IS_ORIGIN(circ) ?
TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0,
-   circuit_purpose_to_string(circ->purpose));
+   i, circuit_purpose_to_string(circ->purpose));
 
   return 0; // abort timer reached; mark the circuit for close now
 }
@@ -524,7 +531,9 @@ circpad_choose_state_length(circpad_machine_runtime_t *mi)
 
   mi->state_length = clamp_double_to_int64(length);
 
-  log_info(LD_CIRC, "State length sampled to %"PRIu64".", mi->state_length);
+  log_info(LD_CIRC, "State length sampled to %"PRIu64" for circuit %u",
+  mi->state_length, CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+ TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 }
 
 /**
@@ -1198,7 +1207,9 @@ 
circpad_send_padding_cell_for_callback(circpad_machine_runtime_t *mi)
   /* Make sure circuit didn't close on us */
   if (mi->on_circ->marked_for_close) {
 log_fn(LOG_INFO,LD_CIRC,
-   "Padding callback on a circuit marked for close. Ignoring.");
+   "Padding callback on circuit marked for close (%u). Ignoring.",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+ TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 return CIRCPAD_STATE_CHANGED;
   }
 
@@ -1409,7 +1420,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   // Don't pad in end (but  also don't cancel any previously
   // scheduled padding either).
   if (mi->current_state == CIRCPAD_STATE_END) {
-log_fn(LOG_INFO, LD_CIRC, "Padding end state");
+log_fn(LOG_INFO, LD_CIRC, "Padding end state on circuit %u",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 return CIRCPAD_STATE_UNCHANGED;
   }
 
@@ -1449,7 +1462,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   } else {
 mi->padding_scheduled_at_usec = 1;
   }
-  log_fn(LOG_INFO,LD_CIRC,"\tPadding in %u usec", in_usec);
+  log_fn(LOG_INFO,LD_CIRC,"\tPadding in %u usec on circuit %u", in_usec,
+   CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 
   // Don't schedule if we have infinite delay.
   if (in_usec == CIRCPAD_DELAY_INFINITE) {
@@ -1473,7 +1488,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   timeout.tv_sec = in_usec/TOR_USEC_PER_SEC;
   timeout.tv_usec = (in_usec%TOR_USEC_PER_SEC);
 
-  log_fn(LOG_INFO, LD_CIRC, "\tPadding in %u sec, %u usec",
+  log_fn(LOG_INFO, LD_CIRC, "\tPadding circuit %u in %u sec, %u usec",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0,
   (unsigned)timeout.tv_sec, (unsigned)timeout.tv_usec);
 
   if (mi->padding_timer) {
@@ -1504,6 +1521,12 @@ static void

[tor-commits] [tor/maint-0.4.1] Practracker

2019-08-19 Thread nickm

commit 6deba34fee9b3ea99771db4fec562a776ff1ed4d
Author: Mike Perry 
Date:   Mon Aug 12 13:40:29 2019 -0500

Practracker
---
 scripts/maint/practracker/exceptions.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 9073f2f1d..726dc9c3e 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -87,7 +87,9 @@ problem function-size 
/src/core/or/circuitlist.c:circuit_about_to_free() 120
 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117
 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110
 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114
+problem file-size /src/core/or/circuitpadding.c 3040
 problem function-size 
/src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107
+problem function-size 
/src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 
 problem function-size 
/src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits()
 104
 problem function-size 
/src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits()
 112
 problem function-size 
/src/core/or/circuitstats.c:circuit_build_times_parse_state() 124
@@ -284,3 +286,4 @@ problem function-size 
/src/tools/tor-gencert.c:parse_commandline() 111
 problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 
104
 problem function-size /src/tools/tor-resolve.c:do_resolve() 174
 problem function-size /src/tools/tor-resolve.c:main() 112
+



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

[tor-commits] [tor/master] Bug 30992: Demote logline of wronghop padding to protocol warn.

2019-08-19 Thread nickm

commit f6bc9d7c7eff9d50e5499007ea3a742b259e6ff9
Author: Mike Perry 
Date:   Thu Aug 8 12:24:31 2019 -0500

Bug 30992: Demote logline of wronghop padding to protocol warn.

This can happen, it's not great, but it's not the worst thing in the world
either. Deferring full fix for 0.4.2/later.
---
 src/core/or/circuitpadding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 392dc5333..cdebda33f 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2907,7 +2907,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t 
*cell,
 
   /* Verify this came from the expected hop */
   if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) {
-log_fn(LOG_WARN, LD_CIRC,
+log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
"Padding negotiated cell from wrong hop on circuit %u",
  TO_ORIGIN_CIRCUIT(circ)->global_identifier);
 return -1;



___
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.1] Additional circpad diagnostic logs

2019-08-19 Thread nickm

commit ccd16caeacd3cec84f6a2c419bfc9a4500506d55
Author: Mike Perry 
Date:   Mon Aug 12 13:40:54 2019 -0500

Additional circpad diagnostic logs

Also add controller circuit id to all relevant circpad loglines. This will
make debugging any future issues like #30992 much easier.
---
 src/core/or/circuitpadding.c | 74 
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index c4670bbc2..392dc5333 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -138,6 +138,11 @@ static void
 circpad_circuit_machineinfo_free_idx(circuit_t *circ, int idx)
 {
   if (circ->padding_info[idx]) {
+log_fn(LOG_INFO,LD_CIRC, "Freeing padding info idx %d on circuit %u (%d)",
+   idx, CIRCUIT_IS_ORIGIN(circ) ?
+ TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0,
+   circ->purpose);
+
 tor_free(circ->padding_info[idx]->histogram);
 timer_free(circ->padding_info[idx]->padding_timer);
 tor_free(circ->padding_info[idx]);
@@ -210,8 +215,9 @@ circpad_marked_circuit_for_padding(circuit_t *circ, int 
reason)
 }
 
 log_info(LD_CIRC, "Circuit %d is not marked for close because of a "
- " pending padding machine.", CIRCUIT_IS_ORIGIN(circ) ?
- TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0);
+ "pending padding machine in index %d.",
+ CIRCUIT_IS_ORIGIN(circ) ?
+ TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0, i);
 
 /* If the machine has had no network events at all within the
  * last circpad_delay_t timespan, it's in some deadlock state.
@@ -222,10 +228,11 @@ circpad_marked_circuit_for_padding(circuit_t *circ, int 
reason)
 if (circ->padding_info[i]->last_cell_time_sec +
 (time_t)CIRCPAD_DELAY_MAX_SECS < approx_time()) {
   log_notice(LD_BUG, "Circuit %d was not marked for close because of a "
-   " pending padding machine for over an hour. Circuit is a %s",
+   "pending padding machine in index %d for over an hour. "
+   "Circuit is a %s",
CIRCUIT_IS_ORIGIN(circ) ?
TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0,
-   circuit_purpose_to_string(circ->purpose));
+   i, circuit_purpose_to_string(circ->purpose));
 
   return 0; // abort timer reached; mark the circuit for close now
 }
@@ -524,7 +531,9 @@ circpad_choose_state_length(circpad_machine_runtime_t *mi)
 
   mi->state_length = clamp_double_to_int64(length);
 
-  log_info(LD_CIRC, "State length sampled to %"PRIu64".", mi->state_length);
+  log_info(LD_CIRC, "State length sampled to %"PRIu64" for circuit %u",
+  mi->state_length, CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+ TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 }
 
 /**
@@ -1198,7 +1207,9 @@ 
circpad_send_padding_cell_for_callback(circpad_machine_runtime_t *mi)
   /* Make sure circuit didn't close on us */
   if (mi->on_circ->marked_for_close) {
 log_fn(LOG_INFO,LD_CIRC,
-   "Padding callback on a circuit marked for close. Ignoring.");
+   "Padding callback on circuit marked for close (%u). Ignoring.",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+ TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 return CIRCPAD_STATE_CHANGED;
   }
 
@@ -1409,7 +1420,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   // Don't pad in end (but  also don't cancel any previously
   // scheduled padding either).
   if (mi->current_state == CIRCPAD_STATE_END) {
-log_fn(LOG_INFO, LD_CIRC, "Padding end state");
+log_fn(LOG_INFO, LD_CIRC, "Padding end state on circuit %u",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 return CIRCPAD_STATE_UNCHANGED;
   }
 
@@ -1449,7 +1462,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   } else {
 mi->padding_scheduled_at_usec = 1;
   }
-  log_fn(LOG_INFO,LD_CIRC,"\tPadding in %u usec", in_usec);
+  log_fn(LOG_INFO,LD_CIRC,"\tPadding in %u usec on circuit %u", in_usec,
+   CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0);
 
   // Don't schedule if we have infinite delay.
   if (in_usec == CIRCPAD_DELAY_INFINITE) {
@@ -1473,7 +1488,9 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   timeout.tv_sec = in_usec/TOR_USEC_PER_SEC;
   timeout.tv_usec = (in_usec%TOR_USEC_PER_SEC);
 
-  log_fn(LOG_INFO, LD_CIRC, "\tPadding in %u sec, %u usec",
+  log_fn(LOG_INFO, LD_CIRC, "\tPadding circuit %u in %u sec, %u usec",
+ CIRCUIT_IS_ORIGIN(mi->on_circ) ?
+   TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier : 0,
   (unsigned)timeout.tv_sec, (unsigned)timeout.tv_usec);
 
   if (mi->padding_timer) {
@@ -1504,6 +1521,12 @@ static void

[tor-commits] [tor/master] Practracker

2019-08-19 Thread nickm

commit 6deba34fee9b3ea99771db4fec562a776ff1ed4d
Author: Mike Perry 
Date:   Mon Aug 12 13:40:29 2019 -0500

Practracker
---
 scripts/maint/practracker/exceptions.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 9073f2f1d..726dc9c3e 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -87,7 +87,9 @@ problem function-size 
/src/core/or/circuitlist.c:circuit_about_to_free() 120
 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117
 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110
 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114
+problem file-size /src/core/or/circuitpadding.c 3040
 problem function-size 
/src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107
+problem function-size 
/src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 
 problem function-size 
/src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits()
 104
 problem function-size 
/src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits()
 112
 problem function-size 
/src/core/or/circuitstats.c:circuit_build_times_parse_state() 124
@@ -284,3 +286,4 @@ problem function-size 
/src/tools/tor-gencert.c:parse_commandline() 111
 problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 
104
 problem function-size /src/tools/tor-resolve.c:do_resolve() 174
 problem function-size /src/tools/tor-resolve.c:main() 112
+



___
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.1] Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1

2019-08-19 Thread nickm

commit 6a89b0104970037893536f3336a1ec982da13dc6
Merge: bba64c988 6deba34fe
Author: Nick Mathewson 
Date:   Mon Aug 19 11:11:32 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1

 changes/bug31356_and_logs| 11 +
 scripts/maint/practracker/exceptions.txt |  3 ++
 src/core/or/circuitpadding.c | 81 +++-
 src/core/or/or.h |  4 +-
 src/core/or/protover.c   |  2 +-
 src/core/or/protover.h   |  2 +
 src/core/or/versions.c   |  5 +-
 src/rust/protover/protover.rs|  4 +-
 src/test/test_circuitpadding.c   |  4 +-
 9 files changed, 84 insertions(+), 32 deletions(-)

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

[tor-commits] [tor/master] Bug 31356: Bump protover for new padding machines

2019-08-19 Thread nickm

commit b14bb12e39d3ccb95a9e5d9cf3eda8428c129520
Author: Mike Perry 
Date:   Thu Aug 8 12:49:33 2019 -0500

Bug 31356: Bump protover for new padding machines

By binding the protover numbering to specific padding machines, we can make
our padding negotiation simpler. We probably should have done this in the
first place.

This has the side effect that earlier 0.4.1.x-alpha clients won't negotiate
with 0.4.1.x-stable relays, and 0.4.1.x-stable clients won't negotiate with
earlier 0.4.1.x-alpha relays (or 0.4.0.x relays). Since we don't support
alphas after the stable is released, this is fine, so long as it gets in
before the first stable of 0.4.1.x.
---
 src/core/or/protover.c| 2 +-
 src/rust/protover/protover.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/or/protover.c b/src/core/or/protover.c
index e12919f0a..ccd33fabf 100644
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@ -402,7 +402,7 @@ protover_get_supported_protocols(void)
 #endif
 "Microdesc=1-2 "
 "Relay=1-2 "
-"Padding=1 "
+"Padding=2 "
 "FlowCtrl=1";
 }
 
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index f7d9d6d15..7a76fcdd9 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -168,7 +168,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static 
CStr {
  LinkAuth=3 \
  Microdesc=1-2 \
  Relay=1-2 \
- Padding=1 \
+ Padding=2 \
  FlowCtrl=1"
 )
 } else {
@@ -183,7 +183,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static 
CStr {
  LinkAuth=1,3 \
  Microdesc=1-2 \
  Relay=1-2 \
- Padding=1 \
+ Padding=2 \
  FlowCtrl=1"
 )
 }



___
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.1] Bug 31356: Bump protover for new padding machines

2019-08-19 Thread nickm

commit b14bb12e39d3ccb95a9e5d9cf3eda8428c129520
Author: Mike Perry 
Date:   Thu Aug 8 12:49:33 2019 -0500

Bug 31356: Bump protover for new padding machines

By binding the protover numbering to specific padding machines, we can make
our padding negotiation simpler. We probably should have done this in the
first place.

This has the side effect that earlier 0.4.1.x-alpha clients won't negotiate
with 0.4.1.x-stable relays, and 0.4.1.x-stable clients won't negotiate with
earlier 0.4.1.x-alpha relays (or 0.4.0.x relays). Since we don't support
alphas after the stable is released, this is fine, so long as it gets in
before the first stable of 0.4.1.x.
---
 src/core/or/protover.c| 2 +-
 src/rust/protover/protover.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/or/protover.c b/src/core/or/protover.c
index e12919f0a..ccd33fabf 100644
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@ -402,7 +402,7 @@ protover_get_supported_protocols(void)
 #endif
 "Microdesc=1-2 "
 "Relay=1-2 "
-"Padding=1 "
+"Padding=2 "
 "FlowCtrl=1";
 }
 
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index f7d9d6d15..7a76fcdd9 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -168,7 +168,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static 
CStr {
  LinkAuth=3 \
  Microdesc=1-2 \
  Relay=1-2 \
- Padding=1 \
+ Padding=2 \
  FlowCtrl=1"
 )
 } else {
@@ -183,7 +183,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static 
CStr {
  LinkAuth=1,3 \
  Microdesc=1-2 \
  Relay=1-2 \
- Padding=1 \
+ Padding=2 \
  FlowCtrl=1"
 )
 }



___
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.1] Bug 31356: Propogate protover padding support to circpad

2019-08-19 Thread nickm

commit b2821b72bc4e228934b5187ae5015230e7cbd26b
Author: Mike Perry 
Date:   Mon Aug 12 13:15:31 2019 -0500

Bug 31356: Propogate protover padding support to circpad
---
 src/core/or/circuitpadding.c   | 5 +++--
 src/core/or/or.h   | 4 ++--
 src/core/or/protover.h | 2 ++
 src/core/or/versions.c | 5 +++--
 src/test/test_circuitpadding.c | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index cdebda33f..a62cdcf9e 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2696,8 +2696,9 @@ circpad_node_supports_padding(const node_t *node)
 {
   if (node->rs) {
 log_fn(LOG_INFO, LD_CIRC, "Checking padding: %s",
-   node->rs->pv.supports_padding ? "supported" : "unsupported");
-return node->rs->pv.supports_padding;
+   node->rs->pv.supports_hs_setup_padding ?
+  "supported" : "unsupported");
+return node->rs->pv.supports_hs_setup_padding;
   }
 
   log_fn(LOG_INFO, LD_CIRC, "Empty routerstatus in padding check");
diff --git a/src/core/or/or.h b/src/core/or/or.h
index db6d08958..ab258629a 100644
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -841,8 +841,8 @@ typedef struct protover_summary_flags_t {
   unsigned int supports_v3_rendezvous_point: 1;
 
   /** True iff this router has a protocol list that allows clients to
-   * negotiate link-level padding. Requires Padding>=1. */
-  unsigned int supports_padding : 1;
+   * negotiate hs circuit setup padding. Requires Padding>=2. */
+  unsigned int supports_hs_setup_padding : 1;
 } protover_summary_flags_t;
 
 typedef struct routerinfo_t routerinfo_t;
diff --git a/src/core/or/protover.h b/src/core/or/protover.h
index d8e541735..af45a31ae 100644
--- a/src/core/or/protover.h
+++ b/src/core/or/protover.h
@@ -28,6 +28,8 @@ struct smartlist_t;
 #define PROTOVER_HS_INTRO_V3 4
 /** The protover version number that signifies HSv3 rendezvous point support */
 #define PROTOVER_HS_RENDEZVOUS_POINT_V3 2
+/** The protover that signals support for HS circuit setup padding machines */
+#define PROTOVER_HS_SETUP_PADDING 2
 
 /** List of recognized subprotocols. */
 /// C_RUST_COUPLED: src/rust/protover/ffi.rs `translate_to_rust`
diff --git a/src/core/or/versions.c b/src/core/or/versions.c
index 2a572d470..06417bb4e 100644
--- a/src/core/or/versions.c
+++ b/src/core/or/versions.c
@@ -448,8 +448,9 @@ memoize_protover_summary(protover_summary_flags_t *out,
   out->supports_v3_rendezvous_point =
 protocol_list_supports_protocol(protocols, PRT_HSREND,
 PROTOVER_HS_RENDEZVOUS_POINT_V3);
-out->supports_padding =
-  protocol_list_supports_protocol(protocols, PRT_PADDING, 1);
+  out->supports_hs_setup_padding =
+protocol_list_supports_protocol(protocols, PRT_PADDING,
+  PROTOVER_HS_SETUP_PADDING);
 
   protover_summary_flags_t *new_cached = tor_memdup(out, sizeof(*out));
   cached = strmap_set(protover_summary_map, protocols, new_cached);
diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c
index 236f4a192..25f8fd311 100644
--- a/src/test/test_circuitpadding.c
+++ b/src/test/test_circuitpadding.c
@@ -90,10 +90,10 @@ static void
 nodes_init(void)
 {
   padding_node.rs = tor_malloc_zero(sizeof(routerstatus_t));
-  padding_node.rs->pv.supports_padding = 1;
+  padding_node.rs->pv.supports_hs_setup_padding = 1;
 
   non_padding_node.rs = tor_malloc_zero(sizeof(routerstatus_t));
-  non_padding_node.rs->pv.supports_padding = 0;
+  non_padding_node.rs->pv.supports_hs_setup_padding = 0;
 }
 
 static void



___
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.1] Bug 31356: Add changes file.

2019-08-19 Thread nickm

commit 02c89c955d60d1135aa231ce8ebc431af732f560
Author: Mike Perry 
Date:   Thu Aug 8 13:59:49 2019 -0500

Bug 31356: Add changes file.

Also document the other log changes in this branch.
---
 changes/bug31356_and_logs | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/changes/bug31356_and_logs b/changes/bug31356_and_logs
new file mode 100644
index 0..fb5307cb6
--- /dev/null
+++ b/changes/bug31356_and_logs
@@ -0,0 +1,11 @@
+  o Minor bugfixes (circuit padding negotiation):
+- Bump circuit padding protover to explicitly signify that the hs setup
+  machine support is finalized in 0.4.1.x-stable. This also means that
+  0.4.1.x-alpha clients will not negotiate padding with 0.4.1.x-stable
+  relays, and 0.4.1.x-stable clients will not negotiate padding with
+  0.4.1.x-alpha relays (or 0.4.0.x relays). Fixes bug 31356;
+  bugfix on 0.4.1.1-alpha.
+  o Minor features (circuit padding logging):
+- Demote noisy client-side warn log to a protocol warning. Add additional
+  log messages and circuit id fields to help with fixing bug 30992 and any
+  other future issues.



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1225'

2019-08-19 Thread nickm

commit deccd3aa6a0289afff42cb6c9ef12283908a892c
Merge: 60adebc49 2e5519da7
Author: Nick Mathewson 
Date:   Mon Aug 19 11:08:44 2019 -0400

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

 src/feature/rend/rendmid.c | 2 ++
 1 file changed, 2 insertions(+)

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

[tor-commits] [tor/master] hs: Initialize the INTRO2 bucket for legacy intro point

2019-08-19 Thread nickm

commit 2e5519da7cf4fb305d040fc07289b827a4d423a9
Author: David Goulet 
Date:   Thu Aug 8 13:40:10 2019 -0400

hs: Initialize the INTRO2 bucket for legacy intro point

Signed-off-by: David Goulet 
---
 src/feature/rend/rendmid.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
index 192da166e..ef2a44c40 100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@ -117,6 +117,8 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const 
uint8_t *request,
   /* Now, set up this circuit. */
   circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_INTRO_POINT);
   hs_circuitmap_register_intro_circ_v2_relay_side(circ, (uint8_t *)pk_digest);
+  token_bucket_ctr_init(>introduce2_bucket, hs_dos_get_intro2_rate(),
+hs_dos_get_intro2_burst(), (uint32_t) approx_time());
 
   log_info(LD_REND,
"Established introduction point on circuit %u for service %s",



___
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 'doc31089_041' into doc31089_master

2019-08-19 Thread asn

commit 320f5068a07ed3dfe204d247245a62549fe976c9
Merge: 0acfd7dce fcb4d273f
Author: teor 
Date:   Thu Aug 8 23:08:19 2019 +1000

Merge branch 'doc31089_041' into doc31089_master

Delete outdated comment about serving the image, which had been modified
earlier in the master branch.

 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 179 ++--
 2 files changed, 176 insertions(+), 7 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1217'

2019-08-19 Thread asn

commit 60adebc4996797de4c179f489d840af9feff60e2
Merge: 4185ef29f 320f5068a
Author: George Kadianakis 
Date:   Mon Aug 19 18:07:48 2019 +0300

Merge branch 'tor-github/pr/1217'

 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 179 ++--
 2 files changed, 176 insertions(+), 7 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'doc31089_040' into doc31089_041

2019-08-19 Thread asn

commit fcb4d273fb54c9aa42de9609edc007d80c940e1f
Merge: 40d7f1e3a c3d6c7594
Author: teor 
Date:   Thu Aug 8 23:07:22 2019 +1000

Merge branch 'doc31089_040' into doc31089_041

 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 177 +++-
 2 files changed, 176 insertions(+), 5 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'doc31089_035' into doc31089_040

2019-08-19 Thread asn

commit c3d6c75945cd3955a7c9960d5a726dd9579e425d
Merge: 0a661cde1 25f39bdfc
Author: teor 
Date:   Thu Aug 8 23:07:17 2019 +1000

Merge branch 'doc31089_035' into doc31089_040

 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 177 +++-
 2 files changed, 176 insertions(+), 5 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'doc31089_029' into doc31089_035

2019-08-19 Thread asn

commit 25f39bdfc4dfdba02b6f5e5f54938413fc53336d
Merge: e83eabc9b 1087c48d6
Author: teor 
Date:   Thu Aug 8 23:07:12 2019 +1000

Merge branch 'doc31089_029' into doc31089_035

 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 177 +++-
 2 files changed, 176 insertions(+), 5 deletions(-)



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

[tor-commits] [tor/master] Hardcode the image into tor-exit-notice.html

2019-08-19 Thread asn

commit 1087c48d6ef56fee25ca1d06a4aa5f311fe287ff
Author: rl1987 
Date:   Fri Jul 12 10:16:55 2019 +0300

Hardcode the image into tor-exit-notice.html
---
 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 177 +++-
 2 files changed, 176 insertions(+), 5 deletions(-)

diff --git a/changes/doc31089 b/changes/doc31089
new file mode 100644
index 0..2fc0ba4f7
--- /dev/null
+++ b/changes/doc31089
@@ -0,0 +1,4 @@
+  o Documentation:
+- Use RFC 2397 data URL scheme to embed image into tor-exit-notice.html
+  so that operators would no longer have to host it themselves.
+  Closes ticket 31089.
diff --git a/contrib/operator-tools/tor-exit-notice.html 
b/contrib/operator-tools/tor-exit-notice.html
index 8cf5c294f..f0f9a6344 100644
--- a/contrib/operator-tools/tor-exit-notice.html
+++ b/contrib/operator-tools/tor-exit-notice.html
@@ -37,13 +37,180 @@ privacy to people who need it most: average computer 
users. This
 router IP should be generating no other traffic, unless it has been
 compromised.
 
-
-
-
 
 https://www.torproject.org/about/overview;>
-https://www.torproject.org/images/how_tor_works_thumb.png; alt="How 
Tor works" style="border-style:none"/>
+
 
 
 



___
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 'tor-github/pr/1122'

2019-08-19 Thread asn

commit 4185ef29fd637b4ca4aefffb4d50146acab395c3
Merge: af7cf7d5c ef2123c7c
Author: George Kadianakis 
Date:   Mon Aug 19 18:06:05 2019 +0300

Merge branch 'tor-github/pr/1122'

 changes/ticket24964   |  4 +++
 src/feature/dircache/dircache.c   | 13 
 src/feature/dircommon/directory.c | 69 +++
 src/feature/dircommon/directory.h |  1 +
 src/test/test_hs_cache.c  | 23 +++--
 5 files changed, 102 insertions(+), 8 deletions(-)

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

[tor-commits] [tor/master] hs-v3: Disallow single hop client to post/get a descriptor

2019-08-19 Thread asn

commit ef2123c7c7bbf0cb6ec2a5528bae082d51ea8962
Author: David Goulet 
Date:   Wed Jun 19 12:02:41 2019 -0400

hs-v3: Disallow single hop client to post/get a descriptor

Closes #24964

Signed-off-by: David Goulet 
---
 changes/ticket24964   |  4 +++
 src/feature/dircache/dircache.c   | 13 
 src/feature/dircommon/directory.c | 69 +++
 src/feature/dircommon/directory.h |  1 +
 src/test/test_hs_cache.c  | 23 +++--
 5 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/changes/ticket24964 b/changes/ticket24964
new file mode 100644
index 0..171c86eb1
--- /dev/null
+++ b/changes/ticket24964
@@ -0,0 +1,4 @@
+  o Minor feature (onion service v3):
+- Do not allow single hop client to fetch or post an HS descriptor from an
+  HSDir. Closes ticket 24964;
+
diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
index 1b36f716f..7c6af3582 100644
--- a/src/feature/dircache/dircache.c
+++ b/src/feature/dircache/dircache.c
@@ -1390,8 +1390,9 @@ handle_get_hs_descriptor_v3(dir_connection_t *conn,
   const char *pubkey_str = NULL;
   const char *url = args->url;
 
-  /* Reject unencrypted dir connections */
-  if (!connection_dir_is_encrypted(conn)) {
+  /* Reject non anonymous dir connections (which also tests if encrypted). We
+   * do not allow single hop clients to query an HSDir. */
+  if (!connection_dir_is_anonymous(conn)) {
 write_short_http_response(conn, 404, "Not found");
 goto done;
   }
@@ -1632,10 +1633,10 @@ directory_handle_command_post,(dir_connection_t *conn, 
const char *headers,
 goto done;
   }
 
-  /* Handle HS descriptor publish request. */
-  /* XXX: This should be disabled with a consensus param until we want to
-   * the prop224 be deployed and thus use. */
-  if (connection_dir_is_encrypted(conn) && !strcmpstart(url, "/tor/hs/")) {
+  /* Handle HS descriptor publish request. We force an anonymous connection
+   * (which also tests for encrypted). We do not allow single-hop client to
+   * post a descriptor onto an HSDir. */
+  if (connection_dir_is_anonymous(conn) && !strcmpstart(url, "/tor/hs/")) {
 const char *msg = "HS descriptor stored successfully.";
 
 /* We most probably have a publish request for an HS descriptor. */
diff --git a/src/feature/dircommon/directory.c 
b/src/feature/dircommon/directory.c
index 9e6f72e9a..b3db0aa10 100644
--- a/src/feature/dircommon/directory.c
+++ b/src/feature/dircommon/directory.c
@@ -7,6 +7,10 @@
 
 #include "app/config/config.h"
 #include "core/mainloop/connection.h"
+#include "core/or/circuitlist.h"
+#include "core/or/connection_edge.h"
+#include "core/or/connection_or.h"
+#include "core/or/channeltls.h"
 #include "feature/dircache/dircache.h"
 #include "feature/dircache/dirserv.h"
 #include "feature/dirclient/dirclient.h"
@@ -15,6 +19,10 @@
 #include "feature/stats/geoip_stats.h"
 #include "lib/compress/compress.h"
 
+#include "core/or/circuit_st.h"
+#include "core/or/or_circuit_st.h"
+#include "core/or/edge_connection_st.h"
+#include "core/or/or_connection_st.h"
 #include "feature/dircommon/dir_connection_st.h"
 #include "feature/nodelist/routerinfo_st.h"
 
@@ -167,6 +175,67 @@ connection_dir_is_encrypted(const dir_connection_t *conn)
   return TO_CONN(conn)->linked;
 }
 
+/** Return true iff the given directory connection dir_conn is
+ * anonymous, that is, it is on a circuit via a public relay and not directly
+ * from a client or bridge.
+ *
+ * For client circuits via relays: true for 2-hop+ paths.
+ * For client circuits via bridges: true for 3-hop+ paths.
+ *
+ * This first test if the connection is encrypted since it is a strong
+ * requirement for anonymity. */
+bool
+connection_dir_is_anonymous(const dir_connection_t *dir_conn)
+{
+  const connection_t *conn, *linked_conn;
+  const edge_connection_t *edge_conn;
+  const circuit_t *circ;
+
+  tor_assert(dir_conn);
+
+  if (!connection_dir_is_encrypted(dir_conn)) {
+return false;
+  }
+
+  /*
+   * Buckle up, we'll do a deep dive into the connection in order to get the
+   * final connection channel of that connection in order to figure out if
+   * this is a client or relay link.
+   *
+   * We go: dir_conn -> linked_conn -> edge_conn -> on_circuit -> p_chan.
+   */
+
+  conn = TO_CONN(dir_conn);
+  linked_conn = conn->linked_conn;
+
+  /* The dir connection should be connected to an edge connection. It can not
+   * be closed or marked for close. */
+  if (linked_conn == NULL || linked_conn->magic != EDGE_CONNECTION_MAGIC ||
+  conn->linked_conn_is_closed || conn->linked_conn->marked_for_close) {
+log_info(LD_DIR, "Rejected HSDir request: not linked to edge");
+return false;
+  }
+
+  edge_conn = TO_EDGE_CONN((connection_t *) linked_conn);
+  circ = edge_conn->on_circuit;
+
+  /* Can't be a circuit we initiated and without a circuit, no channel. */
+  if (circ == NULL || CIRCUIT_IS_ORIGIN(circ)) {
+log_info(LD_DIR,

[tor-commits] [tor/master] Fix typos in HiddenServiceExportCircuitID

2019-08-19 Thread asn

commit e87e34099c00b97740557058bab907a12e3cc7af
Author: teor 
Date:   Thu Aug 15 18:58:10 2019 +1000

Fix typos in HiddenServiceExportCircuitID

Closes bug 31418.
---
 doc/tor.1.txt | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f357fa333..362c40990 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2973,7 +2973,7 @@ The following options are used to configure a hidden 
service.
 
 [[HiddenServiceExportCircuitID]] **HiddenServiceExportCircuitID** 
__protocol__::
The onion service will use the given protocol to expose the global circuit
-   identifier of each inbound client circuit via the selected protocol. The 
only
+   identifier of each inbound client circuit. The only
protocol supported right now \'haproxy'. This option is only for v3
services. (Default: none) +
  +
@@ -2990,12 +2990,12 @@ The following options are used to configure a hidden 
service.
  +
   global_circuit_id = (0xAA << 24) + (0xBB << 16) + (0xCC << 8) + 0xDD; +
  +
-   In the case above, where the last 32-bit is 0x, the global circuit
+   In the case above, where the last 32-bits are 0x, the global circuit
identifier would be 4294967295. You can use this value together with Tor's
-   control port where it is possible to terminate a circuit given the global
-   circuit identifier. For more information about this see controls-spec.txt. +
+   control port to terminate particular circuits using their global
+   circuit identifiers. For more information about this see control-spec.txt. +
  +
-   The HAProxy version 1 proxy protocol is described in detail at
+   The HAProxy version 1 protocol is described in detail at
https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt
 
 [[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__::



___
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 'tor-github/pr/1233'

2019-08-19 Thread asn

commit af7cf7d5c103e649bdd0b58a34ee83cddcbb1b99
Merge: dfc8c0b53 e87e34099
Author: George Kadianakis 
Date:   Mon Aug 19 18:05:22 2019 +0300

Merge branch 'tor-github/pr/1233'

 doc/tor.1.txt | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1214'

2019-08-19 Thread asn

commit dfc8c0b536aedc47f965efd47f180aaf6f5023e1
Merge: 19e19c1fa 484b65404
Author: George Kadianakis 
Date:   Mon Aug 19 18:04:35 2019 +0300

Merge branch 'tor-github/pr/1214'

 src/test/test_token_bucket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/master] test_token_bucket: negate after casting to signed type.

2019-08-19 Thread asn

commit 484b6540480ee4fdbc7a105242c897cca6d9d8eb
Author: Nick Mathewson 
Date:   Tue Aug 6 11:42:04 2019 -0400

test_token_bucket: negate after casting to signed type.

Previously we tried multiplying by -1 before casting to int32_t,
which would cause us to cast the -1 to an unsigned before we
multiplied.  This gave us compiler warnings on windows.

Fixes bug 31353; bug not in any released Tor.
---
 src/test/test_token_bucket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_token_bucket.c b/src/test/test_token_bucket.c
index d3ce59138..31670718d 100644
--- a/src/test/test_token_bucket.c
+++ b/src/test/test_token_bucket.c
@@ -93,7 +93,7 @@ test_token_bucket_ctr_dec(void *arg)
 
   /* Keep underflowing shouldn't flag the bucket as empty. */
   tt_uint_op(false, OP_EQ, token_bucket_ctr_dec(, BURST));
-  tt_int_op(tb.counter.bucket, OP_EQ, (int32_t) ((BURST + 1) * -1));
+  tt_int_op(tb.counter.bucket, OP_EQ, - (int32_t) (BURST + 1));
 
  done:
   ;



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

[tor-commits] [tor/master] Coverity: fix memory leak on error in test function.

2019-08-19 Thread asn

commit ea154a6108bae597cb37e6bc53036b6dd2ed6187
Author: Nick Mathewson 
Date:   Fri Jun 28 12:27:51 2019 -0400

Coverity: fix memory leak on error in test function.

The function make_intro_from_plaintext() in test_introduce.c would
leak memory if we ever hit a failure from our underlying crypto
functions.  This kind of failure should be impossible, but it's best
to be safe here.

Bugfix on 0.2.4.1-alpha.
---
 src/test/test_introduce.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/test_introduce.c b/src/test/test_introduce.c
index 4a6d90d97..104e973b1 100644
--- a/src/test/test_introduce.c
+++ b/src/test/test_introduce.c
@@ -383,8 +383,10 @@ make_intro_from_plaintext(
 
   /* Output the cell */
   *cell_out = cell;
+  cell = NULL;
 
  done:
+  tor_free(cell);
   return cell_len;
 }
 
@@ -535,4 +537,3 @@ struct testcase_t introduce_tests[] = {
   INTRODUCE_LEGACY(late_parse_v3),
   END_OF_TESTCASES
 };
-



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

[tor-commits] [tor/master] Add a changes file for coverity test fixes of 31030.

2019-08-19 Thread asn

commit 75ea7514e1e87124bf250b36a1a1c243b6b0cea0
Author: Nick Mathewson 
Date:   Fri Jun 28 12:36:12 2019 -0400

Add a changes file for coverity test fixes of 31030.
---
 changes/ticket31030 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket31030 b/changes/ticket31030
new file mode 100644
index 0..4d99323b4
--- /dev/null
+++ b/changes/ticket31030
@@ -0,0 +1,3 @@
+  o Minor bugfixes (coverity, tests):
+- Fix several coverity warnings from our unit tests. Fixes bug 31030;
+  bugfix on 0.2.4.1-alpha, 0.3.2.1-alpha, and 0.4.0.1-alpha.



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

[tor-commits] [tor/master] Fix a few coverity unitinitialzed-value warnings in the unit tests.

2019-08-19 Thread asn

commit 68792f77e51f84d0fb6758ef9491a70570ac9a53
Author: Nick Mathewson 
Date:   Fri Jun 28 12:21:49 2019 -0400

Fix a few coverity unitinitialzed-value warnings in the unit tests.

Coverity can't see that it is not in fact going to read
uninitialized memory here, so we initialize these values
unconditionally.

Bugfix on 0.4.0.1-alpha.
---
 src/test/test_btrack.c| 4 
 src/test/test_controller_events.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/test/test_btrack.c b/src/test/test_btrack.c
index 9e5d0d072..21e88a57b 100644
--- a/src/test/test_btrack.c
+++ b/src/test/test_btrack.c
@@ -44,6 +44,8 @@ test_btrack_launch(void *arg)
 {
   orconn_state_msg_t conn;
   ocirc_chan_msg_t circ;
+  memset(, 0, sizeof(conn));
+  memset(, 0, sizeof(circ));
 
   (void)arg;
   conn.gid = 1;
@@ -93,6 +95,8 @@ test_btrack_delete(void *arg)
 {
   orconn_state_msg_t state;
   orconn_status_msg_t status;
+  memset(, 0, sizeof(state));
+  memset(, 0, sizeof(status));
 
   (void)arg;
   state.gid = 1;
diff --git a/src/test/test_controller_events.c 
b/src/test/test_controller_events.c
index a8967bba5..9fb2bc725 100644
--- a/src/test/test_controller_events.c
+++ b/src/test/test_controller_events.c
@@ -429,6 +429,7 @@ static void
 test_cntev_orconn_state(void *arg)
 {
   orconn_state_msg_t conn;
+  memset(, 0, sizeof(conn));
 
   (void)arg;
   MOCK(queue_control_event_string, mock_queue_control_event_string);
@@ -468,6 +469,7 @@ static void
 test_cntev_orconn_state_pt(void *arg)
 {
   orconn_state_msg_t conn;
+  memset(, 0, sizeof(conn));
 
   (void)arg;
   MOCK(queue_control_event_string, mock_queue_control_event_string);
@@ -503,6 +505,7 @@ static void
 test_cntev_orconn_state_proxy(void *arg)
 {
   orconn_state_msg_t conn;
+  memset(, 0, sizeof(conn));
 
   (void)arg;
   MOCK(queue_control_event_string, mock_queue_control_event_string);



___
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 'tor-github/pr/1154'

2019-08-19 Thread asn

commit 19e19c1fa8d138b36b115a6cf5e1993df08c3df3
Merge: e411fcabd 75ea7514e
Author: George Kadianakis 
Date:   Mon Aug 19 18:03:51 2019 +0300

Merge branch 'tor-github/pr/1154'

 changes/ticket31030   | 3 +++
 src/test/test_btrack.c| 4 
 src/test/test_controller_events.c | 3 +++
 src/test/test_hs_common.c | 1 +
 src/test/test_hs_service.c| 1 +
 src/test/test_introduce.c | 3 ++-
 6 files changed, 14 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Coverity: fix test issues with always-present 'service' var.

2019-08-19 Thread asn

commit 5fa2b322005d1860d39e420cb6d3ed25f5073389
Author: Nick Mathewson 
Date:   Fri Jun 28 12:24:26 2019 -0400

Coverity: fix test issues with always-present 'service' var.

Coverity is worried that we check "service" at the end of these test
functions, since it doesn't see any way to reach the cleanup code
without having first dereferenced the variable.

Removing the check would be unwise in this case: instead we add a
tt_assert check before using "service" so that coverity thinks that
the check is doing something useful.

Bugfix on 0.3.2.1-alpha.
---
 src/test/test_hs_common.c  | 1 +
 src/test/test_hs_service.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index abded6021..de3f7e04f 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -502,6 +502,7 @@ test_desc_reupload_logic(void *arg)
 pubkey_hex, strlen(pubkey_hex));
   hs_build_address(, HS_VERSION_THREE, onion_addr);
   service = tor_malloc_zero(sizeof(hs_service_t));
+  tt_assert(service);
   memcpy(service->onion_address, onion_addr, sizeof(service->onion_address));
   ed25519_secret_key_generate(>keys.identity_sk, 0);
   ed25519_public_key_generate(>keys.identity_pk,
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index a303f1041..2e4be4e29 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -1265,6 +1265,7 @@ test_service_event(void *arg)
 
   /* Set a service for this circuit. */
   service = helper_create_service();
+  tt_assert(service);
   ed25519_pubkey_copy(>hs_ident->identity_pk,
   >keys.identity_pk);
 



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

[tor-commits] [tor/master] pre-push hook: Only run practracker when a special file is present

2019-08-19 Thread asn

commit 71e5af0221568b36d128be88c958a7de018ebcb3
Author: Nick Mathewson 
Date:   Thu Aug 8 11:32:11 2019 -0400

pre-push hook: Only run practracker when a special file is present

Closes ticket 30979.
---
 changes/ticket30979|  5 +
 scripts/git/pre-push.git-hook  | 13 -
 scripts/maint/practracker/.enable_practracker_in_hooks |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/changes/ticket30979 b/changes/ticket30979
new file mode 100644
index 0..8ae9b3c41
--- /dev/null
+++ b/changes/ticket30979
@@ -0,0 +1,5 @@
+  o Minor features (git hooks):
+- Our pre-push git hook now checks for a special file
+  before running practracker, so that it only runs on branches
+  that are based on master.
+  Closes ticket 30979.
diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook
index 71abc9aa2..40a3bffa7 100755
--- a/scripts/git/pre-push.git-hook
+++ b/scripts/git/pre-push.git-hook
@@ -28,10 +28,14 @@ if [ -x "$workdir/.git/hooks/pre-commit" ]; then
   fi
 fi
 
-if [ -e scripts/maint/practracker/practracker.py ]; then
-  if ! python3 ./scripts/maint/practracker/practracker.py "$workdir"; then
-exit 1
-  fi
+PT_DIR=scripts/maint/practracker
+
+if [ -e "${PT_DIR}/practracker.py" ]; then
+if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then
+if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then
+exit 1
+fi
+fi
 fi
 
 remote="$1"
@@ -104,4 +108,3 @@ do
 done
 
 exit 0
-
diff --git a/scripts/maint/practracker/.enable_practracker_in_hooks 
b/scripts/maint/practracker/.enable_practracker_in_hooks
new file mode 100644
index 0..a9e707f5d
--- /dev/null
+++ b/scripts/maint/practracker/.enable_practracker_in_hooks
@@ -0,0 +1 @@
+This file is present to tell our git hooks to run practracker on this branch.



___
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 'tor-github/pr/1220'

2019-08-19 Thread asn

commit e411fcabd7f52f2ddb108dd3973be944a0e0ef2b
Merge: c214402a5 71e5af022
Author: George Kadianakis 
Date:   Mon Aug 19 18:02:44 2019 +0300

Merge branch 'tor-github/pr/1220'

 changes/ticket30979|  5 +
 scripts/git/pre-push.git-hook  | 13 -
 scripts/maint/practracker/.enable_practracker_in_hooks |  1 +
 3 files changed, 14 insertions(+), 5 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.4.1] dirauth: Change dizum IP address

2019-08-19 Thread nickm

commit 5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4
Author: David Goulet 
Date:   Thu Aug 15 08:16:53 2019 -0400

dirauth: Change dizum IP address

New IP address from 194.109.206.212 to 45.66.33.45.

Signed request from Alex de Joode, operator of dizum:
https://trac.torproject.org/projects/tor/ticket/31406

Published descriptor by dizum on August 12th, 2019:

--
r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 
15:28:40 45.66.33.45 443 80
s Authority Fast Running Stable V2Dir Valid
v Tor 0.4.0.5
pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 
LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1
w Bandwidth=20 Unmeasured=1
p reject 1-65535
--

Finally, confirmed by DNS:

  $ dig +short tor.dizum.com
  45.66.33.45

Closes #31406

Signed-off-by: David Goulet 
---
 changes/ticket31406  | 3 +++
 src/or/auth_dirs.inc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/ticket31406 b/changes/ticket31406
new file mode 100644
index 0..0ebe6f6c4
--- /dev/null
+++ b/changes/ticket31406
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- A new IP address the directory authority "dizum" has been changed. Closes
+  ticket 31406;
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 08a919b05..278f08bfc 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -7,7 +7,7 @@
   "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
 "dizum orport=443 "
   "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+  "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
 "Serge orport=9001 bridge "
   "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533",
 "gabelmoo orport=443 "



___
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.1] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-08-19 Thread nickm

commit 90f4ed2335fee8bba6e232c6d92078cb133f5b9e
Merge: 20943d00f 5653b93a1
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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.1] Merge branch 'maint-0.4.1' into release-0.4.1

2019-08-19 Thread nickm

commit 262f30dd339410c1a5a106fcb6e077b8d439e61e
Merge: 58c2b35b5 bba64c988
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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.5' into maint-0.4.0

2019-08-19 Thread nickm

commit 90f4ed2335fee8bba6e232c6d92078cb133f5b9e
Merge: 20943d00f 5653b93a1
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-08-19 Thread nickm

commit bba64c9882ffabfdd5cc75554bef222e7eb1e25a
Merge: 6eb5a811d 90f4ed233
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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.2.9' into maint-0.3.5

2019-08-19 Thread nickm

commit 5653b93a1d25e173bebb8f45d364e3a578572789
Merge: d253b31ce 5a1c3e44f
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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] dirauth: Change dizum IP address

2019-08-19 Thread nickm

commit 5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4
Author: David Goulet 
Date:   Thu Aug 15 08:16:53 2019 -0400

dirauth: Change dizum IP address

New IP address from 194.109.206.212 to 45.66.33.45.

Signed request from Alex de Joode, operator of dizum:
https://trac.torproject.org/projects/tor/ticket/31406

Published descriptor by dizum on August 12th, 2019:

--
r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 
15:28:40 45.66.33.45 443 80
s Authority Fast Running Stable V2Dir Valid
v Tor 0.4.0.5
pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 
LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1
w Bandwidth=20 Unmeasured=1
p reject 1-65535
--

Finally, confirmed by DNS:

  $ dig +short tor.dizum.com
  45.66.33.45

Closes #31406

Signed-off-by: David Goulet 
---
 changes/ticket31406  | 3 +++
 src/or/auth_dirs.inc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/ticket31406 b/changes/ticket31406
new file mode 100644
index 0..0ebe6f6c4
--- /dev/null
+++ b/changes/ticket31406
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- A new IP address the directory authority "dizum" has been changed. Closes
+  ticket 31406;
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 08a919b05..278f08bfc 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -7,7 +7,7 @@
   "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
 "dizum orport=443 "
   "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+  "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
 "Serge orport=9001 bridge "
   "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533",
 "gabelmoo orport=443 "



___
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] dirauth: Change dizum IP address

2019-08-19 Thread nickm

commit 5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4
Author: David Goulet 
Date:   Thu Aug 15 08:16:53 2019 -0400

dirauth: Change dizum IP address

New IP address from 194.109.206.212 to 45.66.33.45.

Signed request from Alex de Joode, operator of dizum:
https://trac.torproject.org/projects/tor/ticket/31406

Published descriptor by dizum on August 12th, 2019:

--
r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 
15:28:40 45.66.33.45 443 80
s Authority Fast Running Stable V2Dir Valid
v Tor 0.4.0.5
pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 
LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1
w Bandwidth=20 Unmeasured=1
p reject 1-65535
--

Finally, confirmed by DNS:

  $ dig +short tor.dizum.com
  45.66.33.45

Closes #31406

Signed-off-by: David Goulet 
---
 changes/ticket31406  | 3 +++
 src/or/auth_dirs.inc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/ticket31406 b/changes/ticket31406
new file mode 100644
index 0..0ebe6f6c4
--- /dev/null
+++ b/changes/ticket31406
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- A new IP address the directory authority "dizum" has been changed. Closes
+  ticket 31406;
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 08a919b05..278f08bfc 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -7,7 +7,7 @@
   "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
 "dizum orport=443 "
   "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
-  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+  "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
 "Serge orport=9001 bridge "
   "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533",
 "gabelmoo orport=443 "



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

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

2019-08-19 Thread nickm

commit ba7079fddf282f70085c3879c4e192f1af8bb578
Merge: f65c12351 5a1c3e44f
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket31406  | 3 +++
 src/or/auth_dirs.inc | 2 +-
 2 files changed, 4 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.4.0' into release-0.4.0

2019-08-19 Thread nickm

commit 2ecd36f3c31378a8283d25a97ab81f01f2c52b2f
Merge: 552688c5c 90f4ed233
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.4.0' into release-0.4.0

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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] Merge branch 'maint-0.3.5' into release-0.3.5

2019-08-19 Thread nickm

commit 3a088d43f80abb6216628d81a5a79dea3fef6021
Merge: 13d2a4662 5653b93a1
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-08-19 Thread nickm

commit 5653b93a1d25e173bebb8f45d364e3a578572789
Merge: d253b31ce 5a1c3e44f
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-08-19 Thread nickm

commit 5653b93a1d25e173bebb8f45d364e3a578572789
Merge: d253b31ce 5a1c3e44f
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 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 136 matches

Mail list logo