]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 3 Aug 2011 16:12:47 +0000 (12:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 3 Aug 2011 16:12:47 +0000 (12:12 -0400)
1  2 
bufferevent_openssl.c

Simple merge