Merged from bitcoin: 212/head
authorsvost <ya.nowa@yandex.ru>
Sat, 18 Apr 2015 20:00:01 +0000 (23:00 +0300)
committersvost <ya.nowa@yandex.ru>
Sat, 18 Apr 2015 20:00:01 +0000 (23:00 +0300)
commit17a6c72f2ee4421c07d002983a1f11645b008934
tree6984bf061fab7d0d6425f697b50c7e6916240ca6
parentd041e87aaf08bb731a6a839d135a0a444b717ede
Merged from bitcoin:
https://github.com/bitcoin/bitcoin/commit/3427517d507a938074a50fa8ea6dfe3d13bef357#diff-9a82240fe7dfe86564178691cc57f2f1
src/main.cpp
src/net.cpp