This is an automated email from the git hooks/post-receive script.
dgoulet pushed a change to branch main in repository tor.
from 929a90a24f version: Bump version to 0.4.7.7 new 8c39c664c2 ci: Add 0.4.7 series to scripts and CI new 5345b43fb8 version: Bump to 0.4.7.7-dev new fb4c80f7fb version: Bump version to 0.4.8.0-alpha-dev new 4259bc36af doc: Clarify the release process for a first stable
The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- doc/HACKING/ReleasingTor.md | 15 +++++++++------ scripts/ci/ci-driver.sh | 4 ++++ scripts/git/git-list-tor-branches.sh | 3 +++ src/win32/orconfig.h | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 8c39c664c261c40b7c0a482c57a965f340913847 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Apr 27 11:06:03 2022 -0400
ci: Add 0.4.7 series to scripts and CI
Signed-off-by: David Goulet dgoulet@torproject.org --- scripts/ci/ci-driver.sh | 4 ++++ scripts/git/git-list-tor-branches.sh | 3 +++ 2 files changed, 7 insertions(+)
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index eea98baae7..ef31da1ca3 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -301,6 +301,10 @@ case "$TOR_VERSION" in TOR_VER_AT_LEAST_043=yes TOR_VER_AT_LEAST_044=yes ;; + 0.4.7.*) + TOR_VER_AT_LEAST_043=yes + TOR_VER_AT_LEAST_044=yes + ;; esac
############################################################################# diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh index d7142620d7..dd3cf154b4 100755 --- a/scripts/git/git-list-tor-branches.sh +++ b/scripts/git/git-list-tor-branches.sh @@ -149,6 +149,9 @@ branch release-0.4.5 branch maint-0.4.6 branch release-0.4.6
+branch maint-0.4.7 +branch release-0.4.7 + branch main
finish
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 5345b43fb845cf76d4f0066057170963b96eec7e Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Apr 27 11:12:38 2022 -0400
version: Bump to 0.4.7.7-dev
Signed-off-by: David Goulet dgoulet@torproject.org --- 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 553823c454..a4c6589e2b 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.7.7]) +AC_INIT([tor],[0.4.7.7-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, ["2022-04-27"], # for 0.4.7.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-04-27"], # for 0.4.7.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 d6e7ab6d8c..91edd77895 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.7.7" +!define VERSION "0.4.7.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 d1f09ef587..c2d2e5170a 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.7.7" +#define VERSION "0.4.7.7-dev"
#define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit fb4c80f7fb95f2907d4e0a226ac8e075e4cdb25c Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Apr 27 11:15:25 2022 -0400
version: Bump version to 0.4.8.0-alpha-dev
Signed-off-by: David Goulet dgoulet@torproject.org --- 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 a4c6589e2b..8baae007cf 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.7.7-dev]) +AC_INIT([tor],[0.4.8.0-alpha-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, ["2022-04-27"], # for 0.4.7.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-04-27"], # for 0.4.8.0-alpha-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 91edd77895..9b172331fd 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.7.7-dev" +!define VERSION "0.4.8.0-alpha-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 c2d2e5170a..d5c0d17ee5 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.7.7-dev" +#define VERSION "0.4.8.0-alpha-dev"
#define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 4259bc36af4aea0184488cbef00cef5dd1002044 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Apr 27 11:23:21 2022 -0400
doc: Clarify the release process for a first stable
Signed-off-by: David Goulet dgoulet@torproject.org --- doc/HACKING/ReleasingTor.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index a32bb10dad..f4f1368009 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -132,14 +132,17 @@ do the following:
### New Stable
- 1. Create the `maint-x.y.z` and `release-x.y.z` branches and update the - `./scripts/git/git-list-tor-branches.sh` with the new version. + 1. Create the `maint-x.y.z` and `release-x.y.z` branches at the version + tag. Then update the `./scripts/git/git-list-tor-branches.sh` with the + new version.
- 2. Add the new version in `./scripts/ci/ci-driver.sh`. - - 3. Forward port the ChangeLog and ReleaseNotes into main branch. Remove any - change logs of stable releases in ReleaseNotes. + 2. Update `./scripts/git/git-list-tor-branches.sh` and + `./scripts/ci/ci-driver.sh` with the new version in `maint-x.y.z` and + then merge forward into main. (If you haven't pushed remotely the new + branches, merge the local branch).
+ 3. In `main`, bump version to the next series: `tor-x.y.0-alpha-dev` and + then tag it: `git tag -s tor-x.y.0-alpha-dev`
## Appendix: An alternative means to notify packagers
tor-commits@lists.torproject.org
-
gitolite role