commit 50b8a449b5b11ed3aef1ee3fc3badf0354e51c3b Merge: 4d0a8f53e 2b94b0ea7 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:23:00 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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