Version bump to 0.9.5v0.9.5rc1

5 files changed, 28 insertions, 64 deletions

diff --git a/configure.ac b/configure.ac
index 83c83eb880..7924105d69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 9)
-define(_CLIENT_VERSION_REVISION, 4)
+define(_CLIENT_VERSION_REVISION, 5)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2015)
diff --git a/doc/Doxyfile b/doc/Doxyfile
index fa88d906fc..f3cb577a8b 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -34,7 +34,7 @@ PROJECT_NAME           = Bitcoin
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.9.4
+PROJECT_NUMBER         = 0.9.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 
diff --git a/doc/README.md b/doc/README.md
index b33529f71a..d521bfce63 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,4 +1,4 @@
-Bitcoin 0.9.4 BETA
+Bitcoin 0.9.5 BETA
 =====================
 
 Copyright (c) 2009-2015 Bitcoin Developers
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7ee73246a9..fccb5a355b 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,6 +1,6 @@
-Bitcoin Core version 0.9.4 is now available from:
+Bitcoin Core version 0.9.5 is now available from:
 
-  https://bitcoin.org/bin/0.9.4/
+  https://bitcoin.org/bin/0.9.5/
 
 This is a new minor version release, bringing only bug fixes and updated
 translations. Upgrading to this release is recommended.
@@ -17,79 +17,43 @@ shut down (which might take a few minutes for older versions), then run the
 installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).
 
-OpenSSL Warning
+Notable changes
 ================
 
-OpenSSL 1.0.0p / 1.0.1k was recently released and is being pushed out by
-various operating system maintainers. Review by Gregory Maxwell determined that
-this update is incompatible with the Bitcoin system and could lead to consensus
-forks.
+Mining and relay policy enhancements
+------------------------------------
 
-Bitcoin Core released binaries from https://bitcoin.org are unaffected,
-as are any built with the gitian deterministic build system.
+Bitcoin Core's block templates are now for version 3 blocks only, and any mining
+software relying on its `getblocktemplate` must be updated in parallel to use
+libblkmaker either version 0.4.2 or any version from 0.5.1 onward.
+If you are solo mining, this will affect you the moment you upgrade Bitcoin
+Core, which must be done prior to BIP66 achieving its 951/1001 status.
+If you are mining with the stratum mining protocol: this does not affect you.
+If you are mining with the getblocktemplate protocol to a pool: this will affect
+you at the pool operator's discretion, which must be no later than BIP66
+achieving its 951/1001 status.
 
-However, if you are running either
-
-- The Ubuntu PPA from https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin
-- A third-party or self-compiled Bitcoin Core
-
-upgrade to Bitcoin Core 0.9.4, which includes a workaround, **before** updating
-OpenSSL.
-
-The incompatibility is due to the OpenSSL update changing the
-behavior of ECDSA validation to reject any signature which is
-not encoded in a very rigid manner. This was a result of
-OpenSSL's change for CVE-2014-8275 "Certificate fingerprints
-can be modified".
-
-We are specifically aware of potential hard-forks due to signature
-encoding handling and had been hoping to close them via BIP62 in 0.10.
-BIP62's purpose is to improve transaction malleability handling and
-as a side effect rigidly defines the encoding for signatures, but the
-overall scope of BIP62 has made it take longer than we'd like to
-deploy.
-
-0.9.4 changelog
+0.9.5 changelog
 ================
 
-Validation:
-- `b8e81b7` consensus: guard against openssl's new strict DER checks
-- `60c51f1` fail immediately on an empty signature
-- `037bfef` Improve robustness of DER recoding code
-
-Command-line options:
-- `cd5164a` Make -proxy set all network types, avoiding a connect leak.
-
-P2P:
-- `bb424e4` Limit the number of new addressses to accumulate
-
-RPC:
-- `0a94661` Disable SSLv3 (in favor of TLS) for the RPC client and server.
-
-Build system:
-- `f047dfa` gitian: openssl-1.0.1i.tar.gz -> openssl-1.0.1k.tar.gz
-- `5b9f78d` build: Fix OSX build when using Homebrew and qt5
-- `ffab1dd` Keep symlinks when copying into .app bundle
-- `613247f` osx: fix signing to make Gatekeeper happy (again)
-
-Miscellaneous:
-- `25b49b5` Refactor -alertnotify code
-- `2743529` doc: Add instructions for consistent Mac OS X build names
+- `74f29c2` Check pindexBestForkBase for null
+- `9cd1dd9` Fix priority calculation in CreateTransaction
+- `6b4163b` Sanitize command strings before logging them.
+- `3230b32` Raise version of created blocks, and enforce DERSIG in mempool
+- `989d499` Backport of some of BIP66's tests
+- `ab03660` Implement BIP 66 validation rules and switchover logic
+- `8438074` build: fix dynamic boost check when --with-boost= is used
 
 Credits
 --------
 
 Thanks to who contributed to this release, at least:
 
+- 21E14
+- Alex Morcos
 - Cory Fields
-- Gavin Andresen
 - Gregory Maxwell
-- Jeff Garzik
-- Luke Dashjr
-- Matt Corallo
 - Pieter Wuille
-- Saivann
-- Sergio Demian Lerner
 - Wladimir J. van der Laan
 
 As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).
diff --git a/src/clientversion.h b/src/clientversion.h
index 10bb7ba2e3..31270fea26 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -11,7 +11,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       9
-#define CLIENT_VERSION_REVISION    4
+#define CLIENT_VERSION_REVISION    5
 #define CLIENT_VERSION_BUILD       0
 
 // Set to true for release, false for prerelease or test build