From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Dec 2011 20:42:15 +0000 (-0500)
Subject: Resolve bug 3448: remove mention of tor-ops (which is not in use)
X-Git-Tag: tor-0.2.3.9-alpha~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf14a520c87c7a98c1ab351b476f46b69e7be75d;p=thirdparty%2Ftor.git

Resolve bug 3448: remove mention of tor-ops (which is not in use)
---

diff --git a/changes/bug3448 b/changes/bug3448
new file mode 100644
index 0000000000..6e7d4b4f7a
--- /dev/null
+++ b/changes/bug3448
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Fix a log message suggesting that people contact a non-existent
+      email address. Fix for bug 3448.
diff --git a/src/or/connection.c b/src/or/connection.c
index 7b95acac66..28d8bca12a 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -3137,8 +3137,7 @@ connection_handle_write_impl(connection_t *conn, int force)
   /* Sometimes, "writable" means "connected". */
   if (connection_state_is_connecting(conn)) {
     if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) {
-      log_warn(LD_BUG,
-               "getsockopt() syscall failed?! Please report to tor-ops.");
+      log_warn(LD_BUG, "getsockopt() syscall failed");
       if (CONN_IS_EDGE(conn))
         connection_edge_end_errno(TO_EDGE_CONN(conn));
       connection_mark_for_close(conn);