From 9b9acc27d2ea91223177bc2509568721334af178 Mon Sep 17 00:00:00 2001
From: Diego Viola <diego.viola@gmail.com>
Date: Tue, 22 Sep 2015 04:25:26 -0300
Subject: [PATCH 01/17] Fix spelling of Qt

---
 contrib/debian/examples/bitcoin.conf      | 4 ++--
 doc/release-notes/release-notes-0.10.1.md | 2 +-
 src/qt/guiutil.cpp                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf
index ade80d60e..3fd47afe3 100644
--- a/contrib/debian/examples/bitcoin.conf
+++ b/contrib/debian/examples/bitcoin.conf
@@ -60,7 +60,7 @@
 # JSON-RPC options (for controlling a running Bitcoin/bitcoind process)
 #
 
-# server=1 tells Bitcoin-QT and bitcoind to accept JSON-RPC commands
+# server=1 tells Bitcoin-Qt and bitcoind to accept JSON-RPC commands
 #server=0
 
 # Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6.
@@ -82,7 +82,7 @@
 # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED,
 # because the rpcpassword is transmitted over the network unencrypted.
 
-# server=1 tells Bitcoin-QT to accept JSON-RPC commands.
+# server=1 tells Bitcoin-Qt to accept JSON-RPC commands.
 # it is also read by bitcoind to determine if RPC should be enabled 
 #rpcallowip=10.1.1.34/255.255.255.0
 #rpcallowip=1.2.3.4/24
diff --git a/doc/release-notes/release-notes-0.10.1.md b/doc/release-notes/release-notes-0.10.1.md
index 5e939600a..8f59f1f68 100644
--- a/doc/release-notes/release-notes-0.10.1.md
+++ b/doc/release-notes/release-notes-0.10.1.md
@@ -101,7 +101,7 @@ Tests:
 Miscellaneous:
 - `c9e022b` Initialization: set Boost path locale in main thread
 - `23126a0` Sanitize command strings before logging them.
-- `323de27` Initialization: setup environment before starting QT tests
+- `323de27` Initialization: setup environment before starting Qt tests
 - `7494e09` Initialization: setup environment before starting tests
 - `df45564` Initialization: set fallback locale as environment variable
 
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 4a1f728e1..0f30057ef 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -391,7 +391,7 @@ void SubstituteFonts(const QString& language)
 {
 #if defined(Q_OS_MAC)
 // Background:
-// OSX's default font changed in 10.9 and QT is unable to find it with its
+// OSX's default font changed in 10.9 and Qt is unable to find it with its
 // usual fallback methods when building against the 10.7 sdk or lower.
 // The 10.8 SDK added a function to let it find the correct fallback font.
 // If this fallback is not properly loaded, some characters may fail to

From 01878c9c3f42961b8fb1356105b7b90abbce1c9d Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 17 Sep 2015 17:43:34 -0400
Subject: [PATCH 02/17] Fix locking in GetTransaction.

GetTransaction needs to lock cs_main until ReadBlockFromDisk completes, the data inside CBlockIndex's can change since pruning.  This lock was held by all calls to GetTransaction except rest_tx.
---
 src/main.cpp | 74 +++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f6deaa29b..77d9227f5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1092,47 +1092,45 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
 bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock, bool fAllowSlow)
 {
     CBlockIndex *pindexSlow = NULL;
+
+    LOCK(cs_main);
+
+    if (mempool.lookup(hash, txOut))
     {
-        LOCK(cs_main);
+        return true;
+    }
+
+    if (fTxIndex) {
+        CDiskTxPos postx;
+        if (pblocktree->ReadTxIndex(hash, postx)) {
+            CAutoFile file(OpenBlockFile(postx, true), SER_DISK, CLIENT_VERSION);
+            if (file.IsNull())
+                return error("%s: OpenBlockFile failed", __func__);
+            CBlockHeader header;
+            try {
+                file >> header;
+                fseek(file.Get(), postx.nTxOffset, SEEK_CUR);
+                file >> txOut;
+            } catch (const std::exception& e) {
+                return error("%s: Deserialize or I/O error - %s", __func__, e.what());
+            }
+            hashBlock = header.GetHash();
+            if (txOut.GetHash() != hash)
+                return error("%s: txid mismatch", __func__);
+            return true;
+        }
+    }
+
+    if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it
+        int nHeight = -1;
         {
-            if (mempool.lookup(hash, txOut))
-            {
-                return true;
-            }
-        }
-
-        if (fTxIndex) {
-            CDiskTxPos postx;
-            if (pblocktree->ReadTxIndex(hash, postx)) {
-                CAutoFile file(OpenBlockFile(postx, true), SER_DISK, CLIENT_VERSION);
-                if (file.IsNull())
-                    return error("%s: OpenBlockFile failed", __func__);
-                CBlockHeader header;
-                try {
-                    file >> header;
-                    fseek(file.Get(), postx.nTxOffset, SEEK_CUR);
-                    file >> txOut;
-                } catch (const std::exception& e) {
-                    return error("%s: Deserialize or I/O error - %s", __func__, e.what());
-                }
-                hashBlock = header.GetHash();
-                if (txOut.GetHash() != hash)
-                    return error("%s: txid mismatch", __func__);
-                return true;
-            }
-        }
-
-        if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it
-            int nHeight = -1;
-            {
-                CCoinsViewCache &view = *pcoinsTip;
-                const CCoins* coins = view.AccessCoins(hash);
-                if (coins)
-                    nHeight = coins->nHeight;
-            }
-            if (nHeight > 0)
-                pindexSlow = chainActive[nHeight];
+            CCoinsViewCache &view = *pcoinsTip;
+            const CCoins* coins = view.AccessCoins(hash);
+            if (coins)
+                nHeight = coins->nHeight;
         }
+        if (nHeight > 0)
+            pindexSlow = chainActive[nHeight];
     }
 
     if (pindexSlow) {

From b3eaa301ff375e8568fa86642c0aac064f0946da Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 7 Sep 2015 11:00:59 +0200
Subject: [PATCH 03/17] [Qt] Raise debug window when requested

* Raise the debug window when hidden behind other windows
* Switch to the debug window when on another virtual desktop
* Show the debug window when minimized

This change is a conceptual copy of 5ffaaba and 382e9e2
---
 src/qt/bitcoingui.cpp | 17 ++++++++++++-----
 src/qt/bitcoingui.h   |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 396435f12..fa5083e00 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -212,11 +212,6 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
     statusBar()->addWidget(progressBar);
     statusBar()->addPermanentWidget(frameBlocks);
 
-    connect(openRPCConsoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show()));
-
-    // prevents an open debug window from becoming stuck/unusable on client shutdown
-    connect(quitAction, SIGNAL(triggered()), rpcConsole, SLOT(hide()));
-
     // Install event filter to be able to catch status tip events (QEvent::StatusTip)
     this->installEventFilter(this);
 
