r17548@catbus: nickm | 2008-01-10 11:08:12 -0500

 Make proposal-109 behavior optional.


svn:r13090

2 files changed, 12 insertions, 1 deletions

diff --git a/doc/TODO b/doc/TODO
index 15cbf3f46d..5849a3b060 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -21,7 +21,7 @@ R - Figure out the autoconf problem with adding a fallback consensus.
 R - add a geoip file
 W   - figure out license
 R - let bridges set relaybandwidthrate as low as 5kb
-N - we need a config option to turn off proposal 109 behavior,
+  o we need a config option to turn off proposal 109 behavior,
 RK- make it easier to set up a private tor network on your own computer
     is very hard.
     - FAQ entry which is wrong
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 3860d7e881..500fed0066 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -1129,6 +1129,17 @@ Authoritative directories only.  If set to 1, the directory server
 rejects all uploaded server descriptors that aren't explicitly listed
 in the fingerprints file. This acts as a "panic button" if we get
 Sybiled. (Default: 0)
+.LP
+.TP
+\fBAuthDirMaxServersPerAddr\fR \fINUM\fP
+Authoritative directories only.  The maximum number of servers that we
+will list as acceptable on a single IP address.  Set this to "0" for
+"no limit". (Default: 2)
+.LP
+.TP
+\fBAuthDirMaxServersPerAuthAddr\fR \fINUM\fP
+Authoritative directories only.  Like AuthDirMaxServersPerAddr, but
+applies to addresses shared with directory authorities.  (Default: 5)
 
 .SH HIDDEN SERVICE OPTIONS
 .PP