When the DANGEROUS_VERSION controller status event told us we're

running an obsolete version, it used the string "OLD" to describe
it. Yet the "getinfo" interface used the string "OBSOLETE". Now use
"OBSOLETE" in both cases.


svn:r12686

3 files changed, 13 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 878f57f7a5..7f37095cce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,8 +14,8 @@ Changes in version 0.2.0.13-alpha - 2007-12-??
     - Stop thinking that 0.1.2.x directory servers can handle "begin_dir"
       requests. Should ease bugs 406 and 419 where 0.1.2.x relays are
       crashing or mis-answering these requests.
-    - Stop being so aggressive about fetching dir info if your DirPort is
-      on but your ORPort is off.
+    - Stop being so aggressive about fetching v2 dir info if your
+      DirPort is on but your ORPort is off.
 
   o Minor bugfixes:
     - The fix in 0.2.0.12-alpha cleared the "hsdir" flag in v3 network
@@ -35,6 +35,10 @@ Changes in version 0.2.0.13-alpha - 2007-12-??
       clog everything up. Reported by Aljosha Judmayer.
     - Check for presence of s6_addr16 and s6_addr32 fields in in6_addr
       via autoconf.  Should fix compile on solaris.
+    - When the DANGEROUS_VERSION controller status event told us we're
+      running an obsolete version, it used the string "OLD" to describe
+      it. Yet the "getinfo" interface used the string "OBSOLETE". Now use
+      "OBSOLETE" in both cases.
 
   o Minor features:
     - On USR1, when dmalloc is in use, log the top 10 memory
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index cda883e119..83b35feb77 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -1162,15 +1162,16 @@ $Id$
 
      DANGEROUS_VERSION
      "CURRENT=version"
-     "REASON=NEW/OLD/UNRECOMMENDED"
+     "REASON=NEW/OBSOLETE/UNRECOMMENDED"
      "RECOMMENDED=\"version, version, ...\""
        Tor has found that directory servers don't recommend its version of
        the Tor software.  RECOMMENDED is a comma-and-space-separated string
        of Tor versions that are recommended.  REASON is NEW if this version
-       of Tor is newer than any recommended version, OLD if this version of
-       Tor is older than any recommended version, and UNRECOMMENDED if
-       some recommended versions of Tor are newer and some are old than this
-       version.
+       of Tor is newer than any recommended version, OBSOLETE if
+       this version of Tor is older than any recommended version, and
+       UNRECOMMENDED if some recommended versions of Tor are newer and
+       some are older than this version. (The "OBSOLETE" reason was called
+       "OLD" from Tor 0.1.2.3-alpha up to and including 0.2.0.12-alpha.)
 
        {Controllers may want to suggest that the user upgrade OLD or
        UNRECOMMENDED versions.  NEW versions may be known-insecure, or may
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 169e2d634e..54a9da4c23 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1479,7 +1479,7 @@ routers_update_all_from_networkstatus(time_t now, int dir_version)
       have_warned_about_old_version = 1;
       control_event_general_status(LOG_WARN, "DANGEROUS_VERSION "
            "CURRENT=%s REASON=%s RECOMMENDED=\"%s\"",
-           VERSION, status == VS_OLD ? "OLD" : "UNRECOMMENDED",
+           VERSION, status == VS_OLD ? "OBSOLETE" : "UNRECOMMENDED",
            recommended);
     }
   }