@@ -349,6 +344,10 @@ void BitcoinGUI::createActions()
     connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked()));
     connect(toggleHideAction, SIGNAL(triggered()), this, SLOT(toggleHidden()));
     connect(showHelpMessageAction, SIGNAL(triggered()), this, SLOT(showHelpMessageClicked()));
+    connect(openRPCConsoleAction, SIGNAL(triggered()), this, SLOT(showDebugWindow()));
+    // prevents an open debug window from becoming stuck/unusable on client shutdown
+    connect(quitAction, SIGNAL(triggered()), rpcConsole, SLOT(hide()));
+
 #ifdef ENABLE_WALLET
     if(walletFrame)
     {
@@ -587,6 +586,14 @@ void BitcoinGUI::aboutClicked()
     dlg.exec();
 }
 
+void BitcoinGUI::showDebugWindow()
+{
+    rpcConsole->showNormal();
+    rpcConsole->show();
+    rpcConsole->raise();
+    rpcConsole->activateWindow();
+}
+
 void BitcoinGUI::showHelpMessageClicked()
 {
     HelpMessageDialog *help = new HelpMessageDialog(this, false);
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 4e50b1712..b4647ae44 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -191,6 +191,8 @@ private Q_SLOTS:
     void optionsClicked();
     /** Show about dialog */
     void aboutClicked();
+    /** Show debug window */
+    void showDebugWindow();
     /** Show help message dialog */
     void showHelpMessageClicked();
 #ifndef Q_OS_MAC

From 1e672ae3433d5091f593702c608de4249e62941d Mon Sep 17 00:00:00 2001
From: Zak Wilcox <iwilcox@iwilcox.me.uk>
Date: Sat, 29 Aug 2015 18:52:44 +0100
Subject: [PATCH 04/17] Include bitcoin-tx binary on Debian/Ubuntu

Currently left out of Matt's PPA.  Debian's package for unstable already has it.
---
 contrib/debian/bitcoind.install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install
index 798ea851f..494e5cbdc 100644
--- a/contrib/debian/bitcoind.install
+++ b/contrib/debian/bitcoind.install
@@ -1,2 +1,3 @@
 usr/local/bin/bitcoind usr/bin
 usr/local/bin/bitcoin-cli usr/bin
+usr/local/bin/bitcoin-tx usr/bin

From 2394f4d6747b1fbc14908e4321f704acdb9a99fd Mon Sep 17 00:00:00 2001
From: Zak Wilcox <iwilcox@iwilcox.me.uk>
Date: Thu, 17 Sep 2015 07:23:04 +0100
Subject: [PATCH 05/17] Split bitcoin-tx into its own package

Reverts the change putting it in the bitcoind deb.
---
 contrib/debian/bitcoin-tx.install |  1 +
 contrib/debian/bitcoind.install   |  1 -
 contrib/debian/control            | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 contrib/debian/bitcoin-tx.install

diff --git a/contrib/debian/bitcoin-tx.install b/contrib/debian/bitcoin-tx.install
new file mode 100644
index 000000000..2c21052a6
--- /dev/null
+++ b/contrib/debian/bitcoin-tx.install
@@ -0,0 +1 @@
+usr/local/bin/bitcoin-tx usr/bin
diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install
index 494e5cbdc..798ea851f 100644
--- a/contrib/debian/bitcoind.install
+++ b/contrib/debian/bitcoind.install
@@ -1,3 +1,2 @@
 usr/local/bin/bitcoind usr/bin
 usr/local/bin/bitcoin-cli usr/bin
-usr/local/bin/bitcoin-tx usr/bin
diff --git a/contrib/debian/control b/contrib/debian/control
index 4392bb338..2b30d46b7 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -56,3 +56,18 @@ Description: peer-to-peer network based digital currency - Qt GUI
  requires 20+ GB of space, slowly growing.
  .
  This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt.
+
+Package: bitcoin-tx
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: peer-to-peer digital currency - standalone transaction tool
+ Bitcoin is a free open source peer-to-peer electronic cash system that
+ is completely decentralized, without the need for a central server or
+ trusted parties.  Users hold the crypto keys to their own money and
+ transact directly with each other, with the help of a P2P network to
+ check for double-spending.
+ .
+ This package provides bitcoin-tx, a command-line transaction creation
+ tool with minimal dependencies which can be used without a bitcoin
+ daemon.  Some means of exchanging minimal transaction data with peers
+ is still required.

From 6fd0019232bdbfac5037306c37bb6101431d83a4 Mon Sep 17 00:00:00 2001
From: Zak Wilcox <iwilcox@iwilcox.me.uk>
Date: Thu, 17 Sep 2015 10:17:24 +0100
Subject: [PATCH 06/17] Drop "with minimal dependencies" from description

Five boost libs plus libcrypto are needed; I don't think that quite passes for minimal.
---
 contrib/debian/control | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/debian/control b/contrib/debian/control
index 2b30d46b7..01625b843 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -68,6 +68,5 @@ Description: peer-to-peer digital currency - standalone transaction tool
  check for double-spending.
  .
  This package provides bitcoin-tx, a command-line transaction creation
- tool with minimal dependencies which can be used without a bitcoin
- daemon.  Some means of exchanging minimal transaction data with peers
- is still required.
+ tool which can be used without a bitcoin daemon.  Some means of
+ exchanging minimal transaction data with peers is still required.

From a33cd5ba86c722cf523cf88f78604e2ac91331c2 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 4 Sep 2015 11:05:17 +0200
Subject: [PATCH 07/17] [trivial] Fix rpc message "help generate"

---
 src/rpcmining.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 528d5406f..98133b0f5 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -121,6 +121,7 @@ Value generate(const Array& params, bool fHelp)
             "generate numblocks\n"
             "\nMine blocks immediately (before the RPC call returns)\n"
             "\nNote: this function can only be used on the regtest network\n"
+            "\nArguments:\n"
             "1. numblocks    (numeric) How many blocks are generated immediately.\n"
             "\nResult\n"
             "[ blockhashes ]     (array) hashes of blocks generated\n"

From 87a797a0166a03b716a2a6fa82f789655ef79a8c Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 28 Sep 2015 10:36:33 +0200
Subject: [PATCH 08/17] build: Remove dependency of bitcoin-cli on secp256k1

bitcoin-cli (in contrast to bitcoin-tx, which does signing ops)
shouldn't need secp256k1, and indeed it doesn't.
---
 src/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8de216c17..2461f825f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -343,8 +343,7 @@ endif
 
 bitcoin_cli_LDADD = \
   $(LIBBITCOIN_CLI) \
-  $(LIBBITCOIN_UTIL) \
-  $(LIBSECP256K1)
+  $(LIBBITCOIN_UTIL)
 
 bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS)
 #

