Merge branch 'master' into next

* master:
  Sync conf file to deal with FreeBSD mmap mtime delay.

doc/UPDATES.md

@@ -19,6 +19,8 @@
     used.  On most systems this was harmless since the memory was not actually
     used.  This feature is still enabled by default for debug binaries.
     [1] http://clang.llvm.org/docs/AddressSanitizer.html
+  * Fix './wraith -C' file being immediately modified when saving on
+    FreeBSD (#94)
 
 # 1.4.7
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

src/conf.cc

@@ -192,6 +192,7 @@ confedit()
   um = umask(077);
 
   autowrote = writeconf(NULL, tmpconf.fd, CONF_COMMENT);
+  fsync(tmpconf.fd);
   fstat(tmpconf.fd, &st);		/* for file modification compares */
 //  tmpconf.my_close();