tor

commit 2b99350ca4c905db1bd4f1aecc630b4f55933e96
parent 8d5dcdbda2160b6375cb479827d8cc2f16e06777
Author: Roger Dingledine <arma@torproject.org>
Date:   Wed, 31 Jan 2018 03:21:27 -0500

stop calling channel_mark_client in response to a create_fast

since all it does is produce false positives

this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even
though the code in the previous commit is already present in 0.3.1. sorry
for the mess.

Diffstat:
M
changes/bug24898-029
 | 
5
++---
M
src/or/command.c
 | 
4
----

2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/changes/bug24898-029 b/changes/bug24898-029
@@ -1,7 +1,6 @@
-  o Minor bugfixes:
+  o Minor bugfixes (relay):
     - Make the internal channel_is_client() function look at what sort
       of connection handshake the other side used, rather than whether
       the other side ever sent a create_fast cell to us. Backports part
-      of the fixes from bug 24898.
-
+      of the fixes from bugs 22805 and 24898.
 
diff --git a/src/or/command.c b/src/or/command.c
@@ -344,10 +344,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
     int len;
     created_cell_t created_cell;
 
-    /* Make sure we never try to use the OR connection on which we
-     * received this cell to satisfy an EXTEND request,  */
-    channel_mark_client(chan);
-
     memset(&created_cell, 0, sizeof(created_cell));
     len = onion_skin_server_handshake(ONION_HANDSHAKE_TYPE_FAST,
                                        create_cell->onionskin,