diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-06 11:56:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-06 11:56:46 -0400 |
| commit | 4e3f9c1f3af6292f30799f005f6df8f9c1bc7fee (patch) | |
| tree | a32c7800851c63253ffa1b3333641e0541fcc763 | |
| parent | 440228907da9aff06562c4193ab9551b9fc5bad8 (diff) | |
| parent | e90bd48c2f74026279ababab89a47633f32f982c (diff) | |
| download | tor-4e3f9c1f3af6292f30799f005f6df8f9c1bc7fee.tar.gz tor-4e3f9c1f3af6292f30799f005f6df8f9c1bc7fee.zip | |
Merge remote-tracking branch 'pastly/ticket19122'
| -rw-r--r-- | changes/19122 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/19122 b/changes/19122 new file mode 100644 index 0000000000..cface80679 --- /dev/null +++ b/changes/19122 @@ -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. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4221544ed4..2e7a3537b1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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**:: |