2 files changed, 37 insertions, 64 deletions

diff --git a/gitversion.h b/gitversion.h
index e3b5b7f..092fb64 100644
--- a/gitversion.h
+++ b/gitversion.h
@@ -1 +1 @@
-#define GITVERSION "0.0.8"
+#define GITVERSION "034d0791c08fedff295e196df1e429e0b8dabee7"
diff --git a/tox_bootstrap.h b/tox_bootstrap.h
index 88f0fc9..c9db74b 100644
--- a/tox_bootstrap.h
+++ b/tox_bootstrap.h
@@ -1,7 +1,7 @@
 
 /*
  * Generated with generate_tox_bootstrap.py by GDR!
- * from https://nodes.tox.chat/json on 2017-10-28 14:39:07.047671
+ * from https://nodes.tox.chat/json on 2017-11-01 11:46:00.424767
  */
 struct bootstrap_node {
     char *address;
@@ -154,24 +154,6 @@ struct bootstrap_node {
     },
 
     {
-        "92.54.84.70",
-        33445,
-        {
-            0x56, 0x25, 0xA6, 0x26, 0x18, 0xCB, 0x4F, 0xCA, 0x70, 0xE1, 0x47, 0xA7, 0x1B, 0x29, 0x69, 0x5F,
-            0x38, 0xCC, 0x65, 0xFF, 0x0C, 0xBD, 0x68, 0xAD, 0x46, 0x25, 0x45, 0x85, 0xBE, 0x56, 0x48, 0x02
-        }
-    },
-
-    {
-        "195.93.190.6",
-        33445,
-        {
-            0xFB, 0x4C, 0xE0, 0xDD, 0xEF, 0xEE, 0xD4, 0x5F, 0x26, 0x91, 0x70, 0x53, 0xE5, 0xD2, 0x4B, 0xDD,
-            0xA0, 0xFA, 0x0A, 0x3D, 0x83, 0xA6, 0x72, 0xA9, 0xDA, 0x23, 0x75, 0x92, 0x8B, 0x37, 0x02, 0x3D
-        }
-    },
-
-    {
         "174.127.245.27",
         33445,
         {
@@ -235,7 +217,7 @@ struct bootstrap_node {
     },
 
     {
-        "61.230.173.150",
+        "36.227.175.240",
         33445,
         {
             0x3F, 0x0A, 0x45, 0xA2, 0x68, 0x36, 0x7C, 0x1B, 0xEA, 0x65, 0x2F, 0x25, 0x8C, 0x85, 0xF4, 0xA6,
@@ -491,7 +473,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "205.185.116.116",
-        3389,
+        33445,
         {
             0xA1, 0x79, 0xB0, 0x97, 0x49, 0xAC, 0x82, 0x6F, 0xF0, 0x1F, 0x37, 0xA9, 0x61, 0x3F, 0x6B, 0x57,
             0x11, 0x8A, 0xE0, 0x14, 0xD4, 0x19, 0x6A, 0x0E, 0x11, 0x05, 0xA9, 0x8F, 0x93, 0xA5, 0x47, 0x02
@@ -500,7 +482,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "205.185.116.116",
-        33445,
+        3389,
         {
             0xA1, 0x79, 0xB0, 0x97, 0x49, 0xAC, 0x82, 0x6F, 0xF0, 0x1F, 0x37, 0xA9, 0x61, 0x3F, 0x6B, 0x57,
             0x11, 0x8A, 0xE0, 0x14, 0xD4, 0x19, 0x6A, 0x0E, 0x11, 0x05, 0xA9, 0x8F, 0x93, 0xA5, 0x47, 0x02
@@ -509,7 +491,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "198.98.51.198",
-        33445,
+        3389,
         {
             0x1D, 0x5A, 0x5F, 0x2F, 0x5D, 0x62, 0x33, 0x05, 0x8B, 0xF0, 0x25, 0x9B, 0x09, 0x62, 0x2F, 0xB4,
             0x0B, 0x48, 0x2E, 0x4F, 0xA0, 0x93, 0x1E, 0xB8, 0xFD, 0x3A, 0xB8, 0xE7, 0xBF, 0x7D, 0xAF, 0x6F
@@ -518,7 +500,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "198.98.51.198",
-        3389,
+        33445,
         {
             0x1D, 0x5A, 0x5F, 0x2F, 0x5D, 0x62, 0x33, 0x05, 0x8B, 0xF0, 0x25, 0x9B, 0x09, 0x62, 0x2F, 0xB4,
             0x0B, 0x48, 0x2E, 0x4F, 0xA0, 0x93, 0x1E, 0xB8, 0xFD, 0x3A, 0xB8, 0xE7, 0xBF, 0x7D, 0xAF, 0x6F
@@ -536,7 +518,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "194.249.212.109",
-        3389,
+        33445,
         {
             0x3C, 0xEE, 0x1F, 0x05, 0x40, 0x81, 0xE7, 0xA0, 0x11, 0x23, 0x48, 0x83, 0xBC, 0x4F, 0xC3, 0x9F,
             0x66, 0x1A, 0x55, 0xB7, 0x36, 0x37, 0xA5, 0xAC, 0x29, 0x3D, 0xDF, 0x12, 0x51, 0xD9, 0x43, 0x2B
@@ -545,7 +527,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "194.249.212.109",
-        33445,
+        3389,
         {
             0x3C, 0xEE, 0x1F, 0x05, 0x40, 0x81, 0xE7, 0xA0, 0x11, 0x23, 0x48, 0x83, 0xBC, 0x4F, 0xC3, 0x9F,
             0x66, 0x1A, 0x55, 0xB7, 0x36, 0x37, 0xA5, 0xAC, 0x29, 0x3D, 0xDF, 0x12, 0x51, 0xD9, 0x43, 0x2B
@@ -554,7 +536,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.25.116.107",
-        3389,
+        33445,
         {
             0xDA, 0x4E, 0x4E, 0xD4, 0xB6, 0x97, 0xF2, 0xE9, 0xB0, 0x00, 0xEE, 0xFE, 0x3A, 0x34, 0xB5, 0x54,
             0xAC, 0xD3, 0xF4, 0x5F, 0x5C, 0x96, 0xEA, 0xEA, 0x25, 0x16, 0xDD, 0x7F, 0xF9, 0xAF, 0x7B, 0x43
@@ -563,7 +545,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.25.116.107",
-        33445,
+        3389,
         {
             0xDA, 0x4E, 0x4E, 0xD4, 0xB6, 0x97, 0xF2, 0xE9, 0xB0, 0x00, 0xEE, 0xFE, 0x3A, 0x34, 0xB5, 0x54,
             0xAC, 0xD3, 0xF4, 0x5F, 0x5C, 0x96, 0xEA, 0xEA, 0x25, 0x16, 0xDD, 0x7F, 0xF9, 0xAF, 0x7B, 0x43
@@ -581,7 +563,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.189.176.217",
-        3389,
+        33445,
         {
             0x2B, 0x21, 0x37, 0xE0, 0x94, 0xF7, 0x43, 0xAC, 0x8B, 0xD4, 0x46, 0x52, 0xC5, 0x5F, 0x41, 0xDF,
             0xAC, 0xC5, 0x02, 0xF1, 0x25, 0xE9, 0x9E, 0x4F, 0xE2, 0x4D, 0x40, 0x53, 0x74, 0x89, 0xE3, 0x2F
@@ -590,7 +572,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.189.176.217",
-        33445,
+        3389,
         {
             0x2B, 0x21, 0x37, 0xE0, 0x94, 0xF7, 0x43, 0xAC, 0x8B, 0xD4, 0x46, 0x52, 0xC5, 0x5F, 0x41, 0xDF,
             0xAC, 0xC5, 0x02, 0xF1, 0x25, 0xE9, 0x9E, 0x4F, 0xE2, 0x4D, 0x40, 0x53, 0x74, 0x89, 0xE3, 0x2F
@@ -599,7 +581,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "217.182.143.254",
-        33445,
+        2306,
         {
             0x7A, 0xED, 0x21, 0xF9, 0x4D, 0x82, 0xB0, 0x57, 0x74, 0xF6, 0x97, 0xB2, 0x09, 0x62, 0x8C, 0xD5,
             0xA9, 0xAD, 0x17, 0xE0, 0xC0, 0x73, 0xD9, 0x32, 0x90, 0x76, 0xA4, 0xC2, 0x8E, 0xD2, 0x81, 0x47
@@ -608,7 +590,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "217.182.143.254",
-        2306,
+        33445,
         {
             0x7A, 0xED, 0x21, 0xF9, 0x4D, 0x82, 0xB0, 0x57, 0x74, 0xF6, 0x97, 0xB2, 0x09, 0x62, 0x8C, 0xD5,
             0xA9, 0xAD, 0x17, 0xE0, 0xC0, 0x73, 0xD9, 0x32, 0x90, 0x76, 0xA4, 0xC2, 0x8E, 0xD2, 0x81, 0x47
@@ -689,7 +671,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "88.99.133.52",
-        33445,
+        3389,
         {
             0x2D, 0x32, 0x0F, 0x97, 0x1E, 0xF2, 0xCA, 0x18, 0x00, 0x44, 0x16, 0xC2, 0xAA, 0xE7, 0xBA, 0x52,
             0xBF, 0x79, 0x49, 0xDB, 0x34, 0xEA, 0x8E, 0x2E, 0x21, 0xAF, 0x67, 0xBD, 0x36, 0x7B, 0xE2, 0x11
@@ -698,7 +680,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "88.99.133.52",
-        3389,
+        33445,
         {
             0x2D, 0x32, 0x0F, 0x97, 0x1E, 0xF2, 0xCA, 0x18, 0x00, 0x44, 0x16, 0xC2, 0xAA, 0xE7, 0xBA, 0x52,
             0xBF, 0x79, 0x49, 0xDB, 0x34, 0xEA, 0x8E, 0x2E, 0x21, 0xAF, 0x67, 0xBD, 0x36, 0x7B, 0xE2, 0x11
@@ -724,15 +706,6 @@ struct bootstrap_node tcp_relays[] = {
     },
 
     {
-        "195.93.190.6",
-        33445,
-        {
-            0xFB, 0x4C, 0xE0, 0xDD, 0xEF, 0xEE, 0xD4, 0x5F, 0x26, 0x91, 0x70, 0x53, 0xE5, 0xD2, 0x4B, 0xDD,
-            0xA0, 0xFA, 0x0A, 0x3D, 0x83, 0xA6, 0x72, 0xA9, 0xDA, 0x23, 0x75, 0x92, 0x8B, 0x37, 0x02, 0x3D
-        }
-    },
-
-    {
         "174.127.245.27",
         33445,
         {
@@ -770,7 +743,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "95.215.44.78",
-        3389,
+        33445,
         {
             0x67, 0x2D, 0xBE, 0x27, 0xB4, 0xAD, 0xB9, 0xD5, 0xFB, 0x10, 0x5A, 0x6B, 0xB6, 0x48, 0xB2, 0xF8,
             0xFD, 0xB8, 0x9B, 0x33, 0x23, 0x48, 0x6A, 0x7A, 0x21, 0x96, 0x83, 0x16, 0xE0, 0x12, 0x02, 0x3C
@@ -779,7 +752,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "95.215.44.78",
-        33445,
+        3389,
         {
             0x67, 0x2D, 0xBE, 0x27, 0xB4, 0xAD, 0xB9, 0xD5, 0xFB, 0x10, 0x5A, 0x6B, 0xB6, 0x48, 0xB2, 0xF8,
             0xFD, 0xB8, 0x9B, 0x33, 0x23, 0x48, 0x6A, 0x7A, 0x21, 0x96, 0x83, 0x16, 0xE0, 0x12, 0x02, 0x3C
@@ -833,7 +806,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "80.87.193.193",
-        3389,
+        33445,
         {
             0xB3, 0x82, 0x55, 0xEE, 0x4B, 0x05, 0x49, 0x24, 0xF6, 0xD7, 0x9A, 0x5E, 0x6E, 0x58, 0x89, 0xEC,
             0x94, 0xB6, 0xAD, 0xF6, 0xFE, 0x99, 0x06, 0xF9, 0x7A, 0x3D, 0x01, 0xE3, 0xD0, 0x83, 0x22, 0x3A
@@ -842,7 +815,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "80.87.193.193",
-        33445,
+        3389,
         {
             0xB3, 0x82, 0x55, 0xEE, 0x4B, 0x05, 0x49, 0x24, 0xF6, 0xD7, 0x9A, 0x5E, 0x6E, 0x58, 0x89, 0xEC,
             0x94, 0xB6, 0xAD, 0xF6, 0xFE, 0x99, 0x06, 0xF9, 0x7A, 0x3D, 0x01, 0xE3, 0xD0, 0x83, 0x22, 0x3A
@@ -850,7 +823,7 @@ struct bootstrap_node tcp_relays[] = {
     },
 
     {
-        "61.230.173.150",
+        "36.227.175.240",
         33445,
         {
             0x3F, 0x0A, 0x45, 0xA2, 0x68, 0x36, 0x7C, 0x1B, 0xEA, 0x65, 0x2F, 0x25, 0x8C, 0x85, 0xF4, 0xA6,
@@ -859,7 +832,7 @@ struct bootstrap_node tcp_relays[] = {
     },
 
     {
-        "61.230.173.150",
+        "36.227.175.240",
         3389,
         {
             0x3F, 0x0A, 0x45, 0xA2, 0x68, 0x36, 0x7C, 0x1B, 0xEA, 0x65, 0x2F, 0x25, 0x8C, 0x85, 0xF4, 0xA6,
@@ -896,7 +869,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.9.77.5",
-        33445,
+        3389,
         {
             0xA8, 0x56, 0x24, 0x30, 0x58, 0xD1, 0xDE, 0x63, 0x33, 0x79, 0x50, 0x8A, 0xDC, 0xAF, 0xCF, 0x94,
             0x4E, 0x40, 0xE1, 0x67, 0x2F, 0xF4, 0x02, 0x75, 0x0E, 0xF7, 0x12, 0xE3, 0x0C, 0x42, 0x01, 0x2A
@@ -905,7 +878,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.9.77.5",
-        3389,
+        33445,
         {
             0xA8, 0x56, 0x24, 0x30, 0x58, 0xD1, 0xDE, 0x63, 0x33, 0x79, 0x50, 0x8A, 0xDC, 0xAF, 0xCF, 0x94,
             0x4E, 0x40, 0xE1, 0x67, 0x2F, 0xF4, 0x02, 0x75, 0x0E, 0xF7, 0x12, 0xE3, 0x0C, 0x42, 0x01, 0x2A
@@ -914,7 +887,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "144.217.86.39",
-        33445,
+        3389,
         {
             0x7E, 0x56, 0x68, 0xE0, 0xEE, 0x09, 0xE1, 0x9F, 0x32, 0x0A, 0xD4, 0x79, 0x02, 0x41, 0x93, 0x31,
             0xFF, 0xEE, 0x14, 0x7B, 0xB3, 0x60, 0x67, 0x69, 0xCF, 0xBE, 0x92, 0x1A, 0x2A, 0x2F, 0xD3, 0x4C
@@ -923,7 +896,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "144.217.86.39",
-        3389,
+        33445,
         {
             0x7E, 0x56, 0x68, 0xE0, 0xEE, 0x09, 0xE1, 0x9F, 0x32, 0x0A, 0xD4, 0x79, 0x02, 0x41, 0x93, 0x31,
             0xFF, 0xEE, 0x14, 0x7B, 0xB3, 0x60, 0x67, 0x69, 0xCF, 0xBE, 0x92, 0x1A, 0x2A, 0x2F, 0xD3, 0x4C
@@ -932,7 +905,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.14.30.213",
-        33445,
+        3389,
         {
             0x25, 0x55, 0x76, 0x3C, 0x8C, 0x46, 0x04, 0x95, 0xB1, 0x41, 0x57, 0xD2, 0x34, 0xDD, 0x56, 0xB8,
             0x63, 0x00, 0xA2, 0x39, 0x55, 0x54, 0xBC, 0xAE, 0x46, 0x21, 0xAC, 0x34, 0x5B, 0x8C, 0x1B, 0x1B
@@ -941,7 +914,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.14.30.213",
-        443,
+        33445,
         {
             0x25, 0x55, 0x76, 0x3C, 0x8C, 0x46, 0x04, 0x95, 0xB1, 0x41, 0x57, 0xD2, 0x34, 0xDD, 0x56, 0xB8,
             0x63, 0x00, 0xA2, 0x39, 0x55, 0x54, 0xBC, 0xAE, 0x46, 0x21, 0xAC, 0x34, 0x5B, 0x8C, 0x1B, 0x1B
@@ -950,7 +923,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.14.30.213",
-        3389,
+        443,
         {
             0x25, 0x55, 0x76, 0x3C, 0x8C, 0x46, 0x04, 0x95, 0xB1, 0x41, 0x57, 0xD2, 0x34, 0xDD, 0x56, 0xB8,
             0x63, 0x00, 0xA2, 0x39, 0x55, 0x54, 0xBC, 0xAE, 0x46, 0x21, 0xAC, 0x34, 0x5B, 0x8C, 0x1B, 0x1B
@@ -986,7 +959,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "136.243.141.187",
-        443,
+        33445,
         {
             0x6E, 0xE1, 0xFA, 0xDE, 0x9F, 0x55, 0xCC, 0x79, 0x38, 0x23, 0x4C, 0xC0, 0x7C, 0x86, 0x40, 0x81,
             0xFC, 0x60, 0x6D, 0x8F, 0xE7, 0xB7, 0x51, 0xED, 0xA2, 0x17, 0xF2, 0x68, 0xF1, 0x07, 0x8A, 0x39
@@ -995,7 +968,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "136.243.141.187",
-        33445,
+        3389,
         {
             0x6E, 0xE1, 0xFA, 0xDE, 0x9F, 0x55, 0xCC, 0x79, 0x38, 0x23, 0x4C, 0xC0, 0x7C, 0x86, 0x40, 0x81,
             0xFC, 0x60, 0x6D, 0x8F, 0xE7, 0xB7, 0x51, 0xED, 0xA2, 0x17, 0xF2, 0x68, 0xF1, 0x07, 0x8A, 0x39
@@ -1004,7 +977,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "136.243.141.187",
-        3389,
+        443,
         {
             0x6E, 0xE1, 0xFA, 0xDE, 0x9F, 0x55, 0xCC, 0x79, 0x38, 0x23, 0x4C, 0xC0, 0x7C, 0x86, 0x40, 0x81,
             0xFC, 0x60, 0x6D, 0x8F, 0xE7, 0xB7, 0x51, 0xED, 0xA2, 0x17, 0xF2, 0x68, 0xF1, 0x07, 0x8A, 0x39
@@ -1103,7 +1076,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.79.75.37",
-        3389,
+        33445,
         {
             0xD5, 0x27, 0xE5, 0x84, 0x7F, 0x83, 0x30, 0xD6, 0x28, 0xDA, 0xB1, 0x81, 0x4F, 0x0A, 0x42, 0x2F,
             0x6D, 0xC9, 0xD0, 0xA3, 0x00, 0xE6, 0xC3, 0x57, 0x63, 0x4E, 0xE2, 0xDA, 0x88, 0xC3, 0x54, 0x63
@@ -1112,7 +1085,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.79.75.37",
-        33445,
+        3389,
         {
             0xD5, 0x27, 0xE5, 0x84, 0x7F, 0x83, 0x30, 0xD6, 0x28, 0xDA, 0xB1, 0x81, 0x4F, 0x0A, 0x42, 0x2F,
             0x6D, 0xC9, 0xD0, 0xA3, 0x00, 0xE6, 0xC3, 0x57, 0x63, 0x4E, 0xE2, 0xDA, 0x88, 0xC3, 0x54, 0x63
@@ -1175,7 +1148,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "46.101.197.175",
-        33445,
+        443,
         {
             0xCD, 0x13, 0x3B, 0x52, 0x11, 0x59, 0x54, 0x1F, 0xB1, 0xD3, 0x26, 0xDE, 0x98, 0x50, 0xF5, 0xE5,
             0x6A, 0x6C, 0x72, 0x4B, 0x5B, 0x8E, 0x5E, 0xB5, 0xCD, 0x8D, 0x95, 0x04, 0x08, 0xE9, 0x57, 0x07
@@ -1193,7 +1166,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "46.101.197.175",
-        443,
+        33445,
         {
             0xCD, 0x13, 0x3B, 0x52, 0x11, 0x59, 0x54, 0x1F, 0xB1, 0xD3, 0x26, 0xDE, 0x98, 0x50, 0xF5, 0xE5,
             0x6A, 0x6C, 0x72, 0x4B, 0x5B, 0x8E, 0x5E, 0xB5, 0xCD, 0x8D, 0x95, 0x04, 0x08, 0xE9, 0x57, 0x07