diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-15 17:13:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-15 17:13:07 -0400 |
| commit | c5ffd44ccd3c60780143eb384938276522a173c1 (patch) | |
| tree | f2b43ecea11c04d7e85e63b2c8b81ee9449f5de3 /src/or/connection.c | |
| parent | ab418447eb9838a8a6f5588e374910d753740d0f (diff) | |
| parent | a86e27cf00153f4d926ac2b0974d2cceb543d673 (diff) | |
| download | tor-c5ffd44ccd3c60780143eb384938276522a173c1.tar.gz tor-c5ffd44ccd3c60780143eb384938276522a173c1.zip | |
Merge branch 'bug2756_relay' into maint-0.2.2
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 1894bc71ca..c65c91b73b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3245,6 +3245,8 @@ connection_flushed_some(connection_t *conn) r = connection_dirserv_flushed_some(TO_DIR_CONN(conn)); } else if (conn->type == CONN_TYPE_OR) { r = connection_or_flushed_some(TO_OR_CONN(conn)); + } else if (CONN_IS_EDGE(conn)) { + r = connection_edge_flushed_some(TO_EDGE_CONN(conn)); } conn->in_flushed_some = 0; return r; |