aboutsummaryrefslogtreecommitdiff
path: root/src/common/procmon.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-06-14 11:46:38 -0400
committerNick Mathewson <nickm@torproject.org>2014-06-14 11:46:38 -0400
commita7cafb1ea9307864c94ad3e019af93d09d48350e (patch)
tree1c6cc26fb0a93f46d839b3cb46855c93aca135f4 /src/common/procmon.c
parenta58d94fb7c6c304ecba930eaa7ebbade1d0686ab (diff)
parente07d328457b26babe89abdcc1d5a550ee8273462 (diff)
downloadtor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar
tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar.gz
Merge branch 'bug8746_v2_squashed'
Conflicts: src/common/include.am
Diffstat (limited to 'src/common/procmon.c')
-rw-r--r--src/common/procmon.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/procmon.c b/src/common/procmon.c
index 0a49689e3..7c9b7c3c8 100644
--- a/src/common/procmon.c
+++ b/src/common/procmon.c
@@ -162,6 +162,7 @@ tor_validate_process_specifier(const char *process_spec,
return parse_process_specifier(process_spec, &ppspec, msg);
}
+/* XXXX we should use periodic_timer_new() for this stuff */
#ifdef HAVE_EVENT2_EVENT_H
#define PERIODIC_TIMER_FLAGS EV_PERSIST
#else