Fix bad rebase for SSLContext
authorDave Watson <davejwatson@fb.com>
Fri, 31 Oct 2014 19:49:57 +0000 (12:49 -0700)
committerPavlo Kushnir <pavlo@fb.com>
Sat, 8 Nov 2014 02:26:22 +0000 (18:26 -0800)
commit4f204c1fd7ba52f1466c4ae3fa9dffe05cb82b3a
tree035829136826d86c92b1a7f796baf7fde361a85d
parent8160f2fb948a416e15be3b1201d80377b02948a7
Fix bad rebase for SSLContext

Summary: Put back previous liger diffs

Test Plan: It builds

Reviewed By: seanc@fb.com

Subscribers: doug, ssl-diffs@, njormrod, folly-diffs@

FB internal diff: D1652754

Signature: t1:1652754:1414785984:df0fc7bf59dc2e89defd2c1a4ffe3b288238ba58
folly/io/async/SSLContext.cpp