commit 88638d40ca08057e006c0dd6604a4255371acc75 Merge: 32918e9 3055acb Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 28 16:05:59 2011 -0400

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

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