Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/main.h

1 files changed, 1 insertions, 1 deletions

diff --git a/src/or/main.h b/src/or/main.h
index 67c3bb350..db97cf1c4 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -53,8 +53,8 @@ void dns_servers_relaunch_checks(void);
 
 long get_uptime(void);
 
-void control_signal_act(int the_signal);
 void handle_signals(int is_parent);
+void process_signal(uintptr_t sig);
 
 int try_locking(or_options_t *options, int err_if_locked);
 int have_lockfile(void);