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

commit 95f5910810de88725c86a854db1c1653ec19f724 Merge: 5b5abd8 4f0e289 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 8 15:52:22 2016 -0800

Merge branch 'unixninja_ticket15989_squashed'

changes/ticket15989 | 9 +++++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 6 +++++- src/or/hibernate.c | 20 ++++++++++++++++++-- src/or/hibernate.h | 1 + src/or/or.h | 6 ++++-- src/or/router.c | 7 +++++-- src/or/status.c | 22 ++++++++++++++++++---- src/test/test_accounting.c | 26 ++++++++++++++++++++++++++ src/test/test_status.c | 7 ++++--- 10 files changed, 94 insertions(+), 16 deletions(-)