Merge pull request #268 from svost/CloseSocket

author 0xDEADFACE <masmfan@gmail.com>

Wed, 3 Feb 2016 07:45:26 +0000 (07:45 +0000)

committer 0xDEADFACE <masmfan@gmail.com>

Wed, 3 Feb 2016 07:45:26 +0000 (07:45 +0000)
author 0xDEADFACE <masmfan@gmail.com>
Wed, 3 Feb 2016 07:45:26 +0000 (07:45 +0000)
committer 0xDEADFACE <masmfan@gmail.com>
Wed, 3 Feb 2016 07:45:26 +0000 (07:45 +0000)
diff --cc src/net.h
Simple merge
diff --cc src/netbase.cpp
Simple merge
diff --cc src/netbase.h
Simple merge
diff --cc src/ntp.cpp
Simple merge
author	0xDEADFACE <masmfan@gmail.com>
	Wed, 3 Feb 2016 07:45:26 +0000 (07:45 +0000)
committer	0xDEADFACE <masmfan@gmail.com>
	Wed, 3 Feb 2016 07:45:26 +0000 (07:45 +0000)
		1	2
src/net.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/netbase.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/netbase.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/ntp.cpp	patch \|	diff1 \|	diff2 \|	blob \| history