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

[nickm at torproject.org]

commit fdbdaf8fabd532d8d9b875d135e9f9dde402ab61
Merge: 7c83d40 a0514ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 21 13:41:38 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

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