]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 1 Sep 2011 21:39:37 +0000 (17:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 Sep 2011 21:39:37 +0000 (17:39 -0400)
1  2 
evdns.c

diff --cc evdns.c
Simple merge