date:20170918

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

2017-09-18 Thread translation

commit ee5bc6b590621e3177ba6d3159e8c0450dbad624
Author: Translation commit bot 
Date:   Tue Sep 19 03:49:25 2017 +

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

diff --git a/tr/tr.po b/tr/tr.po
index bbe93bfe5..8fc6eb98e 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -1496,8 +1496,9 @@ msgid ""
 "obfs3 makes Tor traffic look random, so that it does not look like Tor or "
 "any other protocol. obfs3 bridges will work in most places."
 msgstr ""
-"obfs3, Tor trafiÄini rastgele gÃ¶rÃ¼nÃ¼r hale getirir, bÃ¶ylece Tor'a veya 
baÅka"
-" herhangi bir protokole benzemez. obfs3 kÃ¶prÃ¼leri Ã§oÄu yerde 
Ã§alÄ±ÅacaktÄ±r."
+"obfs3, Tor trafiÄini rastgeleymiÅ gibi gÃ¶rÃ¼nmesini saÄlar. BÃ¶ylece Tor 
ya da"
+" baÅka herhangi bir iletiÅim kuralÄ±na benzemez. obfs3 kÃ¶prÃ¼leri Ã§oÄu 
konumda"
+" Ã§alÄ±ÅÄ±r."
 
 #: transports.page:42
 msgid "obfs4"
@@ -1509,9 +1510,9 @@ msgid ""
 "from finding bridges by Internet scanning. obfs4 bridges are less likely to "
 "be blocked than obfs3 bridges."
 msgstr ""
-"obfs4, obfs3 gibi Tor trafiÄinin rastgele gÃ¶rÃ¼nmesini saÄlar ve ayrÄ±ca "
-"denetÃ§ilerin internet taramasÄ± ile kÃ¶prÃ¼leri bulmasÄ±nÄ± Ã¶nler. obfs4 "
-"kÃ¶prÃ¼leri, obfs3 kÃ¶prÃ¼lerinden daha az engellenebilirdir."
+"obfs4, obfs3 gibi Tor trafiÄinin rastgele gÃ¶rÃ¼nmesini saÄlar ve ayrÄ±ca 
aÄÄ± "
+"izleyenlerin Ä°nternet taramasÄ± ile kÃ¶prÃ¼leri bulmasÄ±nÄ± Ã¶nler. obfs4 "
+"kÃ¶prÃ¼lerinin engellenme olasÄ±lÄ±ÄÄ±, obfs3 kÃ¶prÃ¼lerine gÃ¶re daha 
azdÄ±r."
 
 #: transports.page:56
 msgid "Scramblesuit"
@@ -1519,7 +1520,7 @@ msgstr "ScrambleSuit"
 
 #: transports.page:61
 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
-msgstr "ScrambleSuit obfs4'e benzer ancak farklÄ± kÃ¶prÃ¼ler grubuna sahiptir."
+msgstr "ScrambleSuit obfs4'e benzer ancak farklÄ± bir kÃ¶prÃ¼ takÄ±mÄ±na 
sahiptir."
 
 #: transports.page:69
 msgid "FTE"
@@ -1530,8 +1531,8 @@ msgid ""
 "FTE (format-transforming encryption) disguises Tor traffic as ordinary web "
 "(HTTP) traffic."
 msgstr ""
-"FTE (format-transforming encryption; format dÃ¶nÃ¼ÅtÃ¼ren Åifreleme), Tor "
-"trafiÄini sÄ±radan web (HTTP) trafiÄi gibi gizler."
+"FTE (format-transforming encryption; biÃ§im dÃ¶nÃ¼ÅtÃ¼ren Åifreleme), Tor "
+"trafiÄini sÄ±radan bir web (HTTP) trafiÄi gibi gizler."
 
 #: transports.page:82
 msgid "meek"
@@ -1544,11 +1545,11 @@ msgid ""
 "Web Services; meek-azure makes it look like you are using a Microsoft web "
 "site; and meek-google makes it look like you are using Google search."
 msgstr ""
-"Bu aktarÄ±mlarÄ±n hepsi Tor'u kullanÄ±yor gibi olmak yerine bÃ¼yÃ¼k bir web "
-"sitesine gÃ¶z atÄ±yorsunuz gibi gÃ¶rÃ¼nmesini saÄlar. meek-amazon Amazon Web 
"
-"Servislerini kullanmanÄ±za benziyor; meek-azure, Microsoft web sitesini "
-"kullanmanÄ±za benziyor; Ve meek-google, Google aramasÄ±nÄ± kullanmanÄ±za "
-"benziyor."
+"Bu aktarÄ±mlarÄ±n hepsi Tor kullanÄ±yor gibi gÃ¶rÃ¼nmek yerine bÃ¼yÃ¼k bir 
web "
+"sitesinde geziliyormuÅ gibi gÃ¶rÃ¼nmeyi saÄlar. meek-amazon Amazon Web "
+"Servisleri kullanÄ±lÄ±yormuÅ gibi; meek-azure, Microsoft web sitesi "
+"kullanÄ±lÄ±yormuÅ gibi; meek-google, Google aramasÄ± kullanÄ±lÄ±yormuÅ gibi 
"
+"gÃ¶rÃ¼nmeyi saÄlar."
 
 #: troubleshooting.page:6
 msgid "What to do if Tor Browser doesnât work"

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

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

2017-09-18 Thread translation

commit 33bfb3fce586ce9e053bdafd512c3383f464eb4e
Author: Translation commit bot 
Date:   Tue Sep 19 03:49:30 2017 +

Update translations for tor-browser-manual_completed
---
 tr/tr.po | 27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index bbe93bfe5..8fc6eb98e 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -1496,8 +1496,9 @@ msgid ""
 "obfs3 makes Tor traffic look random, so that it does not look like Tor or "
 "any other protocol. obfs3 bridges will work in most places."
 msgstr ""
-"obfs3, Tor trafiÄini rastgele gÃ¶rÃ¼nÃ¼r hale getirir, bÃ¶ylece Tor'a veya 
baÅka"
-" herhangi bir protokole benzemez. obfs3 kÃ¶prÃ¼leri Ã§oÄu yerde 
Ã§alÄ±ÅacaktÄ±r."
+"obfs3, Tor trafiÄini rastgeleymiÅ gibi gÃ¶rÃ¼nmesini saÄlar. BÃ¶ylece Tor 
ya da"
+" baÅka herhangi bir iletiÅim kuralÄ±na benzemez. obfs3 kÃ¶prÃ¼leri Ã§oÄu 
konumda"
+" Ã§alÄ±ÅÄ±r."
 
 #: transports.page:42
 msgid "obfs4"
@@ -1509,9 +1510,9 @@ msgid ""
 "from finding bridges by Internet scanning. obfs4 bridges are less likely to "
 "be blocked than obfs3 bridges."
 msgstr ""
-"obfs4, obfs3 gibi Tor trafiÄinin rastgele gÃ¶rÃ¼nmesini saÄlar ve ayrÄ±ca "
-"denetÃ§ilerin internet taramasÄ± ile kÃ¶prÃ¼leri bulmasÄ±nÄ± Ã¶nler. obfs4 "
-"kÃ¶prÃ¼leri, obfs3 kÃ¶prÃ¼lerinden daha az engellenebilirdir."
+"obfs4, obfs3 gibi Tor trafiÄinin rastgele gÃ¶rÃ¼nmesini saÄlar ve ayrÄ±ca 
aÄÄ± "
+"izleyenlerin Ä°nternet taramasÄ± ile kÃ¶prÃ¼leri bulmasÄ±nÄ± Ã¶nler. obfs4 "
+"kÃ¶prÃ¼lerinin engellenme olasÄ±lÄ±ÄÄ±, obfs3 kÃ¶prÃ¼lerine gÃ¶re daha 
azdÄ±r."
 
 #: transports.page:56
 msgid "Scramblesuit"
@@ -1519,7 +1520,7 @@ msgstr "ScrambleSuit"
 
 #: transports.page:61
 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
-msgstr "ScrambleSuit obfs4'e benzer ancak farklÄ± kÃ¶prÃ¼ler grubuna sahiptir."
+msgstr "ScrambleSuit obfs4'e benzer ancak farklÄ± bir kÃ¶prÃ¼ takÄ±mÄ±na 
sahiptir."
 
 #: transports.page:69
 msgid "FTE"
@@ -1530,8 +1531,8 @@ msgid ""
 "FTE (format-transforming encryption) disguises Tor traffic as ordinary web "
 "(HTTP) traffic."
 msgstr ""
-"FTE (format-transforming encryption; format dÃ¶nÃ¼ÅtÃ¼ren Åifreleme), Tor "
-"trafiÄini sÄ±radan web (HTTP) trafiÄi gibi gizler."
+"FTE (format-transforming encryption; biÃ§im dÃ¶nÃ¼ÅtÃ¼ren Åifreleme), Tor "
+"trafiÄini sÄ±radan bir web (HTTP) trafiÄi gibi gizler."
 
 #: transports.page:82
 msgid "meek"
@@ -1544,11 +1545,11 @@ msgid ""
 "Web Services; meek-azure makes it look like you are using a Microsoft web "
 "site; and meek-google makes it look like you are using Google search."
 msgstr ""
-"Bu aktarÄ±mlarÄ±n hepsi Tor'u kullanÄ±yor gibi olmak yerine bÃ¼yÃ¼k bir web "
-"sitesine gÃ¶z atÄ±yorsunuz gibi gÃ¶rÃ¼nmesini saÄlar. meek-amazon Amazon Web 
"
-"Servislerini kullanmanÄ±za benziyor; meek-azure, Microsoft web sitesini "
-"kullanmanÄ±za benziyor; Ve meek-google, Google aramasÄ±nÄ± kullanmanÄ±za "
-"benziyor."
+"Bu aktarÄ±mlarÄ±n hepsi Tor kullanÄ±yor gibi gÃ¶rÃ¼nmek yerine bÃ¼yÃ¼k bir 
web "
+"sitesinde geziliyormuÅ gibi gÃ¶rÃ¼nmeyi saÄlar. meek-amazon Amazon Web "
+"Servisleri kullanÄ±lÄ±yormuÅ gibi; meek-azure, Microsoft web sitesi "
+"kullanÄ±lÄ±yormuÅ gibi; meek-google, Google aramasÄ± kullanÄ±lÄ±yormuÅ gibi 
"
+"gÃ¶rÃ¼nmeyi saÄlar."
 
 #: troubleshooting.page:6
 msgid "What to do if Tor Browser doesnât work"

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

[tor-commits] [sandboxed-tor-browser/master] Bug 8706: Fully disable the .recently-used.xbel.

2017-09-18 Thread yawning

commit 36a580f723cdd7891eec5e2b2c878ed1a323178d
Author: Yawning Angel 
Date:   Tue Sep 19 02:55:52 2017 +

Bug 8706: Fully disable the .recently-used.xbel.

It's essentially mostly harmless since even if a file is created, it
won't be persisted, but the browser shouldn't be keeping track of
recently used files to begin with.
---
 ChangeLog  | 1 +
 data/gtkrc-2.0 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ea7e000..54e4ea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Changes in version 0.0.14 - UNRELEASED:
+ * Bug 8706: Fully disable the .recently-used.xbel.
 
 Changes in version 0.0.13 - 2017-09-13:
  * Bug 13170: Disable the rest of the Firefox experiments botnet prefs.
diff --git a/data/gtkrc-2.0 b/data/gtkrc-2.0
index 75ea452..e9a48d4 100644
--- a/data/gtkrc-2.0
+++ b/data/gtkrc-2.0
@@ -1,3 +1,4 @@
 gtk-icon-theme-name = "Adwaita"
 gtk-theme-name = "Adwaita"
 gtk-font-name = "Arimo 11"
+gtk-recent-files-max-age = 0

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

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

2017-09-18 Thread translation

commit 486832ce1d7f49cb1117ec0dd6e491573a5ef3e4
Author: Translation commit bot 
Date:   Mon Sep 18 22:45:25 2017 +

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

diff --git a/fa/fa.po b/fa/fa.po
index 426f187e5..eec834efc 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-05-18 19:14+\n"
+"PO-Revision-Date: 2017-09-18 22:16+\n"
 "Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"

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

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

2017-09-18 Thread translation

commit f763a64f4f87bebfeb05584b75dfd498597b39ee
Author: Translation commit bot 
Date:   Mon Sep 18 22:45:20 2017 +

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

diff --git a/fa/fa.po b/fa/fa.po
index 426f187e5..eec834efc 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-05-18 19:14+\n"
+"PO-Revision-Date: 2017-09-18 22:16+\n"
 "Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"

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

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

2017-09-18 Thread translation

commit da417970a96b6bb09675a49bf2a2e61be69ac613
Author: Translation commit bot 
Date:   Mon Sep 18 22:17:55 2017 +

Update translations for tails-openpgp-applet
---
 fa/openpgp-applet.pot | 82 +--
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/fa/openpgp-applet.pot b/fa/openpgp-applet.pot
index 07a41efdd..ec2a7bbfd 100644
--- a/fa/openpgp-applet.pot
+++ b/fa/openpgp-applet.pot
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Tails developers
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the OpenPGP_Applet 
package.
 # 
 # Translators:
-# Gilberto, 2015
+# NoProfile, 2015
 # M.H.S.Ajami, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
-"POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"POT-Creation-Date: 2017-08-05 15:07-0400\n"
+"PO-Revision-Date: 2017-09-18 22:16+\n"
 "Last-Translator: M.H.S.Ajami\n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,158 +19,158 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bin/openpgp-applet:163
+#: bin/openpgp-applet:160
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
 msgstr "Ø´ÙØ§ ÙØµØ¯ Ø®Ø±ÙØ¬ Ø§Ø² Ø§Ù¾ÙØª OpenPGP Ø±Ø§ Ø¯Ø§Ø±ÛØ¯. Ø§Ø² 
Ø§ÛÙ Ú©Ø§Ø± Ø§Ø·ÙÛÙØ§Ù Ø¯Ø§Ø±ÛØ¯Ø"
 
-#: bin/openpgp-applet:175
+#: bin/openpgp-applet:172
 msgid "OpenPGP encryption applet"
 msgstr "Ø§Ù¾ÙØª Ø±ÙØ²ÙÚ¯Ø§Ø±Û OpenPGP"
 
-#: bin/openpgp-applet:178
+#: bin/openpgp-applet:175
 msgid "Exit"
 msgstr "Ø®Ø±ÙØ¬"
 
-#: bin/openpgp-applet:180
+#: bin/openpgp-applet:177
 msgid "About"
 msgstr "Ø¯Ø±Ø¨Ø§Ø±Ù"
 
-#: bin/openpgp-applet:235
+#: bin/openpgp-applet:232
 msgid "Encrypt Clipboard with _Passphrase"
 msgstr "Ú©ÙÛÙ¾ Ø¨Ø±Ø¯ Ø±Ø§ Ø¨Ù ÙØ³ÛÙÙ ÛÚ© Ø¹Ø¨ÙØ±ÙØ§ÚÙ Ø±Ù
Ø²Ú¯Ø°Ø§Ø±Û Ú©ÙÛØ¯."
 
-#: bin/openpgp-applet:238
+#: bin/openpgp-applet:235
 msgid "Sign/Encrypt Clipboard with Public _Keys"
 msgstr "Ú©ÙÛÙ¾ Ø¨Ø±Ø¯ Ø±Ø§ Ø¨Ù ÙØ³ÛÙÙ ÛÚ© Ú©ÙÛØ¯ Ø¹ÙÙÙÛ Ø±Ù
Ø²Ú¯Ø°Ø§Ø±Û/Ø§ÙØ¶Ø§ Ú©ÙÛØ¯."
 
-#: bin/openpgp-applet:243
+#: bin/openpgp-applet:240
 msgid "_Decrypt/Verify Clipboard"
 msgstr "Ø±ÙØ²Ú¯Ø´Ø§ÛÛ/ØªØ§ÛÛØ¯ Ø§ÙØ¶Ø§Û Ú©ÙÛÙ¾âØ¨Ø±Ø¯"
 
-#: bin/openpgp-applet:247
+#: bin/openpgp-applet:244
 msgid "_Manage Keys"
 msgstr "ÙØ¯ÛØ±ÛØª Ú©ÙÛØ¯âÙØ§"
 
-#: bin/openpgp-applet:251
+#: bin/openpgp-applet:248
 msgid "_Open Text Editor"
 msgstr "_Ø¨Ø§Ø²Ú©Ø±Ø¯Ù ÙÛØ±Ø§ÛØ´Ú¯Ø± ÙØªÙ"
 
-#: bin/openpgp-applet:295
+#: bin/openpgp-applet:292
 msgid "The clipboard does not contain valid input data."
 msgstr "Ú©ÙÛÙ¾âØ¨Ø±Ø¯ Ø¯Ø§Ø¯ÙÙ ÙØ¹ØªØ¨Ø±Û ÙØ¯Ø§Ø±Ø¯"
 
-#: bin/openpgp-applet:347 bin/openpgp-applet:349 bin/openpgp-applet:351
+#: bin/openpgp-applet:337 bin/openpgp-applet:339 bin/openpgp-applet:341
 msgid "Unknown Trust"
 msgstr "ÙØ§Ø¨Ù Ø§Ø·ÙÛÙØ§Ù ÙÛØ³Øª"
 
