[tor-commits] [tor/master] Merge branch 'task-5849-3-squashed'

[nickm at torproject.org]

commit 971cf123743693677ab1b480692d117e333cb882
Merge: 068046e 2133b6e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 10:13:01 2012 -0400

    Merge branch 'task-5849-3-squashed'

 changes/bug5849  |    3 +++
 src/or/rephist.c |   14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)