backport r14375

svn:r14376

ChangeLog

@@ -23,6 +23,10 @@ Changes in version 0.1.2.20 - 2008-??-??
     - Fix a pointer error that kept us from reporting nameserver errors.
     - On Windows, correctly detect errors when listing the contents of a
       directory.  Fix from lodger.
+    - Fix a dumb bug that was preventing us from knowing that we should
+      preemptively build circuits to handle expected directory requests.
+      Fixes bug 660.
+
 
 Changes in version 0.1.2.19 - 2008-01-17
   Tor 0.1.2.19 fixes a huge memory leak on exit relays, makes the default

src/or/directory.c

@@ -457,7 +457,7 @@ directory_initiate_command(const char *address, uint32_t addr,
      */
 
     if (private_connection)
-      rep_hist_note_used_port(time(NULL), conn->_base.port);
+      rep_hist_note_used_port(conn->_base.port, time(NULL));
 
     conn->dirconn_direct = 0;
     conn->_base.s =