Jimmy Kiselak
e08d765f11
Merge branch 'master' of https://github.com/bitcoin/bitcoin into realusmerge
...
Conflicts:
Makefile.am
README.md
configure.ac
contrib/seeds/nodes_main.txt
qa/rpc-tests/decodescript.py
qa/rpc-tests/test_framework/util.py
src/Makefile.am
src/Makefile.qt.include
src/Makefile.qttest.include
src/Makefile.test.include
src/bitcoin-cli-res.rc
src/bitcoin-cli.cpp
src/bitcoin-tx.cpp
src/bitcoind.cpp
src/chainparams.cpp
src/chainparamsseeds.h
src/init.cpp
src/main.cpp
src/main.h
src/miner.cpp
src/net.cpp
src/primitives/block.cpp
src/rpc/mining.cpp
src/rpc/rawtransaction.cpp
src/rpc/server.cpp
src/rpcserver.h
src/script/interpreter.cpp
src/script/script.cpp
src/script/script.h
src/test/alert_tests.cpp
src/test/data/alertTests.raw
src/test/data/script_invalid.json
src/test/data/script_valid.json
src/test/data/tx_invalid.json
src/test/data/tx_valid.json
src/test/miner_tests.cpp
src/test/script_tests.cpp
src/test/test_bitcoin.cpp
src/test/test_bitcoin.h
src/test/transaction_tests.cpp
src/timedata.cpp
src/util.cpp
src/wallet/rpcwallet.cpp
src/wallet/wallet.cpp
src/wallet/wallet.h
2016-05-15 22:16:56 -04:00
Wladimir J. van der Laan
4818dba900
net: Hardcoded seeds update January 2016
2016-01-25 16:14:14 +01:00
Jimmy Kiselak
76f24dffde
change default peer address, fix crash in claim trie
2015-12-05 23:03:00 -05:00
Jimmy Kiselak
f976d965c7
merge upstream changes, set up testnet and regtestnet
2015-10-21 22:30:56 -04:00
Wladimir J. van der Laan
b9329536cd
Hardcoded seeds update June 2015
2015-06-25 08:05:52 +02:00
Wladimir J. van der Laan
ccd4369a23
contrib: Improvements to hardcoded seeds scripts
...
- Moved all seed related scripts to contrib/seeds for consistency
- Updated `makeseeds.py` to handle IPv6 and onions, fix regular
expression for recent Bitcoin Core versions
- Fixed a bug in `generate-seeds.py` with regard to IPv6 parsing
2015-06-25 08:05:33 +02:00
