Skip to content
Snippets Groups Projects
Commit a4065cd8 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Merge remote branch 'sebastian/bug925'

parents 6dd71d31 b2b99a70
No related branches found
No related tags found
No related merge requests found
......@@ -15,6 +15,9 @@ Changes in version 0.2.2.9-alpha - 2010-??-??
- Actually reject .exit hostnames when we're supposed to be rejecting
them; do not pass them on to the exit server. Bugfix on 0.2.2.7-alpha;
found and diagnosed by Scott Bennett and Downie on or-talk.
- Don't spam the controller with log messages when we have no file
descriptors available. Rate-limiting for log messages was already
implemented in the past.
o Code simplifications and refactoring:
- Generate our manpage and HTML documentation using Asciidoc. This
......
......@@ -822,9 +822,9 @@ warn_too_many_conns(void)
log_warn(LD_NET,"Failing because we have %d connections already. Please "
"raise your ulimit -n.", n_conns);
last_warned = now;
control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
n_conns);
}
control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
n_conns);
}
/** Bind a new non-blocking socket listening to the socket described
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment