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
commit7cc3cdef2218d5689f2e51ca475b1c21db1359e5 (patch)
tree0420b472e33e99915951c596ee33c33c02b886a2
parent286d02995ff593cad9414e6755a94221171d9854 (diff)
parentca6d289c00e5e18b24c7f463e709125e545d4405 (diff)
downloadtor-7cc3cdef2218d5689f2e51ca475b1c21db1359e5.tar.gz
tor-7cc3cdef2218d5689f2e51ca475b1c21db1359e5.zip
Merge branch 'maint-0.3.3'
-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