[or-cvs] [tor/master] tiny changes i found in my sandbox

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Mon, 9 Aug 2010 18:50:49 -0400
Subject: tiny changes i found in my sandbox
Commit: 0087a37bed508d8240d4b51d1f2112bfae3f4d03

---
 src/or/circuituse.c      |    2 +-
 src/or/connection_edge.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 63742da..4503e1d 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -719,7 +719,7 @@ circuit_expire_old_circuits_clientside(time_t now)
   }
 
   for (circ = global_circuitlist; circ; circ = circ->next) {
-    if (circ->marked_for_close || ! CIRCUIT_IS_ORIGIN(circ))
+    if (circ->marked_for_close || !CIRCUIT_IS_ORIGIN(circ))
       continue;
     /* If the circuit has been dirty for too long, and there are no streams
      * on it, mark it for close.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 7522368..e83028f 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2614,7 +2614,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
     log_debug(LD_REND,"Finished assigning addr/port");
     n_stream->cpath_layer = origin_circ->cpath->prev; /* link it */
 
-    /* add it into the linked list of n_streams on this circuit */
+    /* add it into the linked list of p_streams on this circuit */
     n_stream->next_stream = origin_circ->p_streams;
     n_stream->on_circuit = circ;
     origin_circ->p_streams = n_stream;
-- 
1.7.1