diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-01 10:28:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-01 10:28:01 -0400 |
| commit | 12dc55f4878d16bfc3fb6789b31494d47df7ccec (patch) | |
| tree | fc98af22b5c8ec89902f579fba8ffb9e2d3d77fe /src/or/or.h | |
| parent | dde41fa1b00151e01e11341903069f5b2f0db1b7 (diff) | |
| parent | 5de88dda0acda6914bacd1e14c2e037798c5d9d9 (diff) | |
| download | tor-12dc55f4878d16bfc3fb6789b31494d47df7ccec.tar.gz tor-12dc55f4878d16bfc3fb6789b31494d47df7ccec.zip | |
Merge branch 'prop221_squashed_024'
Conflicts:
src/or/or.h
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 92c0692b68..a313248500 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2898,6 +2898,9 @@ typedef struct circuit_t { * it on the output buffer. */ unsigned int n_delete_pending : 1; + /** True iff this circuit has received a DESTROY cell in either direction */ + unsigned int received_destroy : 1; + uint8_t state; /**< Current status of this circuit. */ uint8_t purpose; /**< Why are we creating this circuit? */ |