diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 584b22384c..b9b07acd2a 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1911,13 +1911,11 @@ helper_node_set_status(const char *digest, int succeeded)
           }
         } else {
           if (!helper->made_contact) { /* dump him */
-
-
             changed = 1;
           } else if (!helper->down_since) {
             helper->down_since = time(NULL);
-            warn(LD_CIRC,
-                 "Connection to helper node '%s' failed. %d/%d helpers usable.",
+            warn(LD_CIRC, "Connection to helper node '%s' failed."
+                 " %d/%d helpers usable.",
                  helper->nickname, num_live_helpers(),
                  smartlist_len(helper_nodes));
             changed = 1;
diff --git a/src/or/main.c b/src/or/main.c
index 4c9b808f66..3139485228 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3,7 +3,8 @@
  * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
-const char main_c_id[] = "$Id$";
+const char main_c_id[] =
+  "$Id$";
 
 /**
  * \file main.c