Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug9776

@@ -0,0 +1,5 @@
+   o Normal bugfixes:
+     - Always call circuit_n_chan_done(chan, 0) from channel_closed(), so we
+       can't leak pending circuits in some cases where
+       run_connection_housekeeping() calls connection_or_close_normally().
+       Fixes bug #9776; bugfix on 0.2.4.17.

src/or/channel.c

@@ -1295,11 +1295,10 @@ channel_closed(channel_t *chan)
   if (chan->state == CHANNEL_STATE_CLOSED ||
       chan->state == CHANNEL_STATE_ERROR) return;
 
-  if (chan->reason_for_closing == CHANNEL_CLOSE_FOR_ERROR) {
-    /* Inform any pending (not attached) circs that they should
-     * give up. */
-    circuit_n_chan_done(chan, 0);
-  }
+  /* Inform any pending (not attached) circs that they should
+   * give up. */
+  circuit_n_chan_done(chan, 0);
+
   /* Now close all the attached circuits on it. */
   circuit_unlink_all_from_channel(chan, END_CIRC_REASON_CHANNEL_CLOSED);
 

src/or/connection_or.c

@@ -1229,6 +1229,16 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,
 
 /** Mark orconn for close and transition the associated channel, if any, to
  * the closing state.
+ *
+ * It's safe to call this and connection_or_close_for_error() any time, and
+ * channel layer will treat it as a connection closing for reasons outside
+ * its control, like the remote end closing it.  It can also be a local
+ * reason that's specific to connection_t/or_connection_t rather than
+ * the channel mechanism, such as expiration of old connections in
+ * run_connection_housekeeping().  If you want to close a channel_t
+ * from somewhere that logically works in terms of generic channels
+ * rather than connections, use channel_mark_for_close(); see also
+ * the comment on that function in channel.c.
  */
 
 void