September 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit e468498469ebb2a676e74884a34fa017fa8ac3a4 Merge: 348b225bd f7b06202c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:21:52 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.0] version bump: 0.3.0.11
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 348b225bd86afa77180b72d33d8bf6025dd8f6ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:20:52 2017 -0400 version bump: 0.3.0.11 --- 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 32024b787..4dc42346a 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.10-dev]) +AC_INIT([tor],[0.3.0.11]) 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 e76b31bfe..7824d02f1 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.10-dev" +!define VERSION "0.3.0.11" !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 6755b2b65..e81bf0c9f 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.10-dev" +#define VERSION "0.3.0.11"

1 0

[tor/release-0.3.0] version bump: 0.2.9.12
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 3c6d4fe04670875497dd451109d1bc16da7b7aae Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:20:29 2017 -0400 version bump: 0.2.9.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 f5545f468..45019bebb 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.11-dev]) +AC_INIT([tor],[0.2.9.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 cf12c069e..eafedfa68 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.11-dev" +!define VERSION "0.2.9.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 672f6cfe8..fc093daeb 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.11-dev" +#define VERSION "0.2.9.12"

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit f7b06202c787d117eb22f04798a6f3f4b6722af1 Merge: 3c6d4fe04 26f68dfce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:21:28 2017 -0400 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 14 Sep '17

14 Sep '17

commit e468498469ebb2a676e74884a34fa017fa8ac3a4 Merge: 348b225bd f7b06202c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:21:52 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.

1 0

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

14 Sep '17

commit 881307dc77a7a6ff37a669c2317ab0bd691e24d1 Merge: eebf93dfd e46849846 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:22:17 2017 -0400 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] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit b05226f05c4a5de92cfa57e6de1b77622bfdf22a Merge: fd8d526f0 2446d4acc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:22:17 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1

1 0

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

14 Sep '17

commit e468498469ebb2a676e74884a34fa017fa8ac3a4 Merge: 348b225bd f7b06202c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:21:52 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.1] version bump: 0.2.8.15
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 26f68dfcef283137e60319c003300b07c56a3209 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:20:14 2017 -0400 version bump: 0.2.8.15 --- 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 eeced5310..4695f111d 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.14-dev]) +AC_INIT([tor],[0.2.8.15]) 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 863a49bac..57002a04e 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.14-dev" +!define VERSION "0.2.8.15" !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 3b3d13605..bb09bafe0 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.14-dev" +#define VERSION "0.2.8.15"

1 0

[tor/release-0.3.1] version bump: 0.3.0.11
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 348b225bd86afa77180b72d33d8bf6025dd8f6ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 13:20:52 2017 -0400 version bump: 0.3.0.11 --- 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 32024b787..4dc42346a 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.10-dev]) +AC_INIT([tor],[0.3.0.11]) 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 e76b31bfe..7824d02f1 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.10-dev" +!define VERSION "0.3.0.11" !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 6755b2b65..e81bf0c9f 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.10-dev" +#define VERSION "0.3.0.11"

1 0