- tor-commits - lists.torproject.org

[tor/main] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 55e329fdc19becc8c056c4852ba39bc44b9705c6 Merge: 6260db5733 fd38609ae2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:21:15 2021 -0400 Merge branch 'maint-0.4.6' "ours" to avoid version bump.

1 0

[tor/maint-0.3.5] Make the version 0.3.6.16, not 0.3.6.16-dev.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 2984fba97a03506fb405bdf2c37481a0a7d6cf09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:17:59 2021 -0400 Make the version 0.3.6.16, not 0.3.6.16-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 e698bf8901..c45b76e5a6 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.16-dev]) +AC_INIT([tor],[0.3.5.16]) 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 013518457f..c8695bc86c 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.16-dev" +!define VERSION "0.3.5.16" !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 7d73fc4a10..273806fde3 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.16-dev" +#define VERSION "0.3.5.16"

1 0

[tor/maint-0.4.5] Make the version 0.3.6.16, not 0.3.6.16-dev.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 2984fba97a03506fb405bdf2c37481a0a7d6cf09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:17:59 2021 -0400 Make the version 0.3.6.16, not 0.3.6.16-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 e698bf8901..c45b76e5a6 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.16-dev]) +AC_INIT([tor],[0.3.5.16]) 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 013518457f..c8695bc86c 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.16-dev" +!define VERSION "0.3.5.16" !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 7d73fc4a10..273806fde3 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.16-dev" +#define VERSION "0.3.5.16"

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 1667e122def480fac8033fb96057971969a446d5 Merge: ca249131b0 2984fba97a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:18:09 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 "ours" to avoid version bump

1 0

[tor/maint-0.4.5] Make the version 0.4.5.10, not 0.4.5.10-dev.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 1ec4c7b34a595a218121b81879ced1450e3a72ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:18:57 2021 -0400 Make the version 0.4.5.10, not 0.4.5.10-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 cd38240a34..14ce94db87 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.10-dev]) +AC_INIT([tor],[0.4.5.10]) 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-08-13"], # for 0.4.5.10-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.5.10 [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 9b9172fb90..fe25571c77 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.10-dev" +!define VERSION "0.4.5.10" !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 070d62c9b8..a2ebca9eb6 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.10-dev" +#define VERSION "0.4.5.10" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 1667e122def480fac8033fb96057971969a446d5 Merge: ca249131b0 2984fba97a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:18:09 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 "ours" to avoid version bump

1 0

[tor/maint-0.4.6] Make the version 0.4.5.10, not 0.4.5.10-dev.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 1ec4c7b34a595a218121b81879ced1450e3a72ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:18:57 2021 -0400 Make the version 0.4.5.10, not 0.4.5.10-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 cd38240a34..14ce94db87 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.10-dev]) +AC_INIT([tor],[0.4.5.10]) 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-08-13"], # for 0.4.5.10-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.5.10 [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 9b9172fb90..fe25571c77 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.10-dev" +!define VERSION "0.4.5.10" !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 070d62c9b8..a2ebca9eb6 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.10-dev" +#define VERSION "0.4.5.10" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] Make the version 0.3.6.16, not 0.3.6.16-dev.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 2984fba97a03506fb405bdf2c37481a0a7d6cf09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:17:59 2021 -0400 Make the version 0.3.6.16, not 0.3.6.16-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 e698bf8901..c45b76e5a6 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.16-dev]) +AC_INIT([tor],[0.3.5.16]) 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 013518457f..c8695bc86c 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.16-dev" +!define VERSION "0.3.5.16" !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 7d73fc4a10..273806fde3 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.16-dev" +#define VERSION "0.3.5.16"

1 0

[tor/maint-0.4.6] Make the version 0.4.6.7, not 0.4.6.7-dev.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit fd38609ae2e5fd5cb826bbf0913f60685c6a66ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:21:04 2021 -0400 Make the version 0.4.6.7, not 0.4.6.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 e41c6f5bf4..788597bfdf 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.6.7-dev]) +AC_INIT([tor],[0.4.6.7]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # 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-08-13"], # for 0.4.6.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.6.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 d69ba2d499..3dd470100f 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.6.7-dev" +!define VERSION "0.4.6.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 feb997196c..cc70a3ab19 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.6.7-dev" +#define VERSION "0.4.6.7" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit df6a92dcc3e83cebaa9cfe98c52ae9eade218ff2 Merge: 70e249123a 1ec4c7b34a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:19:17 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump

1 0