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/or.h | |
| parent | e94ef30a2fa6ef0197fe9fafbb2469475d868627 (diff) | |
| parent | 8234fa00539cd6aa560c4fa1502a04e0f9e35a18 (diff) | |
| download | tor-df0b4f0342fc95f213cb5bb19a1f5260d546c1b6.tar.gz tor-df0b4f0342fc95f213cb5bb19a1f5260d546c1b6.zip | |
Merge branch 'feature16769_squashed'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 503eb56b65..bec39b2b37 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4313,7 +4313,8 @@ typedef struct { } keygen_force_passphrase; int use_keygen_passphrase_fd; int keygen_passphrase_fd; - + int change_key_passphrase; + char *master_key_fname; } or_options_t; /** Persistent state for an onion router, as saved to disk. */ |