From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Sep 2015 13:19:28 +0000 (-0400)
Subject: Merge branch 'feature16944_v2'
X-Git-Tag: tor-0.2.7.3-rc~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e94ef30a2fa6ef0197fe9fafbb2469475d868627;p=thirdparty%2Ftor.git

Merge branch 'feature16944_v2'
---

e94ef30a2fa6ef0197fe9fafbb2469475d868627
diff --cc src/or/routerkeys.c
index f7c65c21b5,d65b62991b..b1e9ed36f0
--- a/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) ||