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

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 28 Jan '21

28 Jan '21

commit 7ed0fbd88572b9f5519e7907f366c54b8ffb0f25 Merge: 641dce2d6b 3ebf75993f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:17:43 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump.

1 0

[tor/master] Bump to 0.4.3.8.
by nickm＠torproject.org 28 Jan '21

28 Jan '21

commit c3ed4b2e5653528641a3a576a0ce9b85390c7d2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:18:13 2021 -0500 Bump to 0.4.3.8. --- 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 921e2f197e..9abfa4b487 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.7-dev]) +AC_INIT([tor],[0.4.3.8]) 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, ["2020-11-12"], # for 0.4.3.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-01-28"], # for 0.4.3.8 [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 e3f8be0b86..347b781116 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.7-dev" +!define VERSION "0.4.3.8" !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 cfeffe581c..ed85c09a71 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.7-dev" +#define VERSION "0.4.3.8" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.5] Bump to 0.4.5.5-rc
by nickm＠torproject.org 28 Jan '21

28 Jan '21

commit 26a07287a458a566e70798ba1c62e1b9b19ec25c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:20:01 2021 -0500 Bump to 0.4.5.5-rc --- 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 99e799ce04..91b7d0a3e0 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.5.4-rc-dev]) +AC_INIT([tor],[0.4.5.5-rc]) 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-22"], # for 0.4.5.4-rc-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-01-28"], # for 0.4.5.5-rc [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 6ac5581251..0d20672cee 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.5.4-rc-dev" +!define VERSION "0.4.5.5-rc" !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 c3cd07f7b1..b09506b9e9 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.5.4-rc-dev" +#define VERSION "0.4.5.5-rc" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.3] Bump to 0.3.5.13.
by nickm＠torproject.org 28 Jan '21

28 Jan '21

commit 3ebf75993f8c64ea0bc022bde69ccdf879bcaeaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:17:32 2021 -0500 Bump to 0.3.5.13. --- 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 642e4cf09c..1f2af57ef7 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.12-dev]) +AC_INIT([tor],[0.3.5.13]) 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 37a0e1e93b..04a720a171 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.12-dev" +!define VERSION "0.3.5.13" !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 e67ff13b13..1c0ce18e73 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.12-dev" +#define VERSION "0.3.5.13"

1 0

[tor/master] Bump to 0.4.5.5-rc
by nickm＠torproject.org 28 Jan '21

28 Jan '21

commit 26a07287a458a566e70798ba1c62e1b9b19ec25c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:20:01 2021 -0500 Bump to 0.4.5.5-rc --- 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 99e799ce04..91b7d0a3e0 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.5.4-rc-dev]) +AC_INIT([tor],[0.4.5.5-rc]) 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-22"], # for 0.4.5.4-rc-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-01-28"], # for 0.4.5.5-rc [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 6ac5581251..0d20672cee 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.5.4-rc-dev" +!define VERSION "0.4.5.5-rc" !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 c3cd07f7b1..b09506b9e9 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.5.4-rc-dev" +#define VERSION "0.4.5.5-rc" #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 28 Jan '21

28 Jan '21

commit 7ed0fbd88572b9f5519e7907f366c54b8ffb0f25 Merge: 641dce2d6b 3ebf75993f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:17:43 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump.

1 0

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

28 Jan '21

commit dec3041952ae4c9ea0ed621b149e6e047738c617 Merge: d4e5066bf2 3ebf75993f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:20:20 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

[tor/master] Bump to 0.4.4.7
by nickm＠torproject.org 28 Jan '21

28 Jan '21

commit f8fea8b979ea7f71e1028f56a4286ee5839de7a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:19:00 2021 -0500 Bump to 0.4.4.7 --- 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 39d2470ee3..7a39d9da95 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.6-dev]) +AC_INIT([tor],[0.4.4.7]) 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, ["2020-11-12"], # for 0.4.4.6-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-01-28"], # for 0.4.4.7 [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 0c6cd5b2f9..11856e9aec 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.6-dev" +!define VERSION "0.4.4.7" !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 c2c67b9639..f3fe9cbd9b 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.6-dev" +#define VERSION "0.4.4.7" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] Merge branch 'maint-0.4.5'
by nickm＠torproject.org 28 Jan '21

28 Jan '21

commit e4e6418023dc2af7f3cb5480dbadbb6893bf82db Merge: b019c83853 26a07287a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:20:08 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump(s)

1 0

[tor/release-0.3.5] Bump to 0.3.5.13.
by nickm＠torproject.org 28 Jan '21

28 Jan '21

commit 3ebf75993f8c64ea0bc022bde69ccdf879bcaeaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:17:32 2021 -0500 Bump to 0.3.5.13. --- 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 642e4cf09c..1f2af57ef7 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.12-dev]) +AC_INIT([tor],[0.3.5.13]) 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 37a0e1e93b..04a720a171 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.12-dev" +!define VERSION "0.3.5.13" !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 e67ff13b13..1c0ce18e73 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.12-dev" +#define VERSION "0.3.5.13"

1 0