tor

commit 9ab45d621cc2b973bdfca99a69c0db2901d0e950
parent 14ffcc003d5e8fd383598e34183938fcec51a901
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  6 Jun 2017 11:34:11 -0400

Merge branch 'maint-0.3.0'

Diffstat:
M
src/or/routerkeys.c
 | 
9
++++-----

1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
@@ -1001,12 +1001,11 @@ generate_ed_link_cert(const or_options_t *options, time_t now,
   const tor_x509_cert_t *link_ = NULL, *id = NULL;
   tor_cert_t *link_cert = NULL;
 
-  if (!server_mode(options)) {
-    /* No need to make an Ed25519->Link cert: we are a client */
-    return 0;
-  }
-
   if (tor_tls_get_my_certs(1, &link_, &id) < 0 || link_ == NULL) {
+    if (!server_mode(options)) {
+        /* No need to make an Ed25519->Link cert: we are a client */
+      return 0;
+    }
     log_warn(LD_OR, "Can't get my x509 link cert.");
     return -1;
   }