diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-19 09:09:25 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-19 09:09:25 -0500 |
| commit | 86105a4009bf3e128abfa3e735d8fa6f1f4d5975 (patch) | |
| tree | aed21bc05c8d864f30ec5460f013f9c80ea8b1a6 /src/or/config.c | |
| parent | 0e22da1b8de0bc10ebe80eb00f9e848a392edbdd (diff) | |
| download | tor-86105a4009bf3e128abfa3e735d8fa6f1f4d5975.tar.gz tor-86105a4009bf3e128abfa3e735d8fa6f1f4d5975.zip | |
Check ENABLE_TOR2WEB_MODE before any tor2webmode code
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index f2c6221c35..fa0e753d86 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3037,6 +3037,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->PredictedPortsRelevanceTime = MAX_PREDICTED_CIRCS_RELEVANCE; } +#ifdef ENABLE_TOR2WEB_MODE if (options->Tor2webMode && options->LearnCircuitBuildTimeout) { /* LearnCircuitBuildTimeout and Tor2webMode are incompatible in * two ways: @@ -3068,6 +3069,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "Tor2WebMode is enabled; disabling UseEntryGuards."); options->UseEntryGuards = 0; } +#endif if (options->Tor2webRendezvousPoints && !options->Tor2webMode) { REJECT("Tor2webRendezvousPoints cannot be set without Tor2webMode."); |