more cleanups

svn:r12172

diff --git a/ChangeLog b/ChangeLog
index 9e5ba0ef87af493f4481cde55ec875918eb39251..5a6f5ed220cd6bf217f9377a7752d48784a30b5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,9 @@ Changes in version 0.2.0.9-alpha - 2007-10-24
       download router descriptors listed in the consensus.
     - Authorities now list servers who have the same nickname as
       a different named server, but list them with a new flag,
-      "Unnamed". Partially implements proposal 122.
+      "Unnamed". Now we can list servers that happen to pick the same
+      nickname as a server that registered two years ago and then
+      disappeared. Partially implements proposal 122.
     - If the consensus list a router as "Unnamed", the name is assigned
       to a different router: do not identify the router by that name.
       Partially implements proposal 122.
@@ -43,8 +45,8 @@ Changes in version 0.2.0.9-alpha - 2007-10-24
       and count failing to get the certificates after 20 minutes as a
       failure.
     - Build circuits and download descriptors even if our consensus is a
-      little expired.  (This feature will go away once authorities are more
-      reliable.)
+      little expired. (This feature will go away once authorities are
+      more reliable.)
 
   o Minor features (router descriptor cache):
     - If we find a cached-routers file that's been sitting around for more
@@ -98,8 +100,8 @@ Changes in version 0.2.0.9-alpha - 2007-10-24
       after one fails: don't wait 60 seconds to notice.
     - When fetching a consensus as a cache, wait until a newer consensus
       should exist before trying to replace the current one.
-    - Use a more forgiving schedule for retrying failed consensus downloads
-      than for other types.
+    - Use a more forgiving schedule for retrying failed consensus
+      downloads than for other types.
 
   o Minor bugfixes (other directory issues):
     - Correct the implementation of "download votes by digest." Bugfix on
@@ -142,7 +144,7 @@ Changes in version 0.2.0.9-alpha - 2007-10-24
     - New convenience code to locate a file within the DataDirectory.
     - Move non-authority functionality out of dirvote.c.
     - Refactor the arguments for router_pick_{directory_|trusteddir}server
-      so that they take all take the same named flags.
+      so that they all take the same named flags.
 
   o Utilities
     - Include the "tor-ctrl.sh" bash script by Stefan Behte to provide

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9da42a3a2ad59267f5226033244dc6688f00699e..e86e2d51f580f004e5954e22855520401eaad354 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -712,7 +712,7 @@ router_get_trusted_dir_servers(void)
  * dirservers that we can't reach.
  *
  * If the <b>PDS_ALLOW_SELF</b> flag is not set, then don't include ourself
- * (if we'rea dirserver).
+ * (if we're a dirserver).
  *
  * Don't pick an authority if any non-authority is viable; try to avoid using
  * servers that have returned 503 recently.
@@ -1467,7 +1467,7 @@ smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule,
         total_bw += bandwidths[i];
     }
   }
-  log_debug(LD_CIRC, "Total bw = "U64_FORMAT
+  log_debug(LD_CIRC, "Total weighted bw = "U64_FORMAT
             ", exit bw = "U64_FORMAT
             ", nonexit bw = "U64_FORMAT", exit weight = %lf "
             "(for exit == %d)"