diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-22 18:15:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-22 18:15:27 -0400 |
| commit | 9919b0127568253b6bec4f681db3cdc2b5978991 (patch) | |
| tree | 333c5db1120ef60f69e51569c4add186b2903dea /src/or/or.h | |
| parent | 64a5a4177f905971d0cf9e28a19180c2ea32b02a (diff) | |
| parent | 2b5ebc70973b1c0dd62201908632733c0953a4ec (diff) | |
| download | tor-9919b0127568253b6bec4f681db3cdc2b5978991.tar.gz tor-9919b0127568253b6bec4f681db3cdc2b5978991.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h index 7daf195265..730b167d94 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2483,14 +2483,14 @@ typedef struct or_circuit_t { cell_ewma_t p_cell_ewma; } or_circuit_t; -/** Convert a circuit subtype to a circuit_t.*/ +/** Convert a circuit subtype to a circuit_t. */ #define TO_CIRCUIT(x) (&((x)->_base)) -/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Asserts +/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert * if the cast is impossible. */ static or_circuit_t *TO_OR_CIRCUIT(circuit_t *); /** Convert a circuit_t* to a pointer to the enclosing origin_circuit_t. - * Asserts if the cast is impossible. */ + * Assert if the cast is impossible. */ static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *); static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x) |