Merge remote-tracking branch 'public/deprecation_v2'

This commit is contained in:
Nick Mathewson
2016-08-19 19:58:51 -04:00
9 changed files with 162 additions and 30 deletions
+4
View File
@@ -84,6 +84,10 @@ COMMAND-LINE OPTIONS
[[opt-list-torrc-options]] **--list-torrc-options**::
List all valid options.
[[opt-list-deprecated-options]] **--list-deprecated-options**::
List all valid options that are scheduled to become obsolete in a
future version. (This is a warning, not a promise.)
[[opt-version]] **--version**::
Display Tor version and exit.