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

Fixed Conflicts:
	SAM.cpp
pull/509/head
Jeff Becker 8 years ago
commit 0b3a719a95
No known key found for this signature in database
GPG Key ID: AB950234D6EA286B

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

Loading…
Cancel
Save