diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-15 17:18:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-15 17:18:29 -0400 |
| commit | 737228ed8e81de6619a29bd039d08d959d4164da (patch) | |
| tree | ce95515af13ca4e6aa596c01b3575b895d14fb06 /src/or/relay.c | |
| parent | 4dde69a6d003682217c2bf6327b5923c7b811974 (diff) | |
| parent | c5ffd44ccd3c60780143eb384938276522a173c1 (diff) | |
| download | tor-737228ed8e81de6619a29bd039d08d959d4164da.tar.gz tor-737228ed8e81de6619a29bd039d08d959d4164da.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index ec8e9ac8da..96430dcec5 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1403,8 +1403,9 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, goto repeat_connection_edge_package_raw_inbuf; } -/** Called when we've just received a relay data cell, or when - * we've just finished flushing all bytes to stream <b>conn</b>. +/** Called when we've just received a relay data cell, when + * we've just finished flushing all bytes to stream <b>conn</b>, + * or when we've flushed *some* bytes to the stream <b>conn</b>. * * If conn->outbuf is not too full, and our deliver window is * low, send back a suitable number of stream-level sendme cells. |