diff --git a/ChangeLog b/ChangeLog
index 209d100ae9..e2ae4e8d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,12 +4,17 @@ Changes in version 0.2.0.20-?? - 2008-02-??
       bandwidth, rather than uniformly at random. This should speed up Tor
       for bridge users. Also do this for people who set StrictEntryNodes.
 
+  o Major bugfixes:
+    - Resolved problems with (re-)fetching hidden service descriptors.
+      Patch from Karsten Loesing; fixes problems with 0.2.0.18-alpha
+      and 0.2.0.19-alpha.
+
   o Minor features (performance):
     - Tune parameters for cell pool allocation to minimize amount of
       RAM overhead used.
 
   o Minor bugfixes:
-    - Log the correct memory chunk sizes for empty RAM chunks in mempool.c
+    - Log the correct memory chunk sizes for empty RAM chunks in mempool.c.
     - Directory mirrors no longer include a guess at the client's IP
       address if the connection appears to be coming from the same /24
       network; it was producing too many wrong guesses.
diff --git a/src/or/connection.c b/src/or/connection.c
index 0041a35cba..9c6c61749a 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2437,7 +2437,7 @@ connection_get_by_type_state(int type, int state)
 /** Return a connection of type <b>type</b> that has rendquery equal
  * to <b>rendquery</b>, and that is not marked for close. If state
  * is non-zero, conn must be of that state too. If rendversion is
- * nonnegative, conn must fetch that rendversion, too.
+ * nonnegative, conn must be fetching that rendversion, too.
  */
 connection_t *
 connection_get_by_type_state_rendquery(int type, int state,
@@ -2456,7 +2456,7 @@ connection_get_by_type_state_rendquery(int type, int state,
         (!state || state == conn->state)) {
       if (type == CONN_TYPE_DIR &&
           (rendversion < 0 ||
-                  rendversion == TO_DIR_CONN(conn)->rend_version) &&
+           rendversion == TO_DIR_CONN(conn)->rend_version) &&
           !rend_cmp_service_ids(rendquery, TO_DIR_CONN(conn)->rend_query))
         return conn;
       else if (CONN_IS_EDGE(conn) &&