]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 29 May 2013 17:32:47 +0000 (13:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 May 2013 17:32:47 +0000 (13:32 -0400)
1  2 
evutil.c

diff --cc evutil.c
Simple merge