sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bug20152'

This commit is contained in:
Nick Mathewson 2017-08-03 10:11:44 -04:00
parent 96cf608b2e a437080d37
commit fabc3deb75
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/doc20152 Normal file
View File

@ -0,0 +1,3 @@
o Documentation:
- Improve the documentation for the directory port part of the
DirAuthority line. Closes ticket 20152.

8
doc/tor.1.txt
View File

@ -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