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

[arma at torproject.org]

commit 2ea53fc0478aaf91c2dd11d520e02da9b2bebd94
Merge: 16e8951 1040cca
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Jun 20 23:50:29 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 src/common/util.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)