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

diff --cc doc/tor.1.txt
Simple merge

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

diff --cc src/or/circuitlist.h
index 94887d5faff2eef1a86e41a5f02738e83ac0de4e,874f68cd2274944b3a949430ab5d9b71d2dd23b7..03f678c5af3d962f8d49e0778e8f4711626ea4e4
--- 1/src/or/circuitlist.h
--- 2/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@@ -63,9 -61,7 +63,10 @@@ int circuit_count_pending_on_channel(ch
  void assert_cpath_layer_ok(const crypt_path_t *cp);
  void assert_circuit_ok(const circuit_t *c);
  void circuit_free_all(void);
+ void circuits_handle_oom(size_t current_allocation);
  
 +void channel_note_destroy_pending(channel_t *chan, circid_t id);
 +void channel_note_destroy_not_pending(channel_t *chan, circid_t id);
 +
  #endif
  

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

diff --cc src/or/or.h
Simple merge

diff --cc src/or/relay.c
index 38776bcd9a4f1424b3e58a2560a3c9f9489309c8,3138c5e8d11f6c31ef22b4bc45660c1e3a1abcaf..251d3ffa2fe8724992b5a03a9a20ce156da87b05
--- 1/src/or/relay.c
--- 2/src/or/relay.c
+++ b/src/or/relay.c
@@@ -2597,8 -2534,14 +2620,14 @@@ append_cell_to_circuit_queue(circuit_t 
    }
  #endif
  
 -  cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids);
 +  cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids, 1);
  
+   if (PREDICT_UNLIKELY(cell_queues_check_size())) {
+     /* We ran the OOM handler */
+     if (circ->marked_for_close)
+       return;
+   }
+ 
    /* If we have too many cells on the circuit, we should stop reading from
     * the edge streams for a while. */
    if (!streams_blocked && queue->n >= CELL_QUEUE_HIGHWATER_SIZE)

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