sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'pastly/ticket19122'

This commit is contained in:
Nick Mathewson 2016-09-06 11:56:46 -04:00
parent 440228907d e90bd48c2f
commit 4e3f9c1f3a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/19122 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (documentation):
- man page incorrectly states the User option takes a UID when it really
takes a username. Fixes bug 19122.

2
doc/tor.1.txt
View File

@ -668,7 +668,7 @@ GENERAL OPTIONS
relay, all log messages generated when acting as a relay are sanitized, but
all messages generated when acting as a client are not. (Default: 1)
[[User]] **User** __UID__::
[[User]] **User** __Username__::
On startup, setuid to this user and setgid to their primary group.
[[KeepBindCapabilities]] **KeepBindCapabilities** **0**|**1**|**auto**::