tor-commits December 2016

tor-commits@lists.torproject.org

18 participants
2010 discussions

[tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 19 Dec '16

19 Dec '16

commit 8f043ffc647bf129e8a6d0c5991586fac880c489 Merge: 24318fb f62c74c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 10:12:34 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "Ours" merge to avoid version bump.

1 0

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

19 Dec '16

commit f2270bf53f8d4ad1cda7eef62ebb64872d3f3c0a Merge: 01ab67e 897d3c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 10:13:10 2016 -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.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 19 Dec '16

19 Dec '16

commit c59e04b51188a5bf3c57a9182a04feb9ace51d4d Merge: 9b3b49f f62c74c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 10:12:17 2016 -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.9] Bump to 0.2.9.8-dev
by nickm＠torproject.org 19 Dec '16

19 Dec '16

commit 897d3c6d13638a39d2e5e17e1a30aa572243b342 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 10:13:01 2016 -0500 Bump to 0.2.9.8-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 2a7548f..7ba4a41 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.8]) +AC_INIT([tor],[0.2.9.8-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 8729946..c665696 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.8" +!define VERSION "0.2.9.8-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 bdb754d..86b05a1 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.8" +#define VERSION "0.2.9.8-dev"

1 0

[tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 19 Dec '16

19 Dec '16

1 0

[tor/release-0.2.8] Bump to 0.2.8.12-dev
by nickm＠torproject.org 19 Dec '16

19 Dec '16

commit f62c74cc7298aa9a7db55f1256754b8e243e3865 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 10:12:11 2016 -0500 Bump to 0.2.8.12-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 d004c78..200ea02 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]) +AC_INIT([tor],[0.2.8.12-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 8132108..7152e43 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" +!define VERSION "0.2.8.12-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 97263ba..26f9950 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" +#define VERSION "0.2.8.12-dev"

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 19 Dec '16

19 Dec '16

commit 157e6a293273b9f899384ee8da7550799308817b Merge: 5e6c338 897d3c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 10:13:29 2016 -0500 Merge branch 'maint-0.2.9' "Ours" merge to avoid version bump.

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 19 Dec '16

19 Dec '16

1 0

[tor/master] Bump to 0.2.9.8-dev
by nickm＠torproject.org 19 Dec '16

19 Dec '16

1 0

[tor/release-0.2.9] Bump to 0.2.8.12-dev
by nickm＠torproject.org 19 Dec '16

19 Dec '16

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2016