[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 1db6eb6cb7db46d8dde482f629fbc1c578310d52
Merge: b1b6552 9dfa244
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 16 18:10:24 2011 -0400

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

 src/common/compat_libevent.c |    8 ++++----
 src/or/config.c              |    6 +++---
 src/or/relay.c               |    4 ++--
 src/or/relay.h               |    2 ++
 src/or/rephist.c             |    1 -
 src/or/routerparse.h         |    2 --
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --cc src/or/rephist.c
index 2b804b1,58e8ff0..688ff82
--- 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