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

[nickm at torproject.org]

commit 521cb581877be404626446aa558cade649c13f03
Merge: 92cba63 5905a0b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 15 10:05:19 2012 -0400

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

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