From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Mar 2011 22:10:24 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.1-alpha~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1db6eb6cb7db46d8dde482f629fbc1c578310d52;p=thirdparty%2Ftor.git

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

1db6eb6cb7db46d8dde482f629fbc1c578310d52
diff --cc src/or/rephist.c
index 2b804b1a1e,58e8ff0a05..688ff82ee4
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@@ -2324,9 -2334,9 +2324,8 @@@ typedef struct circ_buffer_stats_t 
    uint32_t processed_cells;
    double mean_num_cells_in_queue;
    double mean_time_cells_in_queue;
 -  uint32_t local_circ_id;
  } circ_buffer_stats_t;
  
- /** Holds stats. */
  smartlist_t *circuits_for_buffer_stats = NULL;
  
  /** Remember cell statistics for circuit <b>circ</b> at time