[tor-commits] [tor/master] Merge branch 'feature16944_v2'

[nickm at torproject.org]

commit e94ef30a2fa6ef0197fe9fafbb2469475d868627
Merge: 2a96506 d70b1b4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 22 09:19:28 2015 -0400

    Merge branch 'feature16944_v2'

 changes/feature16944 |    5 +++++
 doc/tor.1.txt        |    5 +++++
 src/or/config.c      |    1 +
 src/or/or.h          |    5 +++++
 src/or/routerkeys.c  |   49 +++++++++++++++++++++++++++++++++++++++----------
 src/or/routerkeys.h  |    1 +
 6 files changed, 56 insertions(+), 10 deletions(-)

diff --cc src/or/routerkeys.c
index f7c65c2,d65b629..b1e9ed3
--- 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) ||