diff options
| author | Andrea Shepard <andrea@torproject.org> | 2013-05-10 19:39:48 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2013-05-10 19:39:48 -0700 |
| commit | aaa3a085db05c4d98b7c51b5ef16da166e7c7f0a (patch) | |
| tree | b5b7a62362aac37bcbf237548de19f467d88805b /src/or/router.c | |
| parent | bae5dd6c8d4535360d471932b87431f54b515567 (diff) | |
| parent | 54f41d68e9e30ccd0ebd84a3f8e913ea9e923cfd (diff) | |
| download | tor-aaa3a085db05c4d98b7c51b5ef16da166e7c7f0a.tar.gz tor-aaa3a085db05c4d98b7c51b5ef16da166e7c7f0a.zip | |
Merge bug5595-v2-squashed into maint-0.2.4
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 6e516e5c64..6069da8f09 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -969,7 +969,8 @@ init_keys(void) if (cert) { /* add my own cert to the list of known certs */ log_info(LD_DIR, "adding my own v3 cert"); if (trusted_dirs_load_certs_from_string( - cert->cache_info.signed_descriptor_body, 0, 0)<0) { + cert->cache_info.signed_descriptor_body, + TRUSTED_DIRS_CERTS_SRC_SELF, 0)<0) { log_warn(LD_DIR, "Unable to parse my own v3 cert! Failing."); return -1; } |