Merge remote-tracking branch 'origin/wb/epoch-block-idea-2' into wb/epoch-block-idea-2

consensus/reactor.go

@@ -493,7 +493,7 @@ func (conR *Reactor) sendNewRoundStepMessage(peer p2p.Peer) {
 func (conR *Reactor) updateRoundStateRoutine() {
 	t := time.NewTicker(100 * time.Microsecond)
 	defer t.Stop()
-	for range t {
+	for range t.C {
 		if !conR.IsRunning() {
 			return
 		}