[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 3256627a4548c4977b834cc724689e0e9a960f06
Merge: 33f058a f810a1a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 26 15:30:51 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/main.h

 changes/bug2917  |    4 ++++
 src/or/control.c |    4 +++-
 src/or/main.c    |   49 ++++++++-----------------------------------------
 src/or/main.h    |    2 +-
 src/or/or.h      |    2 +-
 5 files changed, 17 insertions(+), 44 deletions(-)

diff --cc src/or/main.h
index 67c3bb3,0551f7a..db97cf1
--- a/src/or/main.h
+++ b/src/or/main.h
@@@ -51,10 -46,8 +51,10 @@@ void directory_info_has_arrived(time_t 
  void ip_address_changed(int at_interface);
  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);