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

[nickm at torproject.org]

commit 7121e7bd15659052ccf42e554ae959a75cfacb45
Merge: 28485d3 71ec90f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 21 13:42:39 2013 -0400

    Merge branch 'ticket5526'

 changes/ticket5526 |    4 ++++
 src/or/hibernate.c |    7 +++++++
 src/or/hibernate.h |    1 +
 src/or/status.c    |   31 +++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+)