Merge from base#4

Merged

EighteenZi merged 17 commits into

EighteenZi:masterfrom

openethereum:master

Apr 20, 2018

Commits on Apr 13, 2018

Commits on Apr 14, 2018

remove Tendermint extra_info due to seal inconsistencies (#8367)

ordian
authored and
debris
committed
More code refactoring to integrate Duration (#8322)

tomaka
authored and
debris
committed

Commits on Apr 16, 2018

tokio-core v0.1.16 -> v0.1.17 (#8408)

svyatonik
authored and
5chdn
committed
Replace legacy Rlp with UntrustedRlp and use in ethcore rlp views (#8316)

ascjones
authored and
5chdn
committed
Fix TODO comments (#8413)

sorpaas
authored and
5chdn
committed

Commits on Apr 19, 2018

update zip to 0.3 (#8381)

debris
authored and
tomusdrw
committed
typo, docs parity_chainId: empty string -> None (#8434)

sorpaas
authored and
andresilva
committed
Fix receipts stripping. (#8414)

tomusdrw
authored and
andresilva
committed
Changelogs for 1.9.6 and 1.10.1 (#8411)

5chdn
authored and
andresilva
committed
Move ethcore::Error to error_chain (#8386)

ascjones
authored and
5chdn
committed
remove From::from. (#8390)

EighteenZi
authored and
debris
committed