Merge branch 'bug26158_031' into maint-0.3.1

This commit is contained in:
Nick Mathewson 2018-06-13 09:58:01 -04:00
commit 94f3007627
2 changed files with 6 additions and 0 deletions

5
changes/bug26158 Normal file
View File

@ -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.

View File

@ -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,