commit 8f793c38fbcd885d40adf8312ef1767e172e1be4 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 31 14:10:23 2013 -0400

Move other #9731 check to start of its functions

At arma's suggestion. Looks like I missed this one. --- src/or/connection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c index 210c658..1f6e11f 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2711,6 +2711,9 @@ connection_consider_empty_write_buckets(connection_t *conn) { const char *reason;

+ if (!connection_is_rate_limited(conn)) + return; /* Always okay. */ + if (global_write_bucket <= 0) { reason = "global write bucket exhausted. Pausing."; } else if (connection_counts_as_relayed_traffic(conn, approx_time()) && @@ -2723,9 +2726,6 @@ connection_consider_empty_write_buckets(connection_t *conn) } else return; /* all good, no need to stop it */

- if (!connection_is_rate_limited(conn)) - return; /* Always okay. */ - LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason)); conn->write_blocked_on_bw = 1; connection_stop_writing(conn);