Merge branch 'master' into keccak_fn

2017-08-31 11:53:26 +02:00
parent 7849fff41e e04d58f647
commit 94f717a255
55 changed files with 704 additions and 120 deletions
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -92,6 +92,7 @@
 use std::collections::{HashSet, HashMap};
 use std::cmp;
 use hash::keccak;
+use heapsize::HeapSizeOf;
 use util::*;
 use rlp::*;
 use network::*;