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

[arma at torproject.org]

commit e61c6adfa46501f5c69dd94e16b8db2993cf9eac
Merge: 6abb638 0dc47df
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jun 7 15:39:44 2012 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug6094  |    8 ++++++++
 src/or/control.c |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)