[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[teor at torproject.org]

commit faecdace853f7fdb5aa42e58650fd89d1c811136
Merge: bcf29f46c 04e9e74f1
Author: teor <teor at torproject.org>
Date:   Mon Oct 21 13:28:00 2019 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

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