Merge branch 'feature16944_v2'

diff --cc doc/tor.1.txt
Simple merge

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

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

diff --cc src/or/routerkeys.c
index f7c65c21b5bb0083346b02b1920d47680bca7c5e,d65b62991b8cdec37060c259568a43d9fdc394bd..b1e9ed36f06359c58f8ca4345d6b0dfdbc294e69
--- 1/src/or/routerkeys.c
--- 2/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@@ -668,11 -676,9 +676,13 @@@ load_ed_keys(const or_options_t *option
      use_signing = sign;
    }
  
 -
 +  if (!use_signing && master_signing_key) {
 +    check_signing_cert = signing_key_cert;
 +    use_signing = master_signing_key;
 +  }
 +
+   const int offline_master =
+     options->OfflineMasterKey && options->command != CMD_KEYGEN;
    const int need_new_signing_key =
      NULL == use_signing ||
      EXPIRES_SOON(check_signing_cert, 0) ||