summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-01-14 14:41:59 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-14 14:41:59 -0500
commit47122d1d25941da42c550a9f1eded6c883cda39b (patch)
tree55744f80aaf8ab54d1fe7f28363aeb5ea5eaa5e6 /src/or/connection.c
parentcb24852ec57908da0a8d2d724ee5e52bf9e182b8 (diff)
downloadtor-47122d1d25941da42c550a9f1eded6c883cda39b.tar.gz
tor-47122d1d25941da42c550a9f1eded6c883cda39b.zip
Revert junk accidentally included with "start folding in the changes entries"
Looks like Roger's debugging code wanted to take a tour of the world outside his sandbox. This reverts part of commit 19d37202362c0298ae2f3954b0065ccfcef0dbda.
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 42ff7e1a02..740462e7c6 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1245,7 +1245,6 @@ connection_handle_listener_read(connection_t *conn, int new_type)
if (!SOCKET_OK(news)) { /* accept() error */
int e = tor_socket_errno(conn->s);
if (ERRNO_IS_ACCEPT_EAGAIN(e)) {
- log_notice(LD_APP, "he hung up before we could accept(). that's fine.");
return 0; /* he hung up before we could accept(). that's fine. */
} else if (ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e)) {
warn_too_many_conns();
@@ -1257,7 +1256,7 @@ connection_handle_listener_read(connection_t *conn, int new_type)
connection_mark_for_close(conn);
return -1;
}
- log_notice(LD_NET,
+ log_debug(LD_NET,
"Connection accepted on socket %d (child of fd %d).",
(int)news,(int)conn->s);