diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-12 11:11:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-12 11:11:16 -0400 |
| commit | 35e19b9498e3d23d87d7adacd4ec27969d63d315 (patch) | |
| tree | c35c24f1e772b2727c1f5b1744fc5e47823f41e2 /src/or | |
| parent | 6a8861574bba27cbe924c147ee85b9fd72fff563 (diff) | |
| parent | 1f5a7917f5e742c9d64c835439a5ea337e9e934a (diff) | |
| download | tor-35e19b9498e3d23d87d7adacd4ec27969d63d315.tar tor-35e19b9498e3d23d87d7adacd4ec27969d63d315.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or')
| -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 169286ea5..791091569 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2480,7 +2480,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max, tor_assert(tmp == cell_ewma); add_cell_ewma_to_conn(conn, cell_ewma); } - if (circ != conn->active_circuits) { + if (!ewma_enabled && circ != conn->active_circuits) { /* If this happens, the current circuit just got made inactive by * a call in connection_write_to_buf(). That's nothing to worry about: * circuit_make_inactive_on_conn() already advanced conn->active_circuits |