commit 8b3ec74e5fb1963fb42fc2fd47c373fd1cd3fd27 Merge: 11161395a d3d6c5955 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 16 08:02:01 2018 -0400

Merge remote-tracking branch 'public/bug27990'

changes/bug27990 | 3 +++ src/lib/evloop/procmon.c | 3 +++ 2 files changed, 6 insertions(+)