-#: bin/openpgp-applet:353
+#: bin/openpgp-applet:343
 msgid "Marginal Trust"
 msgstr "Ø¨Ù Ø³Ø®ØªÛ ÙØ§Ø¨Ù Ø§Ø·ÙÛÙØ§Ù Ø§Ø³Øª"
 
-#: bin/openpgp-applet:355
+#: bin/openpgp-applet:345
 msgid "Full Trust"
 msgstr "ÙØ§Ø¨Ù Ø§Ø·ÙÛÙØ§Ù Ø§Ø³Øª"
 
-#: bin/openpgp-applet:357
+#: bin/openpgp-applet:347
 msgid "Ultimate Trust"
 msgstr "Ú©Ø§ÙÙØ§Ù ÙØ§Ø¨Ù Ø§Ø·ÙÛÙØ§Ù Ø§Ø³Øª"
 
-#: bin/openpgp-applet:410
+#: bin/openpgp-applet:400
 msgid "Name"
 msgstr "ÙØ§Ù"
 
-#: bin/openpgp-applet:411
+#: bin/openpgp-applet:401
 msgid "Key ID"
 msgstr "Ú©ÙÛØ¯-Ø´ÙØ§Ø³Ù"
 
-#: bin/openpgp-applet:412
+#: bin/openpgp-applet:402
 msgid "Status"
 msgstr "ÙØ¶Ø¹ÛØª"
 
-#: bin/openpgp-applet:444
+#: bin/openpgp-applet:433
 msgid "Fingerprint:"
 msgstr "Ø§Ø«Ø± Ø§ÙÚ¯Ø´Øª:"
 
-#: bin/openpgp-applet:447
+#: bin/openpgp-applet:436
 msgid "User ID:"
 msgid_plural "User IDs:"
 msgstr[0] "Ø´ÙØ§Ø³ÙâÙØ§Û Ú©Ø§Ø±Ø¨Ø±Û:"
 
-#: bin/openpgp-applet:476
+#: bin/openpgp-applet:465
 msgid "None (Don't sign)"
 msgstr "ÙÛÚ Ú©Ø¯Ø§Ù (Ø§ÙØ¶Ø§ ÙÚ©Ù)"
 
-#: bin/openpgp-applet:539
+#: bin/openpgp-applet:528
 msgid "Select recipients:"
 msgstr "Ø¯Ø±ÛØ§ÙØª Ú©ÙÙØ¯ÙâÙØ§:"
 
-#: bin/openpgp-applet:547
+#: bin/openpgp-applet:536
 msgid "Hide recipients"
 msgstr "Ø¯Ø±ÛØ§ÙØª Ú©ÙÙØ¯Ù ÙØ§ Ø±Ø§ ÙØ®ÙÛ Ú©Ù"
 
-#: bin/openpgp-applet:550
+#: bin/openpgp-applet:539
 msgid ""
 "Hide the user IDs of all recipients of an encrypted message. Otherwise "
 "anyone that sees the encrypted message can see who the recipients are."
 msgstr "Ø´ÙØ§Ø³Ù Ú©Ø§Ø±Ø¨Ø±Û ØªÙØ§Ù Ø¯Ø±ÛØ§ÙØª Ú©ÙÙØ¯ÙâÙØ§Û ÛÚ© 
Ù¾ÛØºØ§Ù Ø±ÙØ²ÙÚ¯Ø§Ø±Û Ø´Ø¯Ù Ø±Ø§ Ù¾ÙÙØ§Ù Ú©Ù. Ø¯Ø± ØºÛØ± 
Ø§ÛÙØµÙØ±Øª ÙØ± Ú©Ø³Û Ú©Ù Ø§ÛÙ Ù¾ÛØºØ§Ù Ø±ÙØ²ÙÚ¯Ø§Ø±Û Ø´Ø¯Ù Ø±Ø§ 
Ø¯Ø±ÛØ§ÙØª ÙÛ Ú©ÙØ¯Ø ÙÛ ØªÙØ§ÙØ¯ Ø¨ÙÙÙØ¯ ÚÙ Ú©Ø³Ø§Ù Ø¯ÛÚ¯Ø±Û 
Ø¢Ù Ø±Ø§ Ø¯Ø±ÛØ§ÙØª Ú©Ø±Ø¯Ù Ø§ÙØ¯."
 
-#: bin/openpgp-applet:556

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

2017-09-18 Thread translation

commit d216cf2d0f724584f6365e7863a65099d2ca9388
Author: Translation commit bot 
Date:   Mon Sep 18 22:18:01 2017 +

Update translations for tails-openpgp-applet_completed
---
 fa/openpgp-applet.pot | 82 +--
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/fa/openpgp-applet.pot b/fa/openpgp-applet.pot
index 07a41efdd..ec2a7bbfd 100644
--- a/fa/openpgp-applet.pot
+++ b/fa/openpgp-applet.pot
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Tails developers
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the OpenPGP_Applet 
package.
 # 
 # Translators:
-# Gilberto, 2015
+# NoProfile, 2015
 # M.H.S.Ajami, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
-"POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"POT-Creation-Date: 2017-08-05 15:07-0400\n"
+"PO-Revision-Date: 2017-09-18 22:16+\n"
 "Last-Translator: M.H.S.Ajami\n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,158 +19,158 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bin/openpgp-applet:163
+#: bin/openpgp-applet:160
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
 msgstr "Ø´ÙØ§ ÙØµØ¯ Ø®Ø±ÙØ¬ Ø§Ø² Ø§Ù¾ÙØª OpenPGP Ø±Ø§ Ø¯Ø§Ø±ÛØ¯. Ø§Ø² 
Ø§ÛÙ Ú©Ø§Ø± Ø§Ø·ÙÛÙØ§Ù Ø¯Ø§Ø±ÛØ¯Ø"
 
-#: bin/openpgp-applet:175
+#: bin/openpgp-applet:172
 msgid "OpenPGP encryption applet"
 msgstr "Ø§Ù¾ÙØª Ø±ÙØ²ÙÚ¯Ø§Ø±Û OpenPGP"
 
-#: bin/openpgp-applet:178
+#: bin/openpgp-applet:175
 msgid "Exit"
 msgstr "Ø®Ø±ÙØ¬"
 
-#: bin/openpgp-applet:180
+#: bin/openpgp-applet:177
 msgid "About"
 msgstr "Ø¯Ø±Ø¨Ø§Ø±Ù"
 
-#: bin/openpgp-applet:235
+#: bin/openpgp-applet:232
 msgid "Encrypt Clipboard with _Passphrase"
 msgstr "Ú©ÙÛÙ¾ Ø¨Ø±Ø¯ Ø±Ø§ Ø¨Ù ÙØ³ÛÙÙ ÛÚ© Ø¹Ø¨ÙØ±ÙØ§ÚÙ Ø±Ù
Ø²Ú¯Ø°Ø§Ø±Û Ú©ÙÛØ¯."
 
-#: bin/openpgp-applet:238
+#: bin/openpgp-applet:235
 msgid "Sign/Encrypt Clipboard with Public _Keys"
 msgstr "Ú©ÙÛÙ¾ Ø¨Ø±Ø¯ Ø±Ø§ Ø¨Ù ÙØ³ÛÙÙ ÛÚ© Ú©ÙÛØ¯ Ø¹ÙÙÙÛ Ø±Ù
Ø²Ú¯Ø°Ø§Ø±Û/Ø§ÙØ¶Ø§ Ú©ÙÛØ¯."
 
-#: bin/openpgp-applet:243
+#: bin/openpgp-applet:240
 msgid "_Decrypt/Verify Clipboard"
 msgstr "Ø±ÙØ²Ú¯Ø´Ø§ÛÛ/ØªØ§ÛÛØ¯ Ø§ÙØ¶Ø§Û Ú©ÙÛÙ¾âØ¨Ø±Ø¯"
 
-#: bin/openpgp-applet:247
+#: bin/openpgp-applet:244
 msgid "_Manage Keys"
 msgstr "ÙØ¯ÛØ±ÛØª Ú©ÙÛØ¯âÙØ§"
 
-#: bin/openpgp-applet:251
+#: bin/openpgp-applet:248
 msgid "_Open Text Editor"
 msgstr "_Ø¨Ø§Ø²Ú©Ø±Ø¯Ù ÙÛØ±Ø§ÛØ´Ú¯Ø± ÙØªÙ"
 
-#: bin/openpgp-applet:295
+#: bin/openpgp-applet:292
 msgid "The clipboard does not contain valid input data."
 msgstr "Ú©ÙÛÙ¾âØ¨Ø±Ø¯ Ø¯Ø§Ø¯ÙÙ ÙØ¹ØªØ¨Ø±Û ÙØ¯Ø§Ø±Ø¯"
 
-#: bin/openpgp-applet:347 bin/openpgp-applet:349 bin/openpgp-applet:351
+#: bin/openpgp-applet:337 bin/openpgp-applet:339 bin/openpgp-applet:341
 msgid "Unknown Trust"
 msgstr "ÙØ§Ø¨Ù Ø§Ø·ÙÛÙØ§Ù ÙÛØ³Øª"
 
-#: bin/openpgp-applet:353
+#: bin/openpgp-applet:343
 msgid "Marginal Trust"
 msgstr "Ø¨Ù Ø³Ø®ØªÛ ÙØ§Ø¨Ù Ø§Ø·ÙÛÙØ§Ù Ø§Ø³Øª"
 
-#: bin/openpgp-applet:355
+#: bin/openpgp-applet:345
 msgid "Full Trust"
 msgstr "ÙØ§Ø¨Ù Ø§Ø·ÙÛÙØ§Ù Ø§Ø³Øª"
 
-#: bin/openpgp-applet:357
+#: bin/openpgp-applet:347
 msgid "Ultimate Trust"
 msgstr "Ú©Ø§ÙÙØ§Ù ÙØ§Ø¨Ù Ø§Ø·ÙÛÙØ§Ù Ø§Ø³Øª"
 
-#: bin/openpgp-applet:410
+#: bin/openpgp-applet:400
 msgid "Name"
 msgstr "ÙØ§Ù"
 
-#: bin/openpgp-applet:411
+#: bin/openpgp-applet:401
 msgid "Key ID"
 msgstr "Ú©ÙÛØ¯-Ø´ÙØ§Ø³Ù"
 
-#: bin/openpgp-applet:412
+#: bin/openpgp-applet:402
 msgid "Status"
 msgstr "ÙØ¶Ø¹ÛØª"
 
-#: bin/openpgp-applet:444
+#: bin/openpgp-applet:433
 msgid "Fingerprint:"
 msgstr "Ø§Ø«Ø± Ø§ÙÚ¯Ø´Øª:"
 
-#: bin/openpgp-applet:447
+#: bin/openpgp-applet:436
 msgid "User ID:"
 msgid_plural "User IDs:"
 msgstr[0] "Ø´ÙØ§Ø³ÙâÙØ§Û Ú©Ø§Ø±Ø¨Ø±Û:"
 
-#: bin/openpgp-applet:476
+#: bin/openpgp-applet:465
 msgid "None (Don't sign)"
 msgstr "ÙÛÚ Ú©Ø¯Ø§Ù (Ø§ÙØ¶Ø§ ÙÚ©Ù)"
 
-#: bin/openpgp-applet:539
+#: bin/openpgp-applet:528
 msgid "Select recipients:"
 msgstr "Ø¯Ø±ÛØ§ÙØª Ú©ÙÙØ¯ÙâÙØ§:"
 
-#: bin/openpgp-applet:547
+#: bin/openpgp-applet:536
 msgid "Hide recipients"
 msgstr "Ø¯Ø±ÛØ§ÙØª Ú©ÙÙØ¯Ù ÙØ§ Ø±Ø§ ÙØ®ÙÛ Ú©Ù"
 
-#: bin/openpgp-applet:550
+#: bin/openpgp-applet:539
 msgid ""
 "Hide the user IDs of all recipients of an encrypted message. Otherwise "
 "anyone that sees the encrypted message can see who the recipients are."
 msgstr "Ø´ÙØ§Ø³Ù Ú©Ø§Ø±Ø¨Ø±Û ØªÙØ§Ù Ø¯Ø±ÛØ§ÙØª Ú©ÙÙØ¯ÙâÙØ§Û ÛÚ© 
Ù¾ÛØºØ§Ù Ø±ÙØ²ÙÚ¯Ø§Ø±Û Ø´Ø¯Ù Ø±Ø§ Ù¾ÙÙØ§Ù Ú©Ù. Ø¯Ø± ØºÛØ± 
Ø§ÛÙØµÙØ±Øª ÙØ± Ú©Ø³Û Ú©Ù Ø§ÛÙ Ù¾ÛØºØ§Ù Ø±ÙØ²ÙÚ¯Ø§Ø±Û Ø´Ø¯Ù Ø±Ø§ 
Ø¯Ø±ÛØ§ÙØª ÙÛ Ú©ÙØ¯Ø ÙÛ ØªÙØ§ÙØ¯ Ø¨ÙÙÙØ¯ ÚÙ Ú©Ø³Ø§Ù Ø¯ÛÚ¯Ø±Û 
Ø¢Ù Ø±Ø§ Ø¯Ø±ÛØ§ÙØª Ú©Ø±Ø¯Ù Ø§ÙØ¯."
 
-#:

[tor-commits] [tor/master] Correct what-is-deprecated-when comments

2017-09-18 Thread nickm

commit 6afc924d7e719599a9ad332a102ca1122c82faef
Author: Nick Mathewson 
Date:   Mon Sep 18 15:11:33 2017 -0400

Correct what-is-deprecated-when comments
---
 src/or/config.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 6e8a06ec7..79e1e9401 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -684,16 +684,19 @@ static const config_var_t testing_tor_network_defaults[] 
