Merge remote-tracking branch 'public/bug10169_023' into bug10169_024

Conflicts:
	src/or/relay.c

diff --cc src/common/compat_libevent.c
Simple merge

diff --cc src/common/compat_libevent.h
Simple merge

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

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

diff --cc src/or/relay.c
index 01143f418d0b9b4949f9aa22a8e17e5b7938626c,4cbc8fa4710ae446e1111dd9cd3ada76286e6875..857b7e9d3010947886ec3b3823c738adceeb9902
--- 1/src/or/relay.c
--- 2/src/or/relay.c
+++ b/src/or/relay.c
@@@ -2146,12 -1902,11 +2146,13 @@@ cell_queue_append(cell_queue_t *queue, 
  
  /** Append a newly allocated copy of <b>cell</b> to the end of <b>queue</b> */
  void
 -cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell)
 +cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell,
 +                              int wide_circ_ids)
  {
    struct timeval now;
 -  packed_cell_t *copy = packed_cell_copy(cell);
 +  packed_cell_t *copy = packed_cell_copy(cell, wide_circ_ids);
-   tor_gettimeofday_cached(&now);
+   tor_gettimeofday_cached_monotonic(&now);
++
    copy->inserted_time = (uint32_t)tv_to_msec(&now);
  
    /* Remember the time when this cell was put in the queue. */