commit 3055acbdbe914c31ca4825ed60b4cce6676bd61e Merge: 2c0258b c1927d7 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 28 16:05:34 2011 -0400

Merge remote-tracking branch 'sebastian/bug2497' into maint-0.2.2

changes/ticket2497 | 4 ++++ src/or/rephist.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)