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

[arma at torproject.org]

commit 0daad3e44d609b451173d1fdbbb39f28f2d1d461
Merge: d06ea86 436654e
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu May 10 17:57:16 2012 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

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