aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2012-10-01 01:58:13 -0700
committerAndrea Shepard <andrea@torproject.org>2012-10-10 00:44:46 -0700
commit2565710fd72f6f6ddf42e049c0973b848a86719e (patch)
treeef2de3e59ff434d5480432f1897f7a968cc0f355
parentbbb2c31d26f2eb1ad46433bcfd321d960a6c7862 (diff)
downloadtor-2565710fd72f6f6ddf42e049c0973b848a86719e.tar
tor-2565710fd72f6f6ddf42e049c0973b848a86719e.tar.gz
Fix comment on circuit_t.n_hop and remove circuitmux TODO in or.h
-rw-r--r--src/or/or.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/or/or.h b/src/or/or.h
index dad81eddc..96e029961 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;