diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-09-13 18:27:13 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-09-13 18:27:13 -0400 |
| commit | 4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45 (patch) | |
| tree | def7db8677a35c9638109aa4bd0429231e5c4445 /src/or/router.c | |
| parent | d679ef623fc912a25f0d1c36ad187d7bdca0a440 (diff) | |
| parent | 62ec584a3014b9b9333dcc6feb4989d1592d6d26 (diff) | |
| download | tor-4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45.tar.gz tor-4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45.zip | |
Merge branch 'maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/main.c
src/or/router.c
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 2165e6ea90..365e888af9 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -526,7 +526,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; } @@ -622,7 +622,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; } |