nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2020-05-12 12:52:41 -04:00
commit 86b5bcd80a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/doc34133 Normal file
View File

@ -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.

6
doc/tor.1.txt
View File

@ -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 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. order. Files starting with a dot are ignored. Files on subfolders are ignored.
The %include option can be used recursively. 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 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 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, and **ORPort** are not allowed). Currently, if **Sandbox** is 1,
**ControlPort** command "GETINFO address" will not work. + **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) (Default: 0)
[[Schedulers]] **Schedulers** **KIST**|**KISTLite**|**Vanilla**:: [[Schedulers]] **Schedulers** **KIST**|**KISTLite**|**Vanilla**::