]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Mar 2014 15:10:16 +0000 (11:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Mar 2014 15:10:16 +0000 (11:10 -0400)
1  2 
evdns.c

diff --cc evdns.c
Simple merge