diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-08-20 12:58:26 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-08-20 12:58:26 -0400 |
commit | c57e8da4ea9cccc168bb946040350434088cb7cb (patch) | |
tree | ac5709a62d00c82b346ad853bab75df669b8f14e /src | |
parent | d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce (diff) | |
parent | a3fe8b11663a32f1f007bd7cb0b9656825093544 (diff) | |
download | tor-c57e8da4ea9cccc168bb946040350434088cb7cb.tar.gz tor-c57e8da4ea9cccc168bb946040350434088cb7cb.zip |
Merge remote-tracking branch 'public/bug12908_025'
Diffstat (limited to 'src')
-rw-r--r-- | src/or/config.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 3972c9dc45..3e1eb2dc0e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2567,6 +2567,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) |