tor

commit 7e7585d0a193f8ac368705d7028ec4b241fc2afe
parent 6017447e3ae8f3cd53c7c6fff1f8660c29affde4
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 13 Jun 2018 09:59:28 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

Diffstat:
M
changes/bug26158
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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