diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:26:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:26:30 -0400 |
| commit | df0b4f0342fc95f213cb5bb19a1f5260d546c1b6 (patch) | |
| tree | 550eb99f0f3bba666ac9e60c4de157b69ee265cd /src/or/routerkeys.h | |
| parent | e94ef30a2fa6ef0197fe9fafbb2469475d868627 (diff) | |
| parent | 8234fa00539cd6aa560c4fa1502a04e0f9e35a18 (diff) | |
| download | tor-df0b4f0342fc95f213cb5bb19a1f5260d546c1b6.tar.gz tor-df0b4f0342fc95f213cb5bb19a1f5260d546c1b6.zip | |
Merge branch 'feature16769_squashed'
Diffstat (limited to 'src/or/routerkeys.h')
| -rw-r--r-- | src/or/routerkeys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/routerkeys.h b/src/or/routerkeys.h index b396779bd2..0e1c62571f 100644 --- a/src/or/routerkeys.h +++ b/src/or/routerkeys.h @@ -18,6 +18,7 @@ #define INIT_ED_KEY_NO_REPAIR (1u<<9) #define INIT_ED_KEY_SUGGEST_KEYGEN (1u<<10) #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, |