diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index d966fb1ca8..56bb0b21b1 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -12,7 +12,7 @@ const char dirserv_c_id[] = "$Id$";
  **/
 
 /** How far in the future do we allow a router to get? (seconds) */
-#define ROUTER_ALLOW_SKEW (30*60)
+#define ROUTER_ALLOW_SKEW (60*60*12) /* 12 hours */
 /** How many seconds do we wait before regenerating the directory? */
 #define DIR_REGEN_SLACK_TIME 10
 
diff --git a/src/or/relay.c b/src/or/relay.c
index 9ffb1eaa84..0340d5b2a6 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -748,7 +748,7 @@ connection_edge_process_relay_cell_not_open(
   }
 
   log_fn(LOG_WARN,"Got an unexpected relay command %d, in state %d (%s). Closing.",
-       rh->command, conn->state, conn_state_to_string(conn->type, conn->state));
+         rh->command, conn->state, conn_state_to_string(conn->type, conn->state));
   connection_edge_end(conn, END_STREAM_REASON_TORPROTOCOL, conn->cpath_layer);
   connection_mark_for_close(conn);
   return -1;