aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-20 14:18:35 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-20 14:18:35 -0400
commit3830599a63e09008f7b17c1b37db277bf38d526f (patch)
tree7b8cf76ee899053ae2a0df8a0e872927d165eed3 /doc
parentfa2bd196b40504e0fd20c58574d6911aef19a68e (diff)
parentc4152a25e354b3408570603c8481302bf986f65c (diff)
downloadtor-3830599a63e09008f7b17c1b37db277bf38d526f.tar.gz
tor-3830599a63e09008f7b17c1b37db277bf38d526f.zip
Merge branch 'maint-0.3.1'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index a5cbb40cbf..f0b7fa8e46 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2726,8 +2726,7 @@ __DataDirectory__**/state**::
A set of persistent key-value mappings. These are documented in
the file. These include:
- The current entry guards and their status.
- - The current bandwidth accounting values (unused so far; see
- below).
+ - The current bandwidth accounting values.
- When the file was last written
- What version of Tor generated the state file
- A short history of bandwidth usage, as produced in the server
@@ -2747,8 +2746,7 @@ __DataDirectory__**/diff-cache**::
__DataDirectory__**/bw_accounting**::
Used to track bandwidth accounting values (when the current period starts
and ends; how much has been read and written so far this period). This file
- is obsolete, and the data is now stored in the \'state' file as well. Only
- used when bandwidth accounting is enabled.
+ is obsolete, and the data is now stored in the \'state' file instead.
__DataDirectory__**/control_auth_cookie**::
Used for cookie authentication with the controller. Location can be