Merge branch 'disable_signal_handlers_squashed'

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