sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backport a little bit of r11915 

svn:r11940
This commit is contained in:
Roger Dingledine 2007-10-15 05:41:02 +00:00
parent 75992364c9
commit ec186e77d5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16,6 +16,9 @@ Changes in version 0.1.2.18 - 2007-??-??
- When looking for a circuit to cannibalize, consider family as well - When looking for a circuit to cannibalize, consider family as well
as identity. Fixes bug 438. Bugfix on 0.1.0.x (which introduced as identity. Fixes bug 438. Bugfix on 0.1.0.x (which introduced
circuit cannibalization). 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: o Minor bugfixes:
- Don't try to access (or alter) the state file when running - Don't try to access (or alter) the state file when running

2
doc/TODO.012
View File

@ -13,5 +13,5 @@ Backport for 0.1.2.x once better tested:
(this will break some existing test-network configurations, yes?) (this will break some existing test-network configurations, yes?)
o r11499, r11500, r11501: hidserv hexdigests rather than nicknames o r11499, r11500, r11501: hidserv hexdigests rather than nicknames
o r11829: Don't warn when cancel_pending_resolve() finds a cached failure. 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

3
src/or/main.c
View File

@ -1133,7 +1133,7 @@ dns_servers_relaunch_checks(void)
} }
/** Called when we get a SIGHUP: reload configuration files and keys, /** 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 static int
do_hup(void) do_hup(void)
{ {
@ -1178,7 +1178,6 @@ do_hup(void)
if (server_mode(options)) { if (server_mode(options)) {
// const char *descriptor; // const char *descriptor;
mark_my_descriptor_dirty();
/* Restart cpuworker and dnsworker processes, so they get up-to-date /* Restart cpuworker and dnsworker processes, so they get up-to-date
* configuration options. */ * configuration options. */
cpuworkers_rotate(); cpuworkers_rotate();