summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-13 09:59:28 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-13 09:59:28 -0400
commit7e7585d0a193f8ac368705d7028ec4b241fc2afe (patch)
tree61fe85cda84a79dc25350c19ef2a837029ec2831
parent6017447e3ae8f3cd53c7c6fff1f8660c29affde4 (diff)
parent9713ecfc40c9dafaee5a03e469b0d9d701cc6181 (diff)
downloadtor-7e7585d0a193f8ac368705d7028ec4b241fc2afe.tar.gz
tor-7e7585d0a193f8ac368705d7028ec4b241fc2afe.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
-rw-r--r--changes/bug261582
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