From 33d6825c6f91e99de65555d5f869134cfa54d967 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 9 Apr 2015 11:50:18 +0000
Subject: [PATCH 09/17] Bugfix: Allow mining on top of old tip blocks for
 testnet (fixes testnet-in-a-box use case)

---
 src/chainparams.cpp | 3 +++
 src/chainparams.h   | 2 ++
 src/main.cpp        | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 5f400b265..c71539397 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -51,6 +51,7 @@ public:
         vAlertPubKey = ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284");
         nDefaultPort = 8333;
         nMinerThreads = 0;
+        nMaxTipAge = 24 * 60 * 60;
         nPruneAfterHeight = 100000;
 
         /**
@@ -147,6 +148,7 @@ public:
         vAlertPubKey = ParseHex("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a");
         nDefaultPort = 18333;
         nMinerThreads = 0;
+        nMaxTipAge = 0x7fffffff;
         nPruneAfterHeight = 1000;
 
         //! Modify the testnet genesis block so the timestamp is valid for a later start.
@@ -206,6 +208,7 @@ public:
         pchMessageStart[2] = 0xb5;
         pchMessageStart[3] = 0xda;
         nMinerThreads = 1;
+        nMaxTipAge = 24 * 60 * 60;
         genesis.nTime = 1296688602;
         genesis.nBits = 0x207fffff;
         genesis.nNonce = 2;
diff --git a/src/chainparams.h b/src/chainparams.h
index 8044b553e..f61e3db13 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -60,6 +60,7 @@ public:
     bool DefaultConsistencyChecks() const { return fDefaultConsistencyChecks; }
     /** Policy: Filter transactions that do not match well-defined patterns */
     bool RequireStandard() const { return fRequireStandard; }
+    int64_t MaxTipAge() const { return nMaxTipAge; }
     int64_t PruneAfterHeight() const { return nPruneAfterHeight; }
     /** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */
     bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; }
@@ -80,6 +81,7 @@ protected:
     std::vector<unsigned char> vAlertPubKey;
     int nDefaultPort;
     int nMinerThreads;
+    long nMaxTipAge;
     uint64_t nPruneAfterHeight;
     std::vector<CDNSSeedData> vSeeds;
     std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
diff --git a/src/main.cpp b/src/main.cpp
index 77d9227f5..29a84054a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1239,7 +1239,7 @@ bool IsInitialBlockDownload()
     if (lockIBDState)
         return false;
     bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 ||
-            pindexBestHeader->GetBlockTime() < GetTime() - 24 * 60 * 60);
+            pindexBestHeader->GetBlockTime() < GetTime() - chainParams.MaxTipAge());
     if (!state)
         lockIBDState = true;
     return state;

From 9e451578152d297a69734bef5443b31ad67433f2 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 1 Oct 2015 18:38:54 +0200
Subject: [PATCH 10/17] build: disable -Wself-assign

Prevent these warnings in clang 3.6:

    ./serialize.h:96:9: warning: explicitly assigning value of variable of type 'uint64_t' (aka 'unsigned long') to itself [-Wself-assign]
        obj = (obj);
        ~~~ ^  ~~~
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index fd74aef26..aec1b0145 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,7 @@ fi
 ##       compatibility with the legacy buildsystem.
 ##
 if test "x$CXXFLAGS_overridden" = "xno"; then
-  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter"
+  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wno-self-assign"
 fi
 CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
 

From bfc6154429630c247ae5f3a9644939f356eb36c9 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Thu, 8 Oct 2015 15:21:54 -0400
Subject: [PATCH 11/17] [Trivial] Fixed typo when referring to a previous
 section in depends/README.md [skip ci]

---
 depends/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/README.md b/depends/README.md
index 2dc0b9e47..d85e652c6 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -13,7 +13,7 @@ For example:
     make HOST=x86_64-w64-mingw32 -j4
 
 A prefix will be generated that's suitable for plugging into Bitcoin's
-configure. In the above example, a dir named i686-w64-mingw32 will be
+configure. In the above example, a dir named x86_64-w64-mingw32 will be
 created. To use it for Bitcoin:
 
     ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32

From 54f9dee50cc3c2bbf2c2dc98cbac1b7fb120eca3 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 12 Oct 2015 14:25:51 -0700
Subject: [PATCH 12/17] Update bluematt-key, the old one is long-since revoked

---
 contrib/gitian-downloader/bluematt-key.pgp | Bin 4113 -> 10324 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/contrib/gitian-downloader/bluematt-key.pgp b/contrib/gitian-downloader/bluematt-key.pgp
index fb6d9eb28423d2c8ece89179f8e67ae06fa6dc13..2389d4657fb7f5f225f5d76e08841fd6e21d4be9 100644
GIT binary patch
literal 10324
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
YdwG{wk5UyOo}K#wKU;q@OV7XfKc-z}EdT%j

literal 4113
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


From e42bf16ae03edf651916159f99551cf2779b9927 Mon Sep 17 00:00:00 2001
From: Eric Lombrozo <elombrozo@gmail.com>
Date: Sat, 10 Oct 2015 06:46:35 -0400
Subject: [PATCH 13/17] Clarification of unit test build instructions.

---
 src/test/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/README.md b/src/test/README.md
index 7efce6f05..eeaceb60c 100644
--- a/src/test/README.md
+++ b/src/test/README.md
@@ -16,6 +16,8 @@ their tests in a test suite called "<source_filename>_tests".  For an
 examples of this pattern, examine uint160_tests.cpp and
 uint256_tests.cpp.
 
