tor-commits December 2017

tor-commits@lists.torproject.org

14 participants
2422 discussions

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

01 Dec '17

commit 47e87f2be2d96cc28bcded94bfbc94a750bf32d4 Merge: e8cda9144 495db72c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:43 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 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.0] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 495db72c1eee7f9ed890ae252eb5b61a70438065 Merge: 73869c99a dc3890439 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:07 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.0] 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] bump to 0.2.9.14-dev
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 73869c99a07a298238b14426866bc64acc73da38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:34:00 2017 -0500 bump to 0.2.9.14-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 3e8084cde..17e6fca0d 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.14]) +AC_INIT([tor],[0.2.9.14-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 c5d2d7e89..83c6d5c5e 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.14" +!define VERSION "0.2.9.14-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 46cd55dd6..bfe026296 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.14" +#define VERSION "0.2.9.14-dev"

1 0

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

01 Dec '17

commit 8f858de8193cc66c9b19627ad5c07261639bd7df Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:33:51 2017 -0500 bump to 0.2.8.17-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 94cebf401..18bad71a4 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.17]) +AC_INIT([tor],[0.2.8.17-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 b9076fbc7..2ab2b14ef 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.17" +!define VERSION "0.2.8.17-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 9db6ef209..b0292b111 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.17" +#define VERSION "0.2.8.17-dev"

1 0

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

01 Dec '17

1 0

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

01 Dec '17

1 0

[tor/release-0.3.0] 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] bump to 0.3.1.9-dev
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit a12dbbd882a10d23e5a9cdec451145ca48c06080 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:34:20 2017 -0500 bump to 0.3.1.9-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 5afcdddb0..14e676aa1 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.9]) +AC_INIT([tor],[0.3.1.9-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 391d63c00..472ec0d26 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.9" +!define VERSION "0.3.1.9-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 ccb82d063..3ecf02482 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.9" +#define VERSION "0.3.1.9-dev"

1 0

[tor/release-0.3.2] bump to 0.2.9.14-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