[tor-commits] [tor/master] Merge branch 'bug2373' into maint-0.2.2

[nickm at torproject.org]

commit e247705afefaa0f32ccbc43185f98fc65f041af1
Merge: 70e0291 1be1221
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 8 13:35:26 2011 -0400

    Merge branch 'bug2373' into maint-0.2.2

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