[tor-commits] [tor/maint-0.3.1] Note that bw_accounting is obsoleted by values in the state file

[nickm at torproject.org]

commit c4152a25e354b3408570603c8481302bf986f65c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 14:18:10 2017 -0400

    Note that bw_accounting is obsoleted by values in the state file
    
    Closes ticket 16082.
---
 changes/bug16082 | 4 ++++
 doc/tor.1.txt    | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changes/bug16082 b/changes/bug16082
new file mode 100644
index 0000000..0f2f04f
--- /dev/null
+++ 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
index ff9fba7..2459969 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2725,8 +2725,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
@@ -2746,8 +2745,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