diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-25 12:39:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-25 12:39:00 -0400 |
| commit | 95d9f7e9cce96d684a1f0279aa82c68d0b6182be (patch) | |
| tree | 3928668f93b72e958818ff333c517b81a26fb123 /src | |
| parent | dc014c97472e3adf2306938841c13de0040a2ff0 (diff) | |
| parent | 38609f1354104f14bf7dde540b932450ab9a54cc (diff) | |
| download | tor-95d9f7e9cce96d684a1f0279aa82c68d0b6182be.tar.gz tor-95d9f7e9cce96d684a1f0279aa82c68d0b6182be.zip | |
Merge remote-tracking branch 'rransom/warn-about-hses-without-guards'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 9 | ||||
| -rw-r--r-- | src/or/dirvote.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 462fc73c0a..00ca427f45 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2538,6 +2538,15 @@ options_validate(or_options_t *old_options, or_options_t *options, options->UseEntryGuards = 0; } + if (!(options->UseEntryGuards) && + (options->RendConfigLines != NULL)) { + log_warn(LD_CONFIG, + "UseEntryGuards is disabled, but you have configured one or more " + "hidden services on this Tor instance. Your hidden services " + "will be very easy to locate using a well-known attack -- see " + "http://freehaven.net/anonbib/#hs-attack06 for details."); + } + if (!(options->LearnCircuitBuildTimeout) && options->CircuitBuildTimeout < RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT) { log_warn(LD_CONFIG, diff --git a/src/or/dirvote.c b/src/or/dirvote.c index b1b885cf3e..21ad83663a 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1893,7 +1893,7 @@ networkstatus_compute_consensus(smartlist_t *votes, * listed that descriptor will have the same summary. If not then * something is fishy and we'll use the most common one (breaking * ties in favor of lexicographically larger one (only because it - * lets me reuse more existing code. + * lets me reuse more existing code)). * * The other case that can happen is that no authority that voted * for that descriptor has an exit policy summary. That's |