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 c9009ccf92d9a759d9135bcf872640f769f93a00 Merge: de65647 b838e1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 08:07:56 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

1 0

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

19 Dec '16

commit b838e1f927b1a367111e27db5d4c1eb5beee0036 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 08:07:30 2016 -0500 Bump to 0.2.8.12 --- 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 082eca3..d004c78 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.11-dev]) +AC_INIT([tor],[0.2.8.12]) 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 af5aa67..8132108 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.11-dev" +!define VERSION "0.2.8.12" !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 b05335c..97263ba 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.11-dev" +#define VERSION "0.2.8.12"

1 0

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

19 Dec '16

commit 24318fbda99d7fb316e1c377fedaeba927102145 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 08:08:44 2016 -0500 Bump to 0.2.9.8 --- 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 94774ec..2a7548f 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.7-rc-dev]) +AC_INIT([tor],[0.2.9.8]) 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 d3d793b..8729946 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.7-rc-dev" +!define VERSION "0.2.9.8" !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 5773d04..bdb754d 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.7-rc-dev" +#define VERSION "0.2.9.8"

1 0

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

19 Dec '16

1 0

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

19 Dec '16

1 0

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

19 Dec '16

1 0

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

19 Dec '16

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 49bdcfd4b6f392e6c0f15e6beaec7a7498aadc88 Merge: 054c1d5 24318fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 08:08:52 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 fe7a0c34b05db5f4a8a91353c1615ab9cde33095 Merge: 5d68e5b b838e1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 08:07:37 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/master] Merge branch 'maint-0.2.8' into maint-0.2.9
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