aboutsummaryrefslogtreecommitdiff
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
commit58ac00fce88b70de78c30a5b9ee1db051f2e1c96 (patch)
tree92cd16bc0dae476b4b9d7dc188bd10e5bf968d9b
parent34ea50b32a189d22df535ba283a1d404a263780b (diff)
parent9713ecfc40c9dafaee5a03e469b0d9d701cc6181 (diff)
downloadtor-58ac00fce88b70de78c30a5b9ee1db051f2e1c96.tar.gz
tor-58ac00fce88b70de78c30a5b9ee1db051f2e1c96.zip
Merge branch 'maint-0.3.1' into release-0.3.1
-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