diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-01 11:30:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-01 11:30:29 -0400 |
| commit | 58e1c6dd868704520fcbd7d8d8bdd7f8dd6f5c58 (patch) | |
| tree | 21a45db25727048e78eed67dd92e97423d1497c0 /src/or/or.h | |
| parent | 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2 (diff) | |
| parent | 0151e1d1586b2e96dffb667cf2825e4fe993b62e (diff) | |
| download | tor-58e1c6dd868704520fcbd7d8d8bdd7f8dd6f5c58.tar.gz tor-58e1c6dd868704520fcbd7d8d8bdd7f8dd6f5c58.zip | |
Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/or/or.h b/src/or/or.h index b7c67baf93..33fe8b96c4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -143,18 +143,6 @@ /** Maximum size of a single extrainfo document, as above. */ #define MAX_EXTRAINFO_UPLOAD_SIZE 50000 -/** How long do we keep DNS cache entries before purging them (regardless of - * their TTL)? */ -#define MAX_DNS_ENTRY_AGE (30*60) -/** How long do we cache/tell clients to cache DNS records when no TTL is - * known? */ -#define DEFAULT_DNS_TTL (30*60) -/** How long can a TTL be before we stop believing it? */ -#define MAX_DNS_TTL (3*60*60) -/** How small can a TTL be before we stop believing it? Provides rudimentary - * pinning. */ -#define MIN_DNS_TTL 60 - /** How often do we rotate onion keys? */ #define MIN_ONION_KEY_LIFETIME (7*24*60*60) /** How often do we rotate TLS contexts? */ |