diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-17 10:12:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-17 10:12:37 -0400 |
| commit | d68133c745ccecf2baf86fad08bfd40070c7368c (patch) | |
| tree | e86573f441ccaf2a3073c7cea08e95bb4ce9c150 /src/or/or.h | |
| parent | a5b5d4bd2ea08c2db84aa53f44111f8492af1f62 (diff) | |
| parent | b6eee531bb546683387fb471b754f24bc40580d0 (diff) | |
| download | tor-d68133c745ccecf2baf86fad08bfd40070c7368c.tar.gz tor-d68133c745ccecf2baf86fad08bfd40070c7368c.zip | |
Merge branch '13642_offline_master_v2_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 ec5f2774ba..9e7b7534fb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3405,7 +3405,8 @@ typedef struct { /** What should the tor process actually do? */ enum { CMD_RUN_TOR=0, CMD_LIST_FINGERPRINT, CMD_HASH_PASSWORD, - CMD_VERIFY_CONFIG, CMD_RUN_UNITTESTS, CMD_DUMP_CONFIG + CMD_VERIFY_CONFIG, CMD_RUN_UNITTESTS, CMD_DUMP_CONFIG, + CMD_KEYGEN } command; char *command_arg; /**< Argument for command-line option. */ |