Merge branch 'master' into patch-10

README.md

@@ -90,8 +90,8 @@ Structure of block:
 ------------------
 
 _The on-disk format will change in the future. Consider this the network protocol._
-Each block has fixed size 512 bytes.
-Block consists of 16 fields each of whish has length 32 bytes.
+Each block has a fixed size of 512 bytes.
+Block consists of 16 fields each of which has length 32 bytes.
 Field 0 is header, it consists of 4 quadwords:
 - transport-layer header
 - types of all 16 fields, 4 bits for one type

client/netdb-testnet.txt

@@ -1,2 +1,3 @@
 77.55.222.85:3366
-213.21.5.18:3377
+213.21.5.18:3377
+136.243.55.153:16776

client/netdb-white-testnet.txt

@@ -1,2 +1,3 @@
 77.55.222.85:3366
-213.21.5.18:3377
+213.21.5.18:3377
+136.243.55.153:16776

client/netdb-white.txt

@@ -4,11 +4,9 @@
 195.24.64.107:3356
 77.55.222.85:3355
 24.234.35.55:31334
-95.105.233.208:16775
 120.79.95.7:12563
 139.99.101.187:13655
 52.191.198.174:13655
-66.11.125.30:888
 45.77.35.21:8900
 148.251.139.197:16800
 139.99.124.121:8900
@@ -23,3 +21,7 @@
 115.159.64.173:13654
 81.174.251.23:55555
 178.32.129.122:13654
+183.236.166.17:6666
+109.196.45.218:3355
+142.44.143.234:888
+217.32.219.219:55555

client/netdb.txt

@@ -4,7 +4,6 @@
 195.24.64.107:3356
 77.55.222.85:3355
 24.234.35.55:31334
-95.105.233.208:13655
 120.79.95.7:12563
 139.99.101.187:13655
 62.210.130.205:13654
@@ -20,4 +19,7 @@
 58.218.204.118:13655
 39.104.88.224:13655
 176.31.253.28:13655
-81.174.251.23:55555
+81.174.251.23:55555
+109.196.45.218:3355
+136.243.55.153:16775
+217.32.219.219:55555