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/connection.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/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 42f81d107c..1603833a92 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3648,6 +3648,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; |