[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug10169_023' into bug10169_024

[nickm at torproject.org]

commit 46118d7d7542aa960a26a08d9d5fbac33698765c
Merge: 05d8111 833d027
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 4 10:54:54 2014 -0500

    Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
    
    Conflicts:
    	src/or/relay.c

 src/common/compat_libevent.c |   30 ++++++++++++++++++++++++++++++
 src/common/compat_libevent.h |    1 +
 src/or/buffers.c             |    2 +-
 src/or/circuitlist.c         |    8 +++++---
 src/or/relay.c               |    3 ++-
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --cc src/or/relay.c
index 01143f4,4cbc8fa..857b7e9
--- a/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. */