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

[nickm at torproject.org]

commit 99618a9641d02b7b99a79c71517203bb70043515
Merge: b4126dc 0dc47df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 7 09:46:14 2012 -0400

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

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