tor

commit cc704373cb64cc176ef33d4b07fa875db62100ea
parent 275d790ac1b87816a8f933255e432b335691bc65
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 11 Aug 2022 11:31:29 -0400

doc: Improve ReleasingTor.md and fix announcement ML

Signed-off-by: David Goulet <dgoulet@torproject.org>

Diffstat:
M
doc/HACKING/ReleasingTor.md
 | 
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
@@ -53,6 +53,12 @@ been merged upstream.
       (Version bumps apply to `maint`; anything touching the changelog should
       apply only to `main` or `release`.)
 
+      When updating the version, it will be on `maint` branches and so to
+      merge-forward, use `git merge -s ours`. For instance, if merging the
+      version change of `maint-0.4.5` into `maint-0.4.6`, do on `maint-0.4.6`
+      this command: `git merge -s ours maint-0.4.5`. And then you can proceed
+      with a git-merge-forward.
+
    2. For the ChangeLog and ReleaseNotes, you need to write a blurb at the top
       explaining a bit the release.
 
@@ -126,7 +132,7 @@ do the following:
       If possible, mention in which Tor Browser version (with dates) the
       release will be in. This usually only applies to the latest stable.
 
-   4. Inform `tor-talk@lists.torproject.org` with the releasing pointing to
+   4. Inform `tor-announce@lists.torproject.org` with the releasing pointing to
       the Forum. Append the ChangeLog there. We do this until we can automate
       such post from the forum directly.