[or-cvs] when we fail three times to resolve or connect, we were tel...

[arma@xxxxxxxx]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	relay.c 
Log Message:
when we fail three times to resolve or connect, we were telling the
user it was because we failed to resolve.


Index: relay.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -d -r1.94 -r1.95
--- relay.c	14 Dec 2005 22:00:58 -0000	1.94
+++ relay.c	19 Dec 2005 21:56:43 -0000	1.95
@@ -713,8 +713,8 @@ connection_edge_process_end_not_open(
             return 0;
           /* else, conn will get closed below */
         } else {
-          notice(LD_APP,"Have tried resolving address '%s' at %d different "
-                 "places. Giving up.",
+          notice(LD_APP,"Have tried resolving or connecting to address '%s' "
+                 "at %d different places. Giving up.",
                  safe_str(conn->socks_request->address), MAX_RESOLVE_FAILURES);
           /* clear the failures, so it will have a full try next time */
           client_dns_clear_failures(conn->socks_request->address);