diff options
| author | Andrea Shepard <andrea@torproject.org> | 2012-09-26 00:56:26 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-10-10 00:41:49 -0700 |
| commit | 3c41d7f414511aeb6e9e0fd6bfb9be1af539840a (patch) | |
| tree | bee4cc94d27f5e6bb59175eb1db8bbcf3d799849 /src/or/or.h | |
| parent | e4a11b890e7c5fe45dc1f5f271fbd8130ccc9c55 (diff) | |
| download | tor-3c41d7f414511aeb6e9e0fd6bfb9be1af539840a.tar tor-3c41d7f414511aeb6e9e0fd6bfb9be1af539840a.tar.gz | |
Implement circuitmux_attach_circuit() in circuitmux.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index a9b036171..3555a08c7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2641,11 +2641,7 @@ typedef struct circuit_t { * The circuit_id used in the next (forward) hop of this circuit; * this is unique to n_chan, but this ordered pair is globally * unique: -<<<<<<< HEAD * -======= - * ->>>>>>> f1e8169... Use circuitmux_t in channels and when relaying cells * (n_chan->global_identifier, n_circ_id) */ circid_t n_circ_id; |