commit 05aab3fd21b5f8a3165a58052a6af74a269bdeb6 Merge: 2d5316851 72550c18c Author: David Goulet <dgoulet@torproject.org> Date: Tue Mar 10 09:14:44 2020 -0400 Merge branch 'maint-0.4.3' changes/doc32971 | 3 +++ doc/tor.1.txt | 5 +++++ src/lib/evloop/procmon.c | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-)