summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-05-15 08:23:04 -0700
committerRobert Ransom <rransom.8774@gmail.com>2011-05-20 08:25:42 -0700
commit4b266c6e72254d848b2ca4f594c0b41770104d81 (patch)
tree80da149fd30030dbfbb449076d6ec0c5ab6dd133 /src/or/or.h
parentc714a098ea96fcd452a223ce7bbc6bfa2a6f0d02 (diff)
downloadtor-4b266c6e72254d848b2ca4f594c0b41770104d81.tar.gz
tor-4b266c6e72254d848b2ca4f594c0b41770104d81.zip
Implement __OwningControllerProcess option
Implements part of feature 3049.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index d667358eb0..546c38a9a8 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2669,6 +2669,11 @@ typedef struct {
int DisablePredictedCircuits; /**< Boolean: does Tor preemptively
* make circuits in the background (0),
* or not (1)? */
+
+ /** Process specifier for a controller that ‘owns’ this Tor
+ * instance. Tor will terminate if its owning controller does. */
+ char *OwningControllerProcess;
+
int ShutdownWaitLength; /**< When we get a SIGINT and we're a server, how
* long do we wait before exiting? */
char *SafeLogging; /**< Contains "relay", "1", "0" (meaning no scrubbing). */