July 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 70161785f94ee9e1571af4ec804bf57f877f40e8 Merge: af08dad6d 5aaecf6d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:30:46 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 `-s ours` to avoid version bump.

1 0

[tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 78285594f51fc0009d3911fb894e12b793536a5d Merge: 283ce30c5 0bb227d17 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:30:03 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 `-s ours` to avoid version bump.

1 0

[tor/release-0.4.4] Update version to 0.4.3.6.
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 7ba849349a29bfb07e23180483cd490f93e7a1f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:31:09 2020 -0400 Update version to 0.4.3.6. --- 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 5fbf22bd1..a7c7c06ff 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.5-dev]) +AC_INIT([tor],[0.4.3.6]) 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-05-15"], # for 0.4.3.5-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.3.6 [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 efb64327f..7f2242c95 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.5-dev" +!define VERSION "0.4.3.6" !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 9e18ee9fa..886c47925 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.5-dev" +#define VERSION "0.4.3.6" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.4] Update version to 0.4.2.8.
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 5aaecf6d07a3be0f15ef17643d4bc9ef9d69e0c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:30:37 2020 -0400 Update version to 0.4.2.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 41e0a89c3..8cd15c82e 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.7-dev]) +AC_INIT([tor],[0.4.2.8]) 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, ["2020-03-18"], # for 0.4.2.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.2.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 7bd274f09..7a2ab0d63 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.7-dev" +!define VERSION "0.4.2.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 f5f704675..805fdaae2 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.7-dev" +#define VERSION "0.4.2.8"

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 50b503a9f90f67e7898efdb560e5fdb577f1a1c6 Merge: dfddfa833 3efd60474 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:32:39 2020 -0400 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.4.4] Update version to 0.4.4.2-alpha.
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 3efd604743a9468542e75971cff4dccc5fa894c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:31:55 2020 -0400 Update version to 0.4.4.2-alpha. --- 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 ba5703aaf..1e76ddd14 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.1-alpha-dev]) +AC_INIT([tor],[0.4.4.2-alpha]) 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-06-16"], # for 0.4.4.1-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.4.2-alpha [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 b81ff22c8..67b318d1f 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.1-alpha-dev" +!define VERSION "0.4.4.2-alpha" !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 ddcc3205c..beb2561ee 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.1-alpha-dev" +#define VERSION "0.4.4.2-alpha" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit f9f4c4ab1d37920eb76b024a1057a0b26ddb8377 Merge: e500ea2ea 7ba849349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:31:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 `-s ours` to avoid version bump.

1 0

[tor/maint-0.4.2] bump to 0.3.5.11
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 0bb227d170c2ff5116f9b59a30d055eca192374a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:28:21 2020 -0400 bump to 0.3.5.11 --- 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 5f66d8c37..24f1eeda3 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.10-dev]) +AC_INIT([tor],[0.3.5.11]) 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 7252e7eb7..e4af442c0 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.10-dev" +!define VERSION "0.3.5.11" !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 2b21abe88..521f54192 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.10-dev" +#define VERSION "0.3.5.11"

1 0

[tor/maint-0.4.2] Update version to 0.4.2.8.
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 5aaecf6d07a3be0f15ef17643d4bc9ef9d69e0c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:30:37 2020 -0400 Update version to 0.4.2.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 41e0a89c3..8cd15c82e 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.7-dev]) +AC_INIT([tor],[0.4.2.8]) 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, ["2020-03-18"], # for 0.4.2.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.2.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 7bd274f09..7a2ab0d63 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.7-dev" +!define VERSION "0.4.2.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 f5f704675..805fdaae2 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.7-dev" +#define VERSION "0.4.2.8"

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 78285594f51fc0009d3911fb894e12b793536a5d Merge: 283ce30c5 0bb227d17 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:30:03 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 `-s ours` to avoid version bump.

1 0