[tor-commits] [tor/master] Merge remote-tracking branch 'yawning-schwanenleid/feature18685'

[nickm at torproject.org]

commit 4a44e2d6f1152c6d431f21dca26c84a8a28172a5
Merge: bff53aa a19f419
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 26 13:39:50 2016 -0400

    Merge remote-tracking branch 'yawning-schwanenleid/feature18685'

 changes/feature18685 |  3 +++
 src/or/hibernate.c   | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 6 deletions(-)