Merge upstream fo real now?

1 files changed, 17 insertions, 5 deletions

diff --git a/other/bootstrap_daemon/conf b/other/bootstrap_daemon/conf
index 28e638c1..c05beff1 100644
--- a/other/bootstrap_daemon/conf
+++ b/other/bootstrap_daemon/conf
@@ -3,16 +3,16 @@
 // Listening port.
 port = 33445
 
-// The key file is like a password, so keep it where no one can read it.
+// A key file is like a password, so keep it where no one can read it.
 // The daemon should have permission to read/write to it.
 // Remember to replace the provided example with your own path.
-keys_file_path = "/home/tom/.tox_bootstrap_daemon/keys"
+keys_file_path = "/home/tom/.tox_bootstrap_daemon/.tox_bootstrap_daemon.keys"
 
 // The PID file written to by daemon.
 // Make sure that the user who runs the daemon has permissions to write to the
 // PID file.
 // Remember to replace the provided example with your own path.
-pid_file_path = "/home/tom/.tox_bootstrap_daemon/pid"
+pid_file_path = "/home/tom/.tox_bootstrap_daemon/.tox_bootstrap_daemon.pid"
 
 // Enable IPv6.
 enable_ipv6 = false
@@ -20,6 +20,18 @@ enable_ipv6 = false
 // Automatically bootstrap with nodes on local area network.
 enable_lan_discovery = true
 
+enable_tcp_relay = true
+
+// Tox uses 443, 3389 and 33445 ports by default, so it's highly recommended to keep
+// them.
+tcp_relay_ports = [443, 3389, 33445]
+
+// It's planned to use message of the day as a convenient method of checking
+// whether a node is up or not, though there are other methods of doing that.
+enable_motd = true
+
+motd = "tox_bootstrap_daemon"
+
 // Any number of nodes the daemon will bootstrap itself from.
 // 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.
@@ -28,8 +40,8 @@ enable_lan_discovery = true
 // from anyone.
 bootstrap_nodes = (
   { // Node 1
-    // Any ipv4 or ipv6, depending if `enable_ipv6` is set or not, and also
-    // any US-ASCII domain name.
+    // Any ipv4 or ipv6, depending on whether `enable_ipv6` is set or not, and
+    // also any US-ASCII domain name.
     address = "198.46.136.167"
     port = 33445
     public_key = "728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854"