commit e6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13 Merge: 58dfebb 1dd9889 Author: Nick Mathewson <[email protected]> Date: Wed Jan 26 11:46:13 2011 -0500
Merge branch 'bug2181' into maint-0.2.2
changes/bug2181 | 4 ++++
doc/tor.1.txt | 4 +++-
src/or/hibernate.c | 6 ++++--
3 files changed, 11 insertions(+), 3 deletions(-)
