Merge upstream branch bitcoin/0.10

d8ac901 doc: improve credits in release notes (Gregory Maxwell)
bf8ad0d update release notes for 0.10.1rc3 (Wladimir J. van der Laan)
139cd81 Cap nAttempts penalty at 8 and switch to pow instead of a division loop. (Gregory Maxwell)
bac6fca Set nSequenceId when a block is fully linked (Suhas Daftuar)
323de27 Initialization: setup environment before starting QT tests (dexX7)
7494e09 Initialization: setup environment before starting tests (dexX7)
df45564 Initialization: set fallback locale as environment variable (dexX7)
57d1f46 Fix CheckBlockIndex for reindex. (mrbandrews)
eae305f Fix missing lock in submitblock (Matt Corallo)
34127c7 doc: update release notes pre rc2 (Wladimir J. van der Laan)
1c62e84 Keep mempool consistent during block-reorgs (Gavin Andresen)
149c1d8 doc: Credit Jonas Nick in release notes (Wladimir J. van der Laan)
bf1cc80 Docs: Use new Bitcoin.org download URLs (David A. Harding)
9e1cc16 doc: add historical release notes for 0.10.0 (Wladimir J. van der Laan)
fe31225 update release notes for bitcoin#5953/bitcoin#5900 (Wladimir J. van der Laan)
a1f425b Add a consistency check for the block chain data structures (Pieter Wuille)
ae1479a update release notes after bitcoin#5941 (Wladimir J. van der Laan)
aa587d4 Scale up addrman (Pieter Wuille)
0c6f334 Always use a 50% chance to choose between tried and new entries (Pieter Wuille)
214154e Do not bias outgoing connections towards fresh addresses (Pieter Wuille)
2218d4b Simplify hashing code (Pieter Wuille)
cf0218f Make addrman's bucket placement deterministic. (Pieter Wuille)
b788994 Switch addrman key from vector to uint256 (Pieter Wuille)
90bef66 No notable changes for minor release (Wladimir J. van der Laan)
4635a4c Translations update from transifex (Wladimir J. van der Laan)
0eccf0a Add commits (up to now) to release notes (Wladimir J. van der Laan)
78f64ef don't trickle for whitelisted nodes (Ruben de Vries)
a316622 Clean out release notes for 0.10.1 (Wladimir J. van der Laan)

doc/release-process.md

@@ -132,15 +132,22 @@ rm SHA256SUMS
 (the digest algorithm is forced to sha256 to avoid confusion of the `Hash:` header that GPG adds with the SHA256 used for the files)
 
 - Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the bitcoin.org server
+  into `/var/www/bin/bitcoin-core-${VERSION}`
 
 - Update bitcoin.org version
 
-  - Make a pull request to add a file named `YYYY-MM-DD-vX.Y.Z.md` with the release notes
-  to https://github.com/bitcoin/bitcoin.org/tree/master/_releases
-   ([Example for 0.9.2.1](https://raw.githubusercontent.com/bitcoin/bitcoin.org/master/_releases/2014-06-19-v0.9.2.1.md)).
+  - First, check to see if the Bitcoin.org maintainers have prepared a
+    release: https://github.com/bitcoin/bitcoin.org/labels/Releases
 
-  - After the pull request is merged, the website will automatically show the newest version, as well
-    as update the OS download links. Ping Saivann in case anything goes wrong
+      - If they have, it will have previously failed their Travis CI
+        checks because the final release files weren't uploaded.
+        Trigger a Travis CI rebuild---if it passes, merge.
+
+  - If they have not prepared a release, follow the Bitcoin.org release
+    instructions: https://github.com/bitcoin/bitcoin.org#release-notes
+
+  - After the pull request is merged, the website will automatically show the newest version within 15 minutes, as well
+    as update the OS download links. Ping @saivann/@harding (saivann/harding on Freenode) in case anything goes wrong
 
 - Announce the release:
 

qa/rpc-tests/reindex.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python2
+# Copyright (c) 2014 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test -reindex with CheckBlockIndex
+#
+from test_framework import BitcoinTestFramework
+from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
+from util import *
+import os.path
+
+class ReindexTest(BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 1)
+
+    def setup_network(self):
+        self.nodes = []
+        self.is_network_split = False
+        self.nodes.append(start_node(0, self.options.tmpdir))
+
+    def run_test(self):
+        self.nodes[0].generate(3)
+        stop_node(self.nodes[0], 0)
+        wait_bitcoinds()
+        self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug", "-reindex", "-checkblockindex=1"])
+        assert_equal(self.nodes[0].getblockcount(), 3)
+        print "Success"
+
+if __name__ == '__main__':
+    ReindexTest().main()

src/Makefile.test.include

@@ -51,6 +51,7 @@ BITCOIN_TESTS =\
   test/hash_tests.cpp \
   test/key_tests.cpp \
   test/main_tests.cpp \
+  test/mempool_tests.cpp \
   test/miner_tests.cpp \
   test/mruset_tests.cpp \
   test/multisig_tests.cpp \