diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-14 11:26:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-14 11:26:00 -0400 |
| commit | 0e101e65457163963b01722369eaef5b862a82f9 (patch) | |
| tree | 1bcf5cc03d613b4298f0afc3cf801f012e3376f5 | |
| parent | 0c58627c1cb134d57bb653007d67d9c4a8119faa (diff) | |
| parent | 92813941b5f467b878485eb3c141c59f48736847 (diff) | |
| download | tor-0e101e65457163963b01722369eaef5b862a82f9.tar.gz tor-0e101e65457163963b01722369eaef5b862a82f9.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -rw-r--r-- | changes/bug21720 | 5 | ||||
| -rw-r--r-- | doc/tor.1.txt | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug21720 b/changes/bug21720 new file mode 100644 index 0000000000..6d2fbcf711 --- /dev/null +++ b/changes/bug21720 @@ -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. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index de2e2b4a04..1665cfe947 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |