aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2014-09-21 19:04:18 -0400
committerRoger Dingledine <arma@torproject.org>2014-09-21 19:04:18 -0400
commitbbfb1aca55303c150ebb08e223a0d9a69bb5be26 (patch)
tree57a920e5a48c6a5931045542fac18142980aa7d5 /src/or/circuituse.c
parent4c8b809b9619770e29aa3c5ab66b194f784a9e93 (diff)
downloadtor-bbfb1aca55303c150ebb08e223a0d9a69bb5be26.tar.gz
tor-bbfb1aca55303c150ebb08e223a0d9a69bb5be26.zip
get rid of routerstatus->version_supports_optimistic_data
Clients are now willing to send optimistic circuit data (before they receive a 'connected' cell) to relays of any version. We used to only do it for relays running 0.2.3.1-alpha or later, but now all relays are new enough. Resolves ticket 13153.
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index bd42bd39cb..cb2d7e2b68 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -2110,8 +2110,7 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ,
exitnode->rs) {
/* Okay; we know what exit node this is. */
if (optimistic_data_enabled() &&
- circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL &&
- exitnode->rs->version_supports_optimistic_data)
+ circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL)
apconn->may_use_optimistic_data = 1;
else
apconn->may_use_optimistic_data = 0;