commit 43e12a79885871cdf18bfe6cc835b2414d21e29d Merge: a2c41aa efc9a84 Author: Nick Mathewson <[email protected]> Date: Wed Jan 12 14:00:20 2011 -0500
Merge remote branch 'public/bug2363' into maint-0.2.2
changes/bug2363 | 6 ++++++
src/or/dns.c | 17 ++++++++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
