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

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

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

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

diff --cc src/or/rephist.c
index 2b804b1a1e568ad32f4c1c623a63bbecbecea691,58e8ff0a05c974debbef7c059b28538e0997be46..688ff82ee4e8664edafe9d3e0b7064375fc707d7
--- 1/src/or/rephist.c
--- 2/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