[or-cvs] r16407: minor fixes (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-08-04 19:59:38 -0400 (Mon, 04 Aug 2008)
New Revision: 16407

Modified:
   tor/trunk/ChangeLog
   tor/trunk/ReleaseNotes
   tor/trunk/src/or/dirserv.c
Log:
minor fixes


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-08-04 23:39:07 UTC (rev 16406)
+++ tor/trunk/ChangeLog	2008-08-04 23:59:38 UTC (rev 16407)
@@ -560,7 +560,7 @@
   o Minor bugfixes:
     - Fix compilation with OpenSSL 0.9.8 and 0.9.8a.  All other supported
       OpenSSL versions should have been working fine.  Diagnosis and patch
-      from lodger, Karsten Loesing and Sebastian Hahn.  Fixes bug 616.
+      from lodger, Karsten Loesing, and Sebastian Hahn.  Fixes bug 616.
       Bugfix on 0.2.0.20-rc.
 
 

Modified: tor/trunk/ReleaseNotes
===================================================================
--- tor/trunk/ReleaseNotes	2008-08-04 23:39:07 UTC (rev 16406)
+++ tor/trunk/ReleaseNotes	2008-08-04 23:59:38 UTC (rev 16407)
@@ -455,9 +455,10 @@
       now we expand "-f ~/.tor/torrc" correctly. Suggested by Matt Edman.
 
   o New config options:
-    - New configuration options to override default maximum number of
-      servers allowed on a single IP address. This is important for
-      running a test network on a single host. XXX
+    - New configuration options AuthDirMaxServersPerAddr and
+      AuthDirMaxServersperAuthAddr to override default maximum number
+      of servers allowed on a single IP address. This is important for
+      running a test network on a single host.
     - Three new config options (AlternateDirAuthority,
       AlternateBridgeAuthority, and AlternateHSAuthority) that let the
       user selectively replace the default directory authorities by type,
@@ -481,7 +482,7 @@
     - When we have no consensus, check FallbackNetworkstatusFile (defaults
       to $PREFIX/share/tor/fallback-consensus) for a consensus. This way
       we can start out knowing some directory caches. We don't ship with
-      a fallback consensus by default though, because it wasn't making
+      a fallback consensus by default though, because it was making
       bootstrapping take too long while we tried many down relays.
     - Authorities send back an X-Descriptor-Not-New header in response to
       an accepted-but-discarded descriptor upload. Partially implements

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2008-08-04 23:39:07 UTC (rev 16406)
+++ tor/trunk/src/or/dirserv.c	2008-08-04 23:59:38 UTC (rev 16407)
@@ -1485,7 +1485,7 @@
   return dirserv_pick_cached_dir_obj(cached_directory, the_directory,
                                      the_directory_is_dirty,
                                      dirserv_regenerate_directory,
-                                     "server directory", V1_AUTHORITY);
+                                     "v1 server directory", V1_AUTHORITY);
 }
 
 /** Only called by v1 auth dirservers.