forward-port the fix for the compiler warning

svn:r3273

diff --git a/src/or/directory.c b/src/or/directory.c
index 48cdf6c8cb04c8ecb8ffc2a2373d62ea683ae33b..66b09eb0d8caa6b50f98b941dff7c37a7d482132 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -223,7 +223,7 @@ directory_initiate_command_trusted_dir(trusted_dir_server_t *dirserv,
 /** Called when we are unable to complete our connection to a
  * directory server: Mark the router as down and try again if possible.
  */
-int
+void
 connection_dir_connect_failed(connection_t *conn)
 {
   router_mark_as_down(conn->identity_digest); /* don't try him again */

diff --git a/src/or/or.h b/src/or/or.h
index 3d7c47fbebb8a86ee1a0d08ca8afcc216fdf96e8..4f2f6b2f4d325e9c2bf426037e4e66490e6f6a2c 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1319,7 +1319,7 @@ int connection_dir_reached_eof(connection_t *conn);
 int connection_dir_process_inbuf(connection_t *conn);
 int connection_dir_finished_flushing(connection_t *conn);
 int connection_dir_finished_connecting(connection_t *conn);
-int connection_dir_connect_failed(connection_t *conn);
+void connection_dir_connect_failed(connection_t *conn);
 void parse_dir_policy(void);
 
 /********************************* dirserv.c ***************************/