commit a0514ba531e78bc464ab57e58a443e4d21783718 Merge: 3f7f96d e985835 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 21 13:40:00 2011 -0400

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

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