sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2016-12-11 20:37:02 -05:00
parent 6402144099 a40d212383
commit d3874e4cbc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug19926_029_info Normal file
View File

@ -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.

4
src/or/connection_edge.c
View File

@ -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));