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

[tor/release-0.2.5] 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/release-0.2.6] 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.6' into maint-0.2.7-redux
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 1174b50cab48be08b321deced0cfa022160d2c40 Merge: aec45bc 57e778f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:26:45 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux "ours" merge to avoid version bumps

1 0

[tor/release-0.2.5] 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.8' into maint-0.2.9
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3e07a54928c3b14b4eb86b05251564c3e16504c4 Merge: 67cec75 f93bcab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:38:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 This is an "ours" merge to avoid taking a version bump

1 0

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

28 Feb '17

commit 57e778f882537b5c07465e87f763bcd032cc7ea1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:26:24 2017 -0500 bump to 0.2.6.11 --- 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 3654024..a79ea82 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.10-dev]) +AC_INIT([tor],[0.2.6.11]) 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 4143cf4..6611bb8 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.6.10-dev" +!define VERSION "0.2.6.11" !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 82e7e65..59cd43e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.10-dev" +#define VERSION "0.2.6.11"

1 0

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

28 Feb '17

commit f2a657c22bf47fe4fd8103a1117e1e46af30969c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:34:33 2017 -0500 bump version to 0.2.8.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 200ea02..9c6d95d 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.12-dev]) +AC_INIT([tor],[0.2.8.13]) 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 7152e43..ae477b8 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.12-dev" +!define VERSION "0.2.8.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 26f9950..b61f59f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.12-dev" +#define VERSION "0.2.8.13"

1 0

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

28 Feb '17

commit f93bcab60e09618bf5b9ec55c6f4f338f2a7cd06 Merge: f2a657c b5526be Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:37:25 2017 -0500 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 This is an "ours" merge to avoid taking a version bump, and to avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.

1 0

[tor/release-0.2.5] 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] bump version to 0.3.0.4-rc
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 58908b6540d7296109b60e187ff788b20e79aba5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:40:08 2017 -0500 bump version to 0.3.0.4-rc --- 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 c9e0c2a..4433d57 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.3-alpha-dev]) +AC_INIT([tor],[0.3.0.4-rc]) 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 62e8036..a7fd0d3 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.3-alpha-dev" +!define VERSION "0.3.0.4-rc" !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 ec4d62b..5542452 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.3-alpha-dev" +#define VERSION "0.3.0.4-rc"

1 0