summaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-11-07 07:23:09 -0500
committerNick Mathewson <nickm@torproject.org>2019-11-07 07:23:09 -0500
commit45698e89edecce71256bc5e2529f9610b0eea50f (patch)
treef6e72bcf55827151993611fd6dc0c227cead8189 /src/feature
parent7ee1e16c6f9d5ddc9ceae6aac7a25291e1336426 (diff)
parenta0820bc00df38883555a6307f2e1fe3bdf32ef81 (diff)
downloadtor-45698e89edecce71256bc5e2529f9610b0eea50f.tar.gz
tor-45698e89edecce71256bc5e2529f9610b0eea50f.zip
Merge remote-tracking branch 'tor-github/pr/1515'
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/relay/relay_config.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h
index 214f07efc2..5c36b43bd2 100644
--- a/src/feature/relay/relay_config.h
+++ b/src/feature/relay/relay_config.h
@@ -122,9 +122,6 @@ options_validate_relay_mode(const or_options_t *old_options,
return -1;
}
- /* 31851 / 29211: Set this option the correct way */
- options->ClientOnly = 1;
-
return 0;
}