tor-commits May 2021

tor-commits@lists.torproject.org

20 participants
1972 discussions

[tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 10 May '21

10 May '21

commit 0db0c5c739dc06e1e4ec1b93f7e62922a1bacfc7 Merge: e4f2b52deb ce8d6d143c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:53:10 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump.

1 0

[tor/release-0.4.6] Update to 0.4.5.8-dev
by nickm＠torproject.org 10 May '21

10 May '21

commit ce8d6d143c7a33d6dccf0cc6181f9045091c9156 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:53:00 2021 -0400 Update to 0.4.5.8-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 621fbd1612..6d7cd1dd6a 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.8]) +AC_INIT([tor],[0.4.5.8-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-05-07"], # for 0.4.5.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-05-10"], # for 0.4.5.8-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 580f189525..8276264392 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.8" +!define VERSION "0.4.5.8-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 06e6ad8ff7..716363261c 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.8" +#define VERSION "0.4.5.8-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] Bump to 0.4.6.3-rc-dev
by nickm＠torproject.org 10 May '21

10 May '21

commit af6da4a36b533bdba0d0c8b47d18d63529a48ceb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:53:39 2021 -0400 Bump to 0.4.6.3-rc-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 af9dfb8057..2cdff796b1 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.3-rc]) +AC_INIT([tor],[0.4.6.3-rc-dev]) 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-05-07"], # for 0.4.6.3-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-05-10"], # for 0.4.6.3-rc-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 1c96ffbaad..b56afe7f08 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.3-rc" +!define VERSION "0.4.6.3-rc-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 8061261e18..2301f40fe0 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.3-rc" +#define VERSION "0.4.6.3-rc-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 10 May '21

10 May '21

commit 6cc87bc269b0e2ebeb9e4ea1dd5c9df45bf53c4d Merge: 9c8f7710e6 af6da4a36b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:55:00 2021 -0400 Merge branch 'maint-0.4.6' "ours" to avoid version bump.

1 0

[tor/release-0.4.5] Update to 0.4.5.8-dev
by nickm＠torproject.org 10 May '21

10 May '21

1 0

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

10 May '21

commit 9521c3e7be337c1a48098edc5c36a01369d36791 Merge: 0fd0f45761 ce8d6d143c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:55:16 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.4.6.3-rc-dev
by nickm＠torproject.org 10 May '21

10 May '21

1 0

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

10 May '21

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 10 May '21

10 May '21

commit 9b9fa62f267a8a53f35da453cb9a1e9b8abbc350 Merge: a980597a67 af6da4a36b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:55:16 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 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/maint-0.4.5] Update to 0.4.5.8-dev
by nickm＠torproject.org 10 May '21

10 May '21

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2021