]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 18 Sep 2014 19:08:57 +0000 (15:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 18 Sep 2014 19:08:57 +0000 (15:08 -0400)
1  2 
bufferevent.c

diff --cc bufferevent.c
Simple merge