February 2021 - tor-commits - lists.torproject.org

[tor/release-0.4.4] Bump to 0.3.5.13-dev.
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit 21317c92296f0c08176c8788f8f2bcf501e78032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:37:28 2021 -0500 Bump to 0.3.5.13-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 c7bda74c8b..c4fbc3ff7e 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.13]) +AC_INIT([tor],[0.3.5.13-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 04a720a171..a4ddf8b46c 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.13" +!define VERSION "0.3.5.13-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 1c0ce18e73..991369b9f9 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.13" +#define VERSION "0.3.5.13-dev"

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit 2933c371887d07704fd6101b82302a8b952d638c Merge: f3ba71bbee 8a17999da3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:39:28 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump.

1 0

[tor/release-0.4.4] bump to 0.4.3.8-dev
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit 0d14ac1e0e2434aaa0fade0224fdf2e4d384f4b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:38:56 2021 -0500 bump to 0.4.3.8-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 eb5a038541..64e4984783 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.3.8]) +AC_INIT([tor],[0.4.3.8-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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, ["2021-01-28"], # for 0.4.3.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-02-03"], # for 0.4.3.8-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 347b781116..95bf00d04a 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.3.8" +!define VERSION "0.4.3.8-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 ed85c09a71..85cb588923 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.3.8" +#define VERSION "0.4.3.8-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] bump to 0.4.4.7-dev
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit f3ba71bbee2180634b7931c8d1d79dab3437fbed Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:39:03 2021 -0500 bump to 0.4.4.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 6c761064bf..03c80d73b5 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.4.7]) +AC_INIT([tor],[0.4.4.7-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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, ["2021-01-28"], # for 0.4.4.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-02-03"], # for 0.4.4.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 11856e9aec..39b7999fd1 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.4.7" +!define VERSION "0.4.4.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 f3fe9cbd9b..d1d60bffa2 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.4.7" +#define VERSION "0.4.4.7-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit 2933c371887d07704fd6101b82302a8b952d638c Merge: f3ba71bbee 8a17999da3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:39:28 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump.

1 0

[tor/release-0.3.5] Bump to 0.3.5.13-dev.
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit 21317c92296f0c08176c8788f8f2bcf501e78032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:37:28 2021 -0500 Bump to 0.3.5.13-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 c7bda74c8b..c4fbc3ff7e 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.13]) +AC_INIT([tor],[0.3.5.13-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 04a720a171..a4ddf8b46c 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.13" +!define VERSION "0.3.5.13-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 1c0ce18e73..991369b9f9 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.13" +#define VERSION "0.3.5.13-dev"

1 0

[tor/release-0.4.3] bump to 0.4.3.8-dev
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit 0d14ac1e0e2434aaa0fade0224fdf2e4d384f4b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:38:56 2021 -0500 bump to 0.4.3.8-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 eb5a038541..64e4984783 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.3.8]) +AC_INIT([tor],[0.4.3.8-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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, ["2021-01-28"], # for 0.4.3.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-02-03"], # for 0.4.3.8-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 347b781116..95bf00d04a 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.3.8" +!define VERSION "0.4.3.8-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 ed85c09a71..85cb588923 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.3.8" +#define VERSION "0.4.3.8-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit 8a17999da3626a5f9e8922277151624cd0526fba Merge: 0d14ac1e0e 21317c9229 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:39:08 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump.

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit 306e8f87bcd73461e66386c5e387d4aa2dfb4090 Merge: 926432845b 2933c37188 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:39:55 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 03 Feb '21

03 Feb '21

commit fdd4bc3f4348d55f3eeeef316ec80aec790770b3 Merge: cd60c6ec6b 21317c9229 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 13:39:54 2021 -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