Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2

1 files changed, 1 insertions, 1 deletions

diff --git a/src/or/main.h b/src/or/main.h
index ed0fb97703..626bf1c43b 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -46,8 +46,8 @@ void directory_info_has_arrived(time_t now, int from_cache);
 void ip_address_changed(int at_interface);
 void dns_servers_relaunch_checks(void);
 
-void control_signal_act(int the_signal);
 void handle_signals(int is_parent);
+void signal_callback(int fd, short events, void *arg);
 
 int try_locking(or_options_t *options, int err_if_locked);
 int have_lockfile(void);