tor

commit 8221b5d587d6ae6b7d57d10b0ec9ea78e0c57651
parent 0015d0084262ddc60098b15d6cdf30ea66d59a53
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sun,  2 Dec 2018 19:38:40 -0500

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

Diffstat:
M
doc/tor.1.txt
 | 
4
----
M
src/feature/nodelist/routerlist.c
 | 
2
+-

2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -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:
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
@@ -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.
  */