commit 04e9e74f1dd4fad7fe9e072253dd51b9c03bebf2 Merge: 5dbdca011 4a8d49132 Author: teor teor@torproject.org Date: Mon Oct 21 13:07:39 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2

changes/ticket32058 | 5 +++++ src/core/mainloop/periodic.c | 5 +++++ 2 files changed, 10 insertions(+)