diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-11-22 07:15:30 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-11-22 07:15:30 -0500 |
| commit | 403f99eaa48b0374c9a21f624f81ecae521734b3 (patch) | |
| tree | 50e3c0f67c80cdbc5a6a7ad8a410b375d8e61474 /src/or/relay.c | |
| parent | 7f3f88bed38758d1f6f72cd0864cf93809bb5440 (diff) | |
| download | tor-403f99eaa48b0374c9a21f624f81ecae521734b3.tar.gz tor-403f99eaa48b0374c9a21f624f81ecae521734b3.zip | |
add a minimum for CircuitStreamTimeout, plus a man page
plus some other unrelated touchups that have been sitting in my
sandbox
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 2151ddeb9b..00e70d95c1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1846,7 +1846,7 @@ set_streams_blocked_on_circ(circuit_t *circ, or_connection_t *orconn, } /** Pull as many cells as possible (but no more than <b>max</b>) from the - * queue of the first active circuit on <b>conn</b>, and write then to + * queue of the first active circuit on <b>conn</b>, and write them to * <b>conn</b>->outbuf. Return the number of cells written. Advance * the active circuit pointer to the next active circuit in the ring. */ int |