diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:54:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:54:33 -0500 |
| commit | d04f21bf394eb9e1781a89d9827476e13cc11086 (patch) | |
| tree | de78da1483e0421c73bc9efad042eccd627f572d /src/or/circuituse.c | |
| parent | 3b88b638264011158d27d5b451fd07d16f60e16b (diff) | |
| parent | db648fe886fd8ae4f42bb13d0219ca7fa690bdc1 (diff) | |
| download | tor-d04f21bf394eb9e1781a89d9827476e13cc11086.tar.gz tor-d04f21bf394eb9e1781a89d9827476e13cc11086.zip | |
Merge branch 'feature2553-v4-rebased'
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | 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 0cb934491f..fbcfe24450 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1492,6 +1492,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; |