diff --git a/ChangeLog b/ChangeLog
index 294700ee78..0f28922685 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,11 +83,15 @@ Changes in version 0.2.0.8-alpha - 2007-10-12
       cache when canceling a pending resolve.  Don't log unless stuff
       is fishy.  Resolves bug 463.
 
-  o Minor bugfixes (Security):
+  o Minor bugfixes (anonymity):
     - Never report that we've used more bandwidth than we're willing to
       relay: it leaks how much non-relay traffic we're using. Resolves
       bug 516.
 
+  o Minor bugfixes (of some sort):
+    - Stop calling tor_strlower() on uninitialized memory in some cases.
+      Bugfix in 0.2.0.7-alpha.
+
   o Code simplifications and refactoring:
     - Make a bunch of functions static.  Remove some dead code.
     - Pull out about a third of the really big routerlist.c; put it in a
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index a5264c1bd0..7bb3228774 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2355,10 +2355,10 @@ router_parse_addr_policy_from_string(const char *s, int assume_action)
       return NULL;
     }
     cp = line;
+    tor_strlower(line);
   } else { /* assume an already well-formed address policy line */
     cp = s;
   }
-  tor_strlower(line);
 
   eos = cp + strlen(cp);
   tok = get_next_token(&cp, eos, routerdesc_token_table);