Browse Source

Merge remote-tracking branch 'rransom-tor/bug3349'

Nick Mathewson 14 years ago
parent
commit
19febed9e5
2 changed files with 11 additions and 1 deletions
  1. 9 0
      changes/bug3349
  2. 2 1
      src/or/main.c

+ 9 - 0
changes/bug3349

@@ -0,0 +1,9 @@
+  o Minor bugfixes:
+    - Report a SIGNAL event to controllers when acting on a delayed
+      SIGNAL NEWNYM command.  Previously, we would report a SIGNAL
+      event to the controller if we acted on a SIGNAL NEWNYM command
+      immediately, and otherwise not report a SIGNAL event for the
+      command at all.  Bugfix on 0.2.3.1-alpha; fixes bug 3349.
+
+
+

+ 2 - 1
src/or/main.c

@@ -1030,6 +1030,8 @@ signewnym_impl(time_t now)
   rend_client_purge_state();
   time_of_last_signewnym = now;
   signewnym_is_pending = 0;
+
+  control_event_signal(SIGNEWNYM);
 }
 
 /** Perform regular maintenance tasks.  This function gets run once per
@@ -1887,7 +1889,6 @@ process_signal(uintptr_t sig)
             (int)(MAX_SIGNEWNYM_RATE+time_of_last_signewnym-now));
       } else {
         signewnym_impl(now);
-        control_event_signal(sig);
       }
       break;
     }