[tor-commits] [tor/master] Fix comment on circuit_t.n_hop and remove circuitmux TODO in or.h

[andrea at torproject.org]

commit 2565710fd72f6f6ddf42e049c0973b848a86719e
Author: Andrea Shepard <andrea at torproject.org>
Date:   Mon Oct 1 01:58:13 2012 -0700

    Fix comment on circuit_t.n_hop and remove circuitmux TODO in or.h
---
 src/or/or.h |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/src/or/or.h b/src/or/or.h
index dad81ed..96e0299 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2634,15 +2634,7 @@ typedef struct circuit_t {
 
   /**
    * The hop to which we want to extend this circuit.  Should be NULL if
-   * the circuit has attached to a connection.
-   *
-   * TODO:
-   *  - If this is NULL, we have extended.  Is it true that if this is
-   *    NULL then n_chan is not NULL?
-   *  - If n_chan is NULL, then what is n_circ_id?
-   *  - It doesn't matter, because we'll only ever attach to a circuitmux_t
-   *    when n_chan is not NULL, and that's what needs to use a unique ID
-   *    for circuits.
+   * the circuit has attached to a channel.
    */
   extend_info_t *n_hop;