[or-cvs] r11940: backport a little bit of r11915 (in tor/branches/tor-0_1_2-patches: . doc src/or)

[arma at seul.org]

Author: arma
Date: 2007-10-15 01:41:02 -0400 (Mon, 15 Oct 2007)
New Revision: 11940

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/doc/TODO.012
   tor/branches/tor-0_1_2-patches/src/or/main.c
Log:
backport a little bit of r11915


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-10-15 04:29:00 UTC (rev 11939)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-10-15 05:41:02 UTC (rev 11940)
@@ -16,6 +16,9 @@
     - 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

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-10-15 04:29:00 UTC (rev 11939)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-10-15 05:41:02 UTC (rev 11940)
@@ -13,5 +13,5 @@
     (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
 

Modified: tor/branches/tor-0_1_2-patches/src/or/main.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/main.c	2007-10-15 04:29:00 UTC (rev 11939)
+++ tor/branches/tor-0_1_2-patches/src/or/main.c	2007-10-15 05:41:02 UTC (rev 11940)
@@ -1133,7 +1133,7 @@
 }
 
 /** 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 @@
 
   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();