commit 12954908623a285606ec7522168cd2ac7e799525 Merge: 27d231c 24add40 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 5 12:17:31 2014 -0500

Merge remote-tracking branch 'public/bug8788'

changes/bug8788 | 3 +++ src/ext/eventdns.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)