commit 2cb82c33bcb59ce65c9738ff8ff4977f39fa3d9f Merge: 02a43e5 3db3daa Author: Andrea Shepard <andrea@torproject.org> Date: Tue Nov 13 18:54:24 2012 -0800 Merge branch 'bug7267' of ssh://git-rw.torproject.org/user/andrea/tor changes/bug7267 | 4 ++++ src/or/channel.c | 13 +++++++++++++ src/or/hibernate.c | 10 +++++++++- 3 files changed, 26 insertions(+), 1 deletions(-)