mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2
This commit is contained in:
commit
04e9e74f1d
5
changes/ticket32058
Normal file
5
changes/ticket32058
Normal file
@ -0,0 +1,5 @@
|
||||
o Minor bugfixes (mainloop, periodic events):
|
||||
- Periodic events enabled flag was not unset properly when shutting down tor
|
||||
cleanly. This had the side effect to not re-enable periodic events when
|
||||
tor_api.h is used to relaunch tor after a shutdown. Fixes bug 32058;
|
||||
bugfix on 0.3.3.1-alpha.
|
@ -153,6 +153,11 @@ periodic_event_disconnect(periodic_event_item_t *event)
|
||||
{
|
||||
if (!event)
|
||||
return;
|
||||
|
||||
/* First disable the event so we first cancel the event and set its enabled
|
||||
* flag properly. */
|
||||
periodic_event_disable(event);
|
||||
|
||||
mainloop_event_free(event->ev);
|
||||
event->last_action_time = 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user