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

[nickm@xxxxxxxxxxxxxx]

commit 99c2bfe76b48f8a142682c2729236d5e4e63ec25
Merge: 85ac832 e247705
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Apr 8 13:37:57 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/rephist.c

 src/common/log.c |   11 ++++++++++-
 src/or/rephist.c |   19 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --cc src/or/rephist.c
index 56a3d1d,9b7eefe..d6b4a03
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@@ -2748,6 -2545,11 +2756,13 @@@ rep_hist_free_all(void
    tor_free(exit_streams);
    built_last_stability_doc_at = 0;
    predicted_ports_free();
 +  bidi_map_free();
++
+   if (circuits_for_buffer_stats) {
+     SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, s,
+                       tor_free(s));
+     smartlist_free(circuits_for_buffer_stats);
+     circuits_for_buffer_stats = NULL;
+   }
  }
  

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits