[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit 77c85360f66222365f2fbb98982b8bc0e4781acb
Merge: 3539fdfd7 04e9e74f1
Author: teor <teor at torproject.org>
Date:   Mon Oct 21 13:28:04 2019 +1000

    Merge branch 'maint-0.4.2'

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