= {
 #undef OBSOLETE
 
 static const config_deprecation_t option_deprecation_notes_[] = {
-  /* Deprecated since 0.3.2.0-alpha. */
+  /* Deprecated since 0.3.2.1-alpha. */
   { "HTTPProxy", "It only applies to direct unencrypted HTTP connections "
 "to your directory server, which your Tor probably wasn't using." },
   { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy "
 "which should be used with HTTPSProxyAuthenticator." },
+  /* End of options deprecated since 0.3.2.1-alpha */
+
+  /* Options deprecated since 0.3.2.2-alpha */
   { "ReachableDirAddresses", "It has no effect on relays, and has had no "
 "effect on clients since 0.2.8." },
   { "ClientPreferIPv6DirPort", "It has no effect on relays, and has had no "
 "effect on clients since 0.2.8." },
-  /* End of options deprecated since 0.3.2.0-alpha. */
+  /* End of options deprecated since 0.3.2.2-alpha. */
 
   { NULL, NULL }
 };

___
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 'ewongbb/chkdblcolon'

2017-09-18 Thread nickm

commit 2b5bc5613cac86787a42d69b32a2acd3d7b5bae4
Merge: 94a88eaa4 f0e87ff9e
Author: Nick Mathewson 
Date:   Mon Sep 18 15:04:14 2017 -0400

Merge remote-tracking branch 'ewongbb/chkdblcolon'

 scripts/maint/checkSpace.pl | 4 
 1 file changed, 4 insertions(+)

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

[tor-commits] [tor/master] Deprecate ReachableDirAddresses and ClientPreferIPv6DirPort

2017-09-18 Thread nickm

commit de6f121b5984c7c2c647c785f4707cd5392b37e8
Author: Nick Mathewson 
Date:   Tue Sep 12 16:12:15 2017 -0400

Deprecate ReachableDirAddresses and ClientPreferIPv6DirPort

Closes ticket 19704.
---
 changes/ticket19704 | 5 +
 doc/tor.1.txt   | 6 --
 src/or/config.c | 4 
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/changes/ticket19704 b/changes/ticket19704
new file mode 100644
index 0..b05f6abcb
--- /dev/null
+++ b/changes/ticket19704
@@ -0,0 +1,5 @@
+  o Deprecated features:
+- The ReachableDirAddresses and ClientPreferIPv6DirPort options
+  are now deprecated; they do not apply to relays, and they
+  have had no effect on clients since 0.2.8.x. Closes ticket 19704.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d49dd9633..3aabffdc8 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -978,7 +978,8 @@ The following options are useful only for clients (that is, 
if
 these restrictions when fetching directory information, using standard HTTP
 GET requests. If not set explicitly then the value of
 **ReachableAddresses** is used. If **HTTPProxy** is set then these
-connections will go through that proxy.
+connections will go through that proxy.   (DEPRECATED: This option has
+had no effect for some time.)
 
 [[ReachableORAddresses]] **ReachableORAddresses** 
__ADDR__[/__MASK__][:__PORT__]...::
 Like **ReachableAddresses**, a list of addresses and ports. Tor will obey
@@ -1547,7 +1548,8 @@ The following options are useful only for clients (that 
is, if
 server has both. (Tor also prefers an IPv6 DirPort if IPv4Client is set to
 0.) If this option is set to auto, clients prefer IPv4. Other things may
 influence the choice. This option breaks a tie to the favor of IPv6.
-(Default: auto)
+(Default: auto)  (DEPRECATED: This option has had no effect for some
+time.)
 
 [[ClientPreferIPv6ORPort]] **ClientPreferIPv6ORPort** **0**|**1**|**auto**::
 If this option is set to 1, Tor prefers an OR port with an IPv6
diff --git a/src/or/config.c b/src/or/config.c
index 55c9531f4..bb3bca6c1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -693,6 +693,10 @@ static const config_deprecation_t 
option_deprecation_notes_[] = {
 "to your directory server, which your Tor probably wasn't using." },
   { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy "
 "which should be used with HTTPSProxyAuthenticator." },
+  { "ReachableDirAddresses", "It has no effect on relays, and has had no "
+"effect on clients since 0.2.8." },
+  { "ClientPreferIPv6DirPort", "It has no effect on relays, and has had no "
+"effect on clients since 0.2.8." },
   /* End of options deprecated since 0.3.2.0-alpha. */
 
   { NULL, NULL }



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

[tor-commits] [tor/master] small tweaks to releasingtor.md

2017-09-18 Thread nickm

commit 3c9ff0af96835575af942a367726732366977581
Author: Nick Mathewson 
Date:   Mon Sep 18 14:49:06 2017 -0400

small tweaks to releasingtor.md
---
 doc/HACKING/ReleasingTor.md | 30 --
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
index b206b3149..62029b44f 100644
--- a/doc/HACKING/ReleasingTor.md
+++ b/doc/HACKING/ReleasingTor.md
@@ -8,7 +8,11 @@ new Tor release:
 === 0. Preliminaries
 
 1. Get at least three of weasel/arma/Sebastian/Sina to put the new
-   version number in their approved versions list.
+   version number in their approved versions list.  Give them a few
+   days to do this if you can.
+
+2. If this is going to be an important security release, give the packagers
+   some advance warning: See this list of packagers in IV.3 below.
 
 
 === I. Make sure it works
@@ -26,19 +30,24 @@ new Tor release:
 
What about Coverity Scan?
 
+   What about clan scan-build?
+
Does 'make distcheck' complain?
 
-   How about 'make test-stem' and 'make test-network'?
+   How about 'make test-stem' and 'make test-network' and
+   `make test-network-full`?
 
- Are all those tests still happy with --enable-expensive-hardening ?
 
Any memory leaks?
 
 
-=== II. Write a changelog.
+=== II. Write a changelog
 
 
-1. Gather the `changes/*` files into a changelog entry, rewriting many
+1a. (Alpha release variant)
+
+   Gather the `changes/*` files into a changelog entry, rewriting many
of them and reordering to focus on what users and funders would find
interesting and understandable.
 
@@ -83,6 +92,15 @@ new Tor release:
 
4. Run `./scripts/maint/format_changelog.py --inplace` to make it prettier
 
+1b. (old-stable release variant)
+
+   For stable releases that backport things from later, we try to compose
+   their releases, we try to make sure that we keep the changelog entries
+   identical to their original versions, with a 'backport from 0.x.y.z'
+   note added to each section.  So in this case, once you have the items
+   from the changes files copied together, don't use them to build a new
+   changelog: instead, look up the corrected versions that were merged
+   into ChangeLog in the master branch, and use those.
 
 2. Compose a short release blurb to highlight the user-facing
changes. Insert said release blurb into the ChangeLog stanza. If it's
@@ -109,7 +127,7 @@ new Tor release:
 === III. Making the source release.
 
 1. In `maint-0.?.x`, bump the version number in `configure.ac` and run
-   `scripts/maint/updateVersions.pl` to update version numbers in other
+   `perl scripts/maint/updateVersions.pl` to update version numbers in other
places, and commit.  Then merge `maint-0.?.x` into `release-0.?.x`.
 
(NOTE: To bump the version number, edit `configure.ac`, and then run
@@ -165,7 +183,7 @@ new Tor release:
 5. Mail the release blurb and ChangeLog to tor-talk (development release) or
tor-announce (stable).
 
-   Post the changelog on the the blog as well. You can generate a
+   Post the changelog on the blog as well. You can generate a
blog-formatted version of the changelog with the -B option to
format-changelog.
 



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

[tor-commits] [tor/master] Add check for double-semi-colons at the end of a line

2017-09-18 Thread nickm

commit f0e87ff9eb01ead1a959bd45bd8a3588479514c7
Author: Edmund Wong 
Date:   Mon Sep 18 15:33:24 2017 +0800

Add check for double-semi-colons at the end of a line
---
 scripts/maint/checkSpace.pl | 4 
 1 file changed, 4 insertions(+)

diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl
index 37dcc98af..9929932cc 100755
--- a/scripts/maint/checkSpace.pl
+++ b/scripts/maint/checkSpace.pl
@@ -123,6 +123,10 @@ for my $fn (@ARGV) {
 if (/([^\s'])\{/) {
 msg "   $1\{:$fn:$.\n";
 }
+## Warn about double semi-colons at the end of a line.
+if (/;;$/) {
+msg "   double semi-colons at the end of $. in $fn\n"
+}
 ## Warn about multiple internal spaces.
 #if (/[^\s,:]\s{2,}[^\s\\=]/) {
 #msg " X  X:$fn:$.\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 remote-tracking branch 'public/ticket19704'

2017-09-18 Thread nickm

commit 94a88eaa45adfb05359ceed99aea572f9b123974
Merge: 3c9ff0af9 de6f121b5
Author: Nick Mathewson 
Date:   Mon Sep 18 15:02:16 2017 -0400

Merge remote-tracking branch 'public/ticket19704'

 changes/ticket19704 | 5 +
 doc/tor.1.txt   | 6 --
 src/or/config.c | 4 
 3 files changed, 13 insertions(+), 2 deletions(-)




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

[tor-commits] [torspec/master] prop224: Add an intro onion key in the descriptor

2017-09-18 Thread nickm

commit 0667997d793a08d607a430a2d44a35d683fa52bd
Author: David Goulet 
Date:   Wed Jul 19 09:32:29 2017 -0400

prop224: Add an intro onion key in the descriptor

The onion key for the ntor handshake is missing in the descriptor in order
for the client to extend to it.

Ticket #22979

Signed-off-by: David Goulet 
---
 proposals/224-rend-spec-ng.txt | 8 
 1 file changed, 8 insertions(+)

diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt
index 8431d45..1c4762f 100644
--- a/proposals/224-rend-spec-ng.txt
+++ b/proposals/224-rend-spec-ng.txt
@@ -1304,6 +1304,14 @@ Table of contents:
   The link-specifiers is a base64 encoding of a link specifier
   block in the format described in BUILDING-BLOCKS.
 
+"onion-key" SP "ntor" SP key NL
+
+  [Exactly once per introduction point]
+
+  The key is a base64 encoded curve25519 public key which is the onion
+  key of the introduction point Tor node used for the ntor handshake
+  when a client extends to it.
+
 "auth-key" NL certificate NL
 
   [Exactly once per introduction point]



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

[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket22979_01'

2017-09-18 Thread nickm

commit 609abee7106061d6edd859847eb67f1945f1474b
Merge: a3d9506 0667997
Author: Nick Mathewson 
Date:   Mon Sep 18 14:58:41 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket22979_01'

 proposals/224-rend-spec-ng.txt | 8 
 1 file changed, 8 insertions(+)

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

[tor-commits] [torspec/master] prop224: Remove the HSDir3 flag concept

2017-09-18 Thread nickm

commit 2922ca3243b70c5d923e32d9986714b1ea9daec2
Author: David Goulet 
Date:   Mon Sep 18 08:34:10 2017 -0400

prop224: Remove the HSDir3 flag concept

Signed-off-by: David Goulet 
---
 proposals/224-rend-spec-ng.txt | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt
index 8431d45..e26fb81 100644
--- a/proposals/224-rend-spec-ng.txt
+++ b/proposals/224-rend-spec-ng.txt
@@ -635,12 +635,9 @@ Table of contents:
 2. Generating and publishing hidden service descriptors [HSDIR]
 
Hidden service descriptors follow the same metaformat as other Tor
-   directory objects. They are published anonymously to Tor servers with
-   the HSDir3 flag.
-
-   (Authorities should assign this flag as they currently assign the
-   HSDir flag, except that they should restrict it to Tor versions
-   implementing the HSDir parts of this specification.)
+   directory objects. They are published anonymously to Tor servers with the
+   HSDir flag, HSDir=2 protocol version and tor version >= 0.3.0.8 (because a
+   bug was fixed in this version).
 
 2.1. Deriving blinded keys and subcredentials [SUBCRED]
 



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

[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket23340_01'

2017-09-18 Thread nickm

commit a3d9506c673690a1fe931b7cf008d6091eb4a624
Merge: 417aac2 2922ca3
Author: Nick Mathewson 
Date:   Mon Sep 18 14:55:47 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket23340_01'

 proposals/224-rend-spec-ng.txt | 9 +++--
 1 file changed, 3 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/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-09-18 Thread nickm

commit 23c5259a384b435c76b5cae40f68f07aec34d241
Merge: e78347fcc 42e12a353
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:36 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" to avoid version bump.




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

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

2017-09-18 Thread nickm

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:22 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.




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

[tor-commits] [tor/release-0.3.1] bump to 0.2.9.12-dev

2017-09-18 Thread nickm

commit a57f1ff7abdd61137c579d806bcd2150fd5fecf6
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:46 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 45019bebb..76140cbd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12])
+AC_INIT([tor],[0.2.9.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index eafedfa68..df657d38b 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.2.9.12"
+!define VERSION "0.2.9.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index fc093daeb..47992c0d8 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.2.9.12"
+#define VERSION "0.2.9.12-dev"
 
 
 



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

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

2017-09-18 Thread nickm

commit 586c327e072ec5a85fcb93cc64e703e201251eb2
Merge: 0e85b7106 23c5259a3
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:43 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.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/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2017-09-18 Thread nickm

commit ac21fb8c68d2931293ddd0d70a024ef17f065191
Merge: 6babd3d9b 586c327e0
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:55 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

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

[tor-commits] [tor/release-0.3.1] bump to 0.3.1.7-dev

2017-09-18 Thread nickm

commit 0e85b71066d6341e817529c6a697b3f95e113564
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:04 2017 -0400

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

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



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

[tor-commits] [tor/release-0.3.1] bump to 0.3.0.11-dev

2017-09-18 Thread nickm

commit e78347fcc206dd8bf1838fb5f396c8a7eefc0325
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:55 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4dc42346a..3f36da739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.11])
+AC_INIT([tor],[0.3.0.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7824d02f1..48a4d8e75 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.0.11"
+!define VERSION "0.3.0.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e81bf0c9f..7399f8178 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.11"
+#define VERSION "0.3.0.11-dev"
 
 
 



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

[tor-commits] [tor/release-0.3.1] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 



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

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

2017-09-18 Thread nickm

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:22 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.




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

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

2017-09-18 Thread nickm

commit 23c5259a384b435c76b5cae40f68f07aec34d241
Merge: e78347fcc 42e12a353
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:36 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" to avoid version bump.




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

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

2017-09-18 Thread nickm

commit b594455ddd5761683a127b4d45f2cf1055cf72eb
Merge: 5cb83c942 23c5259a3
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:55 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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

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

[tor-commits] [tor/release-0.3.0] bump to 0.3.0.11-dev

2017-09-18 Thread nickm

commit e78347fcc206dd8bf1838fb5f396c8a7eefc0325
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:55 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4dc42346a..3f36da739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.11])
+AC_INIT([tor],[0.3.0.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7824d02f1..48a4d8e75 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.0.11"
+!define VERSION "0.3.0.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e81bf0c9f..7399f8178 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.11"
+#define VERSION "0.3.0.11-dev"
 
 
 



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

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

2017-09-18 Thread nickm

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:22 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.




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

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-09-18 Thread nickm

commit 586c327e072ec5a85fcb93cc64e703e201251eb2
Merge: 0e85b7106 23c5259a3
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:43 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.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/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2017-09-18 Thread nickm

commit 4cf9d65050bff2e9377ae654c7a513f89a0b3e37
Merge: 2e47bfad4 42e12a353
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:55 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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

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

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

2017-09-18 Thread nickm

commit 8d300c48e77ae995e09f8c5de45a1ebd4a960536
Merge: 32858610c 586c327e0
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:50 2017 -0400

Merge branch 'maint-0.3.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 branch 'maint-0.2.8' into maint-0.2.9

2017-09-18 Thread nickm

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:22 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.




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

[tor-commits] [tor/release-0.3.0] bump to 0.2.9.12-dev

2017-09-18 Thread nickm

commit a57f1ff7abdd61137c579d806bcd2150fd5fecf6
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:46 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 45019bebb..76140cbd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12])
+AC_INIT([tor],[0.2.9.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index eafedfa68..df657d38b 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.2.9.12"
+!define VERSION "0.2.9.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index fc093daeb..47992c0d8 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.2.9.12"
+#define VERSION "0.2.9.12-dev"
 
 
 



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

[tor-commits] [tor/release-0.3.0] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 



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

[tor-commits] [tor/release-0.2.9] bump to 0.2.9.12-dev

2017-09-18 Thread nickm

commit a57f1ff7abdd61137c579d806bcd2150fd5fecf6
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:46 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 45019bebb..76140cbd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12])
+AC_INIT([tor],[0.2.9.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index eafedfa68..df657d38b 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.2.9.12"
+!define VERSION "0.2.9.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index fc093daeb..47992c0d8 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.2.9.12"
+#define VERSION "0.2.9.12-dev"
 
 
 



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

[tor-commits] [tor/release-0.2.8] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 



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

[tor-commits] [tor/release-0.2.9] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 



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

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

2017-09-18 Thread nickm

commit 9eaa66db0b2114401f3748c65222c373617e5c0e
Merge: e25e98028 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:55 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

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

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

[tor-commits] [tor/master] bump to 0.3.2.1.-alpha-dev

2017-09-18 Thread nickm

commit 32858610c77a98e7fb0c577d66cf5749321adf6a
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:13 2017 -0400

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

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



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

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

2017-09-18 Thread nickm

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:22 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.




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

[tor-commits] [tor/master] bump to 0.2.9.12-dev

2017-09-18 Thread nickm

commit a57f1ff7abdd61137c579d806bcd2150fd5fecf6
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:46 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 45019bebb..76140cbd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12])
+AC_INIT([tor],[0.2.9.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index eafedfa68..df657d38b 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.2.9.12"
+!define VERSION "0.2.9.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index fc093daeb..47992c0d8 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.2.9.12"
+#define VERSION "0.2.9.12-dev"
 
 
 



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

[tor-commits] [tor/master] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 



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

[tor-commits] [tor/master] bump to 0.3.1.7-dev

2017-09-18 Thread nickm

commit 0e85b71066d6341e817529c6a697b3f95e113564
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:04 2017 -0400

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

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



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

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

2017-09-18 Thread nickm

commit 23c5259a384b435c76b5cae40f68f07aec34d241
Merge: e78347fcc 42e12a353
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:36 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" to avoid version bump.




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

[tor-commits] [tor/master] bump to 0.3.0.11-dev

2017-09-18 Thread nickm

commit e78347fcc206dd8bf1838fb5f396c8a7eefc0325
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:55 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4dc42346a..3f36da739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.11])
+AC_INIT([tor],[0.3.0.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7824d02f1..48a4d8e75 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.0.11"
+!define VERSION "0.3.0.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e81bf0c9f..7399f8178 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.11"
+#define VERSION "0.3.0.11-dev"
 
 
 



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

[tor-commits] [tor/maint-0.3.1] bump to 0.3.1.7-dev

2017-09-18 Thread nickm

commit 0e85b71066d6341e817529c6a697b3f95e113564
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:04 2017 -0400

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

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



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

[tor-commits] [tor/maint-0.3.1] bump to 0.3.0.11-dev

2017-09-18 Thread nickm

commit e78347fcc206dd8bf1838fb5f396c8a7eefc0325
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:55 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4dc42346a..3f36da739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.11])
+AC_INIT([tor],[0.3.0.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7824d02f1..48a4d8e75 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.0.11"
+!define VERSION "0.3.0.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e81bf0c9f..7399f8178 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.11"
+#define VERSION "0.3.0.11-dev"
 
 
 



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

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-09-18 Thread nickm

commit 586c327e072ec5a85fcb93cc64e703e201251eb2
Merge: 0e85b7106 23c5259a3
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:43 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.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/maint-0.3.1] bump to 0.2.9.12-dev

2017-09-18 Thread nickm

commit a57f1ff7abdd61137c579d806bcd2150fd5fecf6
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:46 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 45019bebb..76140cbd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12])
+AC_INIT([tor],[0.2.9.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index eafedfa68..df657d38b 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.2.9.12"
+!define VERSION "0.2.9.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index fc093daeb..47992c0d8 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.2.9.12"
+#define VERSION "0.2.9.12-dev"
 
 
 



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

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

2017-09-18 Thread nickm

commit 23c5259a384b435c76b5cae40f68f07aec34d241
Merge: e78347fcc 42e12a353
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:36 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" to avoid version bump.




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

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

2017-09-18 Thread nickm

commit 23c5259a384b435c76b5cae40f68f07aec34d241
Merge: e78347fcc 42e12a353
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:36 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" to avoid version bump.

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

[tor-commits] [tor/maint-0.3.1] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 



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

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

2017-09-18 Thread nickm

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:22 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.




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

[tor-commits] [tor/maint-0.3.0] bump to 0.2.9.12-dev

2017-09-18 Thread nickm

commit a57f1ff7abdd61137c579d806bcd2150fd5fecf6
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:46 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 45019bebb..76140cbd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12])
+AC_INIT([tor],[0.2.9.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index eafedfa68..df657d38b 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.2.9.12"
+!define VERSION "0.2.9.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index fc093daeb..47992c0d8 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.2.9.12"
+#define VERSION "0.2.9.12-dev"
 
 
 



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

[tor-commits] [tor/maint-0.3.0] bump to 0.3.0.11-dev

2017-09-18 Thread nickm

commit e78347fcc206dd8bf1838fb5f396c8a7eefc0325
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:55 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4dc42346a..3f36da739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.11])
+AC_INIT([tor],[0.3.0.11-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7824d02f1..48a4d8e75 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.0.11"
+!define VERSION "0.3.0.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e81bf0c9f..7399f8178 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.11"
+#define VERSION "0.3.0.11-dev"
 
 
 



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

[tor-commits] [tor/maint-0.3.0] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 



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

[tor-commits] [tor/maint-0.2.9] bump to 0.2.9.12-dev

2017-09-18 Thread nickm

commit a57f1ff7abdd61137c579d806bcd2150fd5fecf6
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:46 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 45019bebb..76140cbd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12])
+AC_INIT([tor],[0.2.9.12-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index eafedfa68..df657d38b 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.2.9.12"
+!define VERSION "0.2.9.12-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index fc093daeb..47992c0d8 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.2.9.12"
+#define VERSION "0.2.9.12-dev"
 
 
 



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

[tor-commits] [tor/maint-0.2.9] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 



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

[tor-commits] [tor/maint-0.2.8] bump to 0.2.8.15-dev

2017-09-18 Thread nickm

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Author: Nick Mathewson 
Date:   Mon Sep 18 14:39:40 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4695f111d..55ace93cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15])
+AC_INIT([tor],[0.2.8.15-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 57002a04e..60ee61ff8 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.2.8.15"
+!define VERSION "0.2.8.15-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index bb09bafe0..1f256c204 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.15"
+#define VERSION "0.2.8.15-dev"
 
 
 

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

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

2017-09-18 Thread nickm

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:22 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"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] [webwml/master] Alpha is now 0.3.2.1-alpha

2017-09-18 Thread nickm

commit 371e7077fdec72555337d2e1652dad80f3925dba
Author: Nick Mathewson 
Date:   Mon Sep 18 14:27:45 2017 -0400

Alpha is now 0.3.2.1-alpha
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ed0e9d6f..308164ff 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.3.1.7
-export DEVTAG=tor-0.3.1.7
+export DEVTAG=tor-0.3.2.1-alpha
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index 4c49fd02..4ac48ce5 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.3.1.7
-0.3.1.7
+0.3.2.1-alpha
 
 0.3.0.10
 

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

[tor-commits] [tor/master] changelog tweaks from asn

2017-09-18 Thread nickm

commit eba4743487acc7a0f7f67f0b22357b102b855b15
Author: Nick Mathewson 
Date:   Mon Sep 18 12:42:51 2017 -0400

changelog tweaks from asn
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d978c933f..b8b72c514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,7 +51,7 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
   f) A cleaner and more modular codebase.
 
   You can identify a next-generation onion address by its length:
-  they are56 characters long, as in
+  they are 56 characters long, as in
   "4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion".
 
   In the future, we will release more options and features for v3
@@ -61,7 +61,7 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
   guard algorithms, and statistics. For full details, see
   proposal 224.
 
-  Legacy ("v2") onion services will still work for the forseeable
+  Legacy ("v2") onion services will still work for the foreseeable
   future, and will remain the default until this new codebase gets
   tested and hardened. Service operators who want to experiment with
   the new system can use the 'HiddenServiceVersion 3' torrc



___
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 cast so that 32-bit compilation goes without errors

2017-09-18 Thread nickm

commit 290274dbb5428bc5d99926ce5d7f824165be84e8
Author: Nick Mathewson 
Date:   Mon Sep 18 12:44:26 2017 -0400

Add a cast so that 32-bit compilation goes without errors
---
 src/or/scheduler_kist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
index e4ae07107..4713ffdff 100644
--- a/src/or/scheduler_kist.c
+++ b/src/or/scheduler_kist.c
@@ -526,7 +526,7 @@ kist_scheduler_schedule(void)
  * negative and can NOT be smaller than sched_run_interval so values can
  * only go from 1000 usec (diff set to interval - 1) to 10 usec (diff
  * set to 0) for the maximum allowed run interval (100ms). */
-next_run.tv_usec = (sched_run_interval - diff) * 1000;
+next_run.tv_usec = (int) ((sched_run_interval - diff) * 1000);
 /* Readding an event reschedules it. It does not duplicate it. */
 scheduler_ev_add(_run);
   } else {

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

[tor-commits] [tor/master] Try to clarify that KIST helps relays.

2017-09-18 Thread nickm

commit 9342ee5eb262036922d07bce2ae913b61ed33349
Author: Nick Mathewson 
Date:   Mon Sep 18 12:25:13 2017 -0400

Try to clarify that KIST helps relays.
---
 ChangeLog | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fb1a3d801..d978c933f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,17 +8,17 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
   Below are the changes since Tor 0.3.1.7.
 
   o Major feature (scheduler, channel):
-- Clients and relays now use new schedulers to decide which circuits
-  should deliver cells first. The first type is called "KIST"
-  ("Kernel Informed Socket Transport"), and is only available on
-  Linux-like systems: it uses feedback from the kernel to prevent
-  the kernel's TCP buffers from growing too full. The second new
-  scheduler type is called "KISTLite": it behaves the same as KIST,
-  but runs on systems without kernel support for inspecting TCP
-  implementation details. The old scheduler is still available,
-  under the name "Vanilla". To change the default scheduler
-  preference order, use the new "Schedulers" option. (The default
-  preference order is "KIST,KISTLite,Vanilla".)
+- Tor now uses new schedulers to decide which circuits should
+  deliver cells first, in order to improve congestion at relays. The
+  first type is called "KIST" ("Kernel Informed Socket Transport"),
+  and is only available on Linux-like systems: it uses feedback from
+  the kernel to prevent the kernel's TCP buffers from growing too
+  full. The second new scheduler type is called "KISTLite": it
+  behaves the same as KIST, but runs on systems without kernel
+  support for inspecting TCP implementation details. The old
+  scheduler is still available, under the name "Vanilla". To change
+  the default scheduler preference order, use the new "Schedulers"
+  option. (The default preference order is "KIST,KISTLite,Vanilla".)
 
   Matt Traudt implemented KIST, based on research by Rob Jansen,
   John Geddes, Christ Wacek, Micah Sherr, and Paul Syverson. For

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

[tor-commits] [stem/master] Fix string template

2017-09-18 Thread atagar

commit d138f557a4513bb1e7a88deb4a148e2565c2dd94
Author: Edmund Wong 
Date:   Mon Sep 18 10:00:53 2017 +0800

Fix string template
---
 test/integ/process.py | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integ/process.py b/test/integ/process.py
index 00929ce1..59299f81 100644
--- a/test/integ/process.py
+++ b/test/integ/process.py
@@ -330,7 +330,7 @@ class TestProcess(unittest.TestCase):
 """
 
 if test.tor_version() < stem.version.Requirement.TORRC_VIA_STDIN:
-  skip('(requires )' % stem.version.Requirement.TORRC_VIA_STDIN)
+  skip('(requires %s)' % stem.version.Requirement.TORRC_VIA_STDIN)
 
 with tmp_directory() as data_directory:
   torrc = BASIC_RELAY_TORRC % data_directory
@@ -479,7 +479,7 @@ class TestProcess(unittest.TestCase):
 """
 
 if test.tor_version() < stem.version.Requirement.TORRC_VIA_STDIN:
-  skip('(requires )' % stem.version.Requirement.TORRC_VIA_STDIN)
+  skip('(requires %s)' % stem.version.Requirement.TORRC_VIA_STDIN)
 
 with tmp_directory() as data_directory:
   control_port = random_port()
@@ -575,7 +575,7 @@ class TestProcess(unittest.TestCase):
 if not stem.util.system.is_available('sleep'):
   skip('(sleep unavailable)')
 elif test.tor_version() < stem.version.Requirement.TAKEOWNERSHIP:
-  skip('(requires )' % stem.version.Requirement.TAKEOWNERSHIP)
+  skip('(requires %s)' % stem.version.Requirement.TAKEOWNERSHIP)
 
 with tmp_directory() as data_directory:
   sleep_process = subprocess.Popen(['sleep', '60'])
@@ -619,7 +619,7 @@ class TestProcess(unittest.TestCase):
 """
 
 if test.tor_version() < stem.version.Requirement.TAKEOWNERSHIP:
-  skip('(requires )' % stem.version.Requirement.TAKEOWNERSHIP)
+  skip('(requires %s)' % stem.version.Requirement.TAKEOWNERSHIP)
 
 with tmp_directory() as data_directory:
   control_port = random_port()

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

[tor-commits] [tor/master] Revise the first two (big) changelog entries

2017-09-18 Thread nickm

commit 1efe822acccd1d3a4e4a1bbb554afae969b0fbed
Author: Nick Mathewson 
Date:   Mon Sep 18 11:39:22 2017 -0400

Revise the first two (big) changelog entries
---
 ChangeLog | 101 +++---
 1 file changed, 57 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cad6c67c6..afbb1b501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,64 +2,77 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
   Tor 0.3.2.1-alpha is the first release in the 0.3.2.x series. It
   includes support for our next-generation ("v3") onion service
   protocol, and adds a new circuit scheduler for more responsive
-  forwarding decisions from relays.  There are also numerous other
-  small features and bugfixes here.
+  forwarding decisions from relays. There are also numerous other small
+  features and bugfixes here.
 
   Below are the changes since Tor 0.3.1.7.
 
   o Major feature (scheduler, channel):
-- Introducing the KIST scheduler which stands for Kernel Informed
-  Socket Transport. It is only available on Linux systems. This
-  comes from a researched and published paper you can find
-  here: http://www.robgjansen.com/publications/kist-sec2014.pdf
-  https://arxiv.org/abs/1709.01044 This is also a major refactoring
-  of the entire scheduler subsystem in order for it to be more
-  modular and thus much more easier to add more scheduler type
-  later. The current scheduler has been named "Vanilla" but we favor
-  KIST if available in this version. A new torrc option has been
-  added and named "Schedulers type1,type2,..." which allows a user
-  to select which scheduler type it wants tor to use. It is also
-  possible to change it at runtime. It is an ordered list by
-  priority. KIST might not be available on all platforms so there is
-  a fallback to "KISTLite" that uses the same mechanisms but without
-  the kernel support. The current default values are: Schedulers
-  KIST,KISTLite,Vanilla. Closes ticket 12541.
+- Clients and relays now use new schedulers to decide which circuits
+  should deliver cells first. The first type is called "KIST"
+  ("Kernel Informed Socket Transport"), and is only available on
+  Linux-like systems: it uses feedback from the kernel to prevent
+  the kernel's TCP buffers from growing too full. The second new
+  scheduler type is called "KISTLite": it behaves the same as KIST,
+  but runs on systems without kernel support for inspecting TCP
+  implementation details. The old scheduler is still available,
+  under the name "Vanilla". To change the default scheduler
+  preference order, use the new "Schedulers" option. (The default
+  preference order is "KIST,KISTLite,Vanilla".)
+
+  Matt Traudt implemented KIST, based on research by Rob Jansen,
+  John Geddes, Christ Wacek, Micah Sherr, and Paul Syverson. For
+  more information, see the design paper at
+  http://www.robgjansen.com/publications/kist-sec2014.pdf and the
+  followup implementation paper at https://arxiv.org/abs/1709.01044.
+  Closes ticket 12541.
 
   o Major features (next-generation onion services):
 - Tor now supports the next-generation onion services protocol for
   clients and services! As part of this release, the core of
   proposal 224 has been implemented and is available for
   experimentation and testing by our users. This newer version of
-  onion services (v3) features various improvements over the legacy
-  system: a) Better crypto (replaced SHA1/DH/RSA1024 with
-  SHA3/ed25519/curve25519) b) Improved directory protocol leaking
-  less to directory servers. c) Improved directory protocol with
-  smaller surface for targeted attacks. d) Better onion address
-  security against impersonation. e) More extensible
-  introduction/rendezvous protocol. f) A cleaner and more modular
-  codebase. Furthermore, as part of this update, onion addresses
-  increase in length and are now 56 characters long:
-  4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion In
-  the future, we will be releasing more options and features but we
-  first need a testing period, so that the current codebase matures
-  and becomes more robust. Here are some of the features we have
-  planned: 1) Offline keys for onion services 2) Advanced client
-  authorization for onion services 3) Improved guard algorithm for
-  onion services 4) Next-gen onion service statistics Please see our
-  proposal for more details:
-  
https://gitweb.torproject.org/torspec.git/tree/proposals/224-rend-spec-ng.txt
-  The default version for onion services remains v2 (the legacy
-  system) until this new codebase gets tested and hardened. Service
-  operators who want to experiment with the new system can use the
-  'HiddenServiceVersion

[tor-commits] [tor/master] revision pass on the rest of the changelog

2017-09-18 Thread nickm

commit fc4884bf79111521d5e17ad08b9d763f500aa4a7
Author: Nick Mathewson 
Date:   Mon Sep 18 11:52:27 2017 -0400

revision pass on the rest of the changelog
---
 ChangeLog | 109 ++
 1 file changed, 53 insertions(+), 56 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afbb1b501..fb1a3d801 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,20 +75,21 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
   wrong. Fixes bug 23506; bugfix on 0.1.2.6-alpha.
 
   o Minor features (bug detection):
-- Log a warning message, with stack trace, for any attempt to call
-  get_options() during option validation. Closes ticket 22281.
+- Log a warning message with a stack trace for any attempt to call
+  get_options() during option validation. This pattern has caused
+  subtle bugs in the past. Closes ticket 22281.
 
   o Minor features (client):
-- You can now use Tor as a tunneled HTTP proxy: use the
+- You can now use Tor as a tunneled HTTP proxy: use the new
   HTTPTunnelPort option to open a port that accepts HTTP CONNECT
   requests. Closes ticket 22407.
-- Add an extra check to make sure that we always use the new guard
+- Add an extra check to make sure that we always use the newer guard
   selection code for picking our guards. Closes ticket 22779.
-- When downloading (micro)descriptors, don't split the list of
-  descriptors into multiple requests unless there are at least 32
-  descriptors that we want. Previously, we split at 4, not 32, which
-  could lead to significant overhead in HTTP request size and
-  degradation in compression performance. Closes ticket 23220.
+- When downloading (micro)descriptors, don't split the list into
+  multiple requests unless we want at least 32 descriptors.
+  Previously, we split at 4, not 32, which led to significant
+  overhead in HTTP request size and degradation in compression
+  performance. Closes ticket 23220.
 
   o Minor features (command line):
 - Add a new commandline option, --key-expiration, which prints when
@@ -96,17 +97,18 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
   17639; patch by Isis Lovecruft.
 
   o Minor features (control port):
-- If the control port is used as the HTTP proxy, responds with a
-  meaningful "This is the Tor control port" message, and log the
-  event. Closes ticket 1667. Patch from Ravi Chandra Padmala.
-- Provide better error message for GETINFO desc/(id|name) when
-  microdescriptors are in use and router descriptors are not
-  fetched. Closes ticket 5847. Patch by Kevin Butler.
-- Add GETINFO desc/download-enabled and md/download-enabled, to
-  inform the controller whether try to download router descriptors
-  and microdescriptors respectively. Closes ticket 22684.
-- Added new GETINFO targets ip-to-country/{ipv4,ipv6}-available, so
-  controllers can tell whether the geoip databases are loaded.
+- If an application tries to use the control port as an HTTP proxy,
+  respond with a meaningful "This is the Tor control port" message,
+  and log the event. Closes ticket 1667. Patch from Ravi
+  Chandra Padmala.
+- Provide better error message for GETINFO desc/(id|name) when not
+  fetching router descriptors. Closes ticket 5847. Patch by
+  Kevin Butler.
+- Add GETINFO "{desc,md}/download-enabled", to inform the controller
+  whether Tor will try to download router descriptors and
+  microdescriptors respectively. Closes ticket 22684.
+- Added new GETINFO targets "ip-to-country/{ipv4,ipv6}-available",
+  so controllers can tell whether the geoip databases are loaded.
   Closes ticket 23237.
 - Adds a timestamp field to the CIRC_BW and STREAM_BW bandwidth
   events. Closes ticket 19254. Patch by "DonnchaC".
@@ -115,41 +117,40 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
 - Developers can now generate a call-graph for Tor using the
   "calltool" python program, which post-processes object dumps. It
   should work okay on many Linux and OSX platforms, and might work
-  elsewhere too. To run this, install calltool from
+  elsewhere too. To run it, install calltool from
   https://gitweb.torproject.org/user/nickm/calltool.git and run
   "make callgraph". Closes ticket 19307.
 
   o Minor features (ed25519):
 - Add validation function to checks for torsion components in
-  ed25119 public keys, used by prop224 client-side code. Closes
+  ed25519 public keys, used by prop224 client-side code. Closes
   ticket 22006. Math help by Ian Goldberg.
 
   o Minor features (exit relay, DNS):
 - Improve the clarity and safety of the log message from evdns when
-  receiving an apparent spoofed DNS reply. Closes ticket 3056.
+  receiving an apparently spoofed DNS reply. Closes ticket 3056.
 
   o Minor

[tor-commits] [tor/master] Combine some changelog sections.

2017-09-18 Thread nickm

commit 990e15689fde1c5ce6935389ba7bd4f652886388
Author: Nick Mathewson 
Date:   Mon Sep 18 11:27:24 2017 -0400

Combine some changelog sections.
---
 ChangeLog | 79 +++
 1 file changed, 29 insertions(+), 50 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73403a178..cad6c67c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Changes in version 0.3.2.1-alpha - 2017-09-18
-  BLURB
+  Tor 0.3.2.1-alpha is the first release in the 0.3.2.x series. It
+  includes support for our next-generation ("v3") onion service
+  protocol, and adds a new circuit scheduler for more responsive
+  forwarding decisions from relays.  There are also numerous other
+  small features and bugfixes here.
 
   Below are the changes since Tor 0.3.1.7.
 
@@ -53,28 +57,25 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
 
   o Major bugfixes (usability, control port):
 - Report trusted clock skew indications as bootstrap errors, so
-  controllers can more easily alert users. Fixes bug 23506; bugfix
+  controllers can more easily alert users when their clocks are
+  wrong. Fixes bug 23506; bugfix
   on 0.1.2.6-alpha.
 
   o Minor features (bug detection):
 - Log a warning message, with stack trace, for any attempt to call
   get_options() during option validation. Closes ticket 22281.
 
-  o Minor features (client directory bandwidth tuning):
-- When downloading (micro)descriptors, don't split the list of
-  descriptors into multiple requests unless there are at least 32
-  descriptors that we want. Previously, we split at 4, not 32, which
-  could lead to significant overhead in HTTP request size and
-  degradation in compression performance. Closes ticket 23220.
-
   o Minor features (client):
 - You can now use Tor as a tunneled HTTP proxy: use the
   HTTPTunnelPort option to open a port that accepts HTTP CONNECT
   requests. Closes ticket 22407.
-
-  o Minor features (client, entry guards):
 - Add an extra check to make sure that we always use the new guard
   selection code for picking our guards. Closes ticket 22779.
+- When downloading (micro)descriptors, don't split the list of
+  descriptors into multiple requests unless there are at least 32
+  descriptors that we want. Previously, we split at 4, not 32, which
+  could lead to significant overhead in HTTP request size and
+  degradation in compression performance. Closes ticket 23220.
 
   o Minor features (command line):
 - Add a new commandline option, --key-expiration, which prints when
@@ -88,13 +89,9 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
 - Provide better error message for GETINFO desc/(id|name) when
   microdescriptors are in use and router descriptors are not
   fetched. Closes ticket 5847. Patch by Kevin Butler.
-
-  o Minor features (control):
 - Add GETINFO desc/download-enabled and md/download-enabled, to
   inform the controller whether try to download router descriptors
   and microdescriptors respectively. Closes ticket 22684.
-
-  o Minor features (controller):
 - Added new GETINFO targets ip-to-country/{ipv4,ipv6}-available, so
   controllers can tell whether the geoip databases are loaded.
   Closes ticket 23237.
@@ -158,26 +155,17 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
   ticket 23054.
 
   o Minor features (testing):
+- The default chutney network tests now include tests for the v3
+  hidden service design. Make sure you have the latest version of
+  chutney if you want to run these. Closes ticket 22437.
 - Add a unit test to verify that we can parse a hardcoded v2 hidden
   service descriptor. Closes ticket 15554.
 
-  o Minor bugfix (relay address resolution):
-- Avoid unnecessary calls to directory_fetches_from_authorities() on
-  relays. This avoids spurious address resolutions and descriptor
-  rebuilds. This is a mitigation for bug 21789. Fixes bug 23470;
-  bugfix on in 0.2.8.1-alpha.
-
   o Minor bugfixes (certificate handling):
 - Fix a time handling bug in Tor certificates set to expire after
   the year 2106. Fixes bug 23055; bugfix on 0.3.0.1-alpha. Found by
   Coverity as CID 1415728.
 
-  o Minor bugfixes (circuit logging):
-- torspec says hop counts are 1-based, so fix two log messages that
-  mistakenly logged 0-based hop counts. Fixes bug 18982; bugfix on
-  0.2.6.2-alpha and 0.2.4.5-alpha. Patch by teor. Credit to Xiaofan
-  Li for reporting this issue.
-
   o Minor bugfixes (client, usability):
 - Refrain from needlessly rejecting SOCKS5-with-hostnames and
   SOCKS4a requests that contain IP address strings, even when
@@ -192,6 +180,10 @@ Changes in version 0.3.2.1-alpha - 2017-09-18
   Previously we used ntohs(), which happens to behave the same on
   all the platforms we support, but which isn't really correct.

[tor-commits] [webwml/master] 0.3.1.7 is out.

2017-09-18 Thread nickm

commit b002f78ad6a89df82ee7a9794dc848173e0f695c
Author: Nick Mathewson 
Date:   Mon Sep 18 11:15:41 2017 -0400

0.3.1.7 is out.
---
 Makefile | 4 ++--
 include/versions.wmi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 584ad168..ed0e9d6f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@
 # branch to your personal webwml repository, open a trac ticket in the
 # website component, and set it to needs_review.
 
-export STABLETAG=tor-0.3.0.10
-export DEVTAG=tor-0.3.1.6-rc
+export STABLETAG=tor-0.3.1.7
+export DEVTAG=tor-0.3.1.7
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index 1740e025..4c49fd02 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
-0.3.0.10
-0.3.1.6-rc
+0.3.1.7
+0.3.1.7
 
 0.3.0.10
 

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

[tor-commits] [tor/master] sched: Don't cast to int32_t the monotime_diff_msec() result

2017-09-18 Thread nickm

commit 77cc97cf0a20ed0a062a1cb87bef6c40941e4cff
Author: David Goulet 
Date:   Mon Sep 18 10:47:05 2017 -0400

sched: Don't cast to int32_t the monotime_diff_msec() result

When the KIST schedule() is called, it computes a diff value between the 
last
scheduler run and the current monotonic time. If tha value is below the run
interval, the libevent even is updated else the event is run.

It turned out that casting to int32_t the returned int64_t value for the 
very
first scheduler run (which is set to 0) was creating an overflow on the 32 
bit
value leading to adding the event with a gigantic usec value. The scheduler
was simply never running for a while.

First of all, a BUG() is added for a diff value < 0 because if the time is
really monotonic, we should never have a now time that is lower than the 
last
scheduler run time. And we will try to recover with a diff value to 0.

Second, the diff value is changed to int64_t so we avoid this "bootstrap
overflow" and future casting overflow problems.

Fixes #23558

Signed-off-by: David Goulet 
---
 src/or/scheduler_kist.c | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
index ba8d416db..e4ae07107 100644
--- a/src/or/scheduler_kist.c
+++ b/src/or/scheduler_kist.c
@@ -507,16 +507,25 @@ kist_scheduler_schedule(void)
 {
   struct monotime_t now;
   struct timeval next_run;
-  int32_t diff;
+  int64_t diff;
 
   if (!have_work()) {
 return;
   }
   monotime_get();
-  diff = (int32_t) monotime_diff_msec(_last_run, );
+
+  /* If time is really monotonic, we can never have now being smaller than the
+   * last scheduler run. The scheduler_last_run at first is set to 0. */
+  diff = monotime_diff_msec(_last_run, );
+  IF_BUG_ONCE(diff < 0) {
+diff = 0;
+  }
   if (diff < sched_run_interval) {
 next_run.tv_sec = 0;
-/* 1000 for ms -> us */
+/* Takes 1000 ms -> us. This will always be valid because diff can NOT be
+ * negative and can NOT be smaller than sched_run_interval so values can
+ * only go from 1000 usec (diff set to interval - 1) to 10 usec (diff
+ * set to 0) for the maximum allowed run interval (100ms). */
 next_run.tv_usec = (sched_run_interval - diff) * 1000;
 /* Readding an event reschedules it. It does not duplicate it. */
 scheduler_ev_add(_run);



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

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug23558_032_01'

2017-09-18 Thread nickm

commit a23a168f24b490958e999603a719d15ae42755a9
Merge: aaf0fa6d1 c7af92356
Author: Nick Mathewson 
Date:   Mon Sep 18 11:02:37 2017 -0400

Merge remote-tracking branch 'dgoulet/bug23558_032_01'

 src/or/scheduler.c  |  6 +-
 src/or/scheduler_kist.c | 15 ---
 2 files changed, 17 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] sched: BUG() on event_add() and log_warn next_run

2017-09-18 Thread nickm

commit c7af923567bca5b0a6e9dcd5ceda4b01be09f9a1
Author: David Goulet 
Date:   Mon Sep 18 10:58:38 2017 -0400

sched: BUG() on event_add() and log_warn next_run

It is highly unlikely to happen but if so, we need to know and why. The
warning with the next_run values could help.

Signed-off-by: David Goulet 
---
 src/or/scheduler.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index 2d6f7fc4b..43fff2bf2 100644
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -506,7 +506,11 @@ scheduler_ev_add(const struct timeval *next_run)
 {
   tor_assert(run_sched_ev);
   tor_assert(next_run);
-  event_add(run_sched_ev, next_run);
+  if (BUG(event_add(run_sched_ev, next_run) < 0)) {
+log_warn(LD_SCHED, "Adding to libevent failed. Next run time was set to: "
+   "%ld.%06ld", next_run->tv_sec, next_run->tv_usec);
+return;
+  }
 }
 
 /* Make the scheduler event active with the given flags. */



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

[tor-commits] [tor/master] Make hs_ntor_ref.py work with python3

2017-09-18 Thread nickm

commit 63ae9ea316f77346ed2e1941958916fd3a5207a1
Author: Nick Mathewson 
Date:   Mon Sep 18 10:48:28 2017 -0400

Make hs_ntor_ref.py work with python3
---
 src/test/hs_ntor_ref.py | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py
index 3dd2d6d6e..2ed9324e1 100644
--- a/src/test/hs_ntor_ref.py
+++ b/src/test/hs_ntor_ref.py
@@ -83,11 +83,11 @@ from ntor_ref import hash_nil
 from ntor_ref import PrivateKey
 
 # String constants used in this protocol
-PROTOID = "tor-hs-ntor-curve25519-sha3-256-1"
-T_HSENC= PROTOID + ":hs_key_extract"
-T_HSVERIFY = PROTOID + ":hs_verify"
-T_HSMAC= PROTOID + ":hs_mac"
-M_HSEXPAND = PROTOID + ":hs_key_expand"
+PROTOID = b"tor-hs-ntor-curve25519-sha3-256-1"
+T_HSENC= PROTOID + b":hs_key_extract"
+T_HSVERIFY = PROTOID + b":hs_verify"
+T_HSMAC= PROTOID + b":hs_mac"
+M_HSEXPAND = PROTOID + b":hs_key_expand"
 
 INTRO_SECRET_LEN = 161
 REND_SECRET_LEN = 225
@@ -191,7 +191,7 @@ def service_part1(intro_auth_pubkey_str, client_enc_pubkey, 
intro_enc_privkey, i
 
 ntor_key_seed = mac(rend_secret_hs_input, T_HSENC)
 verify = mac(rend_secret_hs_input, T_HSVERIFY)
-auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_pubkey.serialize() + client_enc_pubkey.serialize() + 
PROTOID + "Server"
+auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_pubkey.serialize() + client_enc_pubkey.serialize() + 
PROTOID + b"Server"
 assert(len(auth_input) == AUTH_INPUT_LEN)
 auth_input_mac = mac(auth_input, T_HSMAC)
 
@@ -218,7 +218,7 @@ def client_part2(intro_auth_pubkey_str, 
client_ephemeral_enc_pubkey, client_ephe
 
 ntor_key_seed = mac(rend_secret_hs_input, T_HSENC)
 verify = mac(rend_secret_hs_input, T_HSVERIFY)
-auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_rend_pubkey.serialize() + 
client_ephemeral_enc_pubkey.serialize() + PROTOID + "Server"
+auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_rend_pubkey.serialize() + 
client_ephemeral_enc_pubkey.serialize() + PROTOID + b"Server"
 assert(len(auth_input) == AUTH_INPUT_LEN)
 auth_input_mac = mac(auth_input, T_HSMAC)
 
@@ -294,7 +294,7 @@ def do_pure_python_ntor_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_auth_input_mac == service_auth_input_mac)
 
-print "DONE: python dance [%s]" % repr(client_auth_input_mac)
+print("DONE: python dance [%s]" % repr(client_auth_input_mac))
 
 # Perform a pure little-t-tor integration test.
 def do_little_t_tor_ntor_test():
@@ -334,7 +334,7 @@ def do_little_t_tor_ntor_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_ntor_auth_mac == service_ntor_auth_mac)
 
-print "DONE: tor dance [%s]" % repr(client_ntor_auth_mac)
+print("DONE: tor dance [%s]" % repr(client_ntor_auth_mac))
 
 """
 Do mixed test as follows:
@@ -379,7 +379,7 @@ def do_first_mixed_test():
 assert(client_auth_input_mac == service_ntor_auth_mac)
 assert(client_ntor_key_seed == service_ntor_key_seed)
 
-print "DONE: 1st mixed dance [%s]" % repr(client_auth_input_mac)
+print("DONE: 1st mixed dance [%s]" % repr(client_auth_input_mac))
 
 """
 Do mixed test as follows:
@@ -413,7 +413,7 @@ def do_second_mixed_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_ntor_auth_mac == service_ntor_auth_mac)
 
-print "DONE: 2nd mixed dance [%s]" % repr(client_ntor_auth_mac)
+print("DONE: 2nd mixed dance [%s]" % repr(client_ntor_auth_mac))
 
 def do_mixed_tests():
 do_first_mixed_test()



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

[tor-commits] [tor/master] remove changes files for items that appeared in 0.3.17

2017-09-18 Thread nickm

commit 365bb6356a0d5238adc8153d254cb67bc44ea10d
Author: Nick Mathewson 
Date:   Mon Sep 18 10:12:30 2017 -0400

remove changes files for items that appeared in 0.3.17
---
 changes/bug23533   | 4 
 changes/trove-2017-008 | 5 -
 2 files changed, 9 deletions(-)

diff --git a/changes/bug23533 b/changes/bug23533
deleted file mode 100644
index b5bfdc0ce..0
--- a/changes/bug23533
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (relay):
-- Inform the geoip and rephist modules about all requests, even
-  on relays that are only fetching microdescriptors. Fixes a bug related
-  to 21585; bugfix on 0.3.0.1-alpha.
diff --git a/changes/trove-2017-008 b/changes/trove-2017-008
deleted file mode 100644
index 4b9c5b0a1..0
--- a/changes/trove-2017-008
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (security, hidden services, loggging):
-- Fix a bug where we could log uninitialized stack when a certain
-  hidden service error occurred while SafeLogging was disabled.
-  Fixes bug #23490; bugfix on 0.2.7.2-alpha.
-  This is also tracked as TROVE-2017-008 and CVE-2017-0380.



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

[tor-commits] [tor/master] Start on a changelog for 0.3.2.1-alpha: sortchanges and formatchangelog

2017-09-18 Thread nickm

commit 0bd62c1d92ecb2ee43d2ecd44ee5cf7b1295a3d1
Author: Nick Mathewson 
Date:   Mon Sep 18 10:32:03 2017 -0400

Start on a changelog for 0.3.2.1-alpha: sortchanges and formatchangelog
---
 ChangeLog   | 354 
 changes/15554   |   4 -
 changes/19307   |   7 -
 changes/21148   |   4 -
 changes/bug15645|   3 -
 changes/bug1667 |   4 -
 changes/bug17639|   4 -
 changes/bug17750|   4 -
 changes/bug18982|   6 -
 changes/bug19281|   5 -
 changes/bug19476|   4 -
 changes/bug19648|   5 -
 changes/bug19871|   4 -
 changes/bug22006|   4 -
 changes/bug22410|   4 -
 changes/bug22461|   7 -
 changes/bug22497|   4 -
 changes/bug22677|   3 -
 changes/bug22731|   5 -
 changes/bug22746|   4 -
 changes/bug22750|   5 -
 changes/bug22779|   4 -
 changes/bug22802|  10 --
 changes/bug22885|   5 -
 changes/bug22924|   4 -
 changes/bug23026|   4 -
 changes/bug23054|   4 -
 changes/bug23055|   4 -
 changes/bug23091|   6 -
 changes/bug23098|   4 -
 changes/bug23106|   5 -
 changes/bug23220|   7 -
 changes/bug23366|   4 -
 changes/bug23426|   4 -
 changes/bug23470|   5 -
 changes/bug23487|   5 -
 changes/bug23499|   6 -
 changes/bug23506|   4 -
 changes/bug23524|   4 -
 changes/bug23532|   5 -
 changes/bug3056 |   3 -
 changes/bug4019 |   4 -
 changes/bug5847 |   5 -
 changes/bug7890 |   4 -
 changes/doc20152|   3 -
 changes/feature19254|   3 -
 changes/feature20119_1  |   3 -
 changes/feature22407|   5 -
 changes/feature22976|   8 --
 changes/feature23090|   3 -
 changes/feature23237|   4 -
 changes/prop224 |  36 -
 changes/refactor-buffer |   3 -
 changes/ticket12541 |  23 
 changes/ticket20488 |   5 -
 changes/ticket20575 |   4 -
 changes/ticket21031 |   5 -
 changes/ticket22215 |   5 -
 changes/ticket22281 |   3 -
 changes/ticket22311 |   3 -
 changes/ticket22377 |   4 -
 changes/ticket22437 |   4 -
 changes/ticket22521 |   3 -
 changes/ticket22608 |   6 -
 changes/ticket22684 |   5 -
 changes/ticket22804 |   4 -
 changes/ticket22895 |   3 -
 67 files changed, 354 insertions(+), 345 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 566da0478..73403a178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,357 @@
+Changes in version 0.3.2.1-alpha - 2017-09-18
+  BLURB
+
+  Below are the changes since Tor 0.3.1.7.
+
+  o Major feature (scheduler, channel):
+- Introducing the KIST scheduler which stands for Kernel Informed
+  Socket Transport. It is only available on Linux systems. This
+  comes from a researched and published paper you can find
+  here: http://www.robgjansen.com/publications/kist-sec2014.pdf
+  https://arxiv.org/abs/1709.01044 This is also a major refactoring
+  of the entire scheduler subsystem in order for it to be more
+  modular and thus much more easier to add more scheduler type
+  later. The current scheduler has been named "Vanilla" but we favor
+  KIST if available in this version. A new torrc option has been
+  added and named "Schedulers type1,type2,..." which allows a user
+  to select which scheduler type it wants tor to use. It is also
+  possible to change it at runtime. It is an ordered list by
+  priority. KIST might not be available on all platforms so there is
+  a fallback to "KISTLite" that uses the same mechanisms but without
+  the kernel support. The current default values are: Schedulers
+  KIST,KISTLite,Vanilla. Closes ticket 12541.
+
+  o Major features (next-generation onion services):
+- Tor now supports the next-generation onion services protocol for
+  clients and services! As part of this release, the core of
+  proposal 224 has been implemented and is available for
+  experimentation and testing by our users. This newer version of
+  onion services (v3) features various improvements over the legacy
+  system: a) Better crypto (replaced SHA1/DH/RSA1024 with
+  SHA3/ed25519/curve25519) b) Improved directory protocol leaking
+  less to directory servers. c) Improved directory protocol with
+  smaller surface for targeted attacks. d) Better onion address
+  security against impersonation. e) More extensible
+  introduction/rendezvous protocol. f) A cleaner and more modular
+  codebase. Furthermore, as part of this update, onion addresses
+  increase in length and are now 56 characters long:
+  4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion In
+  the future, we will be releasing more options and features but we
+  first need

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

2017-09-18 Thread nickm

commit d9dccb00ccc8518f716d798786b0144980e6b368
Author: Nick Mathewson 
Date:   Mon Sep 18 10:30:41 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index c449294d0..50e7ec2f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.2.0-alpha-dev])
+AC_INIT([tor],[0.3.2.1-alpha])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9f3a86a69..471f64e7f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.2.0-alpha-dev"
+!define VERSION "0.3.2.1-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 9b16c6475..5882b66e2 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.2.0-alpha-dev"
+#define VERSION "0.3.2.1-alpha"
 
 
 



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

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

2017-09-18 Thread nickm

commit aaf0fa6d1177c045a46ad1e5d6321396bf3690cd
Merge: 0bd62c1d9 63ae9ea31
Author: Nick Mathewson 
Date:   Mon Sep 18 10:48:31 2017 -0400

Merge branch 'maint-0.3.1'

 src/test/hs_ntor_ref.py | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

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

[tor-commits] [tor/master] Use the lintChanges script to fix style issues in changes entries

2017-09-18 Thread nickm

commit 523188afdb4488724da2487d86bfa2ad87f96cb2
Author: Nick Mathewson 
Date:   Mon Sep 18 10:24:03 2017 -0400

Use the lintChanges script to fix style issues in changes entries
---
 changes/{19037 => 19307} | 0
 changes/bug17639 | 8 
 changes/bug17750 | 2 +-
 changes/bug18982 | 4 ++--
 changes/bug19476 | 7 ---
 changes/bug19871 | 8 
 changes/bug22006 | 6 +++---
 changes/bug22410 | 4 ++--
 changes/bug22461 | 2 +-
 changes/bug22924 | 2 +-
 changes/bug23091 | 2 +-
 changes/bug23347 | 9 -
 changes/bug23366 | 6 +++---
 changes/bug23470 | 5 ++---
 changes/bug23499 | 2 +-
 changes/bug23524 | 2 +-
 changes/bug23525 | 6 --
 changes/bug3056  | 6 +++---
 changes/bug4019  | 2 +-
 changes/refactor-buffer  | 2 +-
 changes/ticket20575  | 6 +++---
 changes/ticket22215  | 2 +-
 22 files changed, 39 insertions(+), 54 deletions(-)

diff --git a/changes/19037 b/changes/19307
similarity index 100%
rename from changes/19037
rename to changes/19307
diff --git a/changes/bug17639 b/changes/bug17639
index 4073514fd..be69edbc7 100644
--- a/changes/bug17639
+++ b/changes/bug17639
@@ -1,4 +1,4 @@
- o Minor features:
-   - Add a new commandline option, --key-expiration, which prints when
- the current signing key is going to expire. Implements ticket
- 17639; patch by Isis Lovecruft.
+  o Minor features (command line):
+- Add a new commandline option, --key-expiration, which prints when
+  the current signing key is going to expire. Implements ticket
+  17639; patch by Isis Lovecruft.
diff --git a/changes/bug17750 b/changes/bug17750
index eb77b77ab..c5894a971 100644
--- a/changes/bug17750
+++ b/changes/bug17750
@@ -1,4 +1,4 @@
   o Minor bugfixes (directory downloads):
 - Make clients wait for 6 seconds before trying to download their
   consensus from an authority.
-  Fixes bug 17750, bugfix on 0.2.8.1-alpha.
+  Fixes bug 17750; bugfix on 0.2.8.1-alpha.
diff --git a/changes/bug18982 b/changes/bug18982
index bb0383d13..bfcae4fb5 100644
--- a/changes/bug18982
+++ b/changes/bug18982
@@ -1,6 +1,6 @@
   o Minor bugfixes (circuit logging):
 - torspec says hop counts are 1-based, so fix two log messages
   that mistakenly logged 0-based hop counts.
-  Closes ticket 18982, bugfix on 0275b6876 in tor 0.2.6.2-alpha
-  and 907db008a in tor 0.2.4.5-alpha. Patch by teor.
+  Fixes bug 18982; bugfix on 0.2.6.2-alpha
+  and 0.2.4.5-alpha. Patch by teor.
   Credit to Xiaofan Li for reporting this issue.
diff --git a/changes/bug19476 b/changes/bug19476
index 25a057868..dbde485b3 100644
--- a/changes/bug19476
+++ b/changes/bug19476
@@ -1,3 +1,4 @@
- o Minor changes:
-   - If we fail to write a heartbeat message, schedule a retry for the minimum
- heartbeat interval number of seconds in the future. Fixes bug 19476.
+  o Minor bugfixes (heartbeat):
+- If we fail to write a heartbeat message, schedule a retry for the minimum
+  heartbeat interval number of seconds in the future. Fixes bug 19476;
+  bugfix on 0.2.3.1-alpha.
diff --git a/changes/bug19871 b/changes/bug19871
index 5f1c9dc80..4c4fbfa9e 100644
--- a/changes/bug19871
+++ b/changes/bug19871
@@ -1,4 +1,4 @@
- o Code refactoring:
-   - Remove dead code for largely unused statistics on the number of
- times we've attempted various public key operations. Fixes bug
- 19871; fix by Isis Lovecruft. Bugfix on 0.1.2.4-alpha.
+  o Code simplification and refactoring:
+- Remove dead code for largely unused statistics on the number of
+  times we've attempted various public key operations. Fixes bug
+  19871; bugfix on 0.1.2.4-alpha. Fix by Isis Lovecruft.
diff --git a/changes/bug22006 b/changes/bug22006
index 912bdd87b..8b6f128b9 100644
--- a/changes/bug22006
+++ b/changes/bug22006
@@ -1,4 +1,4 @@
   o Minor features (ed25519):
-- Add validation function that checks for torsion components in ed25119
-  public keys. Currently unused but will be used by prop224 client-side
-  code. Addresses ticket #22006. Math help by Ian Goldberg.
+- Add validation function to checks for torsion components in ed25119
+  public keys, used by prop224 client-side
+  code. Closes ticket 22006. Math help by Ian Goldberg.
diff --git a/changes/bug22410 b/changes/bug22410
index 678a26dce..ee5fc68f3 100644
--- a/changes/bug22410
+++ b/changes/bug22410
@@ -1,4 +1,4 @@
-  o Minor bugfixes (portability):
+  o Minor features (portability):
 - Check at configure time whether uint8_t is unsigned char.  Lots
   of existing code already assumes this, and there could be strict
-  aliasing issues if they aren't the same type.  Fixes #22410.
+  aliasing issues if they aren't the same type. Closes ticket 22410.
diff --git a/changes/bug22461 b/changes/bug22461
index 545468281..3fd5e2164 100644
---

[tor-commits] [tor/master] forward-port changelogs and release notes for 0.2.8.15, 0.2.9.12, 0.3.0.11, 0.3.1.7

2017-09-18 Thread nickm

commit 3767a7020fdac382ac0af9e2269f29307151e8d9
Author: Nick Mathewson 
Date:   Mon Sep 18 10:11:15 2017 -0400

forward-port changelogs and release notes for 0.2.8.15, 0.2.9.12, 0.3.0.11, 
0.3.1.7
---
 ChangeLog| 289 
 ReleaseNotes | 879 +++
 2 files changed, 1168 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b30ca2ad4..566da0478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,292 @@
+Changes in version 0.2.8.15 - 2017-09-18
+  Tor 0.2.8.15 backports a collection of bugfixes from later
+  Tor series.
+
+  Most significantly, it includes a fix for TROVE-2017-008, a
+  security bug that affects hidden services running with the
+  SafeLogging option disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
+
+  Note that Tor 0.2.8.x will no longer be supported after 1 Jan
+  2018.  We suggest that you upgrade to the latest stable release if
+  possible.  If you can't, we recommend that you upgrade at least to
+  0.2.9, which will be supported until 2020.
+
+  o Major bugfixes (openbsd, denial-of-service, backport from 0.3.1.5-alpha):
+- Avoid an assertion failure bug affecting our implementation of
+  inet_pton(AF_INET6) on certain OpenBSD systems whose strtol()
+  handling of "0xx" differs from what we had expected. Fixes bug
+  22789; bugfix on 0.2.3.8-alpha. Also tracked as TROVE-2017-007.
+
+  o Minor features:
+- Update geoip and geoip6 to the September 6 2017 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (compilation, mingw, backport from 0.3.1.1-alpha):
+- Backport a fix for an "unused variable" warning that appeared
+  in some versions of mingw. Fixes bug 22838; bugfix on
+  0.2.8.1-alpha.
+
+  o Minor bugfixes (defensive programming, undefined behavior, backport from 
0.3.1.4-alpha):
+- Fix a memset() off the end of an array when packing cells. This
+  bug should be harmless in practice, since the corrupted bytes are
+  still in the same structure, and are always padding bytes,
+  ignored, or immediately overwritten, depending on compiler
+  behavior. Nevertheless, because the memset()'s purpose is to make
+  sure that any other cell-handling bugs can't expose bytes to the
+  network, we need to fix it. Fixes bug 22737; bugfix on
+  0.2.4.11-alpha. Fixes CID 1401591.
+
+  o Build features (backport from 0.3.1.5-alpha):
+- Tor's repository now includes a Travis Continuous Integration (CI)
+  configuration file (.travis.yml). This is meant to help new
+  developers and contributors who fork Tor to a Github repository be
+  better able to test their changes, and understand what we expect
+  to pass. To use this new build feature, you must fork Tor to your
+  Github account, then go into the "Integrations" menu in the
+  repository settings for your fork and enable Travis, then push
+  your changes. Closes ticket 22636.
+
+
+Changes in version 0.2.9.12 - 2017-09-18
+  Tor 0.2.9.12 backports a collection of bugfixes from later
+  Tor series.
+
+  Most significantly, it includes a fix for TROVE-2017-008, a
+  security bug that affects hidden services running with the
+  SafeLogging option disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
+
+  o Major features (security, backport from 0.3.0.2-alpha):
+- Change the algorithm used to decide DNS TTLs on client and server
+  side, to better resist DNS-based correlation attacks like the
+  DefecTor attack of Greschbach, Pulls, Roberts, Winter, and
+  Feamster. Now relays only return one of two possible DNS TTL
+  values, and clients are willing to believe DNS TTL values up to 3
+  hours long. Closes ticket 19769.
+
+  o Major bugfixes (crash, directory connections, backport from 0.3.0.5-rc):
+- Fix a rare crash when sending a begin cell on a circuit whose
+  linked directory connection had already been closed. Fixes bug
+  21576; bugfix on 0.2.9.3-alpha. Reported by Alec Muffett.
+
+  o Major bugfixes (DNS, backport from 0.3.0.2-alpha):
+- Fix a bug that prevented exit nodes from caching DNS records for
+  more than 60 seconds. Fixes bug 19025; bugfix on 0.2.4.7-alpha.
+
+  o Major bugfixes (linux TPROXY support, backport from 0.3.1.1-alpha):
+- Fix a typo that had prevented TPROXY-based transparent proxying
+  from working under Linux. Fixes bug 18100; bugfix on 0.2.6.3-alpha.
+  Patch from "d4fq0fQAgoJ".
+
+  o Major bugfixes (openbsd, denial-of-service, backport from 0.3.1.5-alpha):
+- Avoid an assertion failure bug affecting our implementation of
+  inet_pton(AF_INET6) on certain OpenBSD systems whose strtol()
+  handling of "0xx" differs from what we had expected. Fixes bug
+  22789; bugfix on 0.2.3.8-alpha. Also tracked as TROVE-2017-007.
+
+  o Minor features (code style,

[tor-commits] [tor/release-0.3.1] Make hs_ntor_ref.py work with python3

2017-09-18 Thread nickm

commit 63ae9ea316f77346ed2e1941958916fd3a5207a1
Author: Nick Mathewson 
Date:   Mon Sep 18 10:48:28 2017 -0400

Make hs_ntor_ref.py work with python3
---
 src/test/hs_ntor_ref.py | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py
index 3dd2d6d6e..2ed9324e1 100644
--- a/src/test/hs_ntor_ref.py
+++ b/src/test/hs_ntor_ref.py
@@ -83,11 +83,11 @@ from ntor_ref import hash_nil
 from ntor_ref import PrivateKey
 
 # String constants used in this protocol
-PROTOID = "tor-hs-ntor-curve25519-sha3-256-1"
-T_HSENC= PROTOID + ":hs_key_extract"
-T_HSVERIFY = PROTOID + ":hs_verify"
-T_HSMAC= PROTOID + ":hs_mac"
-M_HSEXPAND = PROTOID + ":hs_key_expand"
+PROTOID = b"tor-hs-ntor-curve25519-sha3-256-1"
+T_HSENC= PROTOID + b":hs_key_extract"
+T_HSVERIFY = PROTOID + b":hs_verify"
+T_HSMAC= PROTOID + b":hs_mac"
+M_HSEXPAND = PROTOID + b":hs_key_expand"
 
 INTRO_SECRET_LEN = 161
 REND_SECRET_LEN = 225
@@ -191,7 +191,7 @@ def service_part1(intro_auth_pubkey_str, client_enc_pubkey, 
intro_enc_privkey, i
 
 ntor_key_seed = mac(rend_secret_hs_input, T_HSENC)
 verify = mac(rend_secret_hs_input, T_HSVERIFY)
-auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_pubkey.serialize() + client_enc_pubkey.serialize() + 
PROTOID + "Server"
+auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_pubkey.serialize() + client_enc_pubkey.serialize() + 
PROTOID + b"Server"
 assert(len(auth_input) == AUTH_INPUT_LEN)
 auth_input_mac = mac(auth_input, T_HSMAC)
 
@@ -218,7 +218,7 @@ def client_part2(intro_auth_pubkey_str, 
client_ephemeral_enc_pubkey, client_ephe
 
 ntor_key_seed = mac(rend_secret_hs_input, T_HSENC)
 verify = mac(rend_secret_hs_input, T_HSVERIFY)
-auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_rend_pubkey.serialize() + 
client_ephemeral_enc_pubkey.serialize() + PROTOID + "Server"
+auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_rend_pubkey.serialize() + 
client_ephemeral_enc_pubkey.serialize() + PROTOID + b"Server"
 assert(len(auth_input) == AUTH_INPUT_LEN)
 auth_input_mac = mac(auth_input, T_HSMAC)
 
@@ -294,7 +294,7 @@ def do_pure_python_ntor_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_auth_input_mac == service_auth_input_mac)
 
-print "DONE: python dance [%s]" % repr(client_auth_input_mac)
+print("DONE: python dance [%s]" % repr(client_auth_input_mac))
 
 # Perform a pure little-t-tor integration test.
 def do_little_t_tor_ntor_test():
@@ -334,7 +334,7 @@ def do_little_t_tor_ntor_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_ntor_auth_mac == service_ntor_auth_mac)
 
-print "DONE: tor dance [%s]" % repr(client_ntor_auth_mac)
+print("DONE: tor dance [%s]" % repr(client_ntor_auth_mac))
 
 """
 Do mixed test as follows:
@@ -379,7 +379,7 @@ def do_first_mixed_test():
 assert(client_auth_input_mac == service_ntor_auth_mac)
 assert(client_ntor_key_seed == service_ntor_key_seed)
 
-print "DONE: 1st mixed dance [%s]" % repr(client_auth_input_mac)
+print("DONE: 1st mixed dance [%s]" % repr(client_auth_input_mac))
 
 """
 Do mixed test as follows:
@@ -413,7 +413,7 @@ def do_second_mixed_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_ntor_auth_mac == service_ntor_auth_mac)
 
-print "DONE: 2nd mixed dance [%s]" % repr(client_ntor_auth_mac)
+print("DONE: 2nd mixed dance [%s]" % repr(client_ntor_auth_mac))
 
 def do_mixed_tests():
 do_first_mixed_test()



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

2017-09-18 Thread nickm

commit 6babd3d9ba9318b38b5af7278875efe84055a1b0
Merge: 9d35ddf11 63ae9ea31
Author: Nick Mathewson 
Date:   Mon Sep 18 10:48:31 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 src/test/hs_ntor_ref.py | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

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

[tor-commits] [tor/maint-0.3.1] Make hs_ntor_ref.py work with python3

2017-09-18 Thread nickm

commit 63ae9ea316f77346ed2e1941958916fd3a5207a1
Author: Nick Mathewson 
Date:   Mon Sep 18 10:48:28 2017 -0400

Make hs_ntor_ref.py work with python3
---
 src/test/hs_ntor_ref.py | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py
index 3dd2d6d6e..2ed9324e1 100644
--- a/src/test/hs_ntor_ref.py
+++ b/src/test/hs_ntor_ref.py
@@ -83,11 +83,11 @@ from ntor_ref import hash_nil
 from ntor_ref import PrivateKey
 
 # String constants used in this protocol
-PROTOID = "tor-hs-ntor-curve25519-sha3-256-1"
-T_HSENC= PROTOID + ":hs_key_extract"
-T_HSVERIFY = PROTOID + ":hs_verify"
-T_HSMAC= PROTOID + ":hs_mac"
-M_HSEXPAND = PROTOID + ":hs_key_expand"
+PROTOID = b"tor-hs-ntor-curve25519-sha3-256-1"
+T_HSENC= PROTOID + b":hs_key_extract"
+T_HSVERIFY = PROTOID + b":hs_verify"
+T_HSMAC= PROTOID + b":hs_mac"
+M_HSEXPAND = PROTOID + b":hs_key_expand"
 
 INTRO_SECRET_LEN = 161
 REND_SECRET_LEN = 225
@@ -191,7 +191,7 @@ def service_part1(intro_auth_pubkey_str, client_enc_pubkey, 
intro_enc_privkey, i
 
 ntor_key_seed = mac(rend_secret_hs_input, T_HSENC)
 verify = mac(rend_secret_hs_input, T_HSVERIFY)
-auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_pubkey.serialize() + client_enc_pubkey.serialize() + 
PROTOID + "Server"
+auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_pubkey.serialize() + client_enc_pubkey.serialize() + 
PROTOID + b"Server"
 assert(len(auth_input) == AUTH_INPUT_LEN)
 auth_input_mac = mac(auth_input, T_HSMAC)
 
@@ -218,7 +218,7 @@ def client_part2(intro_auth_pubkey_str, 
client_ephemeral_enc_pubkey, client_ephe
 
 ntor_key_seed = mac(rend_secret_hs_input, T_HSENC)
 verify = mac(rend_secret_hs_input, T_HSVERIFY)
-auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_rend_pubkey.serialize() + 
client_ephemeral_enc_pubkey.serialize() + PROTOID + "Server"
+auth_input = verify + intro_auth_pubkey_str + intro_enc_pubkey.serialize() 
+ service_ephemeral_rend_pubkey.serialize() + 
client_ephemeral_enc_pubkey.serialize() + PROTOID + b"Server"
 assert(len(auth_input) == AUTH_INPUT_LEN)
 auth_input_mac = mac(auth_input, T_HSMAC)
 
@@ -294,7 +294,7 @@ def do_pure_python_ntor_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_auth_input_mac == service_auth_input_mac)
 
-print "DONE: python dance [%s]" % repr(client_auth_input_mac)
+print("DONE: python dance [%s]" % repr(client_auth_input_mac))
 
 # Perform a pure little-t-tor integration test.
 def do_little_t_tor_ntor_test():
@@ -334,7 +334,7 @@ def do_little_t_tor_ntor_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_ntor_auth_mac == service_ntor_auth_mac)
 
-print "DONE: tor dance [%s]" % repr(client_ntor_auth_mac)
+print("DONE: tor dance [%s]" % repr(client_ntor_auth_mac))
 
 """
 Do mixed test as follows:
@@ -379,7 +379,7 @@ def do_first_mixed_test():
 assert(client_auth_input_mac == service_ntor_auth_mac)
 assert(client_ntor_key_seed == service_ntor_key_seed)
 
-print "DONE: 1st mixed dance [%s]" % repr(client_auth_input_mac)
+print("DONE: 1st mixed dance [%s]" % repr(client_auth_input_mac))
 
 """
 Do mixed test as follows:
@@ -413,7 +413,7 @@ def do_second_mixed_test():
 assert(client_ntor_key_seed == service_ntor_key_seed)
 assert(client_ntor_auth_mac == service_ntor_auth_mac)
 
-print "DONE: 2nd mixed dance [%s]" % repr(client_ntor_auth_mac)
+print("DONE: 2nd mixed dance [%s]" % repr(client_ntor_auth_mac))
 
 def do_mixed_tests():
 do_first_mixed_test()

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

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

2017-09-18 Thread translation

commit 6737b4fe2be789c8c236f1248284d8d378742ae7
Author: Translation commit bot 
Date:   Mon Sep 18 14:45:33 2017 +

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

diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd
index 044decaba..1947819bd 100644
--- a/uk/https-everywhere.dtd
+++ b/uk/https-everywhere.dtd
@@ -25,7 +25,7 @@
 
 
 
-
+
 
 
 

___
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.0] finish changelog for 0.3.0.11

2017-09-18 Thread nickm

commit 5cb83c942584f86830ef1d13a9cd2501eea367c4
Author: Nick Mathewson 
Date:   Mon Sep 18 09:56:54 2017 -0400

finish changelog for 0.3.0.11
---
 ChangeLog  |  9 ++---
 ReleaseNotes   | 48 
 changes/trove-2017-008 |  5 -
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a7795113..93adb09ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 Changes in version 0.3.0.11 - 2017-09-18
-   Tor 0.3.0.11 backports a collection of bugfixes from Tor the 0.3.1
-   series.
+  Tor 0.3.0.11 backports a collection of bugfixes from Tor the 0.3.1
+  series.
 
-   MORE HERE.
+  Most significantly, it includes a fix for TROVE-2017-008, a
+  security bug that affects hidden services running with the
+  SafeLogging option disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
 
   o Minor features (code style, backport from 0.3.1.7):
 - Add "Falls through" comments to our codebase, in order to silence
diff --git a/ReleaseNotes b/ReleaseNotes
index 1dd3d9530..aaa7a5c46 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,54 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.3.0.11 - 2017-09-18
+  Tor 0.3.0.11 backports a collection of bugfixes from Tor the 0.3.1
+  series.
+
+  Most significantly, it includes a fix for TROVE-2017-008, a
+  security bug that affects hidden services running with the
+  SafeLogging option disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
+
+  Note: now that Tor 0.3.1.x is stable and released, support for the
+  0.3.0.x series will end on 26 Jan 2018.  For longer term support,
+  either upgrade to the most recent 0.3.1.x release, or downgrade to
+  0.2.9.x for long-term support.
+
+  o Minor features (code style, backport from 0.3.1.7):
+- Add "Falls through" comments to our codebase, in order to silence
+  GCC 7's -Wimplicit-fallthrough warnings. Patch from Andreas
+  Stieger. Closes ticket 22446.
+
+  o Minor features:
+- Update geoip and geoip6 to the September 6 2017 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (compilation, backport from 0.3.1.7):
+- Avoid compiler warnings in the unit tests for calling tor_sscanf()
+  with wide string outputs. Fixes bug 15582; bugfix on 0.2.6.2-alpha.
+
+  o Minor bugfixes (controller, backport from 0.3.1.7):
+- Do not crash when receiving a HSPOST command with an empty body.
+  Fixes part of bug 22644; bugfix on 0.2.7.1-alpha.
+- Do not crash when receiving a POSTDESCRIPTOR command with an empty
+  body. Fixes part of bug 22644; bugfix on 0.2.0.1-alpha.
+
+  o Minor bugfixes (file limits, osx, backport from 0.3.1.5-alpha):
+- When setting the maximum number of connections allowed by the OS,
+  always allow some extra file descriptors for other files. Fixes
+  bug 22797; bugfix on 0.2.0.10-alpha.
+
+  o Minor bugfixes (logging, relay, backport from 0.3.1.6-rc):
+- Remove a forgotten debugging message when an introduction point
+  successfully establishes a hidden service prop224 circuit with
+  a client.
+- Change three other log_warn() for an introduction point to
+  protocol warnings, because they can be failure from the network
+  and are not relevant to the operator. Fixes bug 23078; bugfix on
+  0.3.0.1-alpha and 0.3.0.2-alpha.
+
+
 Changes in version 0.3.0.10 - 2017-08-02
Tor 0.3.0.10 backports a collection of small-to-medium bugfixes
from the current Tor alpha series. OpenBSD users and TPROXY users
diff --git a/changes/trove-2017-008 b/changes/trove-2017-008
deleted file mode 100644
index 4b9c5b0a1..0
--- a/changes/trove-2017-008
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (security, hidden services, loggging):
-- Fix a bug where we could log uninitialized stack when a certain
-  hidden service error occurred while SafeLogging was disabled.
-  Fixes bug #23490; bugfix on 0.2.7.2-alpha.
-  This is also tracked as TROVE-2017-008 and CVE-2017-0380.

___
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.8] Finish changelog for 0.2.8.15

2017-09-18 Thread nickm

commit e25e980285a80231956dba6d3c89a25c27fdf94f
Author: Nick Mathewson 
Date:   Mon Sep 18 09:57:45 2017 -0400

Finish changelog for 0.2.8.15
---
 ChangeLog  | 13 -
 ReleaseNotes   | 50 ++
 changes/trove-2017-008 |  5 -
 3 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 602069f5f..28303c082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 Changes in version 0.2.8.15 - 2017-09-18
-  BLURB
+  Tor 0.2.8.15 backports a collection of bugfixes from later
+  Tor series.
+
+  Most significantly, it includes a fix for TROVE-2017-008, a
+  security bug that affects hidden services running with the
+  SafeLogging option disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
+
+  Note that Tor 0.2.8.x will no longer be supported after 1 Jan
+  2018.  We suggest that you upgrade to the latest stable release if
+  possible.  If you can't, we recommend that you upgrade at least to
+  0.2.9, which will be supported until 2020.
 
   o Major bugfixes (openbsd, denial-of-service, backport from 0.3.1.5-alpha):
 - Avoid an assertion failure bug affecting our implementation of
diff --git a/ReleaseNotes b/ReleaseNotes
index 9353cd086..2d67f5b89 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,56 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.2.8.15 - 2017-09-18
+  Tor 0.2.8.15 backports a collection of bugfixes from later
+  Tor series.
+
+  Most significantly, it includes a fix for TROVE-2017-008, a
+  security bug that affects hidden services running with the
+  SafeLogging option disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
+
+  Note that Tor 0.2.8.x will no longer be supported after 1 Jan
+  2018.  We suggest that you upgrade to the latest stable release if
+  possible.  If you can't, we recommend that you upgrade at least to
+  0.2.9, which will be supported until 2020.
+
+  o Major bugfixes (openbsd, denial-of-service, backport from 0.3.1.5-alpha):
+- Avoid an assertion failure bug affecting our implementation of
+  inet_pton(AF_INET6) on certain OpenBSD systems whose strtol()
+  handling of "0xx" differs from what we had expected. Fixes bug
+  22789; bugfix on 0.2.3.8-alpha. Also tracked as TROVE-2017-007.
+
+  o Minor features:
+- Update geoip and geoip6 to the September 6 2017 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (compilation, mingw, backport from 0.3.1.1-alpha):
+- Backport a fix for an "unused variable" warning that appeared
+  in some versions of mingw. Fixes bug 22838; bugfix on
+  0.2.8.1-alpha.
+
+  o Minor bugfixes (defensive programming, undefined behavior, backport from 
0.3.1.4-alpha):
+- Fix a memset() off the end of an array when packing cells. This
+  bug should be harmless in practice, since the corrupted bytes are
+  still in the same structure, and are always padding bytes,
+  ignored, or immediately overwritten, depending on compiler
+  behavior. Nevertheless, because the memset()'s purpose is to make
+  sure that any other cell-handling bugs can't expose bytes to the
+  network, we need to fix it. Fixes bug 22737; bugfix on
+  0.2.4.11-alpha. Fixes CID 1401591.
+
+  o Build features (backport from 0.3.1.5-alpha):
+- Tor's repository now includes a Travis Continuous Integration (CI)
+  configuration file (.travis.yml). This is meant to help new
+  developers and contributors who fork Tor to a Github repository be
+  better able to test their changes, and understand what we expect
+  to pass. To use this new build feature, you must fork Tor to your
+  Github account, then go into the "Integrations" menu in the
+  repository settings for your fork and enable Travis, then push
+  your changes. Closes ticket 22636.
+
+
 Changes in version 0.2.8.14 - 2017-06-08
   Tor 0.2.7.8 backports a fix for a bug that would allow an attacker to
   remotely crash a hidden service with an assertion failure. Anyone
diff --git a/changes/trove-2017-008 b/changes/trove-2017-008
deleted file mode 100644
index 4b9c5b0a1..0
--- a/changes/trove-2017-008
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (security, hidden services, loggging):
-- Fix a bug where we could log uninitialized stack when a certain
-  hidden service error occurred while SafeLogging was disabled.
-  Fixes bug #23490; bugfix on 0.2.7.2-alpha.
-  This is also tracked as TROVE-2017-008 and CVE-2017-0380.

___
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] finish changelog for 0.2.9.12

2017-09-18 Thread nickm

commit 2e47bfad4f596dc39ab31bc66056a07d05715270
Author: Nick Mathewson 
Date:   Mon Sep 18 09:57:26 2017 -0400

finish changelog for 0.2.9.12
---
 ChangeLog  |   8 ++-
 ReleaseNotes   | 129 +
 changes/trove-2017-008 |   5 --
 3 files changed, 136 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4ba66832..2fc7eb5e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Changes in version 0.2.9.12 - 2017-09-18
-  BLURB
+  Tor 0.2.9.12 backports a collection of bugfixes from later
+  Tor series.
+
+  Most significantly, it includes a fix for TROVE-2017-008, a
+  security bug that affects hidden services running with the
+  SafeLogging option disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
 
   o Major features (security, backport from 0.3.0.2-alpha):
 - Change the algorithm used to decide DNS TTLs on client and server
diff --git a/ReleaseNotes b/ReleaseNotes
index 0057fbd44..8621cefa9 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,135 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.2.9.12 - 2017-09-18
+  Tor 0.2.9.12 backports a collection of bugfixes from later
+  Tor series.
+
+  Most significantly, it includes a fix for TROVE-2017-008, a
+  security bug that affects hidden services running with the
+  SafeLogging option disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
+
+  o Major features (security, backport from 0.3.0.2-alpha):
+- Change the algorithm used to decide DNS TTLs on client and server
+  side, to better resist DNS-based correlation attacks like the
+  DefecTor attack of Greschbach, Pulls, Roberts, Winter, and
+  Feamster. Now relays only return one of two possible DNS TTL
+  values, and clients are willing to believe DNS TTL values up to 3
+  hours long. Closes ticket 19769.
+
+  o Major bugfixes (crash, directory connections, backport from 0.3.0.5-rc):
+- Fix a rare crash when sending a begin cell on a circuit whose
+  linked directory connection had already been closed. Fixes bug
+  21576; bugfix on 0.2.9.3-alpha. Reported by Alec Muffett.
+
+  o Major bugfixes (DNS, backport from 0.3.0.2-alpha):
+- Fix a bug that prevented exit nodes from caching DNS records for
+  more than 60 seconds. Fixes bug 19025; bugfix on 0.2.4.7-alpha.
+
+  o Major bugfixes (linux TPROXY support, backport from 0.3.1.1-alpha):
+- Fix a typo that had prevented TPROXY-based transparent proxying
+  from working under Linux. Fixes bug 18100; bugfix on 0.2.6.3-alpha.
+  Patch from "d4fq0fQAgoJ".
+
+  o Major bugfixes (openbsd, denial-of-service, backport from 0.3.1.5-alpha):
+- Avoid an assertion failure bug affecting our implementation of
+  inet_pton(AF_INET6) on certain OpenBSD systems whose strtol()
+  handling of "0xx" differs from what we had expected. Fixes bug
+  22789; bugfix on 0.2.3.8-alpha. Also tracked as TROVE-2017-007.
+
+  o Minor features (code style, backport from 0.3.1.3-alpha):
+- Add "Falls through" comments to our codebase, in order to silence
+  GCC 7's -Wimplicit-fallthrough warnings. Patch from Andreas
+  Stieger. Closes ticket 22446.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the September 6 2017 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (bandwidth accounting, backport from 0.3.1.1-alpha):
+- Roll over monthly accounting at the configured hour and minute,
+  rather than always at 00:00. Fixes bug 22245; bugfix on 0.0.9rc1.
+  Found by Andrey Karpov with PVS-Studio.
+
+  o Minor bugfixes (compilation, backport from 0.3.1.5-alpha):
+- Suppress -Wdouble-promotion warnings with clang 4.0. Fixes bug 22915;
+  bugfix on 0.2.8.1-alpha.
+- Fix warnings when building with libscrypt and openssl scrypt support
+  on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
+- When building with certain versions the mingw C header files, avoid
+  float-conversion warnings when calling the C functions isfinite(),
+  isnan(), and signbit(). Fixes bug 22801; bugfix on 0.2.8.1-alpha.
+
+  o Minor bugfixes (compilation, backport from 0.3.1.7):
+- Avoid compiler warnings in the unit tests for running tor_sscanf()
+  with wide string outputs. Fixes bug 15582; bugfix on 0.2.6.2-alpha.
+
+  o Minor bugfixes (compilation, mingw, backport from 0.3.1.1-alpha):
+- Backport a fix for an "unused variable" warning that appeared
+  in some versions of mingw. Fixes bug 22838; bugfix on
+  0.2.8.1-alpha.
+
+  o Minor bugfixes (controller, backport from 0.3.1.7):
+- Do not crash when receiving a HSPOST command with an empty body.
+  Fixes part of

[tor-commits] [tor/release-0.3.1] Finish changelog and release notes for 0.3.1.7

2017-09-18 Thread nickm

commit 9d35ddf110dc1737af4f12c4135a03cb7ac3c85d
Author: Nick Mathewson 
Date:   Mon Sep 18 09:50:05 2017 -0400

Finish changelog and release notes for 0.3.1.7
---
 ChangeLog  | 20 +++-
 ReleaseNotes   | 20 +++-
 changes/bug23533   |  4 
 changes/trove-2017-008 |  5 -
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 282cb3e8d..0c8c0d310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,11 +9,10 @@ Changes in version 0.3.1.7 - 2017-09-18
   small features, bugfixes on earlier release series, and groundwork for
   the hidden services revamp of 0.3.2.
 
-  Per our stable release policy, we plan to support the Tor 0.3.0
-  release series for at least the next nine months, or for three months
-  after the first stable release of the 0.3.1 series: whichever is
-  longer. If you need a release with long-term support, we recommend
-  that you stay with the 0.2.9 series.
+  This release also includes a fix for TROVE-2017-008, a security bug
+  that affects hidden services running with the SafeLogging option
+  disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
 
   Per our stable release policy, we plan to support each stable release
   series for at least the next nine months, or for three months after
@@ -24,6 +23,12 @@ Changes in version 0.3.1.7 - 2017-09-18
   Below is a list of the changes since 0.3.1.6-rc. For a list of all
   changes since 0.3.0, see the ReleaseNotes file.
 
+  o Major bugfixes (security, hidden services, loggging):
+- Fix a bug where we could log uninitialized stack when a certain
+  hidden service error occurred while SafeLogging was disabled.
+  Fixes bug #23490; bugfix on 0.2.7.2-alpha. This is also tracked as
+  TROVE-2017-008 and CVE-2017-0380.
+
   o Minor features (defensive programming):
 - Create a pair of consensus parameters, nf_pad_tor2web and
   nf_pad_single_onion, to disable netflow padding in the consensus
@@ -49,6 +54,11 @@ Changes in version 0.3.1.7 - 2017-09-18
 - Do not crash when receiving a POSTDESCRIPTOR command with an empty
   body. Fixes part of bug 22644; bugfix on 0.2.0.1-alpha.
 
+  o Minor bugfixes (relay):
+- Inform the geoip and rephist modules about all requests, even on
+  relays that are only fetching microdescriptors. Fixes a bug
+  related to 21585; bugfix on 0.3.0.1-alpha.
+
   o Minor bugfixes (unit tests):
 - Fix a channelpadding unit test failure on slow systems by using
   mocked time instead of actual time. Fixes bug 23077; bugfix
diff --git a/ReleaseNotes b/ReleaseNotes
index 8328b63c1..e8a9f3b41 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -13,11 +13,10 @@ Changes in version 0.3.1.7 - 2017-09-18
   small features, bugfixes on earlier release series, and groundwork for
   the hidden services revamp of 0.3.2.
 
-  Per our stable release policy, we plan to support the Tor 0.3.0
-  release series for at least the next nine months, or for three months
-  after the first stable release of the 0.3.1 series: whichever is
-  longer. If you need a release with long-term support, we recommend
-  that you stay with the 0.2.9 series.
+  This release also includes a fix for TROVE-2017-008, a security bug
+  that affects hidden services running with the SafeLogging option
+  disabled. For more information, see
+  https://trac.torproject.org/projects/tor/ticket/23490
 
   Per our stable release policy, we plan to support each stable release
   series for at least the next nine months, or for three months after
@@ -32,6 +31,12 @@ Changes in version 0.3.1.7 - 2017-09-18
 - To build with zstd and lzma support, Tor now requires the
   pkg-config tool at build time.
 
+  o Major bugfixes (security, hidden services, loggging):
+- Fix a bug where we could log uninitialized stack when a certain
+  hidden service error occurred while SafeLogging was disabled.
+  Fixes bug #23490; bugfix on 0.2.7.2-alpha.
+  This is also tracked as TROVE-2017-008 and CVE-2017-0380.
+
   o Major features (build system, continuous integration):
 - Tor's repository now includes a Travis Continuous Integration (CI)
   configuration file (.travis.yml). This is meant to help new
@@ -515,6 +520,11 @@ Changes in version 0.3.1.7 - 2017-09-18
   and are not relevant to the operator. Fixes bug 23078; bugfix on
   0.3.0.1-alpha and 0.3.0.2-alpha.
 
+  o Minor bugfixes (relay):
+- Inform the geoip and rephist modules about all requests, even on
+  relays that are only fetching microdescriptors. Fixes a bug
+  related to 21585; bugfix on 0.3.0.1-alpha.
+
   o Minor bugfixes (memory leaks):
 - Fix a small memory leak at exit from the backtrace handler code.
   Fixes bug 21788; bugfix on 0.2.5.2-alpha. Patch from Daniel Pinto.
diff --git a/changes/bug23533 b/changes/bug23533
deleted file mode 100644
index

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-09-18 Thread nickm

commit 23c4592ee98df59ccfe1a31bf714809caa78ca98
Merge: 49b5ad6b7 139bda4fe
Author: Nick Mathewson 
Date:   Mon Sep 18 09:40:40 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)




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

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

2017-09-18 Thread nickm

commit c7d0096f9ddde0d8663b40f17110ded40309e09a
Merge: dd8eeabfd 23c4592ee
Author: Nick Mathewson 
Date:   Mon Sep 18 09:42:30 2017 -0400

Merge branch 'maint-0.3.1'

 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'trove-2017-008_030' into maint-0.3.0

2017-09-18 Thread nickm

commit 9d8d4cb3fa3e678955b30dc9ff8d01b3f54d805d
Merge: 7df790890 09ea89764
Author: Nick Mathewson 
Date:   Mon Sep 18 09:40:36 2017 -0400

Merge branch 'trove-2017-008_030' into maint-0.3.0

 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)



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

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

2017-09-18 Thread nickm

commit 139bda4fe48e0cdba68c9e802be983fb971e55be
Merge: 9d8d4cb3f 314652dc1
Author: Nick Mathewson 
Date:   Mon Sep 18 09:40:40 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.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 branch 'maint-0.2.8' into maint-0.2.9

2017-09-18 Thread nickm

commit 314652dc16ece380de343ccdc5a2155d612bcff7
Merge: f7b06202c 0ec72b030
Author: Nick Mathewson 
Date:   Mon Sep 18 09:39:46 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'trove-2017-008_028' into maint-0.2.8

2017-09-18 Thread nickm

commit 0ec72b030839c3a9e8c557483594b9dbe86c0792
Merge: 26f68dfce 4a2cbea6c
Author: Nick Mathewson 
Date:   Mon Sep 18 09:39:35 2017 -0400

Merge branch 'trove-2017-008_028' into maint-0.2.8

 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.3.0

2017-09-18 Thread nickm

commit 7df790890593de1cc2aef84305102f80c00bb8f8
Merge: e46849846 0ec72b030
Author: Nick Mathewson 
Date:   Mon Sep 18 09:40:09 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.3.0

This is an "ours" merge to avoid the conflict from the 0.2.8 version
of the fix for TROVE-2017-008.




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

[tor-commits] [tor/master] Fix log-uninitialized-stack bug in rend_service_intro_established.

2017-09-18 Thread nickm

commit 09ea89764a4d3a907808ed7d4fe42abfe64bd486
Author: Nick Mathewson 
Date:   Mon Sep 18 09:25:21 2017 -0400

Fix log-uninitialized-stack bug in rend_service_intro_established.

Fixes bug 23490; bugfix on 0.2.7.2-alpha.

TROVE-2017-008
CVE-2017-0380
---
 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/trove-2017-008 b/changes/trove-2017-008
new file mode 100644
index 0..4b9c5b0a1
--- /dev/null
+++ b/changes/trove-2017-008
@@ -0,0 +1,5 @@
+  o Major bugfixes (security, hidden services, loggging):
+- Fix a bug where we could log uninitialized stack when a certain
+  hidden service error occurred while SafeLogging was disabled.
+  Fixes bug #23490; bugfix on 0.2.7.2-alpha.
+  This is also tracked as TROVE-2017-008 and CVE-2017-0380.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index fb777ca15..8087e8849 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3372,6 +3372,8 @@ rend_service_intro_established(origin_circuit_t *circuit,
  (unsigned)circuit->base_.n_circ_id);
 goto err;
   }
+  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1,
+rend_pk_digest, REND_SERVICE_ID_LEN);
   /* We've just successfully established a intro circuit to one of our
* introduction point, account for it. */
   intro = find_intro_point(circuit);
@@ -3388,8 +3390,6 @@ rend_service_intro_established(origin_circuit_t *circuit,
   service->desc_is_dirty = time(NULL);
   circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_S_INTRO);
 
-  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1,
-rend_pk_digest, REND_SERVICE_ID_LEN);
   log_info(LD_REND,
"Received INTRO_ESTABLISHED cell on circuit %u for service %s",
(unsigned)circuit->base_.n_circ_id, serviceid);



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

[tor-commits] [tor/master] Fix log-uninitialized-stack bug in rend_service_intro_established.

2017-09-18 Thread nickm

commit 4a2cbea6ce585fcdaf86a80ccf39bceb4137e86a
Author: Nick Mathewson 
Date:   Mon Sep 18 09:25:21 2017 -0400

Fix log-uninitialized-stack bug in rend_service_intro_established.

Fixes bug 23490; bugfix on 0.2.7.2-alpha.

TROVE-2017-008
CVE-2017-0380
---
 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/trove-2017-008 b/changes/trove-2017-008
new file mode 100644
index 0..4b9c5b0a1
--- /dev/null
+++ b/changes/trove-2017-008
@@ -0,0 +1,5 @@
+  o Major bugfixes (security, hidden services, loggging):
+- Fix a bug where we could log uninitialized stack when a certain
+  hidden service error occurred while SafeLogging was disabled.
+  Fixes bug #23490; bugfix on 0.2.7.2-alpha.
+  This is also tracked as TROVE-2017-008 and CVE-2017-0380.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index b81a01c56..0a5b5efd5 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -2859,6 +2859,8 @@ rend_service_intro_established(origin_circuit_t *circuit,
  (unsigned)circuit->base_.n_circ_id);
 goto err;
   }
+  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1,
+circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN);
   /* We've just successfully established a intro circuit to one of our
* introduction point, account for it. */
   intro = find_intro_point(circuit);
@@ -2875,8 +2877,6 @@ rend_service_intro_established(origin_circuit_t *circuit,
   service->desc_is_dirty = time(NULL);
   circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_S_INTRO);
 
-  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1,
-circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN);
   log_info(LD_REND,
"Received INTRO_ESTABLISHED cell on circuit %u for service %s",
(unsigned)circuit->base_.n_circ_id, serviceid);



___
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.1] Fix log-uninitialized-stack bug in rend_service_intro_established.

2017-09-18 Thread nickm

commit 09ea89764a4d3a907808ed7d4fe42abfe64bd486
Author: Nick Mathewson 
Date:   Mon Sep 18 09:25:21 2017 -0400

Fix log-uninitialized-stack bug in rend_service_intro_established.

Fixes bug 23490; bugfix on 0.2.7.2-alpha.

TROVE-2017-008
CVE-2017-0380
---
 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/trove-2017-008 b/changes/trove-2017-008
new file mode 100644
index 0..4b9c5b0a1
--- /dev/null
+++ b/changes/trove-2017-008
@@ -0,0 +1,5 @@
+  o Major bugfixes (security, hidden services, loggging):
+- Fix a bug where we could log uninitialized stack when a certain
+  hidden service error occurred while SafeLogging was disabled.
+  Fixes bug #23490; bugfix on 0.2.7.2-alpha.
+  This is also tracked as TROVE-2017-008 and CVE-2017-0380.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index fb777ca15..8087e8849 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3372,6 +3372,8 @@ rend_service_intro_established(origin_circuit_t *circuit,
  (unsigned)circuit->base_.n_circ_id);
 goto err;
   }
+  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1,
+rend_pk_digest, REND_SERVICE_ID_LEN);
   /* We've just successfully established a intro circuit to one of our
* introduction point, account for it. */
   intro = find_intro_point(circuit);
@@ -3388,8 +3390,6 @@ rend_service_intro_established(origin_circuit_t *circuit,
   service->desc_is_dirty = time(NULL);
   circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_S_INTRO);
 
-  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1,
-rend_pk_digest, REND_SERVICE_ID_LEN);
   log_info(LD_REND,
"Received INTRO_ESTABLISHED cell on circuit %u for service %s",
(unsigned)circuit->base_.n_circ_id, serviceid);



___
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.1] Fix log-uninitialized-stack bug in rend_service_intro_established.

2017-09-18 Thread nickm

commit 4a2cbea6ce585fcdaf86a80ccf39bceb4137e86a
Author: Nick Mathewson 
Date:   Mon Sep 18 09:25:21 2017 -0400

Fix log-uninitialized-stack bug in rend_service_intro_established.

Fixes bug 23490; bugfix on 0.2.7.2-alpha.

TROVE-2017-008
CVE-2017-0380
---
 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/trove-2017-008 b/changes/trove-2017-008
new file mode 100644
index 0..4b9c5b0a1
--- /dev/null
+++ b/changes/trove-2017-008
@@ -0,0 +1,5 @@
+  o Major bugfixes (security, hidden services, loggging):
+- Fix a bug where we could log uninitialized stack when a certain
+  hidden service error occurred while SafeLogging was disabled.
+  Fixes bug #23490; bugfix on 0.2.7.2-alpha.
+  This is also tracked as TROVE-2017-008 and CVE-2017-0380.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index b81a01c56..0a5b5efd5 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -2859,6 +2859,8 @@ rend_service_intro_established(origin_circuit_t *circuit,
  (unsigned)circuit->base_.n_circ_id);
 goto err;
   }
+  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1,
+circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN);
   /* We've just successfully established a intro circuit to one of our
* introduction point, account for it. */
   intro = find_intro_point(circuit);
@@ -2875,8 +2877,6 @@ rend_service_intro_established(origin_circuit_t *circuit,
   service->desc_is_dirty = time(NULL);
   circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_S_INTRO);
 
-  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1,
-circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN);
   log_info(LD_REND,
"Received INTRO_ESTABLISHED cell on circuit %u for service %s",
(unsigned)circuit->base_.n_circ_id, serviceid);



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

1 2 >

1 - 100 of 158 matches

Mail list logo