start folding in the changes entries

src/or/connection.c

@@ -1245,6 +1245,7 @@ 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();
@@ -1256,7 +1257,7 @@ connection_handle_listener_read(connection_t *conn, int new_type)
     connection_mark_for_close(conn);
     return -1;
   }
-  log_debug(LD_NET,
+  log_notice(LD_NET,
             "Connection accepted on socket %d (child of fd %d).",
             (int)news,(int)conn->s);
 

src/or/relay.c

@@ -1619,6 +1619,14 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial,
             conn->base_.s,
             (int)length, (int)connection_get_inbuf_len(TO_CONN(conn)));
 
+  if (conn->base_.type == CONN_TYPE_AP) {
+    char *text = tor_memdup(payload, length+1);
+    text[length] = 0;
+    log_notice(LD_APP, "Incoming socks text (%d):===\n%s\n===",
+               conn->base_.s, text);
+    tor_free(text);
+  }
+
   if (sending_optimistically && !sending_from_optimistic) {
     /* This is new optimistic data; remember it in case we need to detach and
        retry */