aboutsummaryrefslogtreecommitdiff
path: root/control-spec.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-19 16:36:22 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-19 16:36:22 -0500
commited2a4304b88c0901b68c29c0fdfceaff3b0c1f3c (patch)
tree42cc01c9fd0fcb7145933d1b2a0fbe92ecf97d08 /control-spec.txt
parente7231f34af2305f0fe9cd7a9741fac3457f04b7a (diff)
parentb698fa49afcd66f78db48b046783e07a2f81cc44 (diff)
downloadtorspec-ed2a4304b88c0901b68c29c0fdfceaff3b0c1f3c.tar.gz
torspec-ed2a4304b88c0901b68c29c0fdfceaff3b0c1f3c.zip
Merge branch 'disable_signal_handlers_squashed'
Diffstat (limited to 'control-spec.txt')
-rw-r--r--control-spec.txt17
1 files changed, 17 insertions, 0 deletions
diff --git a/control-spec.txt b/control-spec.txt
index a98fc84..605a301 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -3265,8 +3265,25 @@
TAKEOWNERSHIP. It will be automatically authenticated. This option
should only be used by other programs that are starting Tor.
+ This option cannot be changed via SETCONF; it must be set in a torrc or
+ via the command line.
+
(Integer. Default: -1.)
+ __DisableSignalHandlers
+
+ If this option is set to true during startup, then Tor will not install
+ any signal handlers to watch for POSIX signals. The SIGNAL controller
+ command will still work.
+
+ This option is meant for embedding Tor inside another process, when
+ the controlling process would rather handle signals on its own.
+
+ This option cannot be changed via SETCONF; it must be set in a torrc or
+ via the command line.
+
+ (Boolean. Default: 0.)
+
5.5. Phases from the Bootstrap status event.
This section describes the various bootstrap phases currently reported