OSDN Git Service

Merge branch 'master' into demo
authorBlockmeta-区块元 <blockmeta@8btc.com>
Fri, 22 Sep 2017 07:46:08 +0000 (15:46 +0800)
committerGitHub <noreply@github.com>
Fri, 22 Sep 2017 07:46:08 +0000 (15:46 +0800)
commitb191a9f203bf48737da0913b49e70695ea497c0c
tree7733f831f781b1c56e6a74c93efda4cb27889a2e
parent5f0856f4f8029a340a16247ba64ae322df06e62b
parent5ca7a4a8e2466ce07a3ce6d449f6eef199d562c9
Merge branch 'master' into demo
blockchain/hsm.go
blockchain/pseudohsm/pseudohsm.go
blockchain/reactor.go