tor

commit 3830599a63e09008f7b17c1b37db277bf38d526f
parent fa2bd196b40504e0fd20c58574d6911aef19a68e
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 20 Jun 2017 14:18:35 -0400

Merge branch 'maint-0.3.1'

Diffstat:
A
changes/bug16082
 | 
4
++++
M
doc/tor.1.txt
 | 
6
++----

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/changes/bug16082 b/changes/bug16082
@@ -0,0 +1,4 @@
+  o Documentation:
+    - Correctly note that bandwidth accounting values are stored in the
+      state file, and the bw_accounting file is now obsolete. Closes
+      ticket 16082.
diff --git 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