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/main.c | |
| 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/main.c')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 17177b0df5..af77f28dfd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3162,6 +3162,9 @@ tor_main(int argc, char *argv[]) #endif result = do_main_loop(); break; + case CMD_KEYGEN: + result = load_ed_keys(get_options(), time(NULL)); + break; case CMD_LIST_FINGERPRINT: result = do_list_fingerprint(); break; |