commit 879b1e10101f4eb5ecfb37c7a51f2882c2ac3ea1 Merge: 8030ec4 f9fddba Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 15 14:44:32 2012 -0400

Merge remote-tracking branch 'public/bug5932'

changes/bug5932 | 3 +++ src/or/dns.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)