diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:20:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:20:17 -0400 |
| commit | b163e801bcc96f4720a0ac2bf1ade5eb2701a9c1 (patch) | |
| tree | 84398ad7b6ae2142370f2121ea19255c9fdcd118 /src/or/routerlist.c | |
| parent | ed600832d9fcd9ac6b2aacd36114f65ff227daf9 (diff) | |
| parent | 0cf327dc7874ae0a021054b78cbb7b24a11aa8fe (diff) | |
| download | tor-b163e801bcc96f4720a0ac2bf1ade5eb2701a9c1.tar.gz tor-b163e801bcc96f4720a0ac2bf1ade5eb2701a9c1.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/routerlist.c
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f98ba64954..f9bf5774a9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -337,7 +337,6 @@ trusted_dirs_remove_old_certs(void) time_t now = time(NULL); #define DEAD_CERT_LIFETIME (2*24*60*60) #define OLD_CERT_LIFETIME (7*24*60*60) -#define CERT_EXPIRY_SKEW (60*60) if (!trusted_dir_certs) return; |