瀏覽代碼

Merge branch 'bug26158_031' into maint-0.3.1

Nick Mathewson 6 年之前
父節點
當前提交
94f3007627
共有 2 個文件被更改,包括 6 次插入0 次删除
  1. 5 0
      changes/bug26158
  2. 1 0
      src/or/circuitbuild.c

+ 5 - 0
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.

+ 1 - 0
src/or/circuitbuild.c

@@ -1267,6 +1267,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,