March 2018 - tor-commits - lists.torproject.org

[tor/master] bump version to 0.3.2.10-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 0026d1a673e8b01057b0735c977a55995812c85e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:33:27 2018 -0500 bump version to 0.3.2.10-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 73858d3f2..5a74d6c61 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.2.10]) +AC_INIT([tor],[0.3.2.10-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 603f842d6..7f2220153 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.2.10" +!define VERSION "0.3.2.10-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 83ed63fa4..f5186fd24 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.2.10" +#define VERSION "0.3.2.10-dev"

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 35d945a646b3384640d3863aec07d873179efffd Merge: 15f6201a5 0026d1a67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:33:33 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.1] Bump version to 0.2.9.15-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-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 baf6ea3ca..15ecbe60e 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.15]) +AC_INIT([tor],[0.2.9.15-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 f8e571cb0..3a45741d8 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.15" +!define VERSION "0.2.9.15-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 fc6366535..badfab787 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.15" +#define VERSION "0.2.9.15-dev"

1 0

[tor/release-0.2.9] Bump version to 0.2.9.15-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-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 baf6ea3ca..15ecbe60e 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.15]) +AC_INIT([tor],[0.2.9.15-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 f8e571cb0..3a45741d8 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.15" +!define VERSION "0.2.9.15-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 fc6366535..badfab787 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.15" +#define VERSION "0.2.9.15-dev"

1 0

[tor/maint-0.3.3] version bump to 0.3.1.10-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-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 892ee2ae8..9c079b26f 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.10]) +AC_INIT([tor],[0.3.1.10-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 72a99b7e4..7ddb21d8a 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.10" +!define VERSION "0.3.1.10-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 5f2ef7a86..271b018c6 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.10" +#define VERSION "0.3.1.10-dev"

1 0

[tor/maint-0.3.3] bump version to 0.3.2.10-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 0026d1a673e8b01057b0735c977a55995812c85e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:33:27 2018 -0500 bump version to 0.3.2.10-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 73858d3f2..5a74d6c61 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.2.10]) +AC_INIT([tor],[0.3.2.10-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 603f842d6..7f2220153 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.2.10" +!define VERSION "0.3.2.10-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 83ed63fa4..f5186fd24 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.2.10" +#define VERSION "0.3.2.10-dev"

1 0

[tor/master] Bump version to 0.2.9.15-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-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 baf6ea3ca..15ecbe60e 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.15]) +AC_INIT([tor],[0.2.9.15-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 f8e571cb0..3a45741d8 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.15" +!define VERSION "0.2.9.15-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 fc6366535..badfab787 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.15" +#define VERSION "0.2.9.15-dev"

1 0

[tor/master] version bump to 0.3.1.10-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-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 892ee2ae8..9c079b26f 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.10]) +AC_INIT([tor],[0.3.1.10-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 72a99b7e4..7ddb21d8a 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.10" +!define VERSION "0.3.1.10-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 5f2ef7a86..271b018c6 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.10" +#define VERSION "0.3.1.10-dev"

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit d81a5231eee22d2d73a54b87b9ee13d3896220bc Merge: 1ec386561 0aa794d30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:33:02 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

1 0

[tor/release-0.3.2] Bump version to 0.2.9.15-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-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 baf6ea3ca..15ecbe60e 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.15]) +AC_INIT([tor],[0.2.9.15-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 f8e571cb0..3a45741d8 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.15" +!define VERSION "0.2.9.15-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 fc6366535..badfab787 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.15" +#define VERSION "0.2.9.15-dev"

1 0