diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-11 20:37:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-11 20:37:02 -0500 |
| commit | d3874e4cbca233cf83ae0da55e68fb27deafdd82 (patch) | |
| tree | 859bcdab41c74a7846a431d74a664d4015503f89 | |
| parent | 640214409930662456378f103a9ed3fc681453f3 (diff) | |
| parent | a40d2123834cd55e77ed76684a6d0f536a7c2f4e (diff) | |
| download | tor-d3874e4cbca233cf83ae0da55e68fb27deafdd82.tar.gz tor-d3874e4cbca233cf83ae0da55e68fb27deafdd82.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | changes/bug19926_029_info | 3 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug19926_029_info b/changes/bug19926_029_info new file mode 100644 index 0000000000..93fd81b6cb --- /dev/null +++ b/changes/bug19926_029_info @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Downgrade a harmless log message about the pending_entry_connections + list from "warn" to "info". Mitigates bug 19926. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 7b9c315a11..3550d0e212 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -865,7 +865,9 @@ connection_ap_attach_pending(int retry) continue; } if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { - log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state " + // XXXX 030 -- this is downgraded in 0.2.9, since we apparently + // XXXX are running into it in practice. It's harmless. + log_info(LD_BUG, "%p is no longer in circuit_wait. Its current state " "is %s. Why is it on pending_entry_connections?", entry_conn, conn_state_to_string(conn->type, conn->state)); |