[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

[arma at torproject.org]

commit da068c9166d977484222426f1d2423d7ce4e0d5f
Merge: f0e1ee9 c5c5f85
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Oct 29 16:26:01 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug4299    |    5 +++++
 changes/bug4331    |    4 ++++
 changes/bug4340    |    5 +++++
 src/or/command.c   |    6 ++++++
 src/or/config.c    |    2 ++
 src/or/hibernate.c |    2 +-
 6 files changed, 23 insertions(+), 1 deletions(-)