commit 7902c2fa053ee3cf06d27e373fcb2ed8022ed843 Merge: 136fb78f4 7c68b2f1a Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:23:00 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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