aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-14 13:39:26 -0400
committerNick Mathewson <nickm@torproject.org>2011-06-14 13:39:26 -0400
commit19febed9e5ab18bea5e7577f61e0fc930bbcdc68 (patch)
tree5c03fc70780e32dd10e57befd00357a0bb6dcafc /src/or/main.c
parent47c8433a0c3c579588e1e5d4f67f16843ba26bca (diff)
parent8a69cc04683c7e3cfe45150591a47ee7933dce05 (diff)
downloadtor-19febed9e5ab18bea5e7577f61e0fc930bbcdc68.tar
tor-19febed9e5ab18bea5e7577f61e0fc930bbcdc68.tar.gz
Merge remote-tracking branch 'rransom-tor/bug3349'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 35cc1cb8c..9536ae449 100644
--- a/src/or/main.c
+++ b/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;
}