merge upstream

2014-07-01 15:03:02 +01:00
parent 12972b4b65 550407b0ec
commit 89630d2826
71 changed files with 13647 additions and 141 deletions
--- a/peer.go
+++ b/peer.go
@ -21,7 +21,7 @@ const (
 	// The size of the output buffer for writing messages
 	outputBufferSize = 50
 	// Current protocol version
-	ProtocolVersion = 20
+	ProtocolVersion = 21
 	// Interval for ping/pong message
 	pingPongTimer = 2 * time.Second
 )