]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 9 Oct 2014 14:14:30 +0000 (10:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 9 Oct 2014 14:14:30 +0000 (10:14 -0400)
1  2 
include/event2/dns.h

Simple merge