Merge remote-tracking branch 'public/bug4697'

changes/bug4697

@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Fix an assertion failure when, while running with bufferevents, a
+      connection finishes connecting after it is marked for close, but
+      before it is closed. Fix for bug 4697; Bugfix on 0.2.3.1-alpha.
+

src/or/connection.c

@@ -2953,6 +2953,9 @@ connection_handle_event_cb(struct bufferevent *bufev, short event, void *arg)
 {
   connection_t *conn = arg;
   (void) bufev;
+  if (conn->marked_for_close)
+    return;
+
   if (event & BEV_EVENT_CONNECTED) {
     tor_assert(connection_state_is_connecting(conn));
     if (connection_finished_connecting(conn)<0)