Merge branch 'master' into parallel-fast-sync

author yahtoo <yahtoo.ma@gmail.com>

Mon, 8 Jul 2019 12:13:13 +0000 (20:13 +0800)

committer GitHub <noreply@github.com>

Mon, 8 Jul 2019 12:13:13 +0000 (20:13 +0800)
author yahtoo <yahtoo.ma@gmail.com>
Mon, 8 Jul 2019 12:13:13 +0000 (20:13 +0800)
committer GitHub <noreply@github.com>
Mon, 8 Jul 2019 12:13:13 +0000 (20:13 +0800)
diff --cc netsync/chainmgr/block_keeper.go
Simple merge
diff --cc netsync/chainmgr/handle.go
Simple merge
author	yahtoo <yahtoo.ma@gmail.com>
	Mon, 8 Jul 2019 12:13:13 +0000 (20:13 +0800)
committer	GitHub <noreply@github.com>
	Mon, 8 Jul 2019 12:13:13 +0000 (20:13 +0800)
		1	2
netsync/chainmgr/block_keeper.go	patch \|	diff1 \|	diff2 \|	blob \| history
netsync/chainmgr/handle.go	patch \|	diff1 \|	diff2 \|	blob \| history