summaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-06-01 02:00:59 -0700
committerNick Mathewson <nickm@torproject.org>2011-11-30 14:54:15 -0500
commit826f1d5b0ab1faa0c75d2fd6560b4983adec33c8 (patch)
tree6e2e72a5f14dca2e106f72fa36659da2245329a0 /src/or/circuituse.c
parent29287ed0edf925fd9e05d5fbed53eb37bc8799c7 (diff)
downloadtor-826f1d5b0ab1faa0c75d2fd6560b4983adec33c8.tar.gz
tor-826f1d5b0ab1faa0c75d2fd6560b4983adec33c8.zip
Use single-hop intro and rend circuits when in tor2web mode
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 23efe05348..f9931d88d6 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1489,6 +1489,12 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
else
new_circ_purpose = desired_circuit_purpose;
+ if (options->Tor2webMode &&
+ (new_circ_purpose == CIRCUIT_PURPOSE_C_ESTABLISH_REND ||
+ new_circ_purpose == CIRCUIT_PURPOSE_C_INTRODUCING)) {
+ want_onehop = 1;
+ }
+
{
int flags = CIRCLAUNCH_NEED_CAPACITY;
if (want_onehop) flags |= CIRCLAUNCH_ONEHOP_TUNNEL;