Merge remote-tracking branch 'tor-github/pr/559'

This commit is contained in:
Nick Mathewson 2018-12-02 19:38:40 -05:00
commit 8221b5d587
2 changed files with 1 additions and 5 deletions

View File

@ -3271,10 +3271,6 @@ __CacheDirectory__**/cached-microdescs** and **cached-microdescs.new**::
router. The ".new" file is an append-only journal; when it gets too
large, all entries are merged into a new cached-microdescs file.
__CacheDirectory__**/cached-routers** and **cached-routers.new**::
Obsolete versions of cached-descriptors and cached-descriptors.new. When
Tor can't find the newer files, it looks here instead.
__DataDirectory__**/state**::
A set of persistent key-value mappings. These are documented in
the file. These include:

View File

@ -160,7 +160,7 @@ static time_t last_descriptor_download_attempted = 0;
*
* From time to time, we replace "cached-descriptors" with a new file
* containing only the live, non-superseded descriptors, and clear
* cached-routers.new.
* cached-descriptors.new.
*
* On startup, we read both files.
*/