commit f083347adf40164aac3b77d118ec372c89178d5a Merge: 4c789ec 6fde2b4 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 26 11:07:48 2011 -0400

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

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