diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:19:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:19:28 -0400 |
| commit | e94ef30a2fa6ef0197fe9fafbb2469475d868627 (patch) | |
| tree | b6ff0db12c54fe874a640d439a9d508d00bad31c /src/or/or.h | |
| parent | 2a9650625f5ce2cbad67299ce57c92bc70677a9b (diff) | |
| parent | d70b1b4da13d30f16ba0604103a1ebe915a2a20a (diff) | |
| download | tor-e94ef30a2fa6ef0197fe9fafbb2469475d868627.tar.gz tor-e94ef30a2fa6ef0197fe9fafbb2469475d868627.zip | |
Merge branch 'feature16944_v2'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 6660a0dcdc..503eb56b65 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4302,6 +4302,10 @@ typedef struct { /** How long before auth keys expire will we try to make a new one? */ int TestingAuthKeySlop; + /** Force use of offline master key features: never generate a master + * ed25519 identity key except from tor --keygen */ + int OfflineMasterKey; + enum { FORCE_PASSPHRASE_AUTO=0, FORCE_PASSPHRASE_ON, @@ -4309,6 +4313,7 @@ typedef struct { } keygen_force_passphrase; int use_keygen_passphrase_fd; int keygen_passphrase_fd; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */ |