diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 09:50:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 09:50:22 -0400 |
| commit | 6f7dbd3d34fbc476721a64c7c5f5e241ec49b906 (patch) | |
| tree | 9108487ca15bf43c1ee6b952e5eee8912c25a4aa /src/or/router.c | |
| parent | 6864a44a4a6372c909ed8ea308881e4e8420046e (diff) | |
| parent | 5671586dc75eb282ae8d2d04f0fcb5e1e5064c9f (diff) | |
| download | tor-6f7dbd3d34fbc476721a64c7c5f5e241ec49b906.tar.gz tor-6f7dbd3d34fbc476721a64c7c5f5e241ec49b906.zip | |
Merge remote-tracking branch 'linus/bug6362'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index e5c3e1217c..2131c2cf06 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1554,8 +1554,9 @@ router_rebuild_descriptor(int force) ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */ - if (options->BridgeRelay) { - /* For now, only bridges advertise an ipv6 or-address. And only one. */ + + /* For now, at most one IPv6 or-address is being advertised. */ + { const port_cfg_t *ipv6_orport = NULL; SMARTLIST_FOREACH_BEGIN(get_configured_ports(), const port_cfg_t *, p) { if (p->type == CONN_TYPE_OR_LISTENER && @@ -1580,6 +1581,7 @@ router_rebuild_descriptor(int force) ri->ipv6_orport = ipv6_orport->port; } } + ri->identity_pkey = crypto_pk_dup_key(get_server_identity_key()); if (crypto_pk_get_digest(ri->identity_pkey, ri->cache_info.identity_digest)<0) { |