diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-01 13:28:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-01 13:28:31 -0400 |
| commit | cd606d5ad36136cb7e66ac462ea945ceb3a9a7f7 (patch) | |
| tree | aaad24fa79b84e7a17e15c79fea8aa30f78b9962 /src/or/or.h | |
| parent | e79d74072b2a1087d4527912087573412b7da3a7 (diff) | |
| parent | f1bf9bf8198fcfaf078fdc12eb2ad5adf1901d29 (diff) | |
| download | tor-cd606d5ad36136cb7e66ac462ea945ceb3a9a7f7.tar.gz tor-cd606d5ad36136cb7e66ac462ea945ceb3a9a7f7.zip | |
Merge remote-tracking branch 'public/owning_control_fd'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 4572a46458..0a4d712976 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4071,6 +4071,8 @@ typedef struct { /** Process specifier for a controller that ‘owns’ this Tor * instance. Tor will terminate if its owning controller does. */ char *OwningControllerProcess; + /** FD specifier for a controller that owns this Tor instance. */ + int OwningControllerFD; int ShutdownWaitLength; /**< When we get a SIGINT and we're a server, how * long do we wait before exiting? */ |