nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3'

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-13 09:58:05 -04:00
commit 286d02995f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.

1
src/or/circuitbuild.c
View File

@ -1264,6 +1264,7 @@ circuit_extend(cell_t *cell, circuit_t *circ)
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Client asked me to extend back to the previous hop " "Client asked me to extend back to the previous hop "
"(by Ed25519 ID)."); "(by Ed25519 ID).");
return -1;
} }
n_chan = channel_get_for_extend((const char*)ec.node_id, n_chan = channel_get_for_extend((const char*)ec.node_id,