backport a little bit of r11915

svn:r11940

ChangeLog

@@ -16,6 +16,9 @@ Changes in version 0.1.2.18 - 2007-??-??
     - When looking for a circuit to cannibalize, consider family as well
       as identity.  Fixes bug 438.  Bugfix on 0.1.0.x (which introduced
       circuit cannibalization).
+    - Stop publishing a new server descriptor just because we get a
+      HUP signal. This led (in a roundabout way) to some servers getting
+      dropped from the networkstatus lists for a few hours each day.
 
   o Minor bugfixes:
     - Don't try to access (or alter) the state file when running

doc/TODO.012

@@ -13,5 +13,5 @@ Backport for 0.1.2.x once better tested:
     (this will break some existing test-network configurations, yes?)
   o r11499, r11500, r11501: hidserv hexdigests rather than nicknames
   o r11829: Don't warn when cancel_pending_resolve() finds a cached failure.
-R - r11915: just because you hup, don't publish a near-duplicate descriptor
+  o r11915: just because you hup, don't publish a near-duplicate descriptor
 

src/or/main.c

@@ -1133,7 +1133,7 @@ dns_servers_relaunch_checks(void)
 }
 
 /** Called when we get a SIGHUP: reload configuration files and keys,
- * retry all connections, re-upload all descriptors, and so on. */
+ * retry all connections, and so on. */
 static int
 do_hup(void)
 {
@@ -1178,7 +1178,6 @@ do_hup(void)
 
   if (server_mode(options)) {
 //    const char *descriptor;
-    mark_my_descriptor_dirty();
     /* Restart cpuworker and dnsworker processes, so they get up-to-date
      * configuration options. */
     cpuworkers_rotate();