diff --git a/src/or/or.h b/src/or/or.h
index 916476cf7e..f55f837731 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -162,7 +162,7 @@
 /** How long do we keep DNS cache entries before purging them? */
 #define MAX_DNS_ENTRY_AGE (150*60)
 #else
-#define MAX_DNS_ENTRY_AGE (15*60)
+#define MAX_DNS_ENTRY_AGE (30*60)
 #endif
 
 /** How often do we rotate onion keys? */
diff --git a/src/or/router.c b/src/or/router.c
index 6bcc678d52..56ad0d0caf 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -500,8 +500,8 @@ static int decide_if_publishable_server(time_t now) {
 void consider_publishable_server(time_t now, int force) {
   if (decide_if_publishable_server(now)) {
     set_server_advertised(1);
-    router_rebuild_descriptor(force);
-    router_upload_dir_desc_to_dirservers(force);
+    if (router_rebuild_descriptor(force) == 0)
+      router_upload_dir_desc_to_dirservers(force);
   } else {
     set_server_advertised(0);
   }