]> granicus.if.org Git - libevent/commitdiff
Merge commit 'chrisd/connect-hostname-report-err'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 May 2010 18:16:50 +0000 (14:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 May 2010 18:16:50 +0000 (14:16 -0400)
1  2 
bufferevent-internal.h
include/event2/bufferevent.h

Simple merge
Simple merge