Merge remote-tracking branch 'public/20_bev_timeout_semantics' into patches-2.0
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Oct 2012 02:48:59 +0000 (22:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Oct 2012 02:48:59 +0000 (22:48 -0400)
1  2 
bufferevent_openssl.c

Simple merge