Merge branch '1.0'

Browse Source

Conflicts:
	router/crypto.go
	router/ethernet_decoder.go
	router/handshake_test.go
	router/mocks_test.go
	router/peers_test.go
	router/router.go
	router/udp_sender.go

...

This commit is contained in:

Matthias Radestock committed 2015-07-03 20:47:29 +01:00

2 parents 1524796408 bf73029d15

commit ce26f88ee2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available