diff --git a/doc/TODO b/doc/TODO
index 1fe909014c..59c25dd638 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -66,6 +66,9 @@ R   - actually cause the directory.c functions to know about or_port
         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.
diff --git a/src/or/test.c b/src/or/test.c
index 6de1ac7f10..5e299c4d22 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1688,7 +1688,7 @@ test_dir_format(void)
   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");