[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug2003_nm'

[nickm at torproject.org]

commit 1ec22eac4bf20424624fe2ef2151ff57687912de
Merge: 8b0ee60 9bdde89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 7 16:43:45 2011 -0400

    Merge remote-tracking branch 'public/bug2003_nm'

 changes/bug2003     |    8 ++++++++
 src/or/hibernate.c  |   38 +++++++++++++++++++-------------------
 src/or/hibernate.h  |   22 ++++++++++++++++++++++
 src/test/test_dir.c |    6 +++++-
 4 files changed, 54 insertions(+), 20 deletions(-)