December 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc Merge: 6513102b9 b9504f788 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:02:07 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

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

09 Dec '19

commit 09a3bd1ffeedb94c2b50c11ea702b46fcba9203c Merge: 72595eb02 0c4f0ec97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:04:22 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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.4.2'
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 944bdde50edbc6030dfc954ff501c92cd9e73fb0 Merge: 5d4005abf b7d18f861 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:04:09 2019 -0500 Merge branch 'maint-0.4.2' "ours" to avoid version bump.

1 0

[tor/release-0.4.0] bump to 0.3.5.9-dev
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:01:11 2019 -0500 bump to 0.3.5.9-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 15b66eef6..834fea073 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.9]) +AC_INIT([tor],[0.3.5.9-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 32d468e79..9eeb32822 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.5.9" +!define VERSION "0.3.5.9-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 6d1801f85..baad733d0 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.5.9" +#define VERSION "0.3.5.9-dev"

1 0

[tor/release-0.3.5] bump to 0.3.5.9-dev
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:01:11 2019 -0500 bump to 0.3.5.9-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 15b66eef6..834fea073 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.9]) +AC_INIT([tor],[0.3.5.9-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 32d468e79..9eeb32822 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.5.9" +!define VERSION "0.3.5.9-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 6d1801f85..baad733d0 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.5.9" +#define VERSION "0.3.5.9-dev"

1 0

[tor/release-0.4.0] Bump version to 0.4.0.6-dev
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit b9504f788c9798fab2b74d4006ba9b97151d6404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:01:56 2019 -0500 Bump version to 0.4.0.6-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d66dd6db0..8990cd9fc 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.6]) +AC_INIT([tor],[0.4.0.6-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6 +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.0.6-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 29674dee4..93f3f72ec 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.4.0.6" +!define VERSION "0.4.0.6-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 fa1bc6814..bf746a19a 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.4.0.6" +#define VERSION "0.4.0.6-dev"

1 0

[tor/master] bump to 0.4.2.5-dev
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit b7d18f861057fca75f8f49f16e31d9e3a8f94812 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:03:31 2019 -0500 bump to 0.4.2.5-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6d2dae91a..0e4ecaa94 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.2.5]) +AC_INIT([tor],[0.4.2.5-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.2.5 +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.2.5-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index fa0bb6b35..fab06e0e3 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.4.2.5" +!define VERSION "0.4.2.5-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 18f8afca7..fb27f0276 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.4.2.5" +#define VERSION "0.4.2.5-dev"

1 0

[tor/master] bump to 0.4.1.7-dev
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 7174a80edd13d53f63be1558c6de341ec1296006 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:02:36 2019 -0500 bump to 0.4.1.7-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3725235e0..9e31b3bd6 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.1.7]) +AC_INIT([tor],[0.4.1.7-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.1.7-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index c3c14186d..b50746779 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.4.1.7" +!define VERSION "0.4.1.7-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 cbf6217dd..dccf73154 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.4.1.7" +#define VERSION "0.4.1.7-dev"

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 17561434ebcf01eaa86737b2acfb65df8b57a8b5 Merge: 3248630fc 7174a80ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:03:01 2019 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump.

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8 Merge: c7ca3fc18 0c4f0ec97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:01:22 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.

1 0