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.
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)