Merge branch 'feature16769_squashed'

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

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

diff --cc src/or/routerkeys.c
index b1e9ed36f06359c58f8ca4345d6b0dfdbc294e69,197dbf87a1d16a36062691dac99199867044ac44..765dac883a5dae3961d60f65b3eaacc633b432f2
--- 1/src/or/routerkeys.c
--- 2/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@@ -273,8 -281,8 +285,9 @@@ ed_key_init_from_file(const char *fname
    const int encrypt_key = !! (flags & INIT_ED_KEY_TRY_ENCRYPTED);
    const int norepair = !! (flags & INIT_ED_KEY_NO_REPAIR);
    const int split = !! (flags & INIT_ED_KEY_SPLIT);
 -  const int omit_secret = !! (flags &  INIT_ED_KEY_OMIT_SECRET);
 +  const int omit_secret = !! (flags & INIT_ED_KEY_OMIT_SECRET);
 +  const int offline_secret = !! (flags & INIT_ED_KEY_OFFLINE_SECRET);
+   const int explicit_fname = !! (flags & INIT_ED_KEY_EXPLICIT_FNAME);
  
    /* we don't support setting both of these flags at once. */
    tor_assert((flags & (INIT_ED_KEY_NO_REPAIR|INIT_ED_KEY_NEEDCERT)) !=

diff --cc src/or/routerkeys.h
index b396779bd24967cbb3d6b06fdd2576ece0727e8f,f9eb777e90140dd5ff5d5536c6a3873bb79f68ba..0e1c62571fa36ea342371e39063cf0868da3d5b2
--- 1/src/or/routerkeys.h
--- 2/src/or/routerkeys.h
+++ b/src/or/routerkeys.h
@@@ -17,7 -17,7 +17,8 @@@
  #define INIT_ED_KEY_TRY_ENCRYPTED               (1u<<8)
  #define INIT_ED_KEY_NO_REPAIR                   (1u<<9)
  #define INIT_ED_KEY_SUGGEST_KEYGEN              (1u<<10)
 -#define INIT_ED_KEY_EXPLICIT_FNAME              (1u<<11)
 +#define INIT_ED_KEY_OFFLINE_SECRET              (1u<<11)
++#define INIT_ED_KEY_EXPLICIT_FNAME              (1u<<12)
  
  struct tor_cert_st;
  ed25519_keypair_t *ed_key_init_from_file(const char *fname, uint32_t flags,