commit df0b4f0342fc95f213cb5bb19a1f5260d546c1b6 Merge: e94ef30 8234fa0 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 22 09:26:30 2015 -0400

Merge branch 'feature16769_squashed'

changes/feature16769 | 4 ++++ src/or/config.c | 29 +++++++++++++++++++++++++++++ src/or/or.h | 3 ++- src/or/routerkeys.c | 43 +++++++++++++++++++++++++++++++++++-------- src/or/routerkeys.h | 1 + 5 files changed, 71 insertions(+), 9 deletions(-)

diff --cc src/or/routerkeys.c index b1e9ed3,197dbf8..765dac8 --- 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 b396779,f9eb777..0e1c625 --- 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,