Upstream merge #42

Merged

wowario merged 17 commits from upstream_merge into release-v0.2.1.0

Author	SHA1	Message	Date
anonimal	fd2094ed32	rapidjson: remove outdated in-tree, use submodule Includes ~2 years worth of fixes including security and build. Note: this pulls directly from master, not a release branch/tag. See https://github.com/Tencent/rapidjson/issues/1265 (cherry picked from commit `8a6c081df7`)	6 years ago
moneromooo-monero	3bd9d61c33	rpc: the cache is still for non cumulative on that branch	6 years ago
moneromooo-monero	36deb5d509	rpc: convert distribution to cumulative after caching This avoids double conversion on a later cache hit	6 years ago
moneromooo-monero	7b033b1670	http_protocol_handler: limit the number of starting newlines	6 years ago
moneromooo-monero	e59faed04e	abstract_tcp_server2: timeout on RPC connections	6 years ago
moneromooo-monero	8df3cdb4ac	http_protocol_handler: speedup newline discarding	6 years ago
moneromooo-monero	0803ea2401	console_handler: fix start_default_console use of prompt parameter It had not been updated to the function type change	6 years ago
cslashm	b50014071e	Fix CMAKE config for PCSC in order to avoid msys DLL dependencies	6 years ago
wowario	cdb20d58b5	remove whitespace	6 years ago
moneromooo-monero	2fffd60e35	protocol: do not switch to unsafe sync mode for just a few blocks	6 years ago
stoffu	195e309465	Fix output shuffling for multisig	6 years ago
moneromooo-monero	d78fe99ac6	add top height to get_output_distribution, and cache it for rct This should cache the vast majority of calls for long running wallets	6 years ago
moneromooo-monero	1c35363d47	wallet2: fix misc issues when the ringdb can't be initialized	6 years ago
moneromooo-monero	57c006d6f1	core: fix automatic safe db sync mode switching	6 years ago
stoffu	10321fb7c2	wallet2: store subaddress lookahead settings	6 years ago
cslashm	caf9354e2f	Use 'boost' mutex instead of 'std' mutex	6 years ago
cslashm	67a6dbc19f	Fix sub-address tx scan. When additional keys was needed, the TX scan failed because the derivation data was always recomputed with the main tx_key and not the corresponding additional one. Moreover this patch avoid perf decreasing when not using HW device.	6 years ago