Merge branch '13642_offline_master_v2_squashed'

diff --cc configure.ac
Simple merge

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

diff --cc src/or/or.h
Simple merge

diff --cc src/or/routerkeys.c
index e79204cf09d1c86f3a486a1d9fee4b5c3084a7b0,63d61c3f5b01bf1a169d4fd3d325f58886655903..277dc6e4aaf2408682052e11eb43c615a207adee
--- 1/src/or/routerkeys.c
--- 2/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@@ -342,14 -478,13 +483,16 @@@ load_ed_keys(const or_options_t *option
        flags |= INIT_ED_KEY_MISSING_SECRET_OK;
      if (! want_new_signing_key)
        flags |= INIT_ED_KEY_OMIT_SECRET;
+     if (options->command == CMD_KEYGEN)
+       flags |= INIT_ED_KEY_TRY_ENCRYPTED;
  
 +    char *fname =
 +      options_get_datadir_fname2(options, "keys", "ed25519_master_id");
      id = ed_key_init_from_file(
 -             options_get_datadir_fname2(options, "keys", "ed25519_master_id"),
 +             fname,
               flags,
               LOG_WARN, NULL, 0, 0, 0, NULL);
 +    tor_free(fname);
      if (!id)
        FAIL("Missing identity key");
      if (tor_mem_is_zero((char*)id->seckey.seckey, sizeof(id->seckey)))