tor

commit 86b5bcd80ad27083c9b8e5c5999927f235905ec6
parent b7a165228f02e693b3e777b4c815214bb6e05691
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 12 May 2020 12:52:41 -0400

Merge remote-tracking branch 'tor-github/pr/1885/head'

Diffstat:
A
changes/doc34133
 | 
6
++++++
M
doc/tor.1.txt
 | 
6
++++++

2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/changes/doc34133 b/changes/doc34133
@@ -0,0 +1,6 @@
+  o Documentation:
+    - Correctly document that we search for a system torrc file before
+      Document the limitations of using %include on config files with 
+      seccomp sandbox enabled. No new files can be added to the 
+      %included directories. Fixes documentation bug 34133; bugfix 
+      on 0.3.1.1-alpha. Patch by Daniel Pinto.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -211,6 +211,8 @@ file will be parsed as if they were written where the %include option is. If
 the path is a folder, all files on that folder will be parsed following lexical
 order. Files starting with a dot are ignored. Files on subfolders are ignored.
 The %include option can be used recursively.
+New configuration files or directories cannot be added to already running Tor
+instance if **Sandbox** is enabled.
 
 By default, an option on the command line overrides an option found in the
 configuration file, and an option in a configuration file overrides one in
@@ -855,6 +857,10 @@ forward slash (/) in the configuration file and on the command line.
     and **ORPort** are not allowed). Currently, if **Sandbox** is 1,
     **ControlPort** command "GETINFO address" will not work. +
      +
+    When using %include in the tor configuration files, reloading the tor
+    configuration is not supported after adding new configuration files or
+    directories. +
+     +
     (Default: 0)
 
 [[Schedulers]] **Schedulers** **KIST**|**KISTLite**|**Vanilla**::