[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2

[nickm at torproject.org]

commit c12289792507c8dd51c2a947f7c910c70df4dd3d
Merge: 710227a 525d270
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 28 20:03:57 2011 -0400

    Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2

 changes/bug3020    |    7 +++++++
 src/or/hibernate.c |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)