tor-commits December 2017

tor-commits@lists.torproject.org

14 participants
2422 discussions

[tor/release-0.3.2] 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.2] 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.2] 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.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit e0d1ab41723ac0cbc1b8f23d3235f1edc6b0e239 Merge: 87012d076 909c91049 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:43 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 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] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 909c91049a424776c563363312f93dcdc4cdb241 Merge: 998a24712 7fae562a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:31 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump.

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 66e99096b32e4b10620eef40a66228b027a54106 Merge: 5fbb52d10 909c91049 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:36 2017 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid version bump.

1 0

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

01 Dec '17

1 0

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

01 Dec '17

commit 235083308add586c0b86b2e0ce8af7c9a7f4b5c0 Merge: f3c581ee2 dc3890439 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:43 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 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.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 9cb1c2b4ad37f7af1c0d58858f0e5fbe04f33730 Merge: 7d83cfb3a 162a087e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 09:35:43 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2017