Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-empty

Conflicts:
  src/or/router.c
Choose newer comment.
Merge changes to comment and function invocation.

diff --cc src/common/compat.c
Simple merge

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/router.c
index 94ae2e78c4dc511fa6d68a4647c13e0b24e9d19c,56bb909952858e9e3de37cc5007bc3f20f0e8525..f0317aa549eb4f80002ae48339c240a59de7da48
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c
@@@ -885,9 -880,7 +889,9 @@@ init_keys(void
  
    keydir = get_datadir_fname2("keys", "secret_onion_key.old");
    if (!lastonionkey && file_status(keydir) == FN_FILE) {
 -    prkey = init_key_from_file(keydir, 1, LOG_ERR, 0); /* XXXX Why 1? */
 +    /* Load keys from non-empty files only.
 +     * Missing old keys won't be replaced with freshly generated keys. */
-     prkey = init_key_from_file(keydir, 0, LOG_ERR);
++    prkey = init_key_from_file(keydir, 0, LOG_ERR, 0);
      if (prkey)
        lastonionkey = prkey;
    }

diff --cc src/or/routerlist.c
Simple merge