warn on startup that we don't provide anonymity

make exit dns cache entries last 15 minutes

svn:r807

diff --git a/src/or/dns.c b/src/or/dns.c
index f51a5ce75e062488232e2455df357540e930abd2..659b07b25b4d42ddb6df441ab01dd5a7f67c6d72 100644 (file)
--- 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 2e48ec48ce02d70abd140b2ec5ec490504757e51..deba88805df8962525a4175ced34da38f6ed20fb 100644 (file)
--- 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.");