diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:52:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:52:06 -0400 |
| commit | e3b1573be6aefc91946fa4649591ed1690d77ee8 (patch) | |
| tree | 449e6a0f317b7ce73a18b3c34477f474247f074f /src/or/routerkeys.h | |
| parent | dd573f72b2f20b9aec310ee298ac4e9b737f835d (diff) | |
| parent | 91f49bc0f0759d0e0a794fbfe8cce5a9bb07e607 (diff) | |
| download | tor-e3b1573be6aefc91946fa4649591ed1690d77ee8.tar.gz tor-e3b1573be6aefc91946fa4649591ed1690d77ee8.zip | |
Merge branch 'maint-0.3.0'
Diffstat (limited to 'src/or/routerkeys.h')
| -rw-r--r-- | src/or/routerkeys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerkeys.h b/src/or/routerkeys.h index 6453c785b5..c10cf32a71 100644 --- a/src/or/routerkeys.h +++ b/src/or/routerkeys.h @@ -66,7 +66,7 @@ MOCK_DECL(int, check_tap_onion_key_crosscert,(const uint8_t *crosscert, int load_ed_keys(const or_options_t *options, time_t now); int should_make_new_ed_keys(const or_options_t *options, const time_t now); -int generate_ed_link_cert(const or_options_t *options, time_t now); +int generate_ed_link_cert(const or_options_t *options, time_t now, int force); int read_encrypted_secret_key(ed25519_secret_key_t *out, const char *fname); |