[tor-commits] [tor/master] Merge remote-tracking branch 'linus/task-5891'

[nickm at torproject.org]

commit 009453f919825c40ad12b2b89c8754bcb53fa8f9
Merge: ee1b819 ad61282
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 15 08:33:08 2012 -0400

    Merge remote-tracking branch 'linus/task-5891'

 changes/bug5891  |    5 +++++
 src/or/rephist.c |   43 ++++++++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 21 deletions(-)