diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-09-21 20:02:12 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-09-21 20:02:12 -0400 |
| commit | 09183dc3150000007ccc7b8fecd3b5b762a5b698 (patch) | |
| tree | 85668847232a6fd247e1347b553a3b353e9eefdd /src/or/connection_edge.c | |
| parent | 530fac10aaef5e38327c8704d657a2e67987f102 (diff) | |
| download | tor-09183dc3150000007ccc7b8fecd3b5b762a5b698.tar.gz tor-09183dc3150000007ccc7b8fecd3b5b762a5b698.zip | |
clients use optimistic data when reaching hidden services
Allow clients to use optimistic data when connecting to a hidden service,
which should cut out the initial round-trip for client-side programs
including Tor Browser.
(Now that Tor 0.2.2.x is obsolete, all hidden services should support
server-side optimistic data.)
See proposal 181 for details. Implements ticket 13211.
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index af1b5b6e29..522807d7ba 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1767,7 +1767,8 @@ connection_ap_supports_optimistic_data(const entry_connection_t *conn) general circuit. */ if (edge_conn->on_circuit == NULL || edge_conn->on_circuit->state != CIRCUIT_STATE_OPEN || - edge_conn->on_circuit->purpose != CIRCUIT_PURPOSE_C_GENERAL) + (edge_conn->on_circuit->purpose != CIRCUIT_PURPOSE_C_GENERAL && + edge_conn->on_circuit->purpose != CIRCUIT_PURPOSE_C_REND_JOINED)) return 0; return conn->may_use_optimistic_data; |