From: Robert Ransom <rransom.8774@gmail.com>
Date: Wed, 1 Jun 2011 09:00:59 +0000 (-0700)
Subject: Use single-hop intro and rend circuits when in tor2web mode
X-Git-Tag: tor-0.2.3.9-alpha~26^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=826f1d5b0ab1faa0c75d2fd6560b4983adec33c8;p=thirdparty%2Ftor.git

Use single-hop intro and rend circuits when in tor2web mode
---

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;