[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit bb8689b86480d81aa150d5f27fa830afc4de4077
Merge: f38ecd5 c122897
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 28 20:05:48 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

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