summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-10-16 13:29:14 -0400
committerNick Mathewson <nickm@torproject.org>2014-10-16 13:29:14 -0400
commitfc5cab44724e8328e2186f22114625388f1c8f0d (patch)
treed5030afd7b4b9332311f3cc2a6d83df3f57dd9b3 /src
parenta5cc5ad08d7d3289a52335b87bea512d50ba8062 (diff)
parentab4b29625db720817f9af502199ebf1ee3ac5af7 (diff)
downloadtor-fc5cab44724e8328e2186f22114625388f1c8f0d.tar.gz
tor-fc5cab44724e8328e2186f22114625388f1c8f0d.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src')
-rw-r--r--src/or/relay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index d97c84fb07..d60d96e235 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1718,7 +1718,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
if (circ->package_window + CIRCWINDOW_INCREMENT >
CIRCWINDOW_START_MAX) {
static struct ratelim_t client_warn_ratelim = RATELIM_INIT(600);
- log_fn_ratelim(&client_warn_ratelim, LOG_WARN, LD_PROTOCOL,
+ log_fn_ratelim(&client_warn_ratelim,LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Unexpected sendme cell from client. "
"Closing circ (window %d).",
circ->package_window);