Minor tweaks on EOL process

First, clarify that this is for planned deprecations, not
security-related issues.

Second, we actually _don't_ want to remove the versions from the
approved list before the EOL date, or people will start getting
warnings too early.

diff --git a/doc/HACKING/EndOfLifeTor.md b/doc/HACKING/EndOfLifeTor.md
index 36150bca6d01e848673bd2a24db3f8d1192dd915..502b862fc96f77eb5f1a8e016b70452058210a23 100644 (file)
--- a/doc/HACKING/EndOfLifeTor.md
+++ b/doc/HACKING/EndOfLifeTor.md
@@ -3,7 +3,9 @@ End of Life on an old release series
 ------------------------------------
 
 Here are the steps that the maintainer should take when an old Tor release
-series reaches End of Life:
+series reaches End of Life.  Note that they are _only_ for entire series that
+have reached their planned EOL: they do not apply to security-related
+deprecations of individual versions.
 
 === 0. Preliminaries
 
@@ -15,11 +17,6 @@ series reaches End of Life:
    Send the announcement to tor-announce, tor-talk, tor-relays, and the
    packagers.
 
-2. A few days before End of Life:
-   Get at least two of weasel/arma/Sebastian to
-   remove the old version number from their approved versions list.
-   Give them a few days to do this if you can.
-
 === 1. On the day
 
 1. Open tickets to remove the release from:
@@ -44,9 +41,8 @@ series reaches End of Life:
      - other tickets should be closed (if we won't fix them) or moved to a
        supported release (if we will fix them)
 
-5. Double-check: did the version get un-recommended in the consensus yet?
-   If not, don't announce until they have the up-to-date versions, or people
-   will get confused.
-
-6. Mail the end of life announcement to tor-announce, the packagers list,
+5. Mail the end of life announcement to tor-announce, the packagers list,
    and tor-relays. The current list of packagers is in ReleasingTor.md.
+
+6. Get at least two of weasel/arma/Sebastian to remove the old version number
+   from their approved versions list.