Merge remote-tracking branch 'purple/openssl' into websocks

I2PTunnel.cpp

@@ -177,6 +177,8 @@ namespace client
 			{
 				if (bytes_transferred > 0)
 					Write (m_StreamBuffer, bytes_transferred); // postpone termination
+				else if (ecode == boost::asio::error::timed_out && m_Stream->IsOpen ())
+					StreamReceive ();
 				else
 					Terminate ();
 			}