[or-cvs] r9756: fix a socks5 error number as pointed out by juliusz and prep (in tor/branches/tor-0_1_2-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-03-07 04:41:23 -0500 (Wed, 07 Mar 2007)
New Revision: 9756

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/rendclient.c
Log:
fix a socks5 error number as pointed out by juliusz
and prepare the changelog


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-03-07 09:21:24 UTC (rev 9755)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-03-07 09:41:23 UTC (rev 9756)
@@ -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

Modified: tor/branches/tor-0_1_2-patches/src/or/rendclient.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/rendclient.c	2007-03-07 09:21:24 UTC (rev 9755)
+++ tor/branches/tor-0_1_2-patches/src/or/rendclient.c	2007-03-07 09:41:23 UTC (rev 9756)
@@ -468,7 +468,7 @@
     } 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);
     }
   }
 }