commit d85b563dbb0c57bc5731e664952ed3f8b9a8f6e8 Merge: 19b2126 8731a4e Author: Roger Dingledine arma@torproject.org Date: Mon Sep 10 18:25:57 2012 -0400

Merge branch 'maint-0.2.3'

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