Merge remote-tracking branch 'upstream/master'

AS/hk/hk.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "hk.hub.icfreedom.net:39119":{
-        "contact":"mixxit@hyperboria.name",
-        "password":"60dgptu2x8400qxnss5u1h9ld6h89p4",
-        "peerName":"hk.hub.icfreedom.net",
-        "publicKey":"b5rxqzvz1m8nbmx2473dgpxqgh7q0m7hu8fr1kxv40018zq1bwm0.k"
-    }
-}

AS/sg/singapore/sg.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "sg.hub.icfreedom.net:64221":{
-        "contact":"mixxit@hyperboria.name",
-        "password":"92tkn2fhkyx4p139v2320cs2d1407u0",
-        "peerName":"sg.hub.icfreedom.net",
-        "publicKey":"265s36tzlnj26ctxbmk4zjdt6fn5xmn0lgtyurkrwgftc3uysgb0.k"
-    }
-}

EU/fr/nord-pas-de-calais/hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "hub.icfreedom.net:64749":{
-        "contact":"mixxit@hyperboria.name",
-        "password":")h.1-_[?bFW!0H:O{=a>H+9&17q]*j1~Bjzk{e.$",
-        "peerName":"icfreedom.net",
-        "publicKey":"ny90t66vzmfywtcs3rs8fwwhzfk7frgvdfxutqxslk18jrj82hx0.k"
-    }
-}

EU/fr/nord-pas-de-calais/play.fallofanempire.com.k

@@ -1,8 +0,0 @@
-{
-    "play.fallofanempire.com:50005":{
-        "contact":"mixxit@hyperboria.name",
-        "password":"LTRXc&UQ>YQOB=zNSWh{^HXf%|ha5r)A)R/IV!dT",
-        "peerName":"play.fallofanempire.com",
-        "publicKey":"3c4q5wfvjm525gq0d0lmp1lh87dhm7llxhcyh2srhkjyrrmnxsm0.k"
-    }
-}

EU/gr/rethymno/kaotisk.rethymno-meshnet.k

@@ -1,9 +0,0 @@
-{
-    "rethymno-meshnet.tk:38295":{
-        "contact":"kaotisk@irc.fc00.io",
-        "login":"default-login",
-        "password":"wgs9k7n7j5yh0kx7kyl5m7cpp71ls4y",
-        "peerName":"gr-rethymno-meshnet",
-        "publicKey":"wb3pt76psbt28mt9t2wzyudyh9zkqwq9z3jqb3t06y53g6f5qzh0.k"
-    }
-}

EU/md/chisinau/eu-east.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "eu-east.hub.icfreedom.net:22992":{
-        "contact":"mixxit@hyperboria.name",
-        "password":"g7575cd9p1f6cmubhy705b50f0qp95b",
-        "peerName":"eu-east.hub.icfreedom.net",
-        "publicKey":"5xvkzx99t4x915x8xqzbsflvj3urpu48558wjc0613v97p377ks0.k"
-    }
-}

EU/uk/london/ansuz.science.k

@@ -1,6 +1,7 @@
 {
     "139.162.219.143:2331":{
         "contact":"ansuz@transitiontech.ca",
+        "gpg":"024A7C03E67ED8CF",
         "password":"CJ36KhxxO7nmfCy1kVB27rhwlWgnG95i",
         "publicKey":"bddc5j6sc45hlrdnccu120zwnmm2z0qlbfkxn9n8xbs0vqgx9fh0.k",
         "user":"ansuz"

NA/ca/quebec/ca.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "ca.hub.icfreedom.net:25109":{
-        "contact":"mixxituk@gmail.com",
-        "password":".!jjR[tyKF1ZO(J7mbf1=9!0jS^(~LUb#JPknsO,",
-        "publicKey":"g0q7z39pnptj1r5src9jnpp5wuzl1rtg608gy5xmd4ulpg275520.k",
-        "user":"ca.hub.icfreedom.net"
-    }
-}

NA/us/newjersey/h.transitiontech.ca.k

@@ -0,0 +1,9 @@
+{
+    "104.200.29.163:53053":{
+        "contact":"ansuz@transitiontech.ca",
+        "gpg":"024A7C03E67ED8CF",
+        "password":"cLjDBorhsYJUmJrESGueHsRY4HXcFyj",
+        "peerName":"transitiontech",
+        "publicKey":"1941p5k8qqvj17vjrkb9z97wscvtgc1vp8pv1huk5120cu42ytt0.k"
+    }
+}

NA/us/newyork/jacobhenner.usa.k

@@ -1,6 +1,7 @@
 {
     "107.170.57.34:63472":{
         "contact":"code@ventricle.us",
+        "gpg":"7FE895160E3314027CD3B5D37392CF088BB4345C",
         "location":"digitalocean nyc2",
         "login":"public-peer",
         "password":"ppm6j89mgvss7uvtntcd9scy6166mwb",
@@ -9,6 +10,7 @@
     },
     "[2604:a880:0:1010::f:4001]:63472":{
         "contact":"code@ventricle.us",
+        "gpg":"7FE895160E3314027CD3B5D37392CF088BB4345C",
         "location":"digitalocean nyc2",
         "login":"public-peer",
         "password":"ppm6j89mgvss7uvtntcd9scy6166mwb",

NA/us/oregon/h.us-west.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "us-west.hub.icfreedom.net:56941":{
-        "contact":"mixxituk@gmail.com",
-        "password":"80b8cqnbfy560f9mh8g3dqkh17gwp6g",
-        "publicKey":"wjzupkw8h2n20krbf887zyhu107j1dsz8m34rfbb9z10063ym2t0.k",
-        "user":"us-west.hub.icfreedom.net"
-    }
-}

README.md

@@ -37,9 +37,10 @@ We have tried to standardize the structure of the actual credential files, as su
   + publicKey
   + contact (a means of contacting the operator)
 * credentials should be formatted such that:
-  - there is a space after each colon
   - indentation uses four spaces
   - the file ends with a newline character.
+* credentials must use IP:port strings for keys
+  - credentials using hostnames will not be accepted
 
 ```
 {
@@ -85,4 +86,3 @@ console.log(Peers.peers);
 
 console.log(Peers.peers.NA.us.california);
 ```
-