diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:44:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:44:36 -0400 |
| commit | d5acdadaeffa8e1c61abef5881e9cc6e42d9a755 (patch) | |
| tree | ee2887749e97b34092109038dfe3a784df34155c /src/or/routerkeys.h | |
| parent | d1c1dc229e189cbf4e463b82751af007801a02eb (diff) | |
| parent | e5bdfd66cf03e8410c511f6dcf309142c64c85f5 (diff) | |
| download | tor-d5acdadaeffa8e1c61abef5881e9cc6e42d9a755.tar.gz tor-d5acdadaeffa8e1c61abef5881e9cc6e42d9a755.zip | |
Merge branch 'bug22460_030_01' into 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 d2027f4bbe..845abb4c70 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); |