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

[tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit 5fac24053d1615260a4ee437a9686c82262e47a8 Merge: f2cfd1ffad 3271c0bde7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:17:40 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump.

1 0

[tor/release-0.4.4] Bump to 0.3.5.14-dev
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit 3271c0bde782769ba30685ca8907240328f771c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:17:31 2021 -0400 Bump to 0.3.5.14-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 af3762d460..619e91528c 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.14]) +AC_INIT([tor],[0.3.5.14-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 1f3f728aa0..094a53105a 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.14" +!define VERSION "0.3.5.14-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 9cab6cf3e3..1186954db9 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.14" +#define VERSION "0.3.5.14-dev"

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit 5fac24053d1615260a4ee437a9686c82262e47a8 Merge: f2cfd1ffad 3271c0bde7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:17:40 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump.

1 0

[tor/master] Bump version to 0.4.5.7-dev
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit d66178c7b7eb69b5b6fc26a77b13354725eaa1a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:18:27 2021 -0400 Bump version to 0.4.5.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 0f2d6567e1..dfd7a495bb 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.7]) +AC_INIT([tor],[0.4.5.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-03-15"], # for 0.4.5.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-03-16"], # for 0.4.5.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 e599a0857a..569afc57bc 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.7" +!define VERSION "0.4.5.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 9a138c0928..b0ff11395c 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.7" +#define VERSION "0.4.5.7-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit e2dd8f1532e0eb8ca6d6cbe9d588468482d14146 Merge: 7c00afe0fb 94fb308c5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:18:06 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump.

1 0

[tor/master] Bump to 0.3.5.14-dev
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit 3271c0bde782769ba30685ca8907240328f771c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:17:31 2021 -0400 Bump to 0.3.5.14-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 af3762d460..619e91528c 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.14]) +AC_INIT([tor],[0.3.5.14-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 1f3f728aa0..094a53105a 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.14" +!define VERSION "0.3.5.14-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 9cab6cf3e3..1186954db9 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.14" +#define VERSION "0.3.5.14-dev"

1 0

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

16 Mar '21

commit e2dd8f1532e0eb8ca6d6cbe9d588468482d14146 Merge: 7c00afe0fb 94fb308c5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:18:06 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump.

1 0

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

16 Mar '21

commit 5fac24053d1615260a4ee437a9686c82262e47a8 Merge: f2cfd1ffad 3271c0bde7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:17:40 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump.

1 0

[tor/maint-0.4.5] Bump version to 0.4.5.7-dev
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit d66178c7b7eb69b5b6fc26a77b13354725eaa1a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:18:27 2021 -0400 Bump version to 0.4.5.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 0f2d6567e1..dfd7a495bb 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.7]) +AC_INIT([tor],[0.4.5.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-03-15"], # for 0.4.5.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-03-16"], # for 0.4.5.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 e599a0857a..569afc57bc 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.7" +!define VERSION "0.4.5.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 9a138c0928..b0ff11395c 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.7" +#define VERSION "0.4.5.7-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

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

16 Mar '21

commit 36b54fc6aa5f6ac0a765e9e3355ec5310a23233d Merge: 57d969de1a d66178c7b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 16 09:18:40 2021 -0400 Merge branch 'maint-0.4.5' "ours" to avoid version bump.

1 0