Merge branch 'loggranularity'

2 files changed, 10 insertions, 3 deletions

diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index 1864666047..2bbcfaec4c 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -525,9 +525,9 @@
       of the form:
          OptionName SP OptionType [ SP Documentation ] CRLF
          OptionName = Keyword
-         OptionType = "Integer" / "TimeInterval" / "DataSize" / "Float" /
-           "Boolean" / "Time" / "CommaList" / "Dependant" / "Virtual" /
-           "String" / "LineList"
+         OptionType = "Integer" / "TimeInterval" / "TimeMsecInterval" /
+           "DataSize" / "Float" / "Boolean" / "Time" / "CommaList" /
+           "Dependant" / "Virtual" / "String" / "LineList"
          Documentation = Text
 
     "info/names"
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 8660fcb8f1..ed4e9b0537 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -343,6 +343,13 @@ Other options can be specified either on the command-line (--option
     on Windows; instead you should use the --service command-line option.
     (Default: 0)
 
+**LogTimeGranularity** __NUM__::
+    Set the resolution of timestamps in Tor's logs to NUM milliseconds.
+    NUM must be positive and either a divisor or a multiple of 1 second.
+    Note that this option only controls the granularity written by Tor to
+    a file or console log.  Tor does not (for example) "batch up" log
+    messages to affect times logged by a controller, times attached to
+    syslog messages, or the mtime fields on log files.  (Default: 1 second)
 
 **SafeLogging** **0**|**1**|**relay**::
     Tor can scrub potentially sensitive strings from log messages (e.g.