diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-31 18:39:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-31 18:39:27 -0400 |
| commit | 48a6816eb591c6f2a89963bba3d827d845481a0e (patch) | |
| tree | b6b037aaef3e69e78c5858c40a8f722143834ca6 | |
| parent | 65a65edd6b6e60827ac6a9050051eec0a09aebd7 (diff) | |
| parent | b17bb543dab3e34f5076649707bc74d5d3bd62fd (diff) | |
| download | tor-48a6816eb591c6f2a89963bba3d827d845481a0e.tar.gz tor-48a6816eb591c6f2a89963bba3d827d845481a0e.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
| -rw-r--r-- | changes/bug6732 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/changes/bug6732 b/changes/bug6732 new file mode 100644 index 0000000000..7a744e014a --- /dev/null +++ b/changes/bug6732 @@ -0,0 +1,3 @@ + o Documentation: + - Add missing documentation for consensus and microdesc files. Fix for + bug 6732. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9b2ae82c88..aa9303c2fb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1898,7 +1898,10 @@ FILES __DataDirectory__**/cached-status/**:: The most recently downloaded network status document for each authority. Each file holds one such document; the filenames are the hexadecimal - identity key fingerprints of the directory authorities. + identity key fingerprints of the directory authorities. Mostly obsolete. + +__DataDirectory__**/cached-consensus** and/or **cached-microdesc-consensus**:: + The most recent consensus network status document we've downloaded. __DataDirectory__**/cached-descriptors** and **cached-descriptors.new**:: These files hold downloaded router statuses. Some routers may appear more @@ -1907,6 +1910,12 @@ __DataDirectory__**/cached-descriptors** and **cached-descriptors.new**:: a given router. The ".new" file is an append-only journal; when it gets too large, all entries are merged into a new cached-descriptors file. +__DataDirectory__**/cached-microdescs** and **cached-microdescs.new**:: + These files hold downloaded microdescriptors. Lines beginning with + @-signs are annotations that contain more information about a given + router. The ".new" file is an append-only journal; when it gets too + large, all entries are merged into a new cached-microdescs file. + __DataDirectory__**/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. |