=== modified file 'TODO'
--- TODO	2016-07-03 03:32:28 +0000
+++ TODO	2017-02-22 21:45:35 +0000
@@ -119,5 +119,16 @@
 
 * [[http://www.undeadly.org/cgi?action=article&sid=20110530221728][OpenBSD]]
 
+* TODO Use raw public keys (RFC 7250) for TLS communications 		  :2:
+** Support for this is planned for GnuTLS version 3.6
+   https://gitlab.com/gnutls/gnutls/issues/26
+** Rationale
+*** The client key is used both for communication and encryption
+    Using raw keys in GnuTLS instead uses separate keys for
+    communication and password decryption.
+*** GnuTLS 3.5.9 has deprecated the OpenPGP functions
+    The functions are still available, but deprecated:
+    https://gitlab.com/gnutls/gnutls/issues/102
+
 
 #+STARTUP: showall

=== modified file 'mandos'
--- mandos	2017-01-25 19:38:31 +0000
+++ mandos	2017-02-22 21:45:35 +0000
@@ -2883,7 +2883,8 @@
     # Convert the SafeConfigParser object to a dict
     server_settings = server_config.defaults()
     # Use the appropriate methods on the non-string config options
-    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
+    for option in ("debug", "use_dbus", "use_ipv6", "restore",
+                   "foreground", "zeroconf"):
         server_settings[option] = server_config.getboolean("DEFAULT",
                                                            option)
     if server_settings["port"]: