[tor-commits] [tor/master] Use single-hop intro and rend circuits when in tor2web mode

[nickm at torproject.org]

commit 826f1d5b0ab1faa0c75d2fd6560b4983adec33c8
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Wed Jun 1 02:00:59 2011 -0700

    Use single-hop intro and rend circuits when in tor2web mode
---
 src/or/circuituse.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 23efe05..f9931d8 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;