aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-04-16 00:08:20 +0000
committerRoger Dingledine <arma@torproject.org>2008-04-16 00:08:20 +0000
commitb306920af187c70f81b485fa3ea630ca79a3f8e6 (patch)
tree91dc495873bfdcdf5ec834353d13ff46f5e4ccf2
parent5cbc8875736986079cfd83969fd1ce6941c3ac3a (diff)
downloadtor-b306920af187c70f81b485fa3ea630ca79a3f8e6.tar.gz
tor-b306920af187c70f81b485fa3ea630ca79a3f8e6.zip
backport r14375
svn:r14376
-rw-r--r--ChangeLog4
-rw-r--r--src/or/directory.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ab5bdb213..49a65115dd 100644
--- a/ChangeLog
+++ b/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
diff --git a/src/or/directory.c b/src/or/directory.c
index 1b5c21042f..9a6c9f9f5d 100644
--- a/src/or/directory.c
+++ b/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 =