This is an automated email from the git hooks/post-receive script.
dgoulet pushed a change to branch main in repository tor.
from f18afc0b83 version: Bump version to 0.4.7.6-rc new c885a18a2e version: Bump version to 0.4.7.6-rc-dev new 7747469dbe doc: Minor changes to the Releasing doc
The 2 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 | 6 +++--- src/win32/orconfig.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit c885a18a2e70640e9b3eea735f887b82016bb6f1 Author: Tor CI Release no-email@torproject.org AuthorDate: Thu Apr 7 13:16:03 2022 +0000
version: Bump version to 0.4.7.6-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 2553688483..5fd03df5ad 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.6-rc]) +AC_INIT([tor],[0.4.7.6-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, ["2022-04-07"], # for 0.4.7.6-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-04-07"], # for 0.4.7.6-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 a29854b220..51241db66c 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.6-rc" +!define VERSION "0.4.7.6-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 59c9b87285..979c193886 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.6-rc" +#define VERSION "0.4.7.6-rc-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 7747469dbe8b9c8fc793852fb5228bbedc591a7d Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Apr 7 11:50:57 2022 -0400
doc: Minor changes to the Releasing doc
Signed-off-by: David Goulet dgoulet@torproject.org --- doc/HACKING/ReleasingTor.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 9eb89b54de..a32bb10dad 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -86,7 +86,7 @@ Once all signatures from all selected developers have been committed:
Upload the tarball and its sig to the dist website:
- `rsync -avP tor-0.3.5.18.tar.gz{,.asc} dist-master.torproject.org:/srv/dist-master.torproject.org/htdocs/` + `rsync -avP tor-*.gz{,.asc} dist-master.torproject.org:/srv/dist-master.torproject.org/htdocs/`
Then, on dist-master.torproject.org, run:
@@ -110,8 +110,8 @@ Once the tarballs have been uploaded and are ready to be announced, we need to do the following:
1. Tag versions (`main` branch or `release` branch as appropriate) using - `git tag -s tor-0.x.y.z-<status>` and then push the tags: - `git push origin --tags` + `git tag -s tor-0.x.y.z-<status>` and then push the tag(s): + `git push origin tor-0.x.y.z-<status>`
(This should be the `main` or `release` branch because that is the one from which the tarballs are built. We want our tags to match our
tor-commits@lists.torproject.org
-
gitolite role