Write bidirectional connection stats in single line.

There's no need to have a separate line conn-stats-end for the end date
and interval length with only a single line conn-bi-direct following.

2 files changed, 9 insertions, 19 deletions

diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index 4c22771882..1498437712 100644
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -848,27 +848,17 @@
         Mean number of circuits that are included in any of the deciles,
         rounded up to the next integer.
 
-    "conn-stats-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL
-        [At most once]
-
-        YYYY-MM-DD HH:MM:SS defines the end of the included connection
-        statistics measurement interval of length NSEC seconds (86400
-        seconds by default).
-
-        A "conn-stats-end" line, as well as any other "conn-*" line,
-        is first added after the relay has been running for at least 24
-        hours.
-
-    "conn-bi-direct" BELOW,READ,WRITE,BOTH NL
+    "conn-bi-direct" YYYY-MM-DD HH:MM:SS (NSEC s) BELOW,READ,WRITE,BOTH NL
         [At most once]
 
         Number of connections, split into 10-second intervals, that are
-        used uni-directionally or bi-directionally.  Every 10 seconds,
-        we determine for every connection whether we read and wrote less
-        than a threshold of 20 KiB (BELOW), read at least 10 times more
-        than we wrote (READ), wrote at least 10 times more than we read
-        (WRITE), or read and wrote more than the threshold, but not 10
-        times more in either direction (BOTH).  After classifying a
+        used uni-directionally or bi-directionally as observed in the NSEC
+        seconds (usually 86400 seconds) before YYYY-MM-DD HH:MM:SS.  Every
+        10 seconds, we determine for every connection whether we read and
+        wrote less than a threshold of 20 KiB (BELOW), read at least 10
+        times more than we wrote (READ), wrote at least 10 times more than
+        we read (WRITE), or read and wrote more than the threshold, but
+        not 10 times more in either direction (BOTH).  After classifying a
         connection, read and write counters are reset for the next
         10-second interval.
 
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 8949a6ea5a..cfd514292d 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1027,7 +1027,7 @@ is non-zero):
     When this option is enabled, Tor writes statistics on the number of relayed
     bytes and opened stream per exit port to disk every 24 hours. (Default: 0)
 
-**ConnDirectionStats** **0**|**1**::
+**ConnDirectionStatistics** **0**|**1**::
     When this option is enabled, Tor writes statistics on the bidirectional use
     of connections to disk every 24 hours. (Default: 0)