From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 4 Mar 2014 15:54:54 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
X-Git-Tag: tor-0.2.5.3-alpha~38^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46118d7d7542aa960a26a08d9d5fbac33698765c;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/relay.c
---

46118d7d7542aa960a26a08d9d5fbac33698765c
diff --cc src/or/relay.c
index 01143f418d,4cbc8fa471..857b7e9d30
--- 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. */