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

[nickm at torproject.org]

commit beca6a585c5cd594333ae07b0ae3326188f9d67c
Merge: a4a7939ae a1a7ebfb8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:05:15 2018 -0400

    Merge branch 'ticket26064'

 changes/ticket26064 |  5 ++++
 src/or/hibernate.c  | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/or/hibernate.h  |  1 +
 src/or/main.c       |  2 ++
 4 files changed, 81 insertions(+)