Merge branch 'master' of github.com:majestrate/i2pd

Fixed Conflicts:
	SAM.cpp
This commit is contained in:
Jeff Becker
2016-05-29 09:36:01 -04:00

View File

@@ -49,7 +49,6 @@ namespace client
{
if (m_Session)
m_Session->DelSocket (shared_from_this ());
}
break;
}
case eSAMSocketTypeAcceptor: