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

[arma at torproject.org]

commit 4e88a3bc3e1a195864c3185d16d89e090246fc55
Merge: 458cc9d 0b5d264
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Sep 28 15:13:05 2011 -0400

    Merge branch 'maint-0.2.2'

 changes/bug4115    |    7 +++++++
 src/or/directory.c |    3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)