[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5

[teor at torproject.org]

commit 400cee261ecccd024f6cb13dd1a940d4b9d0057b
Merge: 54c01119e 4a8d49132
Author: teor <teor at torproject.org>
Date:   Mon Nov 25 12:34:29 2019 +1000

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

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