[tor-commits] [tor/master] whitespaces fixes

nickm at torproject.org nickm at torproject.org
Wed Jun 11 16:01:22 UTC 2014


commit 02dafc270c0104e894f4725c356594d12cb4b2a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 11 12:00:14 2014 -0400

    whitespaces fixes
---
 src/or/circuituse.c |    1 -
 src/or/main.c       |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 023bd4c..221afea 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -832,7 +832,6 @@ circuit_log_ancient_one_hop_circuits(int age)
     format_local_iso_time(created,
                           (time_t)circ->timestamp_created.tv_sec);
 
-
     if (circ->timestamp_dirty) {
       char dirty_since[ISO_TIME_LEN+1];
       format_local_iso_time(dirty_since, circ->timestamp_dirty);
diff --git a/src/or/main.c b/src/or/main.c
index 3deab3e..f7ad41e 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1065,7 +1065,6 @@ run_connection_housekeeping(int i, time_t now)
   chan = TLS_CHAN_TO_BASE(or_conn->chan);
   tor_assert(chan);
 
-
   if (channel_num_circuits(chan) != 0) {
     have_any_circuits = 1;
     chan->timestamp_last_had_circuits = now;
@@ -1101,7 +1100,8 @@ run_connection_housekeeping(int i, time_t now)
              (int)conn->s,conn->address, conn->port);
     connection_or_close_normally(TO_OR_CONN(conn), 1);
   } else if (!have_any_circuits &&
-             now - or_conn->idle_timeout >= chan->timestamp_last_had_circuits) {
+             now - or_conn->idle_timeout >=
+                                         chan->timestamp_last_had_circuits) {
     log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) "
              "[no circuits for %d; timeout %d; %scanonical].",
              (int)conn->s, conn->address, conn->port,



More information about the tor-commits mailing list