February 2017 - tor-commits - lists.torproject.org

[tor/master] Bump version to 0.2.5.13
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 884b3717a92465a3d6ab31d819e4011d3d929b3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:23:20 2017 -0500 Bump version to 0.2.5.13 --- 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 29ba2fd..8f85dae 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.12]) +AC_INIT([tor],[0.2.5.13]) 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 2fb15b8..9661e10 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.12" +!define VERSION "0.2.5.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 6d6cde4..aa04092 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.12" +#define VERSION "0.2.5.13"

1 0

[tor/master] Bump to 0.2.4.28
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 4bab288a822a5312ee2953822563e694c7274afb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:20:46 2017 -0500 Bump to 0.2.4.28 --- configure.ac | 2 +- contrib/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 6ffe3cc..8e70722 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.4.27]) +AC_INIT([tor],[0.2.4.28]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index a66bcd1..da24244 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.27" +!define VERSION "0.2.4.28" !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 baddef6..cca8ad0 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.4.27" +#define VERSION "0.2.4.28"

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit b2b604ecb4df95526a309c9ff507dff942472daa Merge: aeb299b 4bab288 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:22:36 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid bumping version

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 8a1f0876ed329f6c9d73e6ca786cd8437e6bb55b Merge: 3f5a710 f2a3041 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 10:38:05 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug16248 | 8 ++++++++ changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 66 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit aec45bc0b1d5c694b107373f8d6e3ddd1372defc Merge: 8a1f087 f7ed4a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 17:10:47 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug20384 | 10 + changes/geoip-february2017 | 4 + changes/trove-2017-001.2 | 8 + src/config/geoip | 10832 ++++++++++++++++++++++++------------------- src/config/geoip6 | 1651 ++++++- src/or/routerparse.c | 49 +- 6 files changed, 7399 insertions(+), 5155 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac Merge: f7ed4a7 884b371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:25:51 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bumps

1 0

[tor/release-0.2.6] Bump version to 0.2.5.13
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 884b3717a92465a3d6ab31d819e4011d3d929b3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:23:20 2017 -0500 Bump version to 0.2.5.13 --- 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 29ba2fd..8f85dae 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.12]) +AC_INIT([tor],[0.2.5.13]) 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 2fb15b8..9661e10 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.12" +!define VERSION "0.2.5.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 6d6cde4..aa04092 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.12" +#define VERSION "0.2.5.13"

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 9ec08f98995a87baf6c0367a036661286f58e295 Merge: 1453bda 58908b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:40:34 2017 -0500 Merge branch 'maint-0.3.0' This is an "ours" merge to avoid a version bump.

1 0

[tor/release-0.2.4] Bump to 0.2.4.28
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 4bab288a822a5312ee2953822563e694c7274afb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:20:46 2017 -0500 Bump to 0.2.4.28 --- configure.ac | 2 +- contrib/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 6ffe3cc..8e70722 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.4.27]) +AC_INIT([tor],[0.2.4.28]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index a66bcd1..da24244 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.27" +!define VERSION "0.2.4.28" !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 baddef6..cca8ad0 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.4.27" +#define VERSION "0.2.4.28"

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 4128a8cabdb530fcbe1dda5a21887d7728e4d752 Merge: 3a60214 b049a5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:39:29 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 This is an "ours" merge to avoid a version bump.

1 0