Merge pull request #4463

e832ab7 Rename SendMoneyToDestination to SendMoney. (Daniel Kraft)
Merge pull request #4470

f4b00be Add CChain::GetLocator() unit test (Pieter Wuille)
3c85d2e Fix CChain::GetLocator (Pieter Wuille)
Merge pull request #4446

209377a Use GetBlockTime() more (jtimon)
Merge pull request #4373

2ec5a3d rpc: Prevent easy memory exhaustion attack (Wladimir J. van der Laan)
Merge pull request #4399

674c070 [Qt] seed OpenSSL PNRG with Windows event data (Philip Kaufmann)
Add translation mailing list to README.md

Link to the new translation mailing list from README.md
Merge pull request #4401

cf04d83 add OpenSSL RAND_cleanup() on OpenSSL shutdown (Philip Kaufmann)
Merge pull request #4466

ad87bc4 [Qt] Replace status bar unit icon with actual images (Cozz Lovan)
Merge pull request #4477

18c7ba8 Add translation mailing list to README.md (Michael Ford)
Merge pull request #4327

a339a37 error out, when we detect -socks argument (Philip Kaufmann)
0127a9b remove SOCKS4 support from core and GUI (Philip Kaufmann)
Fix the build for windows

Problem introduced in caf6150. Thanks to @drak for noticing. Fixes #4473.
Merge pull request #4045

a3e192a replaced MINE_ with ISMINE_ (JaSK)
53a2148 fixed bug where validateaddress doesn't display information (JaSK)
f28707a fixed bug in ListReceived() (JaSK)
519dd1c Added MINE_ALL = (spendable|watchonly) (JaSK)
23b0506 Fixed some stuff in TransactionDesc (JaSK)
80dda36 removed default argument values for ismine filter (JaSK)
d5087d1 Use script matching rather than destination matching for watch-only. (Pieter Wuille)
0fa2f88 added includedWatchonly argument to listreceivedbyaddress/...account (JaSK)
f87ba3d added includeWatchonly argument to 'gettransaction' because it affects balance calculation (JaSK)
a5c6c5d fixed tiny glitch and improved readability like laanwj suggested (JaSK)
d7d5d23 Added argument to listtransactions and listsinceblock to include watchonly addresses (JaSK)
952877e Showing 'involvesWatchonly' property for transactions returned by 'listtransactions' and 'listsinceblock'. It is only appended when the transaction involves a watchonly address. (JaSK)
83f3543 Added argument to listaccounts to include watchonly addresses (JaSK)
d4640d7 Added argument to getbalance to include watchonly addresses and fixed errors in balance calculation. (JaSK)
d2692f6 Watchonly transactions are marked in transaction history (JaSK)
ffd40da Watchonly balances are shown separately in gui. (JaSK)
2935b21 qt: Hide unspendable outputs in coin control (Wladimir J. van der Laan)
c898846 Add support for watch-only addresses (Pieter Wuille)
Merge pull request #4471

40f5cb8 Send rejects and apply DoS scoring for errors in direct block validation. (Pieter Wuille)
Bugfix: strerror_r can return an error, and if it does, POSIX does not specify the content of the buffer
test/bloom_tests: Use UL suffix for unsigned long number to ensure compatibility
Merge pull request #4480

2227725 test/bloom_tests: Use UL suffix for unsigned long number to ensure compatibility (Luke Dashjr)
Show bitcoin quantities with full precision, even in the presence of trailing zeros
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/qt/overviewpage.cpp
	src/qt/transactiondesc.cpp
Remove unused fAlign argument from BitcoinUnits::format and friends
Add comments re BitcoinUnits::formatWithUnit/formatHtmlWithUnit