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

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 4a27e6e2352a71881712952b6ba2c6683210ee96 Merge: 74b1ed684 9eb6f9d3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:34:10 2018 -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.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 1eb7041ef105af931d1eb3984aeddb2e79aa03a1 Merge: e3966d47c 0aa794d30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:34:10 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 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] 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 to 0.3.3.3-alpha-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit aec505a310601149d7ad3e8ae61b4f988ed8e8ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:33:56 2018 -0500 bump to 0.3.3.3-alpha-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 daec684d8..017e9cf65 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.3.3-alpha]) +AC_INIT([tor],[0.3.3.3-alpha-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 2f63bd7a4..0e037da45 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.3.3-alpha" +!define VERSION "0.3.3.3-alpha-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 6fa255844..8b4da1df7 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.3.3-alpha" +#define VERSION "0.3.3.3-alpha-dev"

1 0

[tor/maint-0.3.3] 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/master] bump to 0.3.3.3-alpha-dev
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit aec505a310601149d7ad3e8ae61b4f988ed8e8ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:33:56 2018 -0500 bump to 0.3.3.3-alpha-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 daec684d8..017e9cf65 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.3.3-alpha]) +AC_INIT([tor],[0.3.3.3-alpha-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 2f63bd7a4..0e037da45 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.3.3-alpha" +!define VERSION "0.3.3.3-alpha-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 6fa255844..8b4da1df7 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.3.3-alpha" +#define VERSION "0.3.3.3-alpha-dev"

1 0

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

03 Mar '18

commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

1 0

[tor/maint-0.3.3] 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/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

1 0

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

03 Mar '18

commit 27c3a1d65740bd1fe85d7fb0cd401708dcf3a457 Merge: 9a14f1ef6 aec505a31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:34:02 2018 -0500 Merge branch 'maint-0.3.3' "ours" merge to avoid version bump.

1 0