Note the two places where clients will still try to fetch old-style (v1) directory info. These should be fixed, I think.

svn:r5193

src/or/circuituse.c

@@ -870,7 +870,8 @@ circuit_get_open_circ_or_launch(connection_t *conn,
   if (!has_fetched_directory) {
     if (!connection_get_by_type(CONN_TYPE_DIR)) {
       log(LOG_NOTICE,"Application request when we're believed to be offline. Optimistically trying again.");
-      directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1);
+      /* XXXX011 NM This should be a generic "retry all directory fetches". */
+      directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); /*XXXX011NM*/
     }
     /* the stream will be dealt with when has_fetched_directory becomes
      * 1, or when all directory attempts fail and directory_all_unreachable()

src/or/main.c

@@ -946,8 +946,8 @@ do_hup(void)
       log_fn(LOG_NOTICE, "Error reloading fingerprints. Continuing with old list.");
     }
   }
-  /* Fetch a new directory. Even authdirservers do this. */
-  directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1);
+  /* XXXX011 NM This should be a generic "retry all directory fetches". */
+  directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); /*XXXX011NM*/
   if (server_mode(options)) {
     const char *descriptor;
     /* Restart cpuworker and dnsworker processes, so they get up-to-date