aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--doc/TODO8
-rw-r--r--src/or/router.c3
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bf8fe7572a..568758fc23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,9 @@ Changes in version 0.1.2.5-xxxx - 200?-??-??
- Fix a bug in 0.1.2.2-alpha that prevented clients from asking
to resolve an address at a given exit node even when they ask for
it by name.
+ - Routers no longer ever list themselves in their "family" line,
+ even if configured to do so. This makes it easier to configure
+ family lists efficiently.
o Controller features:
- Have GETINFO dir/status/* work on hosts with DirPort disabled.
diff --git a/doc/TODO b/doc/TODO
index d85195b89b..066787d140 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -247,7 +247,7 @@ R - "bandwidth classes", for incoming vs initiated-here conns,
- What do we do about the fact that people can't read zlib-
compressed files manually?
- - Add IPv6 support to eventdns.c
+ o Add IPv6 support to eventdns.c
- Refactor DNS resolve implementation
- Refactor exit side of resolve: do we need a connection_t?
@@ -284,15 +284,15 @@ Minor items for 0.1.2.x as time permits:
o Some way for the authorities to set BadExit for some nodes manually.
- When we export something from foo.c file for testing purposes only,
make a foo_test.h file for test.c to include.
- - "getinfo fingerprint" controller command
- - "setevent guards" controller command
+ o "getinfo fingerprint" controller command
+ o "setevent guards" controller command
- The Debian package now uses --verify-config when (re)starting,
to distinguish configuration errors from other errors. Perhaps
the RPM and other startup scripts should too?
- add a "default.action" file to the tor/vidalia bundle so we can fix the
https thing in the default configuration:
http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#PrivoxyWeirdSSLPort
- - even if your torrc lists yourself in your myfamily line, don't list it in
+ o even if your torrc lists yourself in your myfamily line, don't list it in
the descriptor.
- Flesh out options_description array in src/or/config.c
- Don't let 'newnym' be triggered more often than every n seconds.
diff --git a/src/or/router.c b/src/or/router.c
index ffc7b38fa0..0c3ccafe3d 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -882,6 +882,9 @@ router_rebuild_descriptor(int force)
}
smartlist_add(ri->declared_family, name);
name = NULL;
+ } else if (router_is_me(member)) {
+ /* Don't list ourself in our own family; that's redundant */
+ continue;
} else {
char *fp = tor_malloc(HEX_DIGEST_LEN+2);
fp[0] = '$';