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

Merge branch 'feature16769_squashed'
---

df0b4f0342fc95f213cb5bb19a1f5260d546c1b6
diff --cc src/or/routerkeys.c
index b1e9ed36f0,197dbf87a1..765dac883a
--- a/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 b396779bd2,f9eb777e90..0e1c62571f
--- a/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,