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

[arma at torproject.org]

commit d4a61c76a1f4e21671cb93c1d5df1e31f9adc117
Merge: 78c610e cba1d29
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Apr 27 15:21:27 2011 -0400

    Merge branch 'maint-0.2.2'
    
    Conflicts:
    	src/or/dirserv.h

 src/or/circuituse.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)