Merge branch 'bug2574' into maint-0.2.1
commitee72557d528a846661d4d1d794c127de8c3ef1eb
authorNick Mathewson <nickm@torproject.org>
Sat, 28 May 2011 06:07:48 +0000 (28 02:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 28 May 2011 06:07:48 +0000 (28 02:07 -0400)
tree73d345be5442b3022ab31863c4956269646eceaa
parent0d94f78705d5376059cd2b1bdfe96e84067e212f
parentbe76850995f337337dd94be66a9f03b35d8b1412
Merge branch 'bug2574' into maint-0.2.1
src/or/eventdns.c