commit 648db9a4b7101d54f38aee60f42546e9a172e17e Merge: 02a6507 436654e Author: Roger Dingledine arma@torproject.org Date: Thu May 10 17:57:31 2012 -0400

Merge branch 'maint-0.2.2'

src/or/control.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)