[tor-commits] [tor/release-0.3.0] bump version in the other places :/
commit 5325e7ccab70383a629019323ba01d2c9215b5f4
Author: Nick Mathewson
Date: Tue Oct 24 09:11:17 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 48a4d8e75..a179d8483 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-dev"
+!define VERSION "0.3.0.12"
!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 7399f8178..47a00dc6d 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-dev"
+#define VERSION "0.3.0.12"
___
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.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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
commit a574ab8e2f78e75db45521d185b1a21262489995 Merge: 3353942fd 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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
commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge 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
commit 4d308789e2133261e30b0dac8c31a5517ac2fd3f Merge: 0ad731710 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2 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/release-0.3.0] bump to 0.3.0.12
commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784 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-dev]) +AC_INIT([tor],[0.3.0.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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] bump to 0.2.9.13
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095 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-dev]) +AC_INIT([tor],[0.2.9.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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' into maint-0.3.2
commit 122a7f8848785e3cefef812749c7ec1844b26402 Merge: cce1a6efa 990322fca Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ 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
commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge 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.8' into maint-0.2.9
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge 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 version in the other places :/
commit 5325e7ccab70383a629019323ba01d2c9215b5f4
Author: Nick Mathewson
Date: Tue Oct 24 09:11:17 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 48a4d8e75..a179d8483 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-dev"
+!define VERSION "0.3.0.12"
!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 7399f8178..47a00dc6d 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-dev"
+#define VERSION "0.3.0.12"
___
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' into maint-0.3.2
commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9 Merge: 0d4addfc7 38a58076e Author: Nick Mathewson Date: Tue Oct 24 09:10:37 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge 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] bump to 0.2.8.16
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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.2'
commit 51de3a1c15ddc36e7c7e790224409121c036b31f Merge: abbd6a36f cce1a6efa Author: Nick Mathewson Date: Tue Oct 24 09:10:43 2017 -0400 Merge branch 'maint-0.3.2' ___ 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.8
commit cbb41ddfef3398e2aefef952b491610864f9670d
Author: Nick Mathewson
Date: Tue Oct 24 09:09:50 2017 -0400
bump to 0.3.1.8
---
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 ecff48f85..eeec24e1c 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-dev])
+AC_INIT([tor],[0.3.1.8])
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 0373af313..a8c8de99e 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-dev"
+!define VERSION "0.3.1.8"
!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 e74d54a72..0de6aa2be 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-dev"
+#define VERSION "0.3.1.8"
___
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.5] bump to 0.2.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] bump version in the other places :/
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson
Date: Tue Oct 24 09:11:07 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 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-dev"
+!define VERSION "0.2.9.13"
!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 47992c0d8..a249ba8c5 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-dev"
+#define VERSION "0.2.9.13"
___
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.16
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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.2'
commit 350fecfafe74d08be54d8162a01ab79dbe84d53a Merge: 51de3a1c1 122a7f884 Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.2' ___ 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.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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.9' into maint-0.3.0
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge 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.9' into maint-0.3.0
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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.8] Merge branch 'maint-0.2.8' into release-0.2.8
commit 2182bb827d271d9854ad0f93958933c4bee8899e Merge: 99756033f 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
commit 078604630dad7edc57cc9378102de65f06586efd Merge: 8669a1ea5 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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.2] Merge branch 'maint-0.2.9' into maint-0.3.0
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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.12
commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784 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-dev]) +AC_INIT([tor],[0.3.0.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.2] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge 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.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9 Merge: 0d4addfc7 38a58076e Author: Nick Mathewson Date: Tue Oct 24 09:10:37 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge 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.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 122a7f8848785e3cefef812749c7ec1844b26402 Merge: cce1a6efa 990322fca Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ 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.2] bump to 0.2.8.16
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.2] bump to 0.3.0.12
commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784 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-dev]) +AC_INIT([tor],[0.3.0.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.2] Merge branch 'maint-0.3.0' into maint-0.3.1
commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge 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.2] bump to 0.2.9.13
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095 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-dev]) +AC_INIT([tor],[0.2.9.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.13
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095 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-dev]) +AC_INIT([tor],[0.2.9.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.2] bump to 0.3.1.8
commit cbb41ddfef3398e2aefef952b491610864f9670d
Author: Nick Mathewson
Date: Tue Oct 24 09:09:50 2017 -0400
bump to 0.3.1.8
---
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 ecff48f85..eeec24e1c 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-dev])
+AC_INIT([tor],[0.3.1.8])
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 0373af313..a8c8de99e 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-dev"
+!define VERSION "0.3.1.8"
!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 e74d54a72..0de6aa2be 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-dev"
+#define VERSION "0.3.1.8"
___
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.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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.2] Merge branch 'maint-0.3.0' into maint-0.3.1
commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge 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] Merge branch 'maint-0.3.0' into maint-0.3.1
commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge 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.8.16
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.2] bump to 0.2.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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.2] bump version in the other places :/
commit 5325e7ccab70383a629019323ba01d2c9215b5f4
Author: Nick Mathewson
Date: Tue Oct 24 09:11:17 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 48a4d8e75..a179d8483 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-dev"
+!define VERSION "0.3.0.12"
!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 7399f8178..47a00dc6d 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-dev"
+#define VERSION "0.3.0.12"
___
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.2] bump version in the other places :/
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson
Date: Tue Oct 24 09:11:07 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 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-dev"
+!define VERSION "0.2.9.13"
!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 47992c0d8..a249ba8c5 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-dev"
+#define VERSION "0.2.9.13"
___
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.2] Merge branch 'maint-0.2.9' into maint-0.3.0
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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.2] Merge branch 'maint-0.2.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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] Merge branch 'maint-0.2.9' into maint-0.3.0
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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.16
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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] Merge branch 'maint-0.3.0' into maint-0.3.1
commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge 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.8.16
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.13
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095 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-dev]) +AC_INIT([tor],[0.2.9.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.13
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095 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-dev]) +AC_INIT([tor],[0.2.9.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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] Merge branch 'maint-0.2.9' into maint-0.3.0
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge 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.3.0.12
commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784 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-dev]) +AC_INIT([tor],[0.3.0.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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 version in the other places :/
commit 5325e7ccab70383a629019323ba01d2c9215b5f4
Author: Nick Mathewson
Date: Tue Oct 24 09:11:17 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 48a4d8e75..a179d8483 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-dev"
+!define VERSION "0.3.0.12"
!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 7399f8178..47a00dc6d 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-dev"
+#define VERSION "0.3.0.12"
___
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.8
commit cbb41ddfef3398e2aefef952b491610864f9670d
Author: Nick Mathewson
Date: Tue Oct 24 09:09:50 2017 -0400
bump to 0.3.1.8
---
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 ecff48f85..eeec24e1c 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-dev])
+AC_INIT([tor],[0.3.1.8])
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 0373af313..a8c8de99e 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-dev"
+!define VERSION "0.3.1.8"
!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 e74d54a72..0de6aa2be 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-dev"
+#define VERSION "0.3.1.8"
___
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
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge 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 version in the other places :/
commit 5325e7ccab70383a629019323ba01d2c9215b5f4
Author: Nick Mathewson
Date: Tue Oct 24 09:11:17 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 48a4d8e75..a179d8483 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-dev"
+!define VERSION "0.3.0.12"
!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 7399f8178..47a00dc6d 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-dev"
+#define VERSION "0.3.0.12"
___
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.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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 version in the other places :/
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson
Date: Tue Oct 24 09:11:07 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 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-dev"
+!define VERSION "0.2.9.13"
!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 47992c0d8..a249ba8c5 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-dev"
+#define VERSION "0.2.9.13"
___
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.12
commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784 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-dev]) +AC_INIT([tor],[0.3.0.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge 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 version in the other places :/
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson
Date: Tue Oct 24 09:11:07 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 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-dev"
+!define VERSION "0.2.9.13"
!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 47992c0d8..a249ba8c5 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-dev"
+#define VERSION "0.2.9.13"
___
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] Merge branch 'maint-0.2.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge 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.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge 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.2.8] bump to 0.2.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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.5] bump to 0.2.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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.13
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095 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-dev]) +AC_INIT([tor],[0.2.9.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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 version in the other places :/
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson
Date: Tue Oct 24 09:11:07 2017 -0400
bump version in the other places :/
---
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 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-dev"
+!define VERSION "0.2.9.13"
!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 47992c0d8..a249ba8c5 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-dev"
+#define VERSION "0.2.9.13"
___
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.16
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.16
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) ___ 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.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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.5.15
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson
Date: Tue Oct 24 09:09:00 2017 -0400
bump to 0.2.5.15
---
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 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 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.5.14-dev"
+!define VERSION "0.2.5.15"
!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 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
___
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] add a date
commit af51ac47e0f550339fc25a4b62d7b68a716f8b56 Author: Nick Mathewson Date: Tue Oct 24 08:53:44 2017 -0400 add a date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 09a8efdbf..e4d2e1bba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.1.8: +Changes in version 0.3.1.8 - 2017-10-2? Tor 0.3.1.7 is the second stable release in the 0.3.1 series. It includes several bugfixes, including a bugfix for a crash issue that had affected relays under memory pressure. It also adds ___ 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] Warn that 030 will become deprecated next january.
commit 2244838ec06260fade1dadf76c845c40b441df11 Author: Nick Mathewson Date: Tue Oct 24 09:05:47 2017 -0400 Warn that 030 will become deprecated next january. --- ChangeLog | 4 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index a680dd449..4f0aebb79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ Changes in version 0.3.0.12 - 2017-10-2? series, including a bugfix for a crash issue that had affected relays under memory pressure. It also adds a new directory authority, Bastet. + Note: the Tor 0.3.0 series will no longer be supported after 26 Jan + 2018. If you need a release with long-term support, please stick with + the 0.2.9 series. Otherwise, please upgrade to 0.3.1 or later. + o Directory authority changes: - Add "Bastet" as a ninth directory authority to the default list. Closes ticket 23910. ___ 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] Warn that 028 will become deprecated next january.
commit 99756033f785996413f0b68d7c08c40c355e0c0a Author: Nick Mathewson Date: Tue Oct 24 09:05:40 2017 -0400 Warn that 028 will become deprecated next january. --- ChangeLog | 4 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index b7889d99a..c58044158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ Changes in version 0.2.8.16 - 2017-10-2? series, including a bugfix for a crash issue that had affected relays under memory pressure. It also adds a new directory authority, Bastet. + Note: the Tor 0.2.8 series will no longer be supported after 1 Jan + 2018. If you need a release with long-term support, please stick with + the 0.2.9 series. Otherwise, please upgrade to 0.3.1 or later. + o Directory authority changes: - Add "Bastet" as a ninth directory authority to the default list. Closes ticket 23910. ___ 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] Begin a changelog for 0.3.0.12
commit 658cd486baa9ae8a7e7cd011180e1b0c2e87a34f Author: Nick Mathewson Date: Tue Oct 24 08:53:18 2017 -0400 Begin a changelog for 0.3.0.12 --- ChangeLog | 54 +++ changes/bug22349 | 9 changes/bug23081 | 8 --- changes/bug23610 | 4 changes/bug23690 | 5 - changes/bug23874 | 3 --- changes/geoip-october2017 | 4 changes/longclaw-ipv6 | 6 -- changes/longclaw_23592| 3 --- changes/ticket23910 | 3 --- 10 files changed, 54 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93adb09ed..a680dd449 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,57 @@ +Changes in version 0.3.0.12 - 2017-10-2? + Tor 0.3.0.12 backports a collection of bugfixes from later Tor release + series, including a bugfix for a crash issue that had affected relays + under memory pressure. It also adds a new directory authority, Bastet. + + o Directory authority changes: +- Add "Bastet" as a ninth directory authority to the default list. + Closes ticket 23910. +- The directory authority "Longclaw" has changed its IP address. + Closes ticket 23592. + + o Major bugfixes (relay, crash, assertion failure, backport from 0.3.2.2-alpha): +- Fix a timing-based assertion failure that could occur when the + circuit out-of-memory handler freed a connection's output buffer. + Fixes bug 23690; bugfix on 0.2.6.1-alpha. + + o Minor features (directory authorities, backport from 0.3.2.2-alpha): +- Remove longclaw's IPv6 address, as it will soon change. Authority + IPv6 addresses were originally added in 0.2.8.1-alpha. This leaves + 3/8 directory authorities with IPv6 addresses, but there are also + 52 fallback directory mirrors with IPv6 addresses. Resolves 19760. + + o Minor features (geoip): +- Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 + Country database. + + o Minor bugfixes (directory authority, backport from 0.3.1.5-alpha): +- When a directory authority rejects a descriptor or extrainfo with + a given digest, mark that digest as undownloadable, so that we do + not attempt to download it again over and over. We previously + tried to avoid downloading such descriptors by other means, but we + didn't notice if we accidentally downloaded one anyway. This + behavior became problematic in 0.2.7.2-alpha, when authorities + began pinning Ed25519 keys. Fixes bug 22349; bugfix + on 0.2.1.19-alpha. + + o Minor bugfixes (hidden service, relay, backport from 0.3.2.2-alpha): +- Avoid a possible double close of a circuit by the intro point on + error of sending the INTRO_ESTABLISHED cell. Fixes bug 23610; + bugfix on 0.3.0.1-alpha. + + o Minor bugfixes (memory safety, backport from 0.3.2.3-alpha): +- Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. + + o Minor bugfixes (Windows service, backport from 0.3.1.6-rc): +- When running as a Windows service, set the ID of the main thread + correctly. Failure to do so made us fail to send log messages to + the controller in 0.2.1.16-rc, slowed down controller event + delivery in 0.2.7.3-rc and later, and crash with an assertion + failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha. + Patch and diagnosis from "Vort". + + 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. diff --git a/changes/bug22349 b/changes/bug22349 deleted file mode 100644 index bb43404bf..0 --- a/changes/bug22349 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes (directory authority): -- When a directory authority rejects a descriptor or extrainfo with - a given digest, mark that digest as undownloadable, so that we - do not attempt to download it again over and over. We previously - tried to avoid downloading such descriptors by other means, but - we didn't notice if we accidentally downloaded one anyway. This - behavior became problematic in 0.2.7.2-alpha, when authorities - began pinning Ed25519 keys. Fixes ticket - 22349; bugfix on 0.2.1.19-alpha. diff --git a/changes/bug23081 b/changes/bug23081 deleted file mode 100644 index 76c4e3097..0 --- a/changes/bug23081 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (Windows service): -- When running as a Windows service, set the ID of the main thread - correctly. Failure to do so made us fail to send log messages - to the controller in 0.2.1.16-rc, slowed down controller - event delivery in 0.2.7.3-rc and later, and crash with an assertion - failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha. - Patch and diagnosis from "Vort". - diff --git a/changes/bug23610 b/changes/bug23610 deleted file mode 100644
[tor-commits] [tor/release-0.2.5] begin a changelog for 0.2.5.15
commit 55c918e7d2f45af883e2b5f806cdbc51470f86a1 Author: Nick Mathewson Date: Tue Oct 24 09:01:43 2017 -0400 begin a changelog for 0.2.5.15 --- ChangeLog | 41 + changes/bug22636| 8 changes/bug22737| 12 changes/bug22789| 7 --- changes/geoip-august2017| 4 changes/geoip-july2017 | 4 changes/geoip-june2017 | 4 changes/geoip-october2017 | 4 changes/geoip-september2017 | 4 changes/longclaw_23592 | 3 --- changes/ticket23910 | 3 --- 11 files changed, 41 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index d70ae21e5..5f3bad008 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,44 @@ +Changes in version 0.2.5.15 - 2017-10-0? + Tor 0.2.5.15 backports a collection of bugfixes from later Tor release + series. It also adds a new directory authority, Bastet. + + o Directory authority changes: +- Add "Bastet" as a ninth directory authority to the default list. + Closes ticket 23910. +- The directory authority "Longclaw" has changed its IP address. + Closes ticket 23592. + + 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 (geoip): +- Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 + Country database. + + 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.5.14 - 2017-06-08 Tor 0.2.5.14 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/bug22636 b/changes/bug22636 deleted file mode 100644 index 770cac72e..0 --- a/changes/bug22636 +++ /dev/null @@ -1,8 +0,0 @@ - o Build features: - - 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. diff --git a/changes/bug22737 b/changes/bug22737 deleted file mode 100644 index f0de8e6c4..0 --- a/changes/bug22737 +++ /dev/null @@ -1,12 +0,0 @@ - o Minor bugfixes (defensive programming, undefined behavior): - -- 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. - - diff --git a/changes/bug22789 b/changes/bug22789 deleted file mode 100644 index a65359284..0 --- a/changes/bug22789 +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (openbsd, denial-of-service): -- Avoid an assertion failure bug affecting our implementation of - inet_pton(AF_INET6) on certain OpenBSD systems whose strtol() - handling of "0xfoo" differs from what we had expected. - Fixes bug 22789; bugfix on 0.2.3.8-alpha. Also tracked
[tor-commits] [tor/release-0.2.5] Warn that 025 will become deprecated next may.
commit 8669a1ea50075a05d7f0f3b592748c76b44be10c Author: Nick Mathewson Date: Tue Oct 24 09:05:23 2017 -0400 Warn that 025 will become deprecated next may. --- ChangeLog | 4 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5f3bad008..753143415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ Changes in version 0.2.5.15 - 2017-10-0? Tor 0.2.5.15 backports a collection of bugfixes from later Tor release series. It also adds a new directory authority, Bastet. + Note: the Tor 0.2.5 series will no longer be supported after 1 May + 2018. If you need a release with long-term support, please upgrade to + the 0.2.9 series. Otherwise, please upgrade to 0.3.1 or later. + o Directory authority changes: - Add "Bastet" as a ninth directory authority to the default list. Closes ticket 23910. ___ 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] Start an 0.2.8.16 changelog
commit 7db388c2210378b1ef7ab88bc37598c631b4eb7b Author: Nick Mathewson Date: Tue Oct 24 08:58:56 2017 -0400 Start an 0.2.8.16 changelog --- ChangeLog | 27 +++ changes/bug23690 | 5 - changes/geoip-october2017 | 4 changes/longclaw-ipv6 | 6 -- changes/longclaw_23592| 3 --- changes/ticket23910 | 3 --- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28303c082..b7889d99a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +Changes in version 0.2.8.16 - 2017-10-2? + Tor 0.2.8.16 backports a collection of bugfixes from later Tor release + series, including a bugfix for a crash issue that had affected relays + under memory pressure. It also adds a new directory authority, Bastet. + + o Directory authority changes: +- Add "Bastet" as a ninth directory authority to the default list. + Closes ticket 23910. +- The directory authority "Longclaw" has changed its IP address. + Closes ticket 23592. + + o Major bugfixes (relay, crash, assertion failure, backport from 0.3.2.2-alpha): +- Fix a timing-based assertion failure that could occur when the + circuit out-of-memory handler freed a connection's output buffer. + Fixes bug 23690; bugfix on 0.2.6.1-alpha. + + o Minor features (directory authorities, backport from 0.3.2.2-alpha): +- Remove longclaw's IPv6 address, as it will soon change. Authority + IPv6 addresses were originally added in 0.2.8.1-alpha. This leaves + 3/8 directory authorities with IPv6 addresses, but there are also + 52 fallback directory mirrors with IPv6 addresses. Resolves 19760. + + o Minor features (geoip): +- Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 + Country database. + + Changes in version 0.2.8.15 - 2017-09-18 Tor 0.2.8.15 backports a collection of bugfixes from later Tor series. diff --git a/changes/bug23690 b/changes/bug23690 deleted file mode 100644 index 36ff32e49..0 --- a/changes/bug23690 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (relay, crash, assertion failure): -- Fix a timing-based assertion failure that could occur when the - circuit out-of-memory handler freed a connection's output buffer. - Fixes bug 23690; bugfix on 0.2.6.1-alpha. - diff --git a/changes/geoip-october2017 b/changes/geoip-october2017 deleted file mode 100644 index 11f623e85..0 --- a/changes/geoip-october2017 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): -- Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 - Country database. - diff --git a/changes/longclaw-ipv6 b/changes/longclaw-ipv6 deleted file mode 100644 index 75899c9d0..0 --- a/changes/longclaw-ipv6 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor features (directory authorities): -- Remove longclaw's IPv6 address, as it will soon change. - Authority IPv6 addresses were originally added in 0.2.8.1-alpha. - This leaves 3/8 directory authorities with IPv6 addresses, but there - are also 52 fallback directory mirrors with IPv6 addresses. - Resolves 19760. diff --git a/changes/longclaw_23592 b/changes/longclaw_23592 deleted file mode 100644 index 91e2da897..0 --- a/changes/longclaw_23592 +++ /dev/null @@ -1,3 +0,0 @@ - o Directory authority changes: -- The directory authority "Longclaw" has changed its IP address. - Closes ticket 23592. diff --git a/changes/ticket23910 b/changes/ticket23910 deleted file mode 100644 index eb38fcf32..0 --- a/changes/ticket23910 +++ /dev/null @@ -1,3 +0,0 @@ - o Directory authority changes: -- Add bastet as a ninth directory authority to the default list. Closes - ticket 23910. ___ 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] start a changelog for 0.2.9.13
commit 3353942fde7e3b6caedcf5f97d8fb40e6c171b34 Author: Nick Mathewson Date: Tue Oct 24 08:56:43 2017 -0400 start a changelog for 0.2.9.13 --- ChangeLog | 49 +++ changes/bug22349 | 9 - changes/bug23081 | 8 changes/bug23690 | 5 - changes/bug23874 | 3 --- changes/geoip-october2017 | 4 changes/longclaw-ipv6 | 6 -- changes/longclaw_23592| 3 --- changes/ticket23910 | 3 --- 9 files changed, 49 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fc7eb5e9..43e409d25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,52 @@ +Changes in version 0.2.9.13 - 2017-10-2? + Tor 0.2.9.13 backports a collection of bugfixes from later Tor release + series, including a bugfix for a crash issue that had affected relays + under memory pressure. It also adds a new directory authority, Bastet. + + o Directory authority changes: +- Add "Bastet" as a ninth directory authority to the default list. + Closes ticket 23910. +- The directory authority "Longclaw" has changed its IP address. + Closes ticket 23592. + + o Major bugfixes (relay, crash, assertion failure, backport from 0.3.2.2-alpha): +- Fix a timing-based assertion failure that could occur when the + circuit out-of-memory handler freed a connection's output buffer. + Fixes bug 23690; bugfix on 0.2.6.1-alpha. + + o Minor features (directory authorities, backport from 0.3.2.2-alpha): +- Remove longclaw's IPv6 address, as it will soon change. Authority + IPv6 addresses were originally added in 0.2.8.1-alpha. This leaves + 3/8 directory authorities with IPv6 addresses, but there are also + 52 fallback directory mirrors with IPv6 addresses. Resolves 19760. + + o Minor features (geoip): +- Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 + Country database. + + o Minor bugfixes (directory authority, backport from 0.3.1.5-alpha): +- When a directory authority rejects a descriptor or extrainfo with + a given digest, mark that digest as undownloadable, so that we do + not attempt to download it again over and over. We previously + tried to avoid downloading such descriptors by other means, but we + didn't notice if we accidentally downloaded one anyway. This + behavior became problematic in 0.2.7.2-alpha, when authorities + began pinning Ed25519 keys. Fixes bug 22349; bugfix + on 0.2.1.19-alpha. + + o Minor bugfixes (memory safety, backport from 0.3.2.3-alpha): +- Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. + + o Minor bugfixes (Windows service, backport from 0.3.1.6-rc): +- When running as a Windows service, set the ID of the main thread + correctly. Failure to do so made us fail to send log messages to + the controller in 0.2.1.16-rc, slowed down controller event + delivery in 0.2.7.3-rc and later, and crash with an assertion + failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha. + Patch and diagnosis from "Vort". + + Changes in version 0.2.9.12 - 2017-09-18 Tor 0.2.9.12 backports a collection of bugfixes from later Tor series. diff --git a/changes/bug22349 b/changes/bug22349 deleted file mode 100644 index bb43404bf..0 --- a/changes/bug22349 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes (directory authority): -- When a directory authority rejects a descriptor or extrainfo with - a given digest, mark that digest as undownloadable, so that we - do not attempt to download it again over and over. We previously - tried to avoid downloading such descriptors by other means, but - we didn't notice if we accidentally downloaded one anyway. This - behavior became problematic in 0.2.7.2-alpha, when authorities - began pinning Ed25519 keys. Fixes ticket - 22349; bugfix on 0.2.1.19-alpha. diff --git a/changes/bug23081 b/changes/bug23081 deleted file mode 100644 index 76c4e3097..0 --- a/changes/bug23081 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (Windows service): -- When running as a Windows service, set the ID of the main thread - correctly. Failure to do so made us fail to send log messages - to the controller in 0.2.1.16-rc, slowed down controller - event delivery in 0.2.7.3-rc and later, and crash with an assertion - failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha. - Patch and diagnosis from "Vort". - diff --git a/changes/bug23690 b/changes/bug23690 deleted file mode 100644 index 36ff32e49..0 --- a/changes/bug23690 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (relay, crash, assertion failure): -- Fix a timing-based assertion failure that could occur when the - circuit out-of-memory handler freed a connection's output buffer. - Fix
[tor-commits] [tor/release-0.3.1] mention bastet in blurb
commit d5e3b6e6b7fc6266695b0b75f72895ebb26a0629 Author: Nick Mathewson Date: Tue Oct 24 08:44:59 2017 -0400 mention bastet in blurb --- ChangeLog | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6649a6d09..09a8efdbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,12 @@ Changes in version 0.3.1.8: Tor 0.3.1.7 is the second stable release in the 0.3.1 series. It includes several bugfixes, including a bugfix for a crash issue - that had affected relays under memory pressure. + that had affected relays under memory pressure. It also adds + a new directory authority, Bastet. o Directory authority changes: -- Add "Bastet" as a ninth directory authority to the default list. Closes - ticket 23910. +- Add "Bastet" as a ninth directory authority to the default list. + Closes ticket 23910. - The directory authority "Longclaw" has changed its IP address. Closes ticket 23592. ___ 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] start on an 0.3.1.8 changelog
commit ce8d60674d43d4ac84fc6759290d9a43c1f732fc Author: Nick Mathewson Date: Tue Oct 24 08:42:22 2017 -0400 start on an 0.3.1.8 changelog --- ChangeLog | 55 +++ changes/bug23551 | 3 --- changes/bug23568 | 4 changes/bug23608 | 4 changes/bug23610 | 4 changes/bug23690 | 5 - changes/bug23874 | 3 --- changes/bug23908 | 3 --- changes/geoip-october2017 | 4 changes/longclaw-ipv6 | 6 -- changes/longclaw_23592| 3 --- changes/ticket23910 | 3 --- 12 files changed, 55 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c8c0d310..6649a6d09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,58 @@ +Changes in version 0.3.1.8: + Tor 0.3.1.7 is the second stable release in the 0.3.1 series. + It includes several bugfixes, including a bugfix for a crash issue + that had affected relays under memory pressure. + + o Directory authority changes: +- Add "Bastet" as a ninth directory authority to the default list. Closes + ticket 23910. +- The directory authority "Longclaw" has changed its IP address. + Closes ticket 23592. + + o Major bugfixes (relay, crash, assertion failure, backport from 0.3.2.2-alpha): +- Fix a timing-based assertion failure that could occur when the + circuit out-of-memory handler freed a connection's output buffer. + Fixes bug 23690; bugfix on 0.2.6.1-alpha. + + o Minor features (directory authorities, backport from 0.3.2.2-alpha): +- Remove longclaw's IPv6 address, as it will soon change. Authority + IPv6 addresses were originally added in 0.2.8.1-alpha. This leaves + 3/8 directory authorities with IPv6 addresses, but there are also + 52 fallback directory mirrors with IPv6 addresses. Resolves 19760. + + o Minor features (geoip): +- Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 + Country database. + + o Minor bugfixes (compilation, backport from 0.3.2.2-alpha): +- Fix a compilation warning when building with zstd support on + 32-bit platforms. Fixes bug 23568; bugfix on 0.3.1.1-alpha. Found + and fixed by Andreas Stieger. + + o Minor bugfixes (compression, backport from 0.3.2.2-alpha): +- Handle a pathological case when decompressing Zstandard data when + the output buffer size is zero. Fixes bug 23551; bugfix + on 0.3.1.1-alpha. + + o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha): +- Remove the length limit on HTTP status lines that authorities can + send in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc. + + o Minor bugfixes (hidden service, relay, backport from 0.3.2.2-alpha): +- Avoid a possible double close of a circuit by the intro point on + error of sending the INTRO_ESTABLISHED cell. Fixes bug 23610; + bugfix on 0.3.0.1-alpha. + + o Minor bugfixes (memory safety, backport from 0.3.2.3-alpha): +- Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. + + o Minor bugfixes (unit tests, backport from 0.3.2.2-alpha): +- Fix additional channelpadding unit test failures by using mocked + time instead of actual time for all tests. Fixes bug 23608; bugfix + on 0.3.1.1-alpha. + + Changes in version 0.3.1.7 - 2017-09-18 Tor 0.3.1.7 is the first stable release in the 0.3.1 series. diff --git a/changes/bug23551 b/changes/bug23551 deleted file mode 100644 index 2f918bfa3..0 --- a/changes/bug23551 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compression): -- Handle a pathological case when decompressing Zstandard data when the - output buffer size is zero. Fixes bug 23551; bugfix on 0.3.1.1-alpha. diff --git a/changes/bug23568 b/changes/bug23568 deleted file mode 100644 index cac465568..0 --- a/changes/bug23568 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation): -- Fix a compilation warning when building with zstd support - on 32-bit platforms. Fixes bug 23568; bugfix on 0.3.1.1-alpha. - Found and fixed by Andreas Stieger. diff --git a/changes/bug23608 b/changes/bug23608 deleted file mode 100644 index 16cf88aa3..0 --- a/changes/bug23608 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (unit tests): -- Fix additional channelpadding unit test failures by using mocked time - instead of actual time for all tests. Fixes bug 23608; - bugfix on 0.3.1.1-alpha. diff --git a/changes/bug23610 b/changes/bug23610 deleted file mode 100644 index f2dc8bd1a..0 --- a/changes/bug23610 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (hidden service, relay): -- Avoid a possible double close of a circuit by the intro point on error - of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on - 0.3.0.1-alpha. diff --git a/changes/bug23690 b/changes/bug23690 deleted
[tor-commits] [torspec/master] Remove next-circuit.
commit 226a54418ca84446d1902f7abb9a89937476e5c8 Author: Tom Ritter Date: Fri Oct 20 11:55:36 2017 -0500 Remove next-circuit. It is not documented anywhere else, nor implemented. It is not clear if the TODO refers to the documentation of the feature, or the feature itself. Just remove it and we can add it back if it's implemented. --- control-spec.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 50a59dd..78f02e7 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -747,9 +747,6 @@ Maps IP addresses to 2-letter country codes. For example, "GETINFO ip-to-country/18.0.0.1" should give "US". -"next-circuit/IP:port" - XXX todo. - "process/pid" -- Process id belonging to the main tor process. "process/uid" -- User id running the tor process, -1 if unknown (this is unimplemented on Windows, returning -1). ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Explain the PROTOCOLINFO command
commit 144f33690d523acad9cbe54af26e8dac83f1adb2 Author: Tom Ritter Date: Fri Oct 20 12:22:53 2017 -0500 Explain the PROTOCOLINFO command --- control-spec.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 78f02e7..555e625 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1268,6 +1268,9 @@ PIVERSION: 1*DIGIT + This command tells the controller what kinds of authentication are + supported. + Tor MAY give its InfoLines in any order; controllers MUST ignore InfoLines with keywords they do not recognize. Controllers MUST ignore extraneous data on any InfoLine. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Break up a paragraph into bullet points
commit c912116e9bc300a867a180364765bac10e9fd779 Author: Nick Mathewson Date: Tue Oct 24 08:31:08 2017 -0400 Break up a paragraph into bullet points Also, s/hexidecimal/hexadecimal/. --- control-spec.txt | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index f2af07e..19eabcf 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -361,10 +361,15 @@ "AUTHENTICATE" [ SP 1*HEXDIG / QuotedString ] CRLF This command is used to authenticate to the server. The provided string is - either the original password represented as a QuotedString if HASHEDPASSWORD - is to be used, the contents of the cookie file formatted as hexidecimal if - COOKIE is to be used, or the resulting HMAC if AUTHCHALLENGE has been - previously sent (and therefore SAFECOOKIE is to be used). + one of the following: + * (For the HASHEDPASSWORD authentication method; see 3.21) + The original password represented as a QuotedString. + + * (For the COOKIE is authentication method; see 3.21) + The contents of the cookie file, formatted in hexadecimal + + * (For the SAFECOOKIE authentication method; see 3.21) + The HMAC based on the AUTHCHALLENGE message, in hexadecimal. The server responds with "250 OK" on success or "515 Bad authentication" if the authentication cookie is incorrect. Tor closes the connection on an ___ 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 'tomrittervg/control-spec-editorial-1'
commit cc55d0a7296a521f6f2fd940480330e22e6ff5ab Merge: 4074b89 9e9d61b Author: Nick Mathewson Date: Tue Oct 24 08:28:29 2017 -0400 Merge remote-tracking branch 'tomrittervg/control-spec-editorial-1' control-spec.txt | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Add clarifications to the authenticaiton mechanisms
commit 9e9d61ba48c5ec6a854eef730a6cca8323c7a5f9 Author: Tom Ritter Date: Fri Oct 20 13:41:38 2017 -0500 Add clarifications to the authenticaiton mechanisms --- control-spec.txt | 9 + 1 file changed, 9 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 555e625..6b2c2eb 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -360,6 +360,12 @@ Sent from the client to the server. The syntax is: "AUTHENTICATE" [ SP 1*HEXDIG / QuotedString ] CRLF + This command is used to authenticate to the server. The provided string is + either the original password represented as a QuotedString if HASHEDPASSWORD + is to be used, the contents of the cookie file formatted as hexidecimal if + COOKIE is to be used, or the resulting HMAC if AUTHCHALLENGE has been + previously sent (and therefore SAFECOOKIE is to be used). + The server responds with "250 OK" on success or "515 Bad authentication" if the authentication cookie is incorrect. Tor closes the connection on an authentication failure. @@ -1377,6 +1383,9 @@ ClientNonce = 2*HEXDIG / QuotedString + This command is used to begin the authentication routine for the + SAFECOOKIE method of authentication. + If the server accepts the command, the server reply format is: "250 AUTHCHALLENGE" SP "SERVERHASH=" ServerHash ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Have LOG_PROTOCOL_WARN call its own function
commit 48ee85e0c6c83c31693bc58ca4e8e91c8031421d
Author: Nick Mathewson
Date: Mon Oct 23 12:20:58 2017 -0400
Have LOG_PROTOCOL_WARN call its own function
Also, make the function that implements LOG_PROTOCOL_WARN use a
cached value of the desired loglevel, rather than calling
get_options().
---
changes/bug23952 | 4
src/or/config.c | 22 ++
src/or/config.h | 1 +
src/or/or.h | 4 ++--
4 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/changes/bug23952 b/changes/bug23952
new file mode 100644
index 0..ab1462e52
--- /dev/null
+++ b/changes/bug23952
@@ -0,0 +1,4 @@
+ o Minor bugfixes (relay):
+- Avoid a BUG warning when receiving a dubious CREATE cell while
+ an option transition is in progress. Fixes bug 23952; bugfix on
+ 0.3.2.1-alpha.
diff --git a/src/or/config.c b/src/or/config.c
index 94c4d790a..a2353b94d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1030,6 +1030,23 @@ escaped_safe_str(const char *address)
return escaped(address);
}
+/**
+ * The severity level that should be used for warnings of severity
+ * LOG_PROTOCOL_WARN.
+ *
+ * We keep this outside the options, in case somebody needs to use
+ * LOG_PROTOCOL_WARN while an option transition is happening.
+ */
+static int protocol_warning_severity_level = LOG_WARN;
+
+/** Return the severity level that should be used for warnings of severity
+ * LOG_PROTOCOL_WARN. */
+int
+get_protocol_warning_severity_level(void)
+{
+ return protocol_warning_severity_level;
+}
+
/** List of default directory authorities */
static const char *default_authorities[] = {
@@ -1667,6 +1684,11 @@ options_act(const or_options_t *old_options)
return -1;
}
+ if (options->ProtocolWarnings)
+protocol_warning_severity_level = LOG_WARN;
+ else
+protocol_warning_severity_level = LOG_INFO;
+
if (consider_adding_dir_servers(options, old_options) < 0)
return -1;
diff --git a/src/or/config.h b/src/or/config.h
index f69a3c483..af945f16b 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -31,6 +31,7 @@ const char *safe_str_client(const char *address);
const char *safe_str(const char *address);
const char *escaped_safe_str_client(const char *address);
const char *escaped_safe_str(const char *address);
+int get_protocol_warning_severity_level(void);
const char *get_version(void);
const char *get_short_version(void);
setopt_err_t options_trial_assign(config_line_t *list, unsigned flags,
diff --git a/src/or/or.h b/src/or/or.h
index 5bd07ba6a..8c1ef478e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4079,8 +4079,6 @@ typedef struct {
int Sandbox; /**< Boolean: should sandboxing be enabled? */
int SafeSocks; /**< Boolean: should we outright refuse application
* connections that use socks4 or socks5-with-local-dns? */
-#define LOG_PROTOCOL_WARN (get_options()->ProtocolWarnings ? \
- LOG_WARN : LOG_INFO)
int ProtocolWarnings; /**< Boolean: when other parties screw up the Tor
* protocol, is it a warn or an info in our logs? */
int TestSocks; /**< Boolean: when we get a socks connection, do we loudly
@@ -4627,6 +4625,8 @@ typedef struct {
smartlist_t *SchedulerTypes_;
} or_options_t;
+#define LOG_PROTOCOL_WARN (get_protocol_warning_severity_level())
+
/** Persistent state for an onion router, as saved to disk. */
typedef struct {
uint32_t magic_;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
