Merge remote-tracking branch 'asn/bug4312'
commite5f2f10844dc2445f8cf2f0dc8ec92bc4ce65d63
authorNick Mathewson <nickm@torproject.org>
Fri, 25 Nov 2011 22:00:47 +0000 (25 17:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 25 Nov 2011 22:00:47 +0000 (25 17:00 -0500)
treefae7b809f8c8470921c1b38be572e231b0af7709
parentb1bd30c24c4d9ee1a760c0fb28e18bc597bb0df5
parent406ae1ba5ad529a4d0e710229dab6ed645d42b50
Merge remote-tracking branch 'asn/bug4312'
src/common/compat_libevent.c
src/common/tortls.c
src/common/tortls.h
src/or/connection_or.c