Merge remote-tracking branch 'ffmancera/github/bug24501'

diff --cc src/or/circuitlist.c
index f074025a39ccaf6064a2e1656c92142001d794bb,c1b5c1a9515f71fe8b0ba4cfb667ecbfe218739f..661438d8f1b8e6f08364d26448cb3f4e930a8d12
--- 1/src/or/circuitlist.c
--- 2/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@@ -2403,10 -2328,16 +2403,16 @@@ circuits_handle_oom(size_t current_allo
    size_t mem_recovered=0;
    int n_circuits_killed=0;
    int n_dirconns_killed=0;
 -  uint32_t now_ms;
 +  uint32_t now_ts;
-   log_notice(LD_GENERAL, "We're low on memory.  Killing circuits with "
-              "over-long queues. (This behavior is controlled by "
-              "MaxMemInQueues.)");
+   log_notice(LD_GENERAL, "We're low on memory (cell queues total alloc: %zu,"
+              " buffer total alloc: %zu, tor compress total alloc: %zu,"
+              " rendezvous cache total alloc: %zu). Killing circuits with"
+              " over-long queues. (This behavior is controlled by"
+              " MaxMemInQueues.)",
+              cell_queues_get_total_allocation(),
+              buf_get_total_allocation(),
+              tor_compress_get_total_allocation(),
+              rend_cache_get_total_allocation());
  
    {
      size_t mem_target = (size_t)(get_options()->MaxMemInQueues *

diff --cc src/or/relay.c
Simple merge

diff --cc src/or/relay.h
index daf789c85583d93e124bd74f7510d3f3375296f2,479ce5496b23bcfbff25680eeee46c7b222c1481..f0fa7e98706fc4876a5d182b0856e51d48b638b2
--- 1/src/or/relay.h
--- 2/src/or/relay.h
+++ b/src/or/relay.h
@@@ -113,8 -103,6 +114,7 @@@ STATIC int connection_edge_process_reso
                                                   const relay_header_t *rh);
  STATIC packed_cell_t *packed_cell_new(void);
  STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue);
- STATIC size_t cell_queues_get_total_allocation(void);
 +STATIC destroy_cell_t *destroy_cell_queue_pop(destroy_cell_queue_t *queue);
  STATIC int cell_queues_check_size(void);
  #endif /* defined(RELAY_PRIVATE) */