+Add the source files to /src/Makefile.test.include to add them to the build.
+
 For further reading, I found the following website to be helpful in
 explaining how the boost unit test framework works:
 [http://www.alittlemadness.com/2009/03/31/c-unit-testing-with-boosttest/](http://www.alittlemadness.com/2009/03/31/c-unit-testing-with-boosttest/).
\ No newline at end of file

From 4fbfebea5beae805ff4679d416e675accaad0313 Mon Sep 17 00:00:00 2001
From: Mitchell Cash <mitchell.cash@gmail.com>
Date: Sat, 17 Oct 2015 20:10:45 +1000
Subject: [PATCH 14/17] Correct spelling mistakes in doc folder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OSX —> OS X
- XCode —> Xcode
- github —> GitHub
- homebrew —> Homebrew
- gitian —> Gitian
- Other miscellaneous obvious spelling fixes and whitespace removal
---
 doc/README.md                     |  6 ++--
 doc/README_osx.txt                | 20 +++++------
 doc/build-osx.md                  | 10 +++---
 doc/developer-notes.md            |  2 +-
 doc/dnsseed-policy.md             |  2 +-
 doc/gitian-building.md            | 60 +++++++++++++++----------------
 doc/init.md                       |  8 ++---
 doc/release-process.md            | 34 +++++++++---------
 doc/tor.md                        | 11 +++---
 doc/translation_process.md        |  2 +-
 doc/translation_strings_policy.md |  3 +-
 11 files changed, 77 insertions(+), 81 deletions(-)

diff --git a/doc/README.md b/doc/README.md
index 60636dee6..891e265c8 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -7,7 +7,7 @@ Setup
 
 Running
 ---------------------
-The following are some helpful notes on how to run Bitcoin on your native platform. 
+The following are some helpful notes on how to run Bitcoin on your native platform.
 
 ### Unix
 
@@ -26,7 +26,7 @@ Unpack the files into a directory and run:
 
 Unpack the files into a directory, and then run bitcoin-qt.exe.
 
-### OSX
+### OS X
 
 Drag Bitcoin-Qt to your applications folder, and then run Bitcoin-Qt.
 
@@ -41,7 +41,7 @@ Building
 ---------------------
 The following are developer notes on how to build Bitcoin on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc.
 
-- [OSX Build Notes](build-osx.md)
+- [OS X Build Notes](build-osx.md)
 - [Unix Build Notes](build-unix.md)
 - [Gitian Building Guide](gitian-building.md)
 
diff --git a/doc/README_osx.txt b/doc/README_osx.txt
index a572c7a24..f589bfc67 100644
--- a/doc/README_osx.txt
+++ b/doc/README_osx.txt
@@ -1,12 +1,12 @@
-Deterministic OSX Dmg Notes.
+Deterministic OS X Dmg Notes.
 
-Working OSX DMGs are created in Linux by combining a recent clang,
+Working OS X DMGs are created in Linux by combining a recent clang,
 the Apple's binutils (ld, ar, etc), and DMG authoring tools.
 
 Apple uses clang extensively for development and has upstreamed the necessary
 functionality so that a vanilla clang can take advantage. It supports the use
 of -F, -target, -mmacosx-version-min, and --sysroot, which are all necessary
-when building for OSX. A pre-compiled version of 3.2 is used because it was not
+when building for OS X. A pre-compiled version of 3.2 is used because it was not
 available in the Precise repositories at the time this work was started. In the
 future, it can be switched to use system packages instead.
 
@@ -29,18 +29,18 @@ originally done in toolchain4.
 
 To complicate things further, all builds must target an Apple SDK. These SDKs
 are free to download, but not redistributable.
-To obtain it, register for a developer account, then download the XCode 6.1.1 dmg:
+To obtain it, register for a developer account, then download the Xcode 6.1.1 dmg:
 https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/xcode_6.1.1/xcode_6.1.1.dmg
 
 This file is several gigabytes in size, but only a single directory inside is
 needed: Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk
 
 Unfortunately, the usual linux tools (7zip, hpmount, loopback mount) are incapable of opening this file.
-To create a tarball suitable for gitian input, mount the dmg in OSX, then create it with:
+To create a tarball suitable for Gitian input, mount the dmg in OS X, then create it with:
   $ tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.9.sdk.tar.gz MacOSX10.9.sdk
 
 
-The gitian descriptors build 2 sets of files: Linux tools, then Apple binaries
+The Gitian descriptors build 2 sets of files: Linux tools, then Apple binaries
 which are created using these tools. The build process has been designed to
 avoid including the SDK's files in Gitian's outputs. All interim tarballs are
 fully deterministic and may be freely redistributed.
@@ -64,20 +64,20 @@ Ideally, the creation could be fixed and genisoimage would no longer be necessar
 
 Background images and other features can be added to DMG files by inserting a
 .DS_Store before creation. The easiest way to create this file is to build a
-DMG without one, move it to a device running OSX, customize the layout, then
+DMG without one, move it to a device running OS X, customize the layout, then
 grab the .DS_Store file for later use. That is the approach taken here.
 
-As of OSX Mavericks (10.9), using an Apple-blessed key to sign binaries is a
+As of OS X Mavericks (10.9), using an Apple-blessed key to sign binaries is a
 requirement in order to satisfy the new Gatekeeper requirements. Because this
 private key cannot be shared, we'll have to be a bit creative in order for the
 build process to remain somewhat deterministic. Here's how it works:
 
-- Builders use gitian to create an unsigned release. This outputs an unsigned
+- Builders use Gitian to create an unsigned release. This outputs an unsigned
   dmg which users may choose to bless and run. It also outputs an unsigned app
   structure in the form of a tarball, which also contains all of the tools
   that have been previously (deterministically) built in order to create a
   final dmg.
 - The Apple keyholder uses this unsigned app to create a detached signature,
   using the script that is also included there.
-- Builders feed the unsigned app + detached signature back into gitian. It
+- Builders feed the unsigned app + detached signature back into Gitian. It
   uses the pre-built tools to recombine the pieces into a deterministic dmg.
diff --git a/doc/build-osx.md b/doc/build-osx.md
index dc319dd1c..815d6880c 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -1,6 +1,6 @@
 Mac OS X Build Instructions and Notes
 ====================================
-This guide will show you how to build bitcoind (headless client) for OSX.
+This guide will show you how to build bitcoind (headless client) for OS X.
 
 Notes
 -----
@@ -13,8 +13,8 @@ built-in one is located in `/Applications/Utilities`.
 Preparation
 -----------
 
-You need to install XCode with all the options checked so that the compiler
-and everything is available in /usr not just /Developer. XCode should be
+You need to install Xcode with all the options checked so that the compiler
+and everything is available in /usr not just /Developer. Xcode should be
 available on your OS X installation media, but if not, you can get the
 current version from https://developer.apple.com/xcode/. If you install
 Xcode 4.3 or later, you'll need to install its command line tools. This can
@@ -38,7 +38,7 @@ NOTE: Building with Qt4 is still supported, however, could result in a broken UI
 
 ### Building `bitcoind`
 
-1. Clone the github tree to get the source code and go into the directory.
+1. Clone the GitHub tree to get the source code and go into the directory.
 
         git clone https://github.com/bitcoin/bitcoin.git
         cd bitcoin
@@ -62,7 +62,7 @@ Use Qt Creator as IDE
 You can use Qt Creator as IDE, for debugging and for manipulating forms, etc.
 Download Qt Creator from http://www.qt.io/download/. Download the "community edition" and only install Qt Creator (uncheck the rest during the installation process).
 
-1. Make sure you installed everything through homebrew mentioned above 
+1. Make sure you installed everything through Homebrew mentioned above
 2. Do a proper ./configure --with-gui=qt5 --enable-debug
 3. In Qt Creator do "New Project" -> Import Project -> Import Existing Project
 4. Enter "bitcoin-qt" as project name, enter src/qt as location
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 8f7db31d5..f1e62b2d8 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -57,7 +57,7 @@ As Doxygen recognizes the comments by the delimiters (`/**` and `*/` in this cas
 
 To describe a class use the same construct above the class definition:
 ```c++
-/** 
+/**
  * Alerts are for notifying old versions if they become too obsolete and
  * need to upgrade. The message is displayed in the status bar.
  * @see GetWarnings()
diff --git a/doc/dnsseed-policy.md b/doc/dnsseed-policy.md
index 814ae3876..55a5c2825 100644
--- a/doc/dnsseed-policy.md
+++ b/doc/dnsseed-policy.md
@@ -7,7 +7,7 @@ As such, DNS seeds must be run by entities which have some minimum
 level of trust within the Bitcoin community.
 
 Other implementations of Bitcoin software may also use the same
-seeds and may be more exposed. In light of this exposure, this 
+seeds and may be more exposed. In light of this exposure, this
 document establishes some basic expectations for operating dnsseeds.
 
 0. A DNS seed operating organization or person is expected to follow good
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 630b3c04a..50796c5f1 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -1,7 +1,7 @@
 Gitian building
 ================
 
-*Setup instructions for a gitian build of Bitcoin using a Debian VM or physical system.*
+*Setup instructions for a Gitian build of Bitcoin using a Debian VM or physical system.*
 
 Gitian is the deterministic build process that is used to build the Bitcoin
 Core executables. It provides a way to be reasonably sure that the
@@ -13,7 +13,7 @@ Multiple developers build the source code by following a specific descriptor
 These results are compared and only if they match, the build is accepted and uploaded
 to bitcoin.org.
 
-More independent gitian builders are needed, which is why I wrote this
+More independent Gitian builders are needed, which is why I wrote this
 guide. It is preferred to follow these steps yourself instead of using someone else's
 VM image to avoid 'contaminating' the build.
 
@@ -22,9 +22,9 @@ Table of Contents
 
 - [Create a new VirtualBox VM](#create-a-new-virtualbox-vm)
 - [Connecting to the VM](#connecting-to-the-vm)
-- [Setting up Debian for gitian building](#setting-up-debian-for-gitian-building)
-- [Installing gitian](#installing-gitian)
-- [Setting up the gitian image](#setting-up-the-gitian-image)
+- [Setting up Debian for Gitian building](#setting-up-debian-for-gitian-building)
+- [Installing Gitian](#installing-gitian)
+- [Setting up the Gitian image](#setting-up-the-gitian-image)
 - [Getting and building the inputs](#getting-and-building-the-inputs)
 - [Building Bitcoin](#building-bitcoin)
 - [Building an alternative repository](#building-an-alternative-repository)
@@ -60,18 +60,18 @@ In the VirtualBox GUI click "Create" and choose the following parameters in the
 ![](gitian-building/create_vm_hard_drive.png)
 
 - Hard Drive: Create a virtual hard drive now
-    
+
 ![](gitian-building/create_vm_hard_drive_file_type.png)
 
-- Hard Drive file type: Use the default, VDI (VirtualBox Disk Image) 
+- Hard Drive file type: Use the default, VDI (VirtualBox Disk Image)
 
 ![](gitian-building/create_vm_storage_physical_hard_drive.png)
-    
-- Storage on Physical hard drive: Dynamically Allocated 
-    
+
+- Storage on Physical hard drive: Dynamically Allocated
+
 ![](gitian-building/create_vm_file_location_size.png)
 
-- Disk size: at least 40GB; as low as 20GB *may* be possible, but better to err on the safe side 
+- Disk size: at least 40GB; as low as 20GB *may* be possible, but better to err on the safe side
 - Push the `Create` button
 
 Get the [Debian 7.8 net installer](http://cdimage.debian.org/cdimage/archive/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)).
@@ -81,7 +81,7 @@ Unixy OSes by entering the following in a terminal:
     echo "e39c36d6adc0fd86c6edb0e03e22919086c883b37ca194d063b8e3e8f6ff6a3a  debian-7.8.0-amd64-netinst.iso" | sha256sum -c
     # (must return OK)
 
-After creating the VM, we need to configure it. 
+After creating the VM, we need to configure it.
 
 - Click the `Settings` button, then go to the `Network` tab. Adapter 1 should be attached to `NAT`.
 
@@ -125,22 +125,22 @@ and proceed, just press `Enter`. To select a different button, press `Tab`.
 ![](gitian-building/debian_install_4_configure_keyboard.png)
 
 - The VM will detect network settings using DHCP, this should all proceed automatically
-- Configure the network: 
+- Configure the network:
   - System name `debian`.
   - Leave domain name empty.
 
 ![](gitian-building/debian_install_5_configure_the_network.png)
 
-- Choose a root password and enter it twice (remember it for later) 
+- Choose a root password and enter it twice (remember it for later)
 
 ![](gitian-building/debian_install_6a_set_up_root_password.png)
 
-- Name the new user `debian` (the full name doesn't matter, you can leave it empty) 
+- Name the new user `debian` (the full name doesn't matter, you can leave it empty)
 
 ![](gitian-building/debian_install_7_set_up_user_fullname.png)
 ![](gitian-building/debian_install_8_set_up_username.png)
 
-- Choose a user password and enter it twice (remember it for later) 
+- Choose a user password and enter it twice (remember it for later)
 
 ![](gitian-building/debian_install_9_user_password.png)
 
@@ -150,11 +150,11 @@ and proceed, just press `Enter`. To select a different button, press `Tab`.
 ![](gitian-building/debian_install_10_configure_clock.png)
 
 - Disk setup
-  - Partitioning method: Guided - Use the entire disk 
-  
+  - Partitioning method: Guided - Use the entire disk
+
 ![](gitian-building/debian_install_11_partition_disks.png)
 
-  - Select disk to partition: SCSI1 (0,0,0) 
+  - Select disk to partition: SCSI1 (0,0,0)
 
 ![](gitian-building/debian_install_12_choose_disk.png)
 
@@ -168,7 +168,7 @@ and proceed, just press `Enter`. To select a different button, press `Tab`.
 ![](gitian-building/debian_install_15_write_changes.png)
 
 - The base system will be installed, this will take a minute or so
-- Choose a mirror (any will do) 
+- Choose a mirror (any will do)
 
 ![](gitian-building/debian_install_16_choose_a_mirror.png)
 
@@ -217,7 +217,7 @@ Replace `root` with `debian` to log in as user.
 [1] http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
 [2] http://winscp.net/eng/index.php
 
-Setting up Debian for gitian building
+Setting up Debian for Gitian building
 --------------------------------------
 
 In this section we will be setting up the Debian installation for Gitian building.
@@ -237,7 +237,7 @@ Then set up LXC and the rest with the following, which is a complex jumble of se
 
 ```bash
 # the version of lxc-start in Debian 7.4 needs to run as root, so make sure
-# that the build script can exectute it without providing a password
+# that the build script can execute it without providing a password
 echo "%sudo ALL=NOPASSWD: /usr/bin/lxc-start" > /etc/sudoers.d/gitian-lxc
 # add cgroup for LXC
 echo "cgroup  /sys/fs/cgroup  cgroup  defaults  0   0" >> /etc/fstab
@@ -257,7 +257,7 @@ reboot
 At the end the VM is rebooted to make sure that the changes take effect. The steps in this
 section need only to be performed once.
 
-Installing gitian
+Installing Gitian
 ------------------
 
 Re-login as the user `debian` that was created during installation.
@@ -277,14 +277,14 @@ cd ..
 
 **Note**: When sudo asks for a password, enter the password for the user *debian* not for *root*.
 
-Clone the git repositories for bitcoin and gitian.
+Clone the git repositories for bitcoin and Gitian.
 
 ```bash
 git clone https://github.com/devrandom/gitian-builder.git
 git clone https://github.com/bitcoin/bitcoin
 ```
 
-Setting up the gitian image
+Setting up the Gitian image
 -------------------------
 
 Gitian needs a virtual image of the operating system to build in.
@@ -310,13 +310,13 @@ Getting and building the inputs
 Follow the instructions in [doc/release-process.md](release-process.md) in the bitcoin repository
 under 'Fetch and build inputs' to install sources which require manual intervention. Also follow
 the next step: 'Seed the Gitian sources cache', which will fetch all necessary source files allowing
-for gitian to work offline.
+for Gitian to work offline.
 
 Building Bitcoin
 ----------------
 
-To build Bitcoin (for Linux, OSX and Windows) just follow the steps under 'perform
-gitian builds' in [doc/release-process.md](release-process.md) in the bitcoin repository.
+To build Bitcoin (for Linux, OS X and Windows) just follow the steps under 'perform
+Gitian builds' in [doc/release-process.md](release-process.md) in the bitcoin repository.
 
 This may take a long time as it also builds the dependencies needed for each descriptor.
 These dependencies will be cached after a successful build to avoid rebuilding them where possible.
@@ -356,7 +356,7 @@ Building an alternative repository
 -----------------------------------
 
 If you want to do a test build of a pull on GitHub it can be useful to point
-the gitian builder at an alternative repository, using the same descriptors
+the Gitian builder at an alternative repository, using the same descriptors
 and inputs.
 
 For example:
@@ -386,7 +386,7 @@ in `gitian.sigs` to your signing machine and do
 ```
 
 This will create the `.sig` files that can be committed together with the `.assert` files to assert your
-gitian build.
+Gitian build.
 
 Uploading signatures
 ---------------------
diff --git a/doc/init.md b/doc/init.md
index 1f206a6c0..c376ee4f1 100644
--- a/doc/init.md
+++ b/doc/init.md
@@ -35,9 +35,8 @@ generate one from the shell yourself like this:
 
 bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'
 
-Once you have a password in hand, set rpcpassword= in /etc/bitcoin/bitcoin.conf
 
-For an example configuration file that describes the configuration settings, 
+For an example configuration file that describes the configuration settings,
 see contrib/debian/examples/bitcoin.conf.
 
 3. Paths
@@ -89,8 +88,8 @@ use old versions of Upstart and do not supply the start-stop-daemon utility.
 
 Copy bitcoind.init to /etc/init.d/bitcoind. Test by running "service bitcoind start".
 
-Using this script, you can adjust the path and flags to the bitcoind program by 
-setting the BITCOIND and FLAGS environment variables in the file 
+Using this script, you can adjust the path and flags to the bitcoind program by
+setting the BITCOIND and FLAGS environment variables in the file
 /etc/sysconfig/bitcoind. You can also use the DAEMONOPTS environment variable here.
 
 5. Auto-respawn
@@ -99,4 +98,3 @@ setting the BITCOIND and FLAGS environment variables in the file
 Auto respawning is currently only configured for Upstart and systemd.
 Reasonable defaults have been chosen but YMMV.
 
-
diff --git a/doc/release-process.md b/doc/release-process.md
index 5ecb9334f..f98ddc6bd 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -23,15 +23,15 @@ Release Process
 
 * * *
 
-###update gitian
+###update Gitian
 
- In order to take advantage of the new caching features in gitian, be sure to update to a recent version (`e9741525c` or later is recommended)
+ In order to take advantage of the new caching features in Gitian, be sure to update to a recent version (`e9741525c` or later is recommended)
 
-###perform gitian builds
+###perform Gitian builds
 
  From a directory containing the bitcoin source, gitian-builder and gitian.sigs
   
-	export SIGNER=(your gitian key, ie bluematt, sipa, etc)
+    export SIGNER=(your Gitian key, ie bluematt, sipa, etc)
 	export VERSION=(new version, e.g. 0.8.0)
 	pushd ./bitcoin
 	git checkout v${VERSION}
@@ -39,29 +39,29 @@ Release Process
 	pushd ./gitian-builder
 
 ###fetch and build inputs: (first time, or when dependency versions change)
- 
+
 	mkdir -p inputs
 	wget -P inputs https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
 	wget -P inputs http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
 
- Register and download the Apple SDK: (see OSX Readme for details)
- 
+ Register and download the Apple SDK: (see OS X Readme for details)
+
  https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/xcode_6.1.1/xcode_6.1.1.dmg
- 
+
  Using a Mac, create a tarball for the 10.9 SDK and copy it to the inputs directory:
- 
+
 	tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.9.sdk.tar.gz MacOSX10.9.sdk
 
 ###Optional: Seed the Gitian sources cache
 
-  By default, gitian will fetch source files as needed. For offline builds, they can be fetched ahead of time:
+  By default, Gitian will fetch source files as needed. For offline builds, they can be fetched ahead of time:
 
 	make -C ../bitcoin/depends download SOURCES_PATH=`pwd`/cache/common
 
   Only missing files will be fetched, so this is safe to re-run for each build.
 
 ###Build Bitcoin Core for Linux, Windows, and OS X:
-  
+
 	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
 	./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
 	mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../
@@ -79,8 +79,8 @@ Release Process
   1. source tarball (bitcoin-${VERSION}.tar.gz)
   2. linux 32-bit and 64-bit dist tarballs (bitcoin-${VERSION}-linux[32|64].tar.gz)
   3. windows 32-bit and 64-bit unsigned installers and dist zips (bitcoin-${VERSION}-win[32|64]-setup-unsigned.exe, bitcoin-${VERSION}-win[32|64].zip)
-  4. OSX unsigned installer and dist tarball (bitcoin-${VERSION}-osx-unsigned.dmg, bitcoin-${VERSION}-osx64.tar.gz)
-  5. Gitian signatures (in gitian.sigs/${VERSION}-<linux|{win,osx}-unsigned>/(your gitian key)/
+  4. OS X unsigned installer and dist tarball (bitcoin-${VERSION}-osx-unsigned.dmg, bitcoin-${VERSION}-osx64.tar.gz)
+  5. Gitian signatures (in gitian.sigs/${VERSION}-<linux|{win,osx}-unsigned>/(your Gitian key)/
 
 ###Next steps:
 
@@ -94,11 +94,11 @@ Commit your signature to gitian.sigs:
 	git push  # Assuming you can push to the gitian.sigs tree
 	popd
 
-  Wait for Windows/OSX detached signatures:
-	Once the Windows/OSX builds each have 3 matching signatures, they will be signed with their respective release keys.
+  Wait for Windows/OS X detached signatures:
+	Once the Windows/OS X builds each have 3 matching signatures, they will be signed with their respective release keys.
 	Detached signatures will then be committed to the bitcoin-detached-sigs repository, which can be combined with the unsigned apps to create signed binaries.
 
-  Create the signed OSX binary:
+  Create the signed OS X binary:
 
 	pushd ./gitian-builder
 	./bin/gbuild -i --commit signature=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -115,7 +115,7 @@ Commit your signature to gitian.sigs:
 	mv build/out/bitcoin-*win32-setup.exe ../bitcoin-${VERSION}-win32-setup.exe
 	popd
 
-Commit your signature for the signed OSX/Windows binaries:
+Commit your signature for the signed OS X/Windows binaries:
 
 	pushd gitian.sigs
 	git add ${VERSION}-osx-signed/${SIGNER}
diff --git a/doc/tor.md b/doc/tor.md
index 560f71fa2..e3fabfb2a 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -15,15 +15,15 @@ outgoing connections be anonymized, but more is possible.
 
 	-proxy=ip:port  Set the proxy server. If SOCKS5 is selected (default), this proxy
 	                server will be used to try to reach .onion addresses as well.
-	
+
 	-onion=ip:port  Set the proxy server to use for tor hidden services. You do not
 	                need to set this if it's the same as -proxy. You can use -noonion
 	                to explicitly disable access to hidden service.
-	
+
 	-listen         When using -proxy, listening is disabled by default. If you want
 	                to run a hidden service (see next section), you'll need to enable
 	                it explicitly.
-	
+
 	-connect=X      When behind a Tor proxy, you can specify .onion addresses instead
 	-addnode=X      of IP addresses or hostnames in these parameters. It requires
 	-seednode=X     SOCKS5. In Tor mode, such addresses can also be exchanged with
@@ -55,10 +55,10 @@ your bitcoind's P2P listen port (8333 by default).
 	                preference for your node to advertize itself with, for connections
 	                coming from unroutable addresses (such as 127.0.0.1, where the
 	                Tor proxy typically runs).
-	
+
 	-listen         You'll need to enable listening for incoming connections, as this
 	                is off by default behind a proxy.
-	
+
 	-discover       When -externalip is specified, no attempt is made to discover local
 	                IPv4 or IPv6 addresses. If you want to run a dual stack, reachable
 	                from both Tor and IPv4 (or IPv6), you'll need to either pass your
@@ -82,4 +82,3 @@ If you only want to use Tor to reach onion addresses, but not use it as a proxy
 for normal IPv4/IPv6 communication, use:
 
 	./bitcoin -onion=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover
-
diff --git a/doc/translation_process.md b/doc/translation_process.md
index 3653e5302..3edcd2696 100644
--- a/doc/translation_process.md
+++ b/doc/translation_process.md
@@ -1,7 +1,7 @@
 Translations
 ============
 
-The Bitcoin-Core project has been designed to support multiple localisations. This makes adding new phrases, and completely new languages easily achievable. For managing all application translations, Bitcoin-Core makes use of the Transifex online translation management tool. 
+The Bitcoin-Core project has been designed to support multiple localisations. This makes adding new phrases, and completely new languages easily achievable. For managing all application translations, Bitcoin-Core makes use of the Transifex online translation management tool.
 
 ### Helping to translate (using Transifex)
 Transifex is setup to monitor the Github repo for updates, and when code containing new translations is found, Transifex will process any changes. It may take several hours after a pull-request has been merged, to appear in the Transifex web interface.
diff --git a/doc/translation_strings_policy.md b/doc/translation_strings_policy.md
index 6824b1d8e..1a7decf56 100644
--- a/doc/translation_strings_policy.md
+++ b/doc/translation_strings_policy.md
@@ -1,7 +1,7 @@
 Translation Strings Policy
 ===========================
 
-This document provides guidelines for internationalization of the Bitcoin Core software. 
+This document provides guidelines for internationalization of the Bitcoin Core software.
 
 How to translate?
 ------------------
@@ -69,4 +69,3 @@ This may sometimes be at conflict with the recommendation in the previous sectio
 During a string freeze (often before a major release), no translation strings are to be added, modified or removed.
 
 This can be checked by executing `make translate` in the `src` directory, then verifying that `bitcoin_en.ts` remains unchanged.
-

From 7ce2c915036d51f19651df522cf2f6c0bce2e8cd Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 9 Oct 2015 13:40:36 -0700
Subject: [PATCH 15/17] Update debian/changelog and slight tweak to
 debian/control

---
 contrib/debian/changelog | 30 ++++++++++++++++++++++++++++++
 contrib/debian/control   |  3 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index bd7ab3524..110bfe03e 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,33 @@
+bitcoin (0.11.0-precise1) precise; urgency=medium
+
+  * New upstream release.
+
+ -- Matt Corallo (BlueMatt) <matt@mattcorallo.com>  Tue, 14 Jul 2015 14:39:00 -1000
+
+bitcoin (0.10.2-precise1) precise; urgency=medium
+
+  * New upstream release.
+
+ -- Matt Corallo (BlueMatt) <matt@mattcorallo.com>  Mon, 29 Jun 2015 17:33:00 -1000
+
+bitcoin (0.10.1-precise3) precise; urgency=medium
+
+  * Fix build dep (include python).
+
+ -- Matt Corallo (BlueMatt) <matt@mattcorallo.com>  Tue, 5 May 2015 09:28:00 -1000
+
+bitcoin (0.10.1-precise2) precise; urgency=medium
+
+  * Fix miniupnpc dep.
+
+ -- Matt Corallo (BlueMatt) <matt@mattcorallo.com>  Tue, 5 May 2015 00:33:00 -1000
+
+bitcoin (0.10.1-precise1) precise; urgency=medium
+
+  * New upstream release.
+
+ -- Matt Corallo (BlueMatt) <matt@mattcorallo.com>  Tue, 5 May 2015 00:07:00 -1000
+
 bitcoin (0.10.0-precise1) precise; urgency=medium
 
   * New upstream releases.
diff --git a/contrib/debian/control b/contrib/debian/control
index 01625b843..abbea8b80 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -20,7 +20,8 @@ Build-Depends: debhelper,
  qt4-qmake,
  libqt4-dev,
  libqrencode-dev,
- libprotobuf-dev, protobuf-compiler
+ libprotobuf-dev, protobuf-compiler,
+ python
 Standards-Version: 3.9.2
 Homepage: http://www.bitcoin.org/
 Vcs-Git: git://github.com/bitcoin/bitcoin.git

From 131d7f997c6b59daa69a31d496162b9a9f8d60bf Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 9 Oct 2015 15:32:05 -0700
Subject: [PATCH 16/17] Change URLs to https in debian/control

---
 contrib/debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/debian/control b/contrib/debian/control
index abbea8b80..2fd68583c 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -23,9 +23,9 @@ Build-Depends: debhelper,
  libprotobuf-dev, protobuf-compiler,
  python
 Standards-Version: 3.9.2
-Homepage: http://www.bitcoin.org/
+Homepage: https://www.bitcoin.org/
 Vcs-Git: git://github.com/bitcoin/bitcoin.git
-Vcs-Browser: http://github.com/bitcoin/bitcoin
+Vcs-Browser: https://github.com/bitcoin/bitcoin
 
 Package: bitcoind
 Architecture: any

From af6edac0bd637c07a9eb2cbb0dd1498b3593f801 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Sun, 18 Oct 2015 21:02:36 +1100
Subject: [PATCH 17/17] *: alias -h for --help

---
 src/bitcoin-cli.cpp | 2 +-
 src/bitcoin-tx.cpp  | 2 +-
 src/bitcoind.cpp    | 2 +-
 src/qt/bitcoin.cpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 1269d7a11..386c35149 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -62,7 +62,7 @@ static bool AppInitRPC(int argc, char* argv[])
     // Parameters
     //
     ParseParameters(argc, argv);
-    if (argc<2 || mapArgs.count("-?") || mapArgs.count("-help") || mapArgs.count("-version")) {
+    if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
         std::string strUsage = _("Bitcoin Core RPC client version") + " " + FormatFullVersion() + "\n";
         if (!mapArgs.count("-version")) {
             strUsage += "\n" + _("Usage:") + "\n" +
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 40b4a38e4..319be2991 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -41,7 +41,7 @@ static bool AppInitRawTx(int argc, char* argv[])
 
     fCreateBlank = GetBoolArg("-create", false);
 
-    if (argc<2 || mapArgs.count("-?") || mapArgs.count("-help"))
+    if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help"))
     {
         // First part of help message is specific to this utility
         std::string strUsage = _("Bitcoin Core bitcoin-tx utility version") + " " + FormatFullVersion() + "\n\n" +
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index cce687ac9..6e2758a9d 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -67,7 +67,7 @@ bool AppInit(int argc, char* argv[])
     ParseParameters(argc, argv);
 
     // Process help and version before taking care about datadir
-    if (mapArgs.count("-?") || mapArgs.count("-help") || mapArgs.count("-version"))
+    if (mapArgs.count("-?") || mapArgs.count("-h") ||  mapArgs.count("-help") || mapArgs.count("-version"))
     {
         std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n";
 
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 8a7853342..94121686c 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -548,7 +548,7 @@ int main(int argc, char *argv[])
 
     // Show help message immediately after parsing command-line options (for "-lang") and setting locale,
     // but before showing splash screen.
-    if (mapArgs.count("-?") || mapArgs.count("-help") || mapArgs.count("-version"))
+    if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version"))
     {
         HelpMessageDialog help(NULL, mapArgs.count("-version"));
         help.showOrPrint();