commit 0e4fcd39966ac6f5273920a6a19a8527d891d78e Merge: e43ae24e7 75d6609eb Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 14 10:24:46 2018 -0400 Merge branch 'nss_27664' src/app/config/config.c | 2 ++ src/lib/process/daemon.c | 10 ++++++++++ src/lib/process/daemon.h | 4 ++++ 3 files changed, 16 insertions(+)