commit 6a726d34e175e40cbf86617f9f9c761b52929f96 Merge: 075d904 1cff525 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 26 11:15:03 2011 -0400

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

changes/bug2704 | 5 +++++ src/or/rephist.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-)