]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 2 Feb 2012 16:41:37 +0000 (11:41 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 2 Feb 2012 16:41:37 +0000 (11:41 -0500)
1  2 
bufferevent_sock.c

Simple merge