[tor-commits] [tor/master] Revert "restore the sensible part of ac268a83408e1450544db2f23f364dfa3"

[nickm@xxxxxxxxxxxxxx]

commit d8fe499e08cf6c04fd6bf6230c916dcedf17dc80
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Aug 29 12:25:05 2014 -0400

    Revert "restore the sensible part of ac268a83408e1450544db2f23f364dfa3"
    
    This reverts commit b82e166bec5fcc468424af1ff71e2e753ac534a2.
    
    We don't need that part in 0.2.5, since 0.2.5 no longer supports
    non-multithreaded builds.
---
 src/or/connection.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index bcb1737..36200e5 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -575,17 +575,10 @@ 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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits