tor-commits February 2017

tor-commits@lists.torproject.org

14 participants
1811 discussions

[tor/release-0.2.6] 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/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 70840ea6d53c4bbfd202ce3c83ea398e5a68822b Merge: e9d45f6 4bab288 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:21:58 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

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

28 Feb '17

commit 5c5298e4ff1a3fdeb7e19094bf150828d8eb96e7 Merge: 30844dd 884b371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:25:01 2017 -0500 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(-)

1 0

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

28 Feb '17

commit b5526bef384524badbd1411ad9570e6373438b06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:27:20 2017 -0500 Bump version to 0.2.7.7 --- 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 d37c34d..80c4d3c 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.7.6-dev]) +AC_INIT([tor],[0.2.7.7]) 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 08cef8d..f20c1a6 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.7.6-dev" +!define VERSION "0.2.7.7" !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 8b687c8..57385c9 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.7.6-dev" +#define VERSION "0.2.7.7"

1 0

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

28 Feb '17

1 0

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

28 Feb '17

commit 01a00d0f94e7d8f89cc5244c8b49bf27bc37f797 Merge: 1fe5097 b5526be Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:27:29 2017 -0500 Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.6] 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/release-0.2.7-redux] 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.7-redux] Bump version to 0.2.7.7
by nickm＠torproject.org 28 Feb '17

28 Feb '17

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2017