diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-13 09:58:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-13 09:58:04 -0400 |
| commit | 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 (patch) | |
| tree | 20c1ce045e680066d3276196e6c372501ec6f417 | |
| parent | ff70cc84f8b00e710171bc988ababc9fe1be88e9 (diff) | |
| parent | 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b (diff) | |
| download | tor-6017447e3ae8f3cd53c7c6fff1f8660c29affde4.tar.gz tor-6017447e3ae8f3cd53c7c6fff1f8660c29affde4.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -rw-r--r-- | changes/bug26158 | 5 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug26158 b/changes/bug26158 new file mode 100644 index 0000000000..5ae1c30600 --- /dev/null +++ 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 index b36fed63b3..8c52c58e6d 100644 --- 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, |