Merge branch 'Proplex-patch-2'

This commit is contained in:
irungentoo 2014-10-06 09:04:22 -04:00
commit 116c7f7c7a
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -35,20 +35,53 @@ motd = "tox-bootstrapd"
// Remember to replace the provided example with your own node list. // Remember to replace the provided example with your own node list.
// There is a maintained list of bootstrap nodes on Tox's wiki, if you need it // There is a maintained list of bootstrap nodes on Tox's wiki, if you need it
// (http://wiki.tox.im/Nodes). // (http://wiki.tox.im/Nodes).
// You may leave the list empty or remove "bootstrap_nodes" complitely, // You may leave the list empty or remove "bootstrap_nodes" completely,
// in both cases this will be interpreted as if you don't want to bootstrap // in both cases this will be interpreted as if you don't want to bootstrap
// from anyone. // from anyone.
// address = any ipv4 or Any ipv4 or ipv6, depending on whether `enable_ipv6`
// is set or not, and also any US-ASCII domain name.
bootstrap_nodes = ( bootstrap_nodes = (
{ // Node 1 {
// Any ipv4 or ipv6, depending on whether `enable_ipv6` is set or not, // NikolaiToryzin - US
// and also any US-ASCII domain name. address = "192.254.75.98"
address = "198.46.136.167"
port = 33445 port = 33445
public_key = "728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854" public_key = "951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F"
}, },
{ // Node 2 {
address = "example.org" // Proplex - US
address = "107.161.17.51"
port = 33445 port = 33445
public_key = "8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858" public_key = "7BE3951B97CA4B9ECDDA768E8C52BA19E9E2690AB584787BF4C90E04DBB75111"
},
{
// SonOfRa - DE
address = "144.76.60.215"
port = 33445
public_key = "04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F"
},
{
// Astonex - FR
address = "37.59.102.176"
port = 33445
public_key = "B98A2CEAA6C6A2FADC2C3632D284318B60FE5375CCB41EFA081AB67F500C1B0B"
},
{
// SylvieLorxu - NL
address = "178.21.112.187"
port = 33445
public_key = "4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057"
},
{
// aitjcize - JP
address = "54.199.139.199"
port = 33445
public_key = "7F9C31FE850E97CEFD4C4591DF93FC757C7C12549DDD55F8EEAECC34FE76C029"
},
{
// NikolaiToryzin - CH
address = "31.7.57.236"
port = 443
public_key = "2A4B50D1D525DA2E669592A20C327B5FAD6C7E5962DC69296F9FEC77C4436E4E"
} }
) )