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

[arma at torproject.org]

commit ee72557d528a846661d4d1d794c127de8c3ef1eb
Merge: 0d94f78 be76850
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat May 28 02:07:48 2011 -0400

    Merge branch 'bug2574' into maint-0.2.1

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