Merge branch 'master' into light-poa

2017-08-30 18:18:52 +02:00
parent d3c3e0b164 6b5ad69c22
commit abfa8e95a2
56 changed files with 720 additions and 134 deletions
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -91,6 +91,7 @@

 use std::collections::{HashSet, HashMap};
 use std::cmp;
+use heapsize::HeapSizeOf;
 use util::*;
 use rlp::*;
 use network::*;