diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-09-13 18:32:00 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-09-13 18:32:00 -0400 |
| commit | 1fcaeb60924d155e80a9579588a1b6c31e2174f7 (patch) | |
| tree | 274aa165a9ade0fbf3b9b1ce940d2e91c531d96a /src/or/router.c | |
| parent | 1e1cc43b5723008dc6ec19188b1613c3682c36d3 (diff) | |
| parent | 4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45 (diff) | |
| download | tor-1fcaeb60924d155e80a9579588a1b6c31e2174f7.tar.gz tor-1fcaeb60924d155e80a9579588a1b6c31e2174f7.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index ba6648ba68..c9f141b7f0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -533,7 +533,7 @@ init_keys(void) if (tor_tls_context_init(0, get_tlsclient_identity_key(), NULL, - MAX_SSL_KEY_LIFETIME) < 0) { + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error creating TLS context for Tor client."); return -1; } @@ -629,7 +629,7 @@ init_keys(void) if (tor_tls_context_init(public_server_mode(options), get_tlsclient_identity_key(), get_server_identity_key(), - MAX_SSL_KEY_LIFETIME) < 0) { + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error initializing TLS context"); return -1; } |