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

[tor/release-0.3.5] Bump to 0.3.5.15-dev
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:45:30 2021 -0400 Bump to 0.3.5.15-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 82ef4f5554..89ccbc5807 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.15]) +AC_INIT([tor],[0.3.5.15-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 9d2e25a9e8..234971e178 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.15" +!define VERSION "0.3.5.15-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 dff63efa18..c97889ce46 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.15" +#define VERSION "0.3.5.15-dev"

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 5ab97fa60371afa8faa9d6dbd8decbe7fbc42b6b Merge: 200e9a55e0 253b83b722 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:47:29 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

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

14 Jun '21

commit 88b54f2a5b281558d19793267be54b4d6e5813e7 Merge: dbe8cd3642 253b83b722 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:49:01 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4

1 0

[tor/release-0.4.5] Bump to 0.3.5.15-dev
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:45:30 2021 -0400 Bump to 0.3.5.15-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 82ef4f5554..89ccbc5807 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.15]) +AC_INIT([tor],[0.3.5.15-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 9d2e25a9e8..234971e178 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.15" +!define VERSION "0.3.5.15-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 dff63efa18..c97889ce46 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.15" +#define VERSION "0.3.5.15-dev"

1 0

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

14 Jun '21

commit 253b83b72223f67024ea10b4008610dd18396811 Merge: 0ae9fd62fd 87492154e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:46:20 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump.

1 0

[tor/release-0.4.5] Bump to 0.4.5.9-dev
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 9085508310ab06c2b7ed0650e77dbe86023095f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:47:41 2021 -0400 Bump to 0.4.5.9-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 df721512fc..460154da90 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.9]) +AC_INIT([tor],[0.4.5.9-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-06-07"], # for 0.4.5.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-06-14"], # for 0.4.5.9-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 966057bab1..7e7f0fdd19 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.9" +!define VERSION "0.4.5.9-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 58943025d7..ffe7c65ba4 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.9" +#define VERSION "0.4.5.9-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit ecc1e8eacb9945ec569291e81eacae66c95bb17e Merge: d0ed04d50e 9085508310 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:49:01 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 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.6] Bump to 0.3.5.15-dev
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:45:30 2021 -0400 Bump to 0.3.5.15-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 82ef4f5554..89ccbc5807 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.15]) +AC_INIT([tor],[0.3.5.15-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 9d2e25a9e8..234971e178 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.15" +!define VERSION "0.3.5.15-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 dff63efa18..c97889ce46 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.15" +#define VERSION "0.3.5.15-dev"

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 5ab97fa60371afa8faa9d6dbd8decbe7fbc42b6b Merge: 200e9a55e0 253b83b722 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:47:29 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

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

14 Jun '21

commit 253b83b72223f67024ea10b4008610dd18396811 Merge: 0ae9fd62fd 87492154e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 14 11:46:20 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump.

1 0