Merge branch 'maint-0.3.0'

This commit is contained in:
Nick Mathewson 2017-03-14 11:26:07 -04:00
commit 5b5ec52cae
2 changed files with 8 additions and 2 deletions

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.

View File

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