aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-10 22:12:47 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-10 22:12:47 -0400
commita9b2e5eac6168a1eb09da8d6d3ff43b08cc51411 (patch)
tree12f0900fd451189aee10b9fcd36469b7bdb08ead /src/or/config.c
parent8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7 (diff)
parenta3fe8b11663a32f1f007bd7cb0b9656825093544 (diff)
downloadtor-a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411.tar.gz
tor-a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411.zip
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 921503b4b9..c4fc8dd58f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2564,6 +2564,13 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("Can't use a relative path to torrc when RunAsDaemon is set.");
#endif
+ if (server_mode(options) && options->RendConfigLines)
+ log_warn(LD_CONFIG,
+ "Tor is currently configured as a relay and a hidden service. "
+ "That's not very secure: you should probably run your hidden service "
+ "in a separate Tor process, at least -- see "
+ "https://trac.torproject.org/8742");
+
/* XXXX require that the only port not be DirPort? */
/* XXXX require that at least one port be listened-upon. */
if (n_ports == 0 && !options->RendConfigLines)