[tor-commits] [tor/master] Merge branch 'ticket4294'

[nickm at torproject.org]

commit aa3c70922002b1fbb8fa5e60fbfe0c25d2d1abae
Merge: ea0518f 7ab0b5f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 25 17:53:55 2011 -0400

    Merge branch 'ticket4294'

 changes/ticket4294 |    8 ++++++++
 src/or/dirserv.c   |   13 ++++++++++++-
 src/or/rephist.c   |   40 ++++++++++++++++++++++++++++++++++++----
 3 files changed, 56 insertions(+), 5 deletions(-)