summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-03-07 09:41:23 +0000
committerRoger Dingledine <arma@torproject.org>2007-03-07 09:41:23 +0000
commit350bfb641d5ed24500e57e466b24bc731180c1f2 (patch)
tree0ec2da03489aad40e06c9e68f5677f5f1194934d
parentfbf610e679f29330113855149b6903b456f66ee6 (diff)
downloadtor-350bfb641d5ed24500e57e466b24bc731180c1f2.tar.gz
tor-350bfb641d5ed24500e57e466b24bc731180c1f2.zip
fix a socks5 error number as pointed out by juliusz
and prepare the changelog svn:r9756
-rw-r--r--ChangeLog6
-rw-r--r--src/or/rendclient.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a6e90a910c..a24e62f117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
-Changes in version 0.1.2.10-rc - 2007-03-??
+Changes in version 0.1.2.10-rc - 2007-03-07
o Major bugfixes (Windows):
- Do not load the NT services library functions (which may not exist)
- just to detect if we're a service trying to shut down.
+ just to detect if we're a service trying to shut down. Now we run
+ on Win98 and friends again.
o Minor bugfixes (other):
- Clarify a couple of log messages.
+ - Fix a misleading socks5 error number.
Changes in version 0.1.2.9-rc - 2007-03-02
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index b8d2d59c91..9518943c18 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -468,7 +468,7 @@ rend_client_desc_here(const char *query)
} else { /* 404, or fetch didn't get that far */
log_notice(LD_REND,"Closing stream for '%s.onion': hidden service is "
"unavailable (try again later).", safe_str(query));
- connection_mark_unattached_ap(conn, END_STREAM_REASON_TIMEOUT);
+ connection_mark_unattached_ap(conn, END_STREAM_REASON_RESOLVEFAILED);
}
}
}