diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-13 09:59:28 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-13 09:59:28 -0400 |
commit | ca6d289c00e5e18b24c7f463e709125e545d4405 (patch) | |
tree | d8602f54de4b7515065e6d3f5a52f0eb37fc74e5 | |
parent | 049ba66746006e45d8033d8f88f97ba61d8c5631 (diff) | |
parent | 7e7585d0a193f8ac368705d7028ec4b241fc2afe (diff) | |
download | tor-ca6d289c00e5e18b24c7f463e709125e545d4405.tar.gz tor-ca6d289c00e5e18b24c7f463e709125e545d4405.zip |
Merge branch 'maint-0.3.2' into maint-0.3.3
-rw-r--r-- | changes/bug26158 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/bug26158 b/changes/bug26158 index 5ae1c30600..0d74cf1167 100644 --- a/changes/bug26158 +++ b/changes/bug26158 @@ -1,4 +1,4 @@ - o Minor bugfixes (relay): + 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 |