diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-24 12:39:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-24 12:39:26 -0400 |
| commit | 281a5e4670bfd4d687f58cf9999666a4d097e35e (patch) | |
| tree | 94a54235c332e3b48b9651d6893106f1a5a37317 /src/or/router.c | |
| parent | 75fc4dbbcabaedc715f0f9e883ccab1c9634e787 (diff) | |
| download | tor-281a5e4670bfd4d687f58cf9999666a4d097e35e.tar.gz tor-281a5e4670bfd4d687f58cf9999666a4d097e35e.zip | |
Warn and ignore the MyFamily setting if BridgeRelay is also set
Roger explains at
http://archives.seul.org/tor/talk/Nov-2011/msg00209.html :
"If you list your bridge as part of your family in the relay
descriptor, then everybody can learn your bridge fingerprint, and
they can look up your bridge's descriptor (and thus location) at
the bridge directory authority."
Now, we can't stop relays from listing bridges, but we can warn when
we notice a bridge listing anybody, which might help some.
This fixes bug 4657; it's a fix on 0.2.0.3-alpha, where bridges were
first introduced.
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c index 365e888af9..1919448152 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1483,7 +1483,7 @@ router_rebuild_descriptor(int force) } if (authdir_mode(options)) ri->is_valid = ri->is_named = 1; /* believe in yourself */ - if (options->MyFamily) { + if (options->MyFamily && ! options->BridgeRelay) { smartlist_t *family; if (!warned_nonexistent_family) warned_nonexistent_family = smartlist_create(); |