diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-16 13:29:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-16 13:29:14 -0400 |
| commit | fc5cab44724e8328e2186f22114625388f1c8f0d (patch) | |
| tree | d5030afd7b4b9332311f3cc2a6d83df3f57dd9b3 | |
| parent | a5cc5ad08d7d3289a52335b87bea512d50ba8062 (diff) | |
| parent | ab4b29625db720817f9af502199ebf1ee3ac5af7 (diff) | |
| download | tor-fc5cab44724e8328e2186f22114625388f1c8f0d.tar.gz tor-fc5cab44724e8328e2186f22114625388f1c8f0d.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
| -rw-r--r-- | changes/bug8093 | 3 | ||||
| -rw-r--r-- | src/or/relay.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug8093 b/changes/bug8093 new file mode 100644 index 0000000000..f0fbc618c2 --- /dev/null +++ b/changes/bug8093 @@ -0,0 +1,3 @@ + o Downgraded warnings: + - Downgrade the severity of the 'unexpected sendme cell from client' from + 'warn' to 'protocol warning'. Closes ticket 8093. 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); |