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

[nickm at torproject.org]

commit 71a21256b0c06bcd0e32fd5d56edbed921aa70fa
Merge: 85f75d6 a6514b8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 15 11:46:55 2017 -0400

    Merge branch 'bug22245_024'

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