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

Merge branch 'maint-0.3.0' into release-0.3.0

This commit is contained in:
Nick Mathewson 2017-03-14 11:26:00 -04:00
parent 0c58627c1c 92813941b5
commit 0e101e6545
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug21720 Normal file
View File

@ -0,0 +1,5 @@
o Documentation:
- Update the description of the directory server options in the manual
page, to clarify that DirPort is no longer necessary to be a directory
cache. Closes ticket 21720.

5
doc/tor.1.txt
View File

@ -2121,8 +2121,9 @@ is non-zero):
DIRECTORY SERVER OPTIONS
------------------------
The following options are useful only for directory servers (that is,
if DirPort is non-zero):
The following options are useful only for directory servers. (Relays with
enough bandwidth automatically become directory servers; see DirCache for
details.)
[[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__::
When this option is set, it takes an HTML file and publishes it as "/" on