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/or.h | |
| 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/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index a2f4083752..31deb897c7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -163,7 +163,9 @@ /** How often do we rotate onion keys? */ #define MIN_ONION_KEY_LIFETIME (7*24*60*60) /** How often do we rotate TLS contexts? */ -#define MAX_SSL_KEY_LIFETIME (2*60*60) +#define MAX_SSL_KEY_LIFETIME_INTERNAL (2*60*60) +/** What expiry time shall we place on our SSL certs? */ +#define MAX_SSL_KEY_LIFETIME_ADVERTISED (365*24*60*60) /** How old do we allow a router to get before removing it * from the router list? In seconds. */ |