Whitespace fixes on recent merges to master.

diff --git a/src/or/connection.c b/src/or/connection.c
index 9c6166df3bb524c3fd3592ca56c791bd9d025435..d1b079a97e288b84b11bde500f19d58a4d8ec65f 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -3423,7 +3423,6 @@ connection_dir_get_by_purpose_and_resource(int purpose,
   return NULL;
 }
 
-
 /** Return an open, non-marked connection of a given type and purpose, or NULL
  * if no such connection exists. */
 connection_t *

diff --git a/src/or/directory.c b/src/or/directory.c
index 242f7da2165a098a4ca674541bc17716090f87ac..657b210b5f9defdfe6745fff1e33d9fbb2e01245 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1919,7 +1919,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
     smartlist_t *which = NULL;
     log_info(LD_DIR,"Received answer to microdescriptor request (status %d, "
              "size %d) from server '%s:%d'",
-             status_code, (int)body_len, conn->_base.address, conn->_base.port);
+             status_code, (int)body_len, conn->_base.address,
+             conn->_base.port);
     tor_assert(conn->requested_resource &&
                !strcmpstart(conn->requested_resource, "d/"));
     which = smartlist_create();

diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 000411370c525e62bf7f10335fa600a113a4287a..2752d15c8c0328a8f1fa14237fe59f188fe8e023 100644 (file)
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -129,8 +129,8 @@ get_microdesc_cache(void)
  * set the last_listed field of every microdesc to listed_at.  If
  * requested_digests is non-null, then it contains a list of digests we mean
  * to allow, so we should reject any non-requested microdesc with a different
- * digest, and alter the list to contain only the digests of those microdescs we
- * didn't find.
+ * digest, and alter the list to contain only the digests of those microdescs
+ * we didn't find.
  * Return a list of the added microdescriptors.  */
 smartlist_t *
 microdescs_add_to_cache(microdesc_cache_t *cache,

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index a6cccabf32012ef41446318a64a4051876534df6..0b271f1aa3fa633bf083b16accb76b3c5cec4830 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4278,7 +4278,6 @@ launch_descriptor_downloads(int purpose,
       pds_flags |= (purpose == DIR_PURPOSE_FETCH_MICRODESC) ?
         PDS_NO_EXISTING_MICRODESC_FETCH :
         PDS_NO_EXISTING_SERVERDESC_FETCH;
-
     }
 
     n_per_request = CEIL_DIV(n_downloadable, MIN_REQUESTS);