]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 7 May 2013 14:03:28 +0000 (10:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 May 2013 14:03:28 +0000 (10:03 -0400)
1  2 
evdns.c

diff --cc evdns.c
Simple merge