diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-05 10:20:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-05 10:20:44 -0400 |
| commit | 1ce0c5eba93d2ac48609efc327e6dc1d3a8de981 (patch) | |
| tree | 8e6fe5aaf8ae5f7b7ad974cc68295d79825cb11e /src/or/router.c | |
| parent | c19a2ff6913111d69f2b541194ae188dc354fc54 (diff) | |
| parent | 281a5e4670bfd4d687f58cf9999666a4d097e35e (diff) | |
| download | tor-1ce0c5eba93d2ac48609efc327e6dc1d3a8de981.tar.gz tor-1ce0c5eba93d2ac48609efc327e6dc1d3a8de981.zip | |
Merge remote-tracking branch 'public/bug4657'
Conflicts:
src/or/router.c
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 b98bb39b1c..352c456f1f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1598,7 +1598,7 @@ router_rebuild_descriptor(int force) ri->is_valid = ri->is_named = 1; /* believe in yourself */ #endif - if (options->MyFamily) { + if (options->MyFamily && ! options->BridgeRelay) { smartlist_t *family; if (!warned_nonexistent_family) warned_nonexistent_family = smartlist_new(); |