diff options
| -rw-r--r-- | changes/bug13196-systemd-writable-run-directory | 3 | ||||
| -rw-r--r-- | changes/bug7733a | 4 | ||||
| -rw-r--r-- | contrib/dist/tor.service.in | 1 | ||||
| -rw-r--r-- | src/or/entrynodes.c | 7 |
4 files changed, 15 insertions, 0 deletions
diff --git a/changes/bug13196-systemd-writable-run-directory b/changes/bug13196-systemd-writable-run-directory new file mode 100644 index 0000000000..737c354984 --- /dev/null +++ b/changes/bug13196-systemd-writable-run-directory @@ -0,0 +1,3 @@ + o Distribution: + - systemd unit file: set up /var/run/tor as writable for the Tor service. + Patch by intrigeri; resolves ticket 13196. diff --git a/changes/bug7733a b/changes/bug7733a new file mode 100644 index 0000000000..183c00994e --- /dev/null +++ b/changes/bug7733a @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When a bridge has been configured without an identity digest + (not recommended), avoid launching an extra channel to it when + bootstrapping. Fixes bug 7733; bugfix on 0.2.4.4-alpha. diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 20ceecf0ca..57409a7b0a 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -22,6 +22,7 @@ InaccessibleDirectories = /home ReadOnlyDirectories = / ReadWriteDirectories = @LOCALSTATEDIR@/lib/tor ReadWriteDirectories = @LOCALSTATEDIR@/log/tor +ReadWriteDirectories = @LOCALSTATEDIR@/run/tor NoNewPrivileges = yes [Install] 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, |