Provide dire warnings to any users who set DirServer; move it out of torrc.sample and into torrc.complete.

svn:r5132

2 files changed, 11 insertions, 5 deletions

diff --git a/doc/TODO b/doc/TODO
index 711a36238..e746a696c 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -163,7 +163,8 @@ N     . Routerdesc download changes
         o Reset failure count every 60 minutes
         o Drop fallback to download-all.  Also, always split download.
         - Only use a routerdesc if you recognize its hash.
-          - Must defer till dirservers are upgraded to latest.
+          - (Must defer till dirservers are upgraded to latest code, which
+            actually generates these hashes.)
           - Of course, authdirservers must not do this.
           - Should directory mirrors do something else entirely?
         - Use has_fetched_directory sanely, whatever that means.
@@ -177,7 +178,7 @@ N     . Routerdesc download changes
       - Call dirport_is_reachable from somewhere else.
       o Networkstatus should list who's an authority.
       - Add nickname element to dirserver line.  Log this along with IP:Port.
-      - Warn when using non-default directory servers.
+      o Warn when using non-default directory servers.
       - When giving up on a non-finished dir request, log how many bytes
         dropped, to see whether it's worthwhile to use partial info.
     - Security
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 1210d57c9..848d1b146 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -83,12 +83,17 @@ their current liveness status. A value of "0 seconds" tells Tor to choose an
 appropriate default. (Default: 1 hour for clients, 20 minutes for servers)
 .LP
 .TP
-\fBDirServer \fR\fIaddress:port fingerprint\fP
+\fBDirServer \fR[v1] \fIaddress:port fingerprint\fP
 Use a nonstandard authoritative directory server at the provided
 address and port, with the specified key fingerprint.  This option can
 be repeated many times, for multiple authoritative directory
-servers. If no \fBdirserver\fP line is given, Tor will use the default
-directory servers: moria1, moria2, and tor26.
+servers.  If the "v1" option is provided, Tor will use this server as an
+authority for old-style (v1) directories as well.  (Only directory mirrors
+care about this.) If no \fBdirserver\fP line is given, Tor will use the default
+directory servers: moria1, moria2, and tor26.  NOTE: this option is intended
+for setting up a private Tor network with its own directory authorities.  If
+you use it, you will be distinguishable from other users, because you won't
+believe the same authorities they do.
 .LP
 .TP
 \fBGroup \fR\fIGID\fP