commit 86f619d0d34657e96d8ae3e83a197382bf6ba344 Merge: fc9e840 46a3914 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 1 21:50:55 2014 -0400

Merge remote-tracking branch 'public/bug10468_024'

changes/bug10468 | 4 ++++ src/or/dnsserv.c | 10 ++++++++++ 2 files changed, 14 insertions(+)