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/channel.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/channel.c')
-rw-r--r-- | src/core/or/channel.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 476f31d5b4..0c204ddfb6 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -1882,13 +1882,6 @@ channel_do_open_actions(channel_t *chan) if (!get_options()->ConnectionPadding) { /* Disable if torrc disabled */ channelpadding_disable_padding_on_channel(chan); - } else if (get_options()->Tor2webMode && - !networkstatus_get_param(NULL, - CHANNELPADDING_TOR2WEB_PARAM, - CHANNELPADDING_TOR2WEB_DEFAULT, 0, 1)) { - /* Disable if we're using tor2web and the consensus disabled padding - * for tor2web */ - channelpadding_disable_padding_on_channel(chan); } else if (rend_service_allow_non_anonymous_connection(get_options()) && !networkstatus_get_param(NULL, CHANNELPADDING_SOS_PARAM, |