Make last commit build

svn:r593

diff --git a/src/or/main.c b/src/or/main.c
index ff0e470d474f733496104e0c6a89fb18ff66ad15..61cf4e3cfd75a634a4307f443adca6d2f6bb7c20 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -636,7 +636,7 @@ static int do_main_loop(void) {
         log_fn(LOG_ERR,"poll failed.");
         return -1;
       } else {
-        log_fn(LOG_DEBUG,"poll interrupted."):
+        log_fn(LOG_DEBUG,"poll interrupted.");
       }
     }
 

diff --git a/src/or/or.h b/src/or/or.h
index 24fd53e7a500760dad27351c1d63633ed331df94..7a8d715477b68e6053121e7e91251524c240ee4b 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -498,7 +498,7 @@ int circuit_consider_sending_sendme(circuit_t *circ, int edge_type, crypt_path_t
 void circuit_close(circuit_t *circ);
 void circuit_about_to_close_connection(connection_t *conn);
 
-void circuit_dump_by_conn(connection_t *conn);
+void circuit_dump_by_conn(connection_t *conn, int severity);
 
 void circuit_expire_unused_circuits(void);
 void circuit_launch_new(int failure_status);