commit 5e8cc766e6a4d297c66ff1afd6a5f8024607ef9c Merge: dc019b0 f15e5ae Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 29 09:05:18 2014 -0400

Merge branch 'ticket961_squashed'

changes/ticket961 | 5 +++ doc/tor.1.txt | 38 ++++++++++++++-------- src/or/config.c | 11 +++++++ src/or/hibernate.c | 51 ++++++++++++++++++++--------- src/or/hibernate.h | 1 + src/or/or.h | 5 +++ src/or/router.c | 7 +++- src/or/status.c | 6 +++- src/test/include.am | 1 + src/test/test.c | 2 ++ src/test/test_accounting.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 173 insertions(+), 30 deletions(-)