# HG changeset patch
# User tcatm <tcatm@gawab.com>
# Date 1298419663 -3600
# Node ID 0d6cf2dc0aa72be7729d356c221781a411ff2179
# Parent  79faf1c282c221ef56997a017ddaad18281fe162# Parent  10b5ecf3f7e90e71e25fa79cb43b867259e95316
Merge branch 'master' of https://github.com/sandos/bitcoin into sandos-master

diff --git a/rpc.cpp b/rpc.cpp
--- a/rpc.cpp
+++ b/rpc.cpp
@@ -1710,6 +1710,8 @@
     ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332));
     ip::tcp::acceptor acceptor(io_service, endpoint);
 
+    acceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+
 #ifdef USE_SSL
     ssl::context context(io_service, ssl::context::sslv23);
     if (fUseSSL)