Merge remote-tracking branch 'purple/openssl'

This commit is contained in:
Jeff Becker 2016-12-30 04:46:55 -05:00
commit be0c1c0912
16 changed files with 154 additions and 149 deletions

View file

@ -114,6 +114,7 @@ namespace client
const decltype(m_ClientForwards)& GetClientForwards () const { return m_ClientForwards; }
const decltype(m_ServerForwards)& GetServerForwards () const { return m_ServerForwards; }
const i2p::proxy::HTTPProxy * GetHttpProxy () const { return m_HttpProxy; }
const i2p::proxy::SOCKSProxy * GetSocksProxy () const { return m_SocksProxy; }
};
extern ClientContext context;