tor

commit ca6d289c00e5e18b24c7f463e709125e545d4405
parent 049ba66746006e45d8033d8f88f97ba61d8c5631
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 13 Jun 2018 09:59:28 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

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