Merge branch 'maint-0.4.7'

changes/ticket40623

@@ -0,0 +1,4 @@
+  o Major bugfixes (relay):
+    - Stop sending TRUNCATED cell and instead close the circuits which sends a
+      DESTROY cell so every relay in the circuit path can stop queuing cells.
+      Fixes bug 40623; bugfix on 0.1.0.2-rc.

src/core/or/command.c

@@ -664,11 +664,11 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan)
     if (CIRCUIT_IS_ORIGIN(circ)) {
       circuit_mark_for_close(circ, reason|END_CIRC_REASON_FLAG_REMOTE);
     } else {
-      char payload[1];
-      log_debug(LD_OR, "Delivering 'truncated' back.");
-      payload[0] = (char)reason;
-      relay_send_command_from_edge(0, circ, RELAY_COMMAND_TRUNCATED,
-                                   payload, sizeof(payload), NULL);
+      /* Close the circuit so we stop queuing cells for it and propagate the
+       * DESTROY cell down the circuit so relays can stop queuing in-flight
+       * cells for this circuit which helps with memory pressure. */
+      log_debug(LD_OR, "Received DESTROY cell from n_chan, closing circuit.");
+      circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);
     }
   }
 }