]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Nov 2012 15:44:57 +0000 (10:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Nov 2012 15:44:57 +0000 (10:44 -0500)
1  2 
bufferevent_openssl.c

Simple merge