diff --git a/trunk/src/or/main.c b/trunk/src/or/main.c
index 9ed1dd14ef..759487c0ae 100644
--- a/trunk/src/or/main.c
+++ b/trunk/src/or/main.c
@@ -802,6 +802,10 @@ static int do_main_loop(void) {
     }
 #else /* do signal stuff only on unix */
     if(please_shutdown) {
+      if(!server_mode()) { /* do it now */
+        log(LOG_NOTICE,"Interrupt: exiting cleanly.");
+        exit(0);
+      }
       if(shutting_down) { /* we've already been asked. do it now. */
         log(LOG_NOTICE,"Second sigint received; exiting now.");
         exit(0);