commit 0e6e902cbc2e98028e58c73f7b1a8dece89fc03f parent 5c85ba3077a7ee90b2ac73b1b1afd6555e718382 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 20 Dec 2018 11:50:48 -0500 Merge branch 'document_--version' Diffstat:
| A | changes/document_version | | | 2 | ++ |
| M | doc/tor.1.txt | | | 4 | +++- |
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/document_version b/changes/document_version @@ -0,0 +1,2 @@ + o Documentation: + - Document the exact output of "tor --version". Closes ticket 28889. diff --git a/doc/tor.1.txt b/doc/tor.1.txt @@ -89,7 +89,9 @@ COMMAND-LINE OPTIONS future version. (This is a warning, not a promise.) [[opt-version]] **--version**:: - Display Tor version and exit. + Display Tor version and exit. The output is a single line of the format + "Tor version [version number]." (The version number format + is as specified in version-spec.txt.) [[opt-quiet]] **--quiet**|**--hush**:: Override the default console log. By default, Tor starts out logging