diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-22 10:38:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-22 10:38:05 -0400 |
| commit | 1a1e695800d373facbe736d3f386009248ad70ef (patch) | |
| tree | 6c8ae6a9eba6ba78d8c88d55aa82d6e43d9ac4e7 /src | |
| parent | bc758e4a5e10739d65eafa9ce2624c49859f317b (diff) | |
| parent | 79c875ecdc546094dc761241a8f4cd7caccf9c0e (diff) | |
| download | tor-1a1e695800d373facbe736d3f386009248ad70ef.tar.gz tor-1a1e695800d373facbe736d3f386009248ad70ef.zip | |
Merge remote-tracking branch 'public/bug7733a'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/entrynodes.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index b95391e37a..b1fd310f97 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2291,6 +2291,13 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) node = node_get_mutable_by_id(ri->cache_info.identity_digest); tor_assert(node); rewrite_node_address_for_bridge(bridge, node); + if (tor_digest_is_zero(bridge->identity)) { + memcpy(bridge->identity,ri->cache_info.identity_digest, DIGEST_LEN); + log_notice(LD_DIR, "Learned identity %s for bridge at %s:%d", + hex_str(bridge->identity, DIGEST_LEN), + fmt_and_decorate_addr(&bridge->addr), + (int) bridge->port); + } add_an_entry_guard(node, 1, 1, 0, 0); log_notice(LD_DIR, "new bridge descriptor '%s' (%s): %s", ri->nickname, |