diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dns.c | 3 | ||||
| -rw-r--r-- | src/or/main.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dns.c b/src/or/dns.c index f51a5ce75e..659b07b25b 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -130,8 +130,7 @@ int dns_resolve(connection_t *exitconn) { resolve = tor_malloc(sizeof(struct cached_resolve)); memset(resolve, 0, sizeof(struct cached_resolve)); resolve->state = CACHE_STATE_PENDING; - resolve->expire = now + 100; /* XXX for testing. when we're confident, switch it back */ -// resolve->expire = now + 86400; /* now + 1 day */ + resolve->expire = now + 15*60; /* 15 minutes */ strncpy(resolve->question, exitconn->address, MAX_ADDRESSLEN); /* add us to the pending list */ diff --git a/src/or/main.c b/src/or/main.c index 2e48ec48ce..deba88805d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -751,6 +751,7 @@ int tor_main(int argc, char *argv[]) { /* give it somewhere to log to initially */ add_stream_log(LOG_INFO, "<stdout>", stdout); + log_fn(LOG_WARN,"Tor v%s. This is experimental software. Do not use it if you need anonymity.",VERSION); if(getconfig(argc,argv,&options)) { log_fn(LOG_ERR,"Reading config failed. For usage, try -h."); |