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

commit aeb27526f81297ed265f93ee82a0ed2eabbd451e Merge: 0ddc8de 03f6ee8 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 15 10:54:55 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3732 | 7 +++++++ src/or/control.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-)