]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 26 Mar 2013 01:14:10 +0000 (21:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 26 Mar 2013 01:14:10 +0000 (21:14 -0400)
1  2 
include/event2/buffer.h

Simple merge