Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged

2 files changed, 7 insertions, 1 deletions

diff --git a/src/app/config/config.c b/src/app/config/config.c
index dcefa3d6a4..1d0b435c7c 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -142,7 +142,7 @@
 #include "lib/process/pidfile.h"
 #include "lib/process/restrict.h"
 #include "lib/process/setuid.h"
-#include "lib/process/subprocess.h"
+#include "lib/process/process.h"
 #include "lib/net/gethostname.h"
 #include "lib/thread/numcpus.h"
 
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 3f4e1d06a7..51113cd53c 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -74,6 +74,7 @@
 #include "lib/net/resolve.h"
 
 #include "lib/process/waitpid.h"
+#include "lib/process/process.h"
 
 #include "lib/meminfo/meminfo.h"
 #include "lib/osinfo/uname.h"
@@ -558,6 +559,10 @@ tor_init(int argc, char *argv[])
   rend_cache_init();
   addressmap_init(); /* Init the client dns cache. Do it always, since it's
                       * cheap. */
+
+  /* Initialize Process subsystem. */
+  process_init();
+
   /* Initialize the HS subsystem. */
   hs_init();
 
@@ -785,6 +790,7 @@ tor_free_all(int postfork)
   circuitmux_ewma_free_all();
   accounting_free_all();
   protover_summary_cache_free_all();
+  process_free_all();
 
   if (!postfork) {
     config_free_all();