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

[nickm at torproject.org]

commit c9ad172dd4081fbb3cd5e2995a79d3e449b7e474
Merge: cf98ca715 e9f57e193
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 31 11:59:18 2017 -0400

    Merge branch 'bug23571_033_squashed'

 changes/bug23571   |  3 +++
 src/or/hibernate.c | 14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)