Make more notes about important stuff in ReleasingTor.md

diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
index 570a175b6383bb5e1bf8d08111af6e4e3c328146..6c8fa1331f0174a867d8829648a3eca000d6845b 100644 (file)
--- a/doc/HACKING/ReleasingTor.md
+++ b/doc/HACKING/ReleasingTor.md
@@ -14,6 +14,9 @@ new Tor release:
 2. If this is going to be an important security release, give the packagers
    some advance warning: See this list of packagers in IV.3 below.
 
+3. Given the release date for Tor, ask the TB team about the likely release
+   date of a TB that contains it.  See note below in "commit, upload,
+   announce".
 
 === I. Make sure it works
 
@@ -22,6 +25,7 @@ new Tor release:
    resolve those.
 
    As applicable, merge the `maint-X` branch into the `release-X` branch.
+   But you've been doing that all along, right?
 
 2. Are all of the jenkins builders happy?  See jenkins.torproject.org.
 
@@ -134,6 +138,9 @@ new Tor release:
    either `make`, or `perl scripts/maint/updateVersions.pl`, depending on
    your version.)
 
+   When you merge the maint branch forward to the next maint branch, or into
+   master, merge it with "-s ours" to avoid a needless version bump.
+
 2. Make distcheck, put the tarball up in somewhere (how about your
    homedir on your homedir on people.torproject.org?) , and tell `#tor`
    about it. Wait a while to see if anybody has problems building it.
@@ -147,6 +154,9 @@ new Tor release:
         git tag -u <keyid> tor-0.3.x.y-status
         git push origin tag tor-0.3.x.y-status
 
+   (You must do this before you update the website: it relies on finding
+   the version by tag.)
+
 2. scp the tarball and its sig to the dist website, i.e.
    `/srv/dist-master.torproject.org/htdocs/` on dist-master. When you want
    it to go live, you run "static-update-component dist.torproject.org"
@@ -174,6 +184,8 @@ new Tor release:
        - {yuri} at freebsd.org
        - {mh+tor} at scrit.ch
 
+   Also, email tor-packagers@lists.torproject.org.
+
 4. Add the version number to Trac.  To do this, go to Trac, log in,
     select "Admin" near the top of the screen, then select "Versions" from
     the menu on the left.  At the right, there will be an "Add version"