diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-03 10:11:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-03 10:11:44 -0400 |
| commit | fabc3deb7570837f0969f8023c6927900263d313 (patch) | |
| tree | 8fabf2db1a8d6ad2777596e40e7dac81f50960eb /doc | |
| parent | 96cf608b2eeb4643290917b093ae9bd1c1364700 (diff) | |
| parent | a437080d379bb7a6c723edec163b16a7ca3d2cf9 (diff) | |
| download | tor-fabc3deb7570837f0969f8023c6927900263d313.tar.gz tor-fabc3deb7570837f0969f8023c6927900263d313.zip | |
Merge branch 'bug20152'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index fdb7168673..c8d7688a93 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -436,9 +436,11 @@ GENERAL OPTIONS authority is listening for IPv6 connections on the indicated IPv6 address and OR Port. + + - Tor will contact the authority at __address__:__port__ (the DirPort) to - download directory documents. If an IPv6 address is supplied, Tor will - also download directory documents at the IPv6 address on the DirPort. + + Tor will contact the authority at __address__ to + download directory documents. The provided __port__ value is a dirport; + clients ignore this in favor of the specified "orport=" value. If an + IPv6 ORPort is supplied, Tor will + also download directory documents at the IPv6 ORPort. + + If no **DirAuthority** line is given, Tor will use the default directory authorities. NOTE: this option is intended for setting up a private Tor |