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

[arma at torproject.org]

commit d6b5caa40413ad697b54e959873bd0947f71bd61
Merge: caa44c9 a0514ba
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Apr 25 18:42:01 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug2933   |    4 ++++
 src/or/eventdns.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)