Merge pull request #844 from sipa/shutdownfix
authorPieter Wuille <pieter.wuille@gmail.com>
Thu, 16 Feb 2012 11:34:11 +0000 (03:34 -0800)
committerPieter Wuille <pieter.wuille@gmail.com>
Thu, 16 Feb 2012 11:34:11 +0000 (03:34 -0800)
Several shutdown-related fixes

1  2 
src/net.cpp

diff --cc src/net.cpp
Simple merge