Merge commit 'origin/maint-0.2.1'

This commit is contained in:
Nick Mathewson 2009-09-01 15:59:40 -04:00
commit 64dce12ac8

View File

@ -557,6 +557,7 @@
"status/circuit-established" "status/circuit-established"
"status/enough-dir-info" "status/enough-dir-info"
"status/good-server-descriptor" "status/good-server-descriptor"
"status/accepted-server-descriptor"
"status/..." "status/..."
These provide the current internal Tor values for various Tor These provide the current internal Tor values for various Tor
states. See Section 4.1.10 for explanations. (Only a few of the states. See Section 4.1.10 for explanations. (Only a few of the
@ -1487,18 +1488,22 @@
We successfully uploaded our server descriptor to at least one We successfully uploaded our server descriptor to at least one
of the directory authorities, with no complaints. of the directory authorities, with no complaints.
{This event could affect the controller's idea of server status, but {Originally, the goal of this event was to declare "every authority
the controller should not interrupt the user to tell them so.} has accepted the descriptor, so there will be no complaints
about it." But since some authorities might be offline, it's
harder to get certainty than we had thought. As such, this event
is equivalent to ACCEPTED_SERVER_DESCRIPTOR below. Controllers
should just look at ACCEPTED_SERVER_DESCRIPTOR and should ignore
this event for now.}
NAMESERVER_STATUS NAMESERVER_STATUS
"NS=addr" "NS=addr"
"STATUS=" "UP" / "DOWN" "STATUS=" "UP" / "DOWN"
"ERR=" message "ERR=" message
One of our nameservers has changed status. One of our nameservers has changed status.
// actually notice
{This event could affect the controller's idea of server status, but {This event could affect the controller's idea of server status, but
the controller should not interrupt the user to tell them so.} the controller should not interrupt the user to tell them so.}
NAMESERVER_ALL_DOWN NAMESERVER_ALL_DOWN
All of our nameservers have gone down. All of our nameservers have gone down.