]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Sun, 12 Feb 2012 02:20:47 +0000 (21:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 12 Feb 2012 02:20:47 +0000 (21:20 -0500)
1  2 
arc4random.c
devpoll.c
evutil.c
util-internal.h

diff --cc arc4random.c
Simple merge
diff --cc devpoll.c
Simple merge
diff --cc evutil.c
Simple merge
diff --cc util-internal.h
Simple merge