[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9

[nickm at torproject.org]

commit 2b94b0ea721f2bd0127d097860ef64b915e2781a
Merge: f6ecda840 a6514b8a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:22:42 2017 -0400

    Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9

 changes/bug22245   | 5 +++++
 src/or/hibernate.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)