tor-commits December 2017

tor-commits@lists.torproject.org

14 participants
2422 discussions

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 27b04b8bad295157a92fdd59d0c3e09bc360a84a Merge: e5e3f1364 6e3ec8222 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:43 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] bump to 0.2.5.16-dev
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 162a087e5feb1205e3cefb7b1ab12ad0c0d2e041 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:33:41 2017 -0500 bump to 0.2.5.16-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 67fddd7b4..25e197d43 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.16]) +AC_INIT([tor],[0.2.5.16-dev]) 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 c88262afa..9d9eef632 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.16" +!define VERSION "0.2.5.16-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 87ba1f11a..a890f62f3 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.16" +#define VERSION "0.2.5.16-dev"

1 0

[tor/release-0.3.2] bump to 0.3.2.6-alpha-dev
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 998a24712336c830ad9f73ddbb95c0f7d9ebffb0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:34:31 2017 -0500 bump to 0.3.2.6-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4413328de..086822313 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.2.6-alpha]) +AC_INIT([tor],[0.3.2.6-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 5c6463ff1..4a4fc51f9 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.2.6-alpha" +!define VERSION "0.3.2.6-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d04bc37ac..5bd1f47e5 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.2.6-alpha" +#define VERSION "0.3.2.6-alpha-dev"

1 0

[tor/release-0.3.1] bump to 0.3.0.13-dev
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 1983068ba9530917d94d6cfa6ffd23a28a64274b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:34:09 2017 -0500 bump to 0.3.0.13-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 10612eba2..88bc96884 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.13]) +AC_INIT([tor],[0.3.0.13-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index bd8cf3d5c..8cb6fb1d3 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.13" +!define VERSION "0.3.0.13-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 5795552a4..0b09a5ca5 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.13" +#define VERSION "0.3.0.13-dev"

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit dc3890439f156d4c79b153f13f7ecf3393362b29 Merge: 8f858de81 162a087e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:34:47 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 6e3ec8222c6b2b3eec332ef3b5d3b0eac0c00ce5 Merge: 1983068ba 495db72c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:16 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 7fae562a4da62090817f8546e8f4a8a29dcf1c4a Merge: a12dbbd88 6e3ec8222 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:25 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit d3048a8f5b1db2179dee4c30c1ad3d94f1972363 Merge: 9703b4148 7fae562a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:43 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.2] bump to 0.2.5.16-dev
by nickm＠torproject.org 01 Dec '17

01 Dec '17

1 0

[tor/release-0.3.2] bump to 0.3.0.13-dev
by nickm＠torproject.org 01 Dec '17

01 Dec '17

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2017