Add helptexts for -whitelist and rpc prioritisetransaction and switch to bitcoin instead of satoshis
Add a new checkpoint at block 295,000

Block 295,000 seems to meet the criteria of a reasonable timestamp and
no strange transactions. 295,000 is the current block height in the
bootstrap.dat torrent provided by jgarzik.
net: add SetSocketNonBlocking() as OS independent wrapper
remove an unneded .c_str() in OpenNetworkConnection()
Add missing FindNode prototype to net.h

Also make the argument a const std::string & instead of pass-by-value.
pyminer: Fix memory leak, refactor to be more pythonic, maintainable, and possibly faster

Pull #4483.

Note that pyminer is not currently functional due to the removal of
getwork in cf0c47b.
Merge pull request #4567

f469f79 remove an unneded .c_str() in OpenNetworkConnection() (Philip Kaufmann)
Merge pull request #4584

0430c30 Add missing FindNode prototype to net.h (Wladimir J. van der Laan)
[Qt] small Qt-only include cleanup
Merge pull request #4586

f65352a [Qt] small Qt-only include cleanup (Philip Kaufmann)
Merge pull request #4491

eaedb59 net: add SetSocketNonBlocking() as OS independent wrapper (Philip Kaufmann)
Merge pull request #4531

ebdcc36 Add helptexts for -whitelist and rpc prioritisetransaction and switch to bitcoin instead of satoshis (Cozz Lovan)
[Qt] remove ProxySocksVersion from OptionID

- we only support SOCKS5, so remove it
Merge pull request #4541

125fba1 Add a new checkpoint at block 295,000 (Trevin Hofmann)
Merge pull request #4597

d817187 [Qt] remove ProxySocksVersion from OptionID (Philip Kaufmann)
Add warning comment to getinfo

Warn that people should not add new information, or change current
information returned by getinfo.
Backport 0.10 checkpoints
Merge remote-tracking branch 'bitcoin/master'
include PoW in getblock output
No longer call ComputeMinWork()
ConputeMinWork() should not be called anymore with the Dark Gravity Wave.
The combination of a checkpoint that was too close to the current
date and time and fast blocks from fast pools had caused a fork and
numerous banned hosts, causing them to isolate themselves into small
islands, each with their own chain.

Eventually the longest chain did indeed prevail.

This change removes the computation of date-based and block height
based minimum work, and thus removes the banning that was going on before.

This will allow more nodes to reach a consensus on the current longest
block without the numerous ban islands.