Merge branch 'ticket22348_031' into maint-0.3.1

This commit is contained in:
Nick Mathewson
2017-08-28 11:44:18 -04:00
2 changed files with 11 additions and 1 deletions
+5
View File
@@ -0,0 +1,5 @@
o Minor features (directory authority):
- Improve the message that authorities report to relays when
the RSA/Ed25519 key pair they present conflicts with a previously
pinned key. Closes ticket 22348.