diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-07-09 16:11:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-28 16:01:57 -0400 |
| commit | 4976eca8261015dd2a214c4f4722dcdbcfed9c64 (patch) | |
| tree | d7d46d07510bbedc1846bf633691ed43ab8bdbb1 /src/core/or/circuitstats.c | |
| parent | f8766e887879214297175b0548e3ba4235879df3 (diff) | |
| download | tor-4976eca8261015dd2a214c4f4722dcdbcfed9c64.tar.gz tor-4976eca8261015dd2a214c4f4722dcdbcfed9c64.zip | |
hs: Render obsolete Tor2web
Remove support for Tor2web in the code and build system. At this commit, tor
doesn't have Tor2web support anymore.
Ref: https://lists.torproject.org/pipermail/tor-dev/2018-July/013295.html
Close #26367
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/core/or/circuitstats.c')
| -rw-r--r-- | src/core/or/circuitstats.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c index 63cd21540d..9ebf618b45 100644 --- a/src/core/or/circuitstats.c +++ b/src/core/or/circuitstats.c @@ -113,8 +113,7 @@ get_circuit_build_timeout_ms(void) * 2. If the torrc option LearnCircuitBuildTimeout is false. * 3. If we are a directory authority * 4. If we fail to write circuit build time history to our state file. - * 5. If we are compiled or configured in Tor2web mode - * 6. If we are configured in Single Onion mode + * 5. If we are configured in Single Onion mode */ int circuit_build_times_disabled(const or_options_t *options) @@ -136,7 +135,7 @@ circuit_build_times_disabled_(const or_options_t *options, int config_disabled = !options->LearnCircuitBuildTimeout; int dirauth_disabled = authdir_mode(options); int state_disabled = did_last_state_file_write_fail() ? 1 : 0; - /* LearnCircuitBuildTimeout and Tor2web/Single Onion Services are + /* LearnCircuitBuildTimeout and Single Onion Services are * incompatible in two ways: * * - LearnCircuitBuildTimeout results in a low CBT, which @@ -148,12 +147,11 @@ circuit_build_times_disabled_(const or_options_t *options, * * If we fix both of these issues someday, we should test * these modes with LearnCircuitBuildTimeout on again. */ - int tor2web_disabled = rend_client_allow_non_anonymous_connection(options); int single_onion_disabled = rend_service_allow_non_anonymous_connection( options); if (consensus_disabled || config_disabled || dirauth_disabled || - state_disabled || tor2web_disabled || single_onion_disabled) { + state_disabled || single_onion_disabled) { #if 0 log_debug(LD_CIRC, "CircuitBuildTime learning is disabled. " |