[or-cvs] r9529: Oops; the change in tor_version_is_obsolete broke a unit tes (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-02-08 14:44:36 -0500 (Thu, 08 Feb 2007)
New Revision: 9529

Modified:
   tor/trunk/
   tor/trunk/doc/TODO
   tor/trunk/src/or/test.c
Log:
 r11715 at catbus:  nickm | 2007-02-08 14:07:03 -0500
 Oops; the change in tor_version_is_obsolete broke a unit test.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11715] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-02-08 09:35:15 UTC (rev 9528)
+++ tor/trunk/doc/TODO	2007-02-08 19:44:36 UTC (rev 9529)
@@ -66,6 +66,9 @@
         or_conn is full, and accept the sometimes directory data will just
         never get written.
 
+N - When we get a connection using the v0 controller protocol, warn that the
+    next revision of Tor won't support it.
+
 N - DNS improvements
     . Asynchronous DNS
       - Make evdns use windows strerror equivalents.

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2007-02-08 09:35:15 UTC (rev 9528)
+++ tor/trunk/src/or/test.c	2007-02-08 19:44:36 UTC (rev 9529)
@@ -1688,7 +1688,7 @@
   test_v_i_o(VS_NEW, "0.1.0", "Tor 0.0.2,Tor 0.0.3");
   test_v_i_o(VS_RECOMMENDED, "0.0.7rc2", "0.0.7,Tor 0.0.7rc2,Tor 0.0.8");
   test_v_i_o(VS_OLD, "0.0.5.0", "0.0.5.1-cvs");
-  test_v_i_o(VS_NEW_IN_SERIES, "0.0.5.1-cvs", "0.0.5");
+  test_v_i_o(VS_NEW_IN_SERIES, "0.0.5.1-cvs", "0.0.5, 0.0.6");
   /* Not on list, but newer than any in same series. */
   test_v_i_o(VS_NEW_IN_SERIES, "0.1.0.3",
              "Tor 0.1.0.2,Tor 0.0.9.5,Tor 0.1.1.0");