tor

commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4
parent ff70cc84f8b00e710171bc988ababc9fe1be88e9
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 13 Jun 2018 09:58:04 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

Diffstat:
A
changes/bug26158
 | 
5
+++++
M
src/or/circuitbuild.c
 | 
1
+

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug26158 b/changes/bug26158
@@ -0,0 +1,5 @@
+   o Minor bugfixes (relay):
+     - Relays now correctly block attempts to re-extend to the previous
+       relay by Ed25519 identity. Previously they would warn in this case,
+       but not actually reject the attempt. Fixes bug 26158; bugfix on
+       0.3.0.1-alpha.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
@@ -1314,6 +1314,7 @@ circuit_extend(cell_t *cell, circuit_t *circ)
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Client asked me to extend back to the previous hop "
            "(by Ed25519 ID).");
+    return -1;
   }
 
   n_chan = channel_get_for_extend((const char*)ec.node_id,