[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug13988_025'

[nickm at torproject.org]

commit 7dd852835c24a2db1cc4751f3b9235a8c78bf775
Merge: 79aaad9 6830667
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 7 11:45:24 2015 -0500

    Merge remote-tracking branch 'public/bug13988_025'

 changes/bug13988 |    3 +++
 src/or/rephist.c |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)