diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-20 14:52:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-20 14:52:24 -0400 |
| commit | 01a0ab02a3d8ef9e7664945224ce5e22f18ac4b9 (patch) | |
| tree | d20337ec9be297b82497bcbac1cd928c64ddd3ff /src/or/or.h | |
| parent | 7c61d10c6c09b32a4b8acd2553aa05c4fbc06611 (diff) | |
| parent | 7f5a440421b122c2d594a89e21799078b3d7284a (diff) | |
| download | tor-01a0ab02a3d8ef9e7664945224ce5e22f18ac4b9.tar.gz tor-01a0ab02a3d8ef9e7664945224ce5e22f18ac4b9.zip | |
Merge branch 'bug10116_squashed'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 80b552dbb1..3683607741 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2864,8 +2864,8 @@ typedef struct circuit_t { /** Unique ID for measuring tunneled network status requests. */ uint64_t dirreq_id; - /** Next circuit in linked list of all circuits (global_circuitlist). */ - TOR_LIST_ENTRY(circuit_t) head; + /** Index in smartlist of all circuits (global_circuitlist). */ + int global_circuitlist_idx; /** Next circuit in the doubly-linked ring of circuits waiting to add * cells to n_conn. NULL if we have no cells pending, or if we're not |