Commit 0696ac5b authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'doc17392'

parents 92a6c578 3c08b76f
Loading
Loading
Loading
Loading

changes/doc17392

0 → 100644
+4 −0
Original line number Diff line number Diff line
  o Documentation:
    - Mention torspec URL in the manpage and point the reader to it
      whenever we mention a document that belongs in torspce.
      Fixes issue 17392.
+13 −11
Original line number Diff line number Diff line
@@ -277,11 +277,12 @@ GENERAL OPTIONS
[[ControlPort]] **ControlPort** __PORT__|**unix:**__path__|**auto** [__flags__]::
    If set, Tor will accept connections on this port and allow those
    connections to control the Tor process using the Tor Control Protocol
    (described in control-spec.txt). Note: unless you also specify one or
    more of **HashedControlPassword** or **CookieAuthentication**,
    setting this option will cause Tor to allow any process on the local
    host to control it. (Setting both authentication methods means either
    method is sufficient to authenticate to Tor.) This
    (described in control-spec.txt in
    https://spec.torproject.org[torspec]). Note: unless you also
    specify one or more of **HashedControlPassword** or
    **CookieAuthentication**, setting this option will cause Tor to allow
    any process on the local host to control it. (Setting both authentication
    methods means eithermethod is sufficient to authenticate to Tor.) This
    option is required for many Tor controllers; most use the value of 9051.
    Set it to "auto" to have Tor pick a port for you. (Default: 0)
 +
@@ -1975,8 +1976,8 @@ on the public Tor network.
[[V3AuthoritativeDirectory]] **V3AuthoritativeDirectory** **0**|**1**::
    When this option is set in addition to **AuthoritativeDirectory**, Tor
    generates version 3 network statuses and serves descriptors, etc as
    described in doc/spec/dir-spec.txt (for Tor clients and servers running at
    least 0.2.0.x).
    described in dir-spec.txt file of https://spec.torproject.org/[torspec]
    (for Tor clients and servers running atleast 0.2.0.x).

[[VersioningAuthoritativeDirectory]] **VersioningAuthoritativeDirectory** **0**|**1**::
    When this option is set to 1, Tor adds information on which versions of
@@ -2552,8 +2553,8 @@ __DataDirectory__**/bw_accounting**::
__DataDirectory__**/control_auth_cookie**::
    Used for cookie authentication with the controller. Location can be
    overridden by the CookieAuthFile config option. Regenerated on startup. See
    control-spec.txt for details. Only used when cookie authentication is
    enabled.
    control-spec.txt in https://spec.torproject.org/[torspec] for details.
    Only used when cookie authentication is enabled.
 
__DataDirectory__**/lock**::
    This file is used to prevent two Tor instances from using same data
@@ -2640,6 +2641,7 @@ SEE ALSO

**https://www.torproject.org/**

**torspec: https://spec.torproject.org **

BUGS
----