diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 12:15:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 12:15:53 -0400 |
| commit | 36909674b45d05854b821b6ac5952126a2cd2ab3 (patch) | |
| tree | 76ea7ebde26ef0a1296d65681c533c5f4ef8d40a /src/or/router.c | |
| parent | 5e5d4c99c131279931b702aa2a02639e9bdc0062 (diff) | |
| parent | cdb528d841e753b6cc0b8d8b2aeb6bed183a1a8d (diff) | |
| download | tor-36909674b45d05854b821b6ac5952126a2cd2ab3.tar.gz tor-36909674b45d05854b821b6ac5952126a2cd2ab3.zip | |
Merge remote-tracking branch 'teor/bug18963-remember-v2'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c index d70756fdbf..c30c1dd4d5 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1054,7 +1054,8 @@ init_keys(void) log_info(LD_DIR, "adding my own v3 cert"); if (trusted_dirs_load_certs_from_string( cert->cache_info.signed_descriptor_body, - TRUSTED_DIRS_CERTS_SRC_SELF, 0)<0) { + TRUSTED_DIRS_CERTS_SRC_SELF, 0, + NULL)<0) { log_warn(LD_DIR, "Unable to parse my own v3 cert! Failing."); return -1; } |