merged with upstream

2017-06-02 23:43:33 +08:00
parent 298181999d
commit 7379b4ddd2
9 changed files with 167 additions and 50 deletions
--- a/libi2pd_client/SAM.cpp
+++ b/libi2pd_client/SAM.cpp
@@ -812,7 +812,7 @@ namespace client
 				socks.push_back(sock);
 			}
 		}
-		for (auto & sock : socks ) sock->Terminate();
+                for (auto & sock : socks ) sock->Terminate("SAMSession::CloseStreams()");
 		m_Sockets.clear();
 	}