restore the sensible part of ac268a83408e1450544db2f23f364dfa3

We don't want to call event_del() postfork, if cpuworkers are
multiprocess.

diff --git a/src/or/connection.c b/src/or/connection.c
index 6d205d143c6058b49ba859047119df549581eb23..aedb29d4e42630e292d54fdbc68fb35ca9d037d9 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -553,10 +553,17 @@ connection_free_(connection_t *conn)
     tor_free(control_conn->incoming_cmd);
   }
 
+#ifdef TOR_IS_MULTITHREADED
   /* Probably already freed by connection_free. */
+  /* We don't do these frees on the multiprocess case, since in that case we
+   * don't want to call event_del() postfork or it's likely to mess up.
+   * Multiprocess builds are deprecated, so let's just have a one-time memory
+   * leak here.
+   */
   tor_event_free(conn->read_event);
   tor_event_free(conn->write_event);
   conn->read_event = conn->write_event = NULL;
+#endif
   IF_HAS_BUFFEREVENT(conn, {
       /* This was a workaround to handle bugs in some old versions of libevent
        * where callbacks can occur after calling bufferevent_free